Commit c04039cd authored by p x's avatar p x
Browse files

演示前准备

parent 46f764ee
...@@ -4,6 +4,7 @@ import android.app.ProgressDialog ...@@ -4,6 +4,7 @@ import android.app.ProgressDialog
import android.content.ComponentName import android.content.ComponentName
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.widget.Toast
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
...@@ -19,6 +20,9 @@ class MainActivity : AppCompatActivity() { ...@@ -19,6 +20,9 @@ class MainActivity : AppCompatActivity() {
private var pd: ProgressDialog? = null private var pd: ProgressDialog? = null
//开始时间
private var starTime = 0L
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
enableEdgeToEdge() enableEdgeToEdge()
...@@ -29,7 +33,6 @@ class MainActivity : AppCompatActivity() { ...@@ -29,7 +33,6 @@ class MainActivity : AppCompatActivity() {
// v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) // v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
// insets // insets
// } // }
pyTorchVm.initialize(this)
setLis() setLis()
} }
...@@ -62,16 +65,35 @@ class MainActivity : AppCompatActivity() { ...@@ -62,16 +65,35 @@ class MainActivity : AppCompatActivity() {
} }
private fun setLis() { private fun setLis() {
//加载模型
binding.bt2.setOnClickListener {
starTime = System.currentTimeMillis()
pyTorchVm.initialize(this)
Toast.makeText(
this,
"加载模型耗时:${System.currentTimeMillis() - starTime}ms",
Toast.LENGTH_LONG
).show()
starTime = 0L
}
//开始计算
binding.bt1.setOnClickListener { binding.bt1.setOnClickListener {
if (pyTorchVm.isInitialized) { if (pyTorchVm.isInitialized) {
showProgress() showProgress()
var str = binding.et.text.toString() var str = binding.et.text.toString()
starTime = System.currentTimeMillis()
pyTorchVm.analyzeText(str) pyTorchVm.analyzeText(str)
} else { } else {
Snackbar.make(binding.root, "请等待模型加载完成", Snackbar.LENGTH_SHORT).show() Snackbar.make(binding.root, "请等待模型加载完成", Snackbar.LENGTH_SHORT).show()
} }
} }
pyTorchVm.starDemo.observe(this) { it -> pyTorchVm.starDemo.observe(this) { it ->
Toast.makeText(
this,
"计算耗时:${System.currentTimeMillis() - starTime}ms",
Toast.LENGTH_LONG
).show()
starTime = 0L
pd?.dismiss() pd?.dismiss()
binding.et.setHint("打开车窗到60%") binding.et.setHint("打开车窗到60%")
starDemoApl(it.name, it.value, it.status, it.speed) starDemoApl(it.name, it.value, it.status, it.speed)
...@@ -81,7 +103,7 @@ class MainActivity : AppCompatActivity() { ...@@ -81,7 +103,7 @@ class MainActivity : AppCompatActivity() {
private fun showProgress() { private fun showProgress() {
pd = ProgressDialog(this) pd = ProgressDialog(this)
pd?.setProgressStyle(ProgressDialog.STYLE_SPINNER); pd?.setProgressStyle(ProgressDialog.STYLE_SPINNER);
pd?.setMessage("正在计算,请稍后"); pd?.setMessage("推理中,请稍后");
pd?.setIndeterminate(false); pd?.setIndeterminate(false);
pd?.setCancelable(true); pd?.setCancelable(true);
pd?.show(); pd?.show();
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:maxLines="1" android:maxLines="1"
android:text="" android:text="空调设置45"
android:hint="空调设置45"/> android:hint="空调设置45"/>
...@@ -24,4 +24,10 @@ ...@@ -24,4 +24,10 @@
android:text="开始计算" /> android:text="开始计算" />
<Button
android:id="@+id/bt2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="加载模型" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment