餐盘柜接口改造

2025-12-26 14:05:41 +08:00
parent 5e4dc4baa4
commit 7a6c4012d1
28 changed files with 859 additions and 507 deletions
@@ -17,8 +17,11 @@ import androidx.core.view.WindowCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
 import com.sw.inbound.utils.DateTimeUtils
+import com.sw.plate.utils.Base64
 import com.sw.plate.utils.ScanGunKeyEventHelper
 import com.sw.plate.utils.ToastUtils
+import com.sw.plate.utils.arcface.facedb.FaceDatabase
+import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
 import com.sw.plate.utils.comn.SerialApi
 import com.sw.plate.utils.comn.SerialPortManager
 import com.sw.platecabinet.R
@@ -26,7 +29,10 @@ import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
 import com.sw.platecabinet.ext.setClickListeners
 import com.sw.platecabinet.model.response.EquipmentUserInfo
+import com.sw.platecabinet.model.response.UserFaceModel
+import com.sw.platecabinet.utils.IntervalExecutor
 import com.sw.platecabinet.utils.PermissionHelper
+import com.sw.platecabinet.utils.SpTool
 import com.sw.platecabinet.view.CustomLoadingDialog
 import com.sw.platecabinet.viewmodel.SettingViewModel
 import com.sw.platecabinet.viewmodel.UserViewModel
@@ -77,6 +83,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
        registerKeyEvent()
        val durationTime = System.currentTimeMillis() - startTime
        Timber.d("启动时间：$durationTime")
+
+        startFaceTask()
    }

    /**
@@ -291,23 +299,27 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
                handleLoginSuccess(it, true)
            }
        }
-        lifecycleScope.launch {
-            settingViewModel.equipmentList.collect {
-                if (it.isEmpty()) return@collect
-                val unbindList = it.filter { !it.isBound() }
-                if (unbindList.isEmpty()) {
-                    MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
-                } else {
-                    val firstInfo = unbindList[0]
-                    val currentUserInfo = settingViewModel.searchUserInfo.value
-                    firstInfo.plateNumber = currentUserInfo?.plateNumber ?: ""
-                    MainActivity.start(
-                        context = context,
-                        pageType = PageType.BIND_PLATE,
-                        equipmentUserInfo = firstInfo
-                    )
-                }
-            }
+//        lifecycleScope.launch {
+//            settingViewModel.equipmentList.collect {
+//               loadEquipmentList(it)
+//            }
+//        }
+    }
+
+    private fun loadEquipmentList(items:List<EquipmentUserInfo>) {
+        if (items.isEmpty()) return
+        val unbindList = items.filter { !it.isBound() }
+        if (unbindList.isEmpty()) {
+            MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
+        } else {
+            val firstInfo = unbindList[0]
+            val currentUserInfo = settingViewModel.searchUserInfo.value
+            firstInfo.plateNumber = currentUserInfo?.plateNumber ?: ""
+            MainActivity.start(
+                context = context,
+                pageType = PageType.BIND_PLATE,
+                equipmentUserInfo = firstInfo
+            )
        }
    }

@@ -352,7 +364,9 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
                })
        } else {
            if (isAdmin) {
-                settingViewModel.getEquipmentList()
+                settingViewModel.getEquipmentList{
+                    loadEquipmentList(it)
+                }
            } else {
                Timber.d("无餐盘信息")
                MainActivity.start(
@@ -370,4 +384,66 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
        keyEventHelper?.onDestroy()
        super.onDestroy()
    }
+
+
+    private val intervalExecutor by lazy { IntervalExecutor() }
+    private var faceTaskJob: Job? = null
+
+    //    private val initialDelay = 5 * 60 * 1000L
+//    private val dealyMillis = 10 * 60 * 1000L
+    private val initialDelay = 60 * 1000L
+    private val dealyMillis = 30 * 1000L
+    private var taskPageNo = 1
+    fun startFaceTask() {
+        faceTaskJob =
+            intervalExecutor.startIntervalTaskWithInitialDelay(initialDelay, dealyMillis) {
+                settingViewModel.getFaceIncrementList(
+                    pageNo = taskPageNo,
+                    timestamp = SpTool.getLastFaceTimestamp()
+                ) { list ->
+                    runOnUiThread {
+                        if (list.isEmpty()) {
+                            return@runOnUiThread
+                        }
+                        SpTool.setLastFaceTimestamp(System.currentTimeMillis())
+                        updateFaceData(list)
+                    }
+                }
+            }
+    }
+
+    private fun updateFaceData(list: List<UserFaceModel>) {
+        Thread {
+            val faceList = mutableListOf<FaceEntity>()
+            try {
+                list.forEach { model ->
+                    if (model.faceDeleted == true) {
+                        //删除数据
+                        FaceDatabase.getInstance(this).faceDao().deleteFaceById(model.userId)
+                    } else {
+                        //保存数据
+                        val faceEntity = FaceEntity(
+                            model.userId,
+                            null,
+                            Base64.decode(model.faceFeatureStr)
+                        ).also {
+                            it.userType = "1"
+                        }
+                        faceList.add(faceEntity)
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            try {
+                if (faceList.isNotEmpty()) {
+                    FaceDatabase.getInstance(this).faceDao().insert(faceList)
+                }
+                recognizeViewModel.refreshFaceList();
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }.start()
+    }
+
 }
@@ -1,24 +1,19 @@
 package com.sw.platecabinet.activity

 import android.content.Intent
-import androidx.activity.viewModels
-import androidx.lifecycle.lifecycleScope
 import com.sw.plate.utils.AppUtil
 import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.databinding.ActivityDeviceInitBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
-import com.sw.platecabinet.utils.QRCodeUtil
-import com.sw.platecabinet.viewmodel.DeviceViewModel
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import kotlin.getValue
+import com.sw.platecabinet.ext.gone
+import com.sw.platecabinet.ext.invisible

 /**
 * 设备初始化界面
 */
 class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {

-    private val deviceViewModel by viewModels<DeviceViewModel>()
+//    private val deviceViewModel by viewModels<DeviceViewModel>()

    override fun inflateViewBinding(): ActivityDeviceInitBinding {
        return ActivityDeviceInitBinding.inflate(layoutInflater)
@@ -32,31 +27,36 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
        var deviceId = AppUtil.getUDID(this)
        deviceId = "be154831-3466-3ba2-a2ea-57652c919fed"
        GlobalData.deviceId = deviceId
-        val isSuccess = deviceViewModel.checkEquipmentInfo()
-        if (isSuccess) {
+//        val isSuccess = deviceViewModel.checkEquipmentInfo()
+//        if (isSuccess) {
+//            goLoginActivity()
+//            return
+//        }
+//        binding.ivQrCode.setImageBitmap(
+//            QRCodeUtil.generateQRCode(
+//                content = GlobalData.deviceId,
+//                size = 200
+//            )
+//        )
+//        binding.btnInit.setOnClickListener {
+//            deviceViewModel.getDeviceToken()
+//        }
+        binding.btnInit.gone()
+        binding.ivQrCode.invisible()
+        binding.root.postDelayed({
            goLoginActivity()
-            return
-        }
-        binding.ivQrCode.setImageBitmap(
-            QRCodeUtil.generateQRCode(
-                content = GlobalData.deviceId,
-                size = 200
-            )
-        )
-        binding.btnInit.setOnClickListener {
-            deviceViewModel.getDeviceToken()
-        }
+        }, 1000)
    }

    override fun registerDataChange() {
        super.registerDataChange()
-        lifecycleScope.launch {
-            deviceViewModel.deviceInfoResult.collect { it ->
-               if (it == true) {
-                   goLoginActivity()
-               }
-            }
-        }
+//        lifecycleScope.launch {
+//            deviceViewModel.deviceInfoResult.collect { it ->
+//               if (it == true) {
+//                   goLoginActivity()
+//               }
+//            }
+//        }
    }

    private fun goLoginActivity() {
@@ -79,7 +79,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        initArcView()
        openRectInfoDraw = true
        recognizeViewModel.setDrawRectInfoTextValue(true)
-        viewModel.generateToken()
+        //viewModel.generateToken()
+        viewModel.activeEngine()
+        viewModel.getUserFaceCache()
+
        binding.llToPwd.setOnClickListener {
            val intent = Intent(this, LoginByPwdActivity::class.java)
            startActivity(intent)
@@ -169,7 +172,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),

        recognizeViewModel.recognizeUserId.observe(this, Observer { userId: String? ->
            Timber.i("recognizeUserId observe userId = $userId")
-            viewModel.getUserInfoById(memberId = userId?.toInt() ?: 0)
+            viewModel.getUserInfoById(memberId = userId?.toIntOrNull())
        })

        recognizeViewModel.drawRectInfoText.observe(this, Observer { info ->
@@ -5,6 +5,7 @@ import com.sw.plate.utils.ToastUtils
 import com.sw.platecabinet.databinding.ActivityLoginByPwdBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
+import com.sw.platecabinet.model.request.LoginParam
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.KeyboardUtils

@@ -29,7 +30,12 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
                ToastUtils.showToast("手机或校验码不能为空")
                return@setOnClickListener
            }
-            viewModel.loginWithPwd(phone = phone, password = pwd)
+            val loginParam = LoginParam(
+                //equipmentId = equipmentId,
+                phone = phone,
+                password = pwd
+            )
+            viewModel.loginWithPwd(loginParam)
            KeyboardUtils.hideKeyboard(this)
        }
        binding.tvFaceRec.setOnClickListener {