添加了初始化界面，修复了人脸数据更新后不能识别的问题

2025-08-07 16:23:21 +08:00
parent 742b3a0775
commit 1f1c3804ac
18 changed files with 509 additions and 70 deletions
@@ -0,0 +1,84 @@
+package com.sw.dualscreen.activity
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.View
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
+import androidx.lifecycle.lifecycleScope
+import androidx.viewbinding.ViewBinding
+import com.sw.dualscreen.R
+import com.sw.dualscreen.view.CustomDialog
+import com.sw.dualscreen.viewmodel.BaseViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
+    protected lateinit var binding: VB
+    protected lateinit var context: Context
+    private var mDialogWaiting: CustomDialog? = null
+    private lateinit var viewModel: BaseViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        context = this
+
+        //保持亮屏
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+
+        binding = inflateViewBinding()
+        setContentView(binding.root)
+        viewModel = getViewModel()
+        initialize()
+        registerDataChange()
+    }
+
+    abstract fun getViewModel(): BaseViewModel
+
+    protected abstract fun inflateViewBinding(): VB
+
+    open fun initialize() {
+
+    }
+
+    open fun registerDataChange() {
+        lifecycleScope.launch {
+            viewModel.showLoading.collect {
+                Timber.d("registerDataChange 用户 showLoading = $it")
+                if (it) {
+                    showWaitingDialog("")
+                } else {
+                    hideWaitingDialog()
+                }
+            }
+        }
+    }
+
+    /**
+     * 显示等待提示框
+     */
+    fun showWaitingDialog(tip: String?): Dialog? {
+        hideWaitingDialog()
+        val view = View.inflate(this, R.layout.dialog_waiting, null)
+        if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).text = tip
+        mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
+        mDialogWaiting!!.show()
+        mDialogWaiting!!.setCancelable(true)
+        return mDialogWaiting
+    }
+
+    /**
+     * 隐藏等待提示框
+     */
+    fun hideWaitingDialog() {
+        mDialogWaiting?.dismiss()
+        mDialogWaiting = null
+    }
+}
@@ -5,35 +5,48 @@ import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat.startActivity
 import androidx.lifecycle.lifecycleScope
+import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.databinding.ActivityInitBinding
+import com.sw.dualscreen.utils.QRCodeUtil
+import com.sw.dualscreen.viewmodel.BaseViewModel
 import com.sw.dualscreen.viewmodel.DeviceViewModel
 import com.sw.plate.utils.AppUtil
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch

-class InitActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityInitBinding
+class InitActivity : BaseActivity<ActivityInitBinding>() {
    private val viewModel by viewModels<DeviceViewModel>()

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        binding = ActivityInitBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        val deviceId = AppUtil.getUDID(this)
+    override fun getViewModel(): BaseViewModel {
+        return viewModel
+    }
+
+    override fun inflateViewBinding(): ActivityInitBinding {
+        return ActivityInitBinding.inflate(layoutInflater)
+    }
+
+    override fun initialize() {
+        super.initialize()
        val isSuccess = viewModel.checkEquipmentInfo()
        if (isSuccess) {
            goMainActivity()
+            return
        }
-        binding.tvDeviceId.text = deviceId
-        binding.btConfirm.setOnClickListener {
+        binding.imgQr.setImageBitmap(
+            QRCodeUtil.generateQRCode(
+                content = GlobalData.deviceId,
+                size = 200
+            )
+        )
+        binding.initButton.setOnClickListener {
            viewModel.getDeviceToken()
        }
-        registerDataChange()
    }

-    private fun registerDataChange() {
+    override fun registerDataChange() {
+        super.registerDataChange()
        lifecycleScope.launch {
            viewModel.deviceInfoResult.drop(1).collect {
                if (it != true) return@collect
@@ -36,6 +36,8 @@ import com.sw.dualscreen.presentation.SecondaryScreenPresentation
 import com.sw.dualscreen.sdk.SensorScaleUtils
 import com.sw.dualscreen.utils.GlideUtils
 import com.sw.dualscreen.view.CustomBottomSheetDialog
+import com.sw.dualscreen.view.CustomDialog
+import com.sw.dualscreen.viewmodel.BaseViewModel
 import com.sw.dualscreen.viewmodel.UserViewModel
 import com.sw.plate.utils.ToastUtils
 import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
@@ -44,8 +46,7 @@ import timber.log.Timber
 import java.io.File
 import java.util.concurrent.Executors

-class MainActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityMainBinding
+class MainActivity : BaseActivity<ActivityMainBinding>() {
    private val viewModel by viewModels<UserViewModel>()
    private var imageCapture: ImageCapture? = null
    private var isAnalyzing = true // 控制是否进行图像分析
@@ -59,12 +60,16 @@ class MainActivity : AppCompatActivity() {
    private var bottomSheetDialog: CustomBottomSheetDialog? = null
    private var lastWeight: Double = 0.0

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        binding = ActivityMainBinding.inflate(layoutInflater)
-        setContentView(binding.main)
+    override fun getViewModel(): BaseViewModel {
+        return viewModel
+    }

+    override fun inflateViewBinding(): ActivityMainBinding {
+        return ActivityMainBinding.inflate(layoutInflater)
+    }
+
+    override fun initialize() {
+        super.initialize()
        initView()
        setupSecondaryDisplay()
        setupCamera()
@@ -94,7 +99,7 @@ class MainActivity : AppCompatActivity() {
        val spinnerAdapter = ArrayAdapter<String>(
            this,
            R.layout.item_for_custom_spinner,
-            arrayOf("即放即取", "持续取餐")
+            arrayOf("即放即取", "余量取餐")
        )
        binding.spinner.adapter = spinnerAdapter
        binding.spinner.setSelection(0)
@@ -105,12 +110,10 @@ class MainActivity : AppCompatActivity() {
                position: Int,
                id: Long
            ) {
-
+                presentation.updateMealPickupMode(position)
            }

-            override fun onNothingSelected(parent: AdapterView<*>?) {
-
-            }
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
        }
        adapter = createAdapter()
        binding.recyclerview.layoutManager = GridLayoutManager(this, 2)
@@ -126,7 +129,6 @@ class MainActivity : AppCompatActivity() {
        binding.tvFoodName.setOnClickListener {
            SensorScaleUtils.zero()
        }
-        registerDataChange()
    }

    fun updateCurrentFood(foodInfo: FoodInfo?) {
@@ -154,7 +156,8 @@ class MainActivity : AppCompatActivity() {
        }
    }

-    private fun registerDataChange() {
+    override fun registerDataChange() {
+        super.registerDataChange()
        lifecycleScope.launch {
            viewModel.identifiedFoodInfoList.collect { list ->
                binding.recyclerview