吐盘机: 避免相机关闭后预览画面残留

- 将双击判定窗口时间由300ms延长至600ms，提升触摸屏操作体验
- 为标题时间布局的左右TextView添加最小高度和内边距，优化显示效果
- 相机关闭时清空预览画面，防止TextureView冻结并残留上一用户画面
- 重启相机前先清空残留帧，避免闪现上一用户画面

.idea/appInsightsSettings.xml

@@ -2,5 +2,26 @@
 <project version="4">
   <component name="AppInsightsSettings">
     <option name="selectedTabId" value="Firebase Crashlytics" />
+    <option name="tabSettings">
+      <map>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="PLACEHOLDER" />
+                  <option name="mobileSdkAppId" value="" />
+                  <option name="projectId" value="" />
+                  <option name="projectNumber" value="" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
 </project>

.idea/deploymentTargetSelector.xml

@@ -2,16 +2,11 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
+      <SelectionState runConfigName="SmartPlateCabinet.app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-18T06:09:00.079142300Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.1.161:5555;connection=2c537abb" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="azul-17" />
+        <option name="gradleJvm" value="corretto-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="UsePropertyAccessSyntax" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="zulu-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle.kts

@@ -27,7 +27,7 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
-            abiFilters.addAll(listOf("armeabi-v7a"/*, "arm64-v8a"*/))
+            abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a"))
         }
         setProperty("archivesBaseName", "zncpg_${versionName}")
     }

app/lint.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lint>
+    <!-- Glide库中的NotificationTarget触发了此检查，但本kiosk应用不使用通知功能 -->
+    <issue id="NotificationPermission" severity="ignore" />
+</lint>

app/src/main/java/com/sw/platecabinet/GlobalData.kt

@@ -38,9 +38,9 @@ object GlobalData {
     /**
      * 具体业务 BaseUrl
      */
-    const val TEST_BASE_URL: String = "http://192.168.1.201:14801"
+    const val LOCAL_BASE_URL: String = "http://192.168.10.101:24801"
-    const val UAT_BASE_URL: String = "https://dev.yixiong-tech.com:8083"
+    const val TEST_BASE_URL: String = "https://dev.yixiong-tech.com:8081"
-    const val PROD_BASE_URL: String = "https://api.dm.yixiong-tech.com:8443"
+    const val PROD_BASE_URL: String = "https://platform-api.uat.shuziweidao.com"
 
     /**
      * 设备id

app/src/main/java/com/sw/platecabinet/MyApp.kt

@@ -42,12 +42,15 @@ class MyApp : App() {
         } else {
             GlobalData.appBaseUrl =
                 if ("14d2dad5-7d33-3ced-8a59-f14cb1ef2d21" == deviceId)
-                    GlobalData.TEST_BASE_URL
+                    GlobalData.LOCAL_BASE_URL
                 else
-                    GlobalData.PROD_BASE_URL
+//                    GlobalData.PROD_BASE_URL
+                    GlobalData.TEST_BASE_URL
         }
 
         // TODO: 临时测试----------------
+//        GlobalData.appBaseUrl = GlobalData.TEST_BASE_URL
+//        GlobalData.deviceId = "79814f20-f253-397c-9da7-8430ffa5ef00"
 //        if ("2987f0c5-5754-33e9-b00a-251db5e2e55f" == deviceId) {
 //            GlobalData.deviceId = "79814f20-f253-397c-9da7-8430ffa5ef00"
 //        }
@@ -55,6 +58,7 @@ class MyApp : App() {
         GlobalData.appVersion = AppUtil.getAppVersionCode(this).toString()
         GlobalData.globalEquipmentCode = "202501171634"
 
+
 //        GlobalData.appBaseUrl = "http://192.168.1.201:14801"
     }
 }

app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt

@@ -25,11 +25,10 @@ import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.ext.clickWithCoroutines
-import com.sw.platecabinet.model.response.UserFaceModel
 import com.sw.platecabinet.utils.IntervalExecutor
 import com.sw.platecabinet.utils.SpTool
 import com.sw.platecabinet.view.CustomLoadingDialog
-import com.sw.platecabinet.viewmodel.UserViewModel
+import com.sw.platecabinet.viewmodel.NetViewModelV2
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -48,10 +47,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 //    private val permissionHelpers = mutableMapOf<Int, PermissionHelper>()
 //    protected var keyEventHelper: ScanGunKeyEventHelper? = null
 
-    // 用户对应的viewModel
-    protected val userViewModel by viewModels<UserViewModel>()
-
     public val recognizeViewModel by viewModels<RecognizeViewModel>()
+    public val netViewModelV2 by viewModels<NetViewModelV2>()
 
     private var startTime: Long = 0
 
@@ -132,12 +129,16 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
     fun updateTime() {
         headerBinding?.let {
+            // 双击判定窗口放宽至 600ms：默认 300ms 对触摸屏上的手动双击过短，
+            // 两次点击间隔常在 300~600ms，导致设置页"点很多次才进"
             it.tvLeftDate.clickWithCoroutines(
+                doubleClickInterval = 600,
                 onDoubleClick = {
                     onLeftDoubleClick()
                 }
             )
             it.tvRightTime.clickWithCoroutines(
+                doubleClickInterval = 600,
                 onDoubleClick = {
                     onRightDoubleClick()
                 }
@@ -298,84 +299,23 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 //    private val dealyMillis = 10 * 60 * 1000L
     private val initialDelay = 1 * 1000L
     private val dealyMillis = 10 * 1000L
-    fun startFaceTask(block: (List<String?>) -> Unit) {
+    fun startFaceTask() {
         faceTaskJob =
             intervalExecutor.startIntervalTaskWithInitialDelay(initialDelay, dealyMillis) {
-                getFaceIncrementList(action = block)
+                getFaceIncrementList()
             }
     }
 
     private var faceTimestamp = 0L
 
     //private var taskPageNo = 1
-    private fun getFaceIncrementList(pageNo: Int = 1, action: (List<String?>) -> Unit) {
+    private fun getFaceIncrementList(pageNo: Int = 1) {
         val timestamp = SpTool.lastFaceTimestamp
-        userViewModel.getFaceIncrementList(
+        netViewModelV2.getFaceIncrementList(
             pageNo = pageNo,
             timestamp = timestamp
-        ) { list ->
+        ) {
-            runOnUiThread {
-                if (pageNo == 1 && list.isEmpty()) {
-                    return@runOnUiThread
-                }
-                updateFaceData(list)
-                val userIdList = list.map { it.userId }
-                action(userIdList)
-                if (list.isNotEmpty()) {
-                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
-                }
-                SpTool.lastFaceTimestamp = faceTimestamp
-            }
-        }
-    }
-
-    private fun updateFaceData(list: List<UserFaceModel>) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val faceList = mutableListOf<FaceEntity>()
-            val faceDao = FaceDatabase.getInstance(this@BaseActivity).faceDao()
-            try {
-                list.forEach { model ->
-                    if (model.faceDeleted == true) {
-                        //删除数据
-                        faceDao.deleteFaceById(model.userId)
-                    } else {
-                        // 获取该用户所有已存特征，判断当前特征是否已存在
-                        val existList = faceDao.queryAllByUserName(model.userId)
-                        val featureMatches =
-                            existList.map { Base64.encode(it.featureData) == model.faceFeatureStr }
-                        Timber.d("userId=${model.userId}, 已存记录数=${existList.size}, 各条特征是否与服务器一致=$featureMatches")
-                        val alreadyExists = featureMatches.any { it }
-                        if (!alreadyExists) {
-                            //当前特征不存在，保存
-                            runCatching { getNewFaceEntity(model) }
-                                .onSuccess { faceList.add(it) }
-                                .onFailure { Timber.e(it, "人脸特征解码失败: userId=${model.userId}") }
-                        }
-                    }
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-            try {
-                if (faceList.isNotEmpty()) {
-                    FaceDatabase.getInstance(this@BaseActivity).faceDao().insert(faceList)
-                }
             recognizeViewModel.refreshFaceList()
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-    }
-
-    private fun getNewFaceEntity(model: UserFaceModel): FaceEntity {
-        return FaceEntity(
-            model.userId,
-            null,
-            Base64.decode(model.faceFeatureStr)
-        ).also {
-            //1-会员、2-临时用户
-            it.userType = if (model.member) "1" else "2"
-            it.cardNo = model.cardNo
         }
     }
 

app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt

@@ -3,7 +3,6 @@ package com.sw.platecabinet.activity
 import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import com.sw.plate.utils.ToastUtils
-import com.sw.plate.utils.arcface.FaceApi
 import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.databinding.ActivityDeviceInitBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
@@ -32,7 +31,7 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
                 //val count = FaceApi().queryFaceCount()
                 //if (count == 0) {
                 if (SpTool.firstGetFace) {
-                    userViewModel.getUserFaceCache { status, msg ->
+                    netViewModelV2.getUserFaceCache { status, msg ->
                         SpTool.firstGetFace = false
                         getDeviceConfig()
                     }
@@ -44,7 +43,7 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
     }
 
     private fun getDeviceConfig() {
-        userViewModel.getDeviceConfig { deviceConfig ->
+        netViewModelV2.getDeviceConfig(onSuccess = { deviceConfig ->
             runOnUiThread {
                 if (deviceConfig == null) {
                     hideWaitingDialog()
@@ -61,7 +60,11 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
                     goLoginActivity()
                 }, 500)
             }
+        }, onFailure = { errMsg ->
+            runOnUiThread {
+                ToastUtils.showToast(errMsg ?: "接口异常")
             }
+        })
     }
 
     override fun registerDataChange() {

app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt

@@ -20,7 +20,6 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.arcsoft.face.ErrorInfo
 import com.bumptech.glide.Glide
-import com.google.gson.Gson
 import com.sw.inbound.utils.DateTimeUtils
 import com.sw.plate.utils.Base64
 import com.sw.plate.utils.ToastUtils
@@ -33,7 +32,6 @@ import com.sw.plate.utils.arcface.PreviewConfig
 import com.sw.plate.utils.arcface.camera.CameraListener
 import com.sw.plate.utils.arcface.camera.DualCameraHelper
 import com.sw.plate.utils.arcface.face.constants.LivenessType
-import com.sw.plate.utils.arcface.face.constants.RecognizeColor
 import com.sw.plate.utils.arcface.face.model.CompareResult
 import com.sw.plate.utils.arcface.face.model.FacePreviewInfo
 import com.sw.plate.utils.arcface.face.model.RecognizeConfiguration
@@ -49,7 +47,7 @@ import com.sw.platecabinet.dialog.CustomDialog
 import com.sw.platecabinet.ext.clickWithDebounce
 import com.sw.platecabinet.ext.gone
 import com.sw.platecabinet.ext.visible
-import com.sw.platecabinet.model.response.UserFaceModel
+import com.sw.platecabinet.model.response.UserFaceModelV2
 import com.sw.platecabinet.utils.BitmapSaver
 import com.sw.platecabinet.utils.CountDownUtil
 import com.sw.platecabinet.utils.Debouncer
@@ -92,7 +90,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     }
 
     override fun initialize() {
-        userViewModel.activeEngine()
+        netViewModelV2.activeEngine()
 
         PlcHelper.getInstance(this@LoginByFaceActivity)
             .openSerialPort(object : PlcCallback<String> {
@@ -113,9 +111,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         EventBus.getDefault().register(this)
 
         //开启人脸增量数据定时任务
-        startFaceTask {
+        startFaceTask()
-            loadLogInfo("collectFace增量接口数据用户id:${Gson().toJson(it)}")
-        }
 
         val soundMap = hashMapOf<String, Int>()
         soundMap[COLLECT_SUCCESS] = R.raw.collect_success
@@ -421,27 +417,94 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         PlcHelper.getInstance(this@LoginByFaceActivity)
             .outPlate(object : PlcCallback<String> {
                 override fun onSuccess(result: String) {
+                    loadLogInfo("collectFace,openPlate: 出盘完成，result=$result，开始查询剩余餐盘")
+                    onOutPlateSuccess(result, RECOGNIZE_SUCCESS)
+                }
+
+                override fun onError(message: String) {
+                    onOutPlateError(message)
+                }
+            })
+    }
+
+    /**
+     * 新用户注册采集成功后立即出盘（与上传后台并行，互不阻塞）。
+     * 故意不经过 recognizeSuccess：避免使用临时 userId、避免与识别成功的防抖语义混淆。
+     */
+    private fun outPlateForRegister() {
+        loadLogInfo("collectFace,outPlateForRegister: 新用户采集成功，立即出盘，plateEnable=$plateEnable")
+        if (plateEnable.not()) return
+
+        PlcHelper.getInstance(this@LoginByFaceActivity)
+            .outPlate(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    loadLogInfo("collectFace,outPlateForRegister: 出盘完成，result=$result")
+                    onOutPlateSuccess(result, COLLECT_SUCCESS)
+                }
+
+                override fun onError(message: String) {
+                    onOutPlateError(message)
+                }
+            })
+    }
+
+    /**
+     * 出盘成功后的统一处理：
+     * 1. 置 plateEnable=false、取消识别倒计时，防止重复出盘；
+     * 2. result 为 "false" 表示出盘后已无餐盘，播放无盘提示音并跳转；
+     * 3. 否则播放提示音并查询剩余餐盘状态。
+     *
+     * @param result        PLC 返回结果（"false" 表示出盘后无餐盘）
+     * @param successSound  出盘成功播放的提示音 key（识别成功 / 采集成功）
+     */
+    private fun onOutPlateSuccess(result: String, successSound: String) {
         plateEnable = false
         recognizeCountDownUtil.cancelCountDown()
-                    // result 为 false 时表示出盘后无餐盘，直接播放无盘提示音
         if (result.equals("false", ignoreCase = true)) {
-                        loadLogInfo("collectFace,openPlate: result=false，餐盘已空")
+            loadLogInfo("collectFace,onOutPlateSuccess: result=false，餐盘已空")
             SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0)
             goInitActivity()
             return
         }
-                    loadLogInfo("collectFace,openPlate: 出盘完成，result=$result，开始查询剩余餐盘")
+        SoundPoolUtil.getInstance().play(successSound, 0)
-                    // result 为 true，出盘成功，再查询是否还有剩余餐盘
+        // 已注册用户：出盘成功且有盘时，上报取餐盘时刻（P-09a）
-                    SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
+        if (successSound == RECOGNIZE_SUCCESS) {
+            reportPlatePickup(currentUserId, "recognize")
+        }
         checkRemainingPlate()
     }
 
-                override fun onError(message: String) {
+    /**
+     * 出盘失败后的统一处理：提示失败并跳转回初始页
+     */
+    private fun onOutPlateError(message: String) {
         ToastUtils.showToast("出盘失败，message=$message")
-                    loadLogInfo("collectFace,openPlate: 出盘失败，message=$message")
+        loadLogInfo("collectFace,onOutPlateError: 出盘失败，message=$message")
         goInitActivity()
     }
-            })
+
+    /**
+     * 上报取餐盘时刻（P-09a）：记录用户开始就餐时刻，是后续就餐记录（P-09）的强前置。
+     *
+     * 调用时机：
+     * - 已注册用户：识别成功且出盘成功（有盘）后，userId 取自 [currentUserId]（来源 "recognize"）；
+     * - 新用户：addUserFace 注册成功拿到真实 userId 后（出盘已由 outPlateForRegister 并行触发，来源 "collect"）。
+     *
+     * 上报失败仅记录日志，不影响吐盘主流程。
+     *
+     * @param userId 用户 id（餐盘号 = userId），为空或非数字时跳过
+     * @param source 调用来源标识，仅用于日志区分
+     */
+    private fun reportPlatePickup(userId: String?, source: String) {
+        val id = userId?.toLongOrNull()
+        if (id == null) {
+            loadLogInfo("collectFace,reportPlatePickup[$source]: userId 为空或非数字，跳过上报，userId=$userId")
+            return
+        }
+        loadLogInfo("collectFace,reportPlatePickup[$source]: 上报取餐盘时刻，userId=$id")
+        netViewModelV2.platePickup(id) { success, msg ->
+            loadLogInfo("collectFace,reportPlatePickup[$source]: 上报完成，success=$success，msg=$msg")
+        }
     }
 
     /**
@@ -621,7 +684,9 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                     userFaceInfo = null
                     binding.btnCollect.tag = ""
                     binding.tvSimilarValue.text = ""
-                    retryFailCount = 0
+                    // 注意：此处不再重置 retryFailCount。
+                    // 人脸检测会抖动（短暂丢帧），若每次无人脸就清零，"尝试几次失败"将无法累计。
+                    // 失败计数仅在识别成功、会话重启、确认用户离开时清零。
                     // 人脸离开时，发送空帧清除 ViewModel 内部识别缓存，防止再次进入时使用旧数据
                     recognizeViewModel.onPreviewFrame(emptyFrame, true)
                     if (binding.llCollectButton.isVisible) {
@@ -633,6 +698,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
             override fun onCameraClosed() {
                 Timber.i("initRgbCamera onCameraClosed: ")
+                // 相机关闭时清空预览画面，防止 TextureView 冻结残留上一位用户的帧
+                clearPreviewFrame()
             }
 
             override fun onCameraError(e: java.lang.Exception) {
@@ -698,11 +765,30 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         checkCameraPermission()
     }
 
+    /**
+     * 清除预览 TextureView 中缓存的最后一帧画面（提交一帧全黑）。
+     * 相机关闭后 TextureView 会冻结保留最后一帧，若不清除，
+     * 下一位用户重启识别时会先闪现上一位用户的画面。
+     */
+    private fun clearPreviewFrame() {
+        val previewView = binding.dualCameraTexturePreviewRgb
+        if (!previewView.isAvailable) return
+        runCatching {
+            val canvas = previewView.lockCanvas() ?: return@runCatching
+            canvas.drawColor(android.graphics.Color.BLACK)
+            previewView.unlockCanvasAndPost(canvas)
+        }.onFailure {
+            loadLogInfo("clearPreviewFrame 失败: ${it.message}")
+        }
+    }
+
     private fun resumeCamera() {
 //        isRecognition = true
         val helper = rgbCameraHelper
         if (helper != null && helper.isStopped) {
             loadLogInfo("collectFace,resumeCamera: ")
+            // 重启相机前先清空残留帧，避免闪现上一位用户的画面
+            clearPreviewFrame()
             isRecognition = true
             helper.start()
         } else {
@@ -887,7 +973,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     }
 
     private fun addUserFace(faceData: String, imageFile: File) {
-        userViewModel.addUserFace(faceData, imageFile) { status, faceModel ->
+        netViewModelV2.addUserFace(faceData, imageFile) { status, faceModel ->
             loadLogInfo("collectFace,saveFaceInfo: ----------12,人脸数据发送完成时间:${DateTimeUtils.getDateTimeString()},结果：$status-----------")
             if (status.not()) {
                 ToastUtils.showToast("新增数据失败")
@@ -899,6 +985,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                 loadLogInfo("collectFace,sendFaceData: ----------12,发送人脸数据成功但接口返回为null，faceData=${faceData}")
                 return@addUserFace
             }
+            // 新用户：注册成功拿到真实 userId 后，上报取餐盘时刻（P-09a）
+            reportPlatePickup(faceModel.userId, "collect")
             lifecycleScope.launch(Dispatchers.IO) {
                 saveFaceInfo(faceModel) {
                     runOnUiThread {
@@ -926,6 +1014,9 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         //block(faceData, headBmp)
         isCollecting.set(false)
         isCollectFace = false
+        // 采集成功后立即出盘，与上传后台并行执行，确保上传失败时仍能吐盘
+        outPlateForRegister()
+        // 异步上传后台（上传成功后才入库），不阻塞出盘
         sendFaceData(faceData, headBmp)
     }
 
@@ -943,27 +1034,29 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
     private var currentUserId: String? = null
 
-    private fun saveFaceInfo(faceModel: UserFaceModel, block: () -> Unit = {}) {
+    private fun saveFaceInfo(faceModel: UserFaceModelV2, block: () -> Unit = {}) {
         try {
             loadLogInfo("collectFace,saveFaceInfo: ----------8,保存人脸取特征数据-----------")
             val faceDao = FaceDatabase.getInstance(this).faceDao()
-            val faceEntity = FaceEntity(
+            val faceEntity = faceModel.toFaceEntity()
-                faceModel.userId,
+            // 先查后插：按 userFaceId 判重，避免采集入库与增量同步各插一条
-                null,
+            val userFaceId = faceModel.userFaceId
-                Base64.decode(faceModel.faceFeatureStr)
+            val existing = if (!userFaceId.isNullOrEmpty()) faceDao.queryByUserFaceId(userFaceId) else null
-            ).also {
+            val faceId = if (existing != null) {
-                //1-会员、2-临时用户
+                // 已存在记录，更新特征等字段并复用主键，避免重复
-                it.userType = if (faceModel.member) "1" else "2"
+                faceEntity.faceId = existing.faceId
+                faceDao.updateFaceEntity(faceEntity)
+                existing.faceId
+            } else {
+                faceDao.insert(faceEntity)
             }
-            val faceId = faceDao.insert(faceEntity)
             faceEntity.faceId = faceId
             loadLogInfo("collectFace,saveFaceInfo: ----------10,人脸数据保存完成-----------")
             recognizeViewModel.refreshFaceList()
             loadLogInfo("collectFace,saveFaceInfo: ----------11,刷新人脸数据-----------")
             runOnUiThread {
-                //采集完成，不再识别，直接提示成功
+                //采集完成，停止识别（出盘已在采集成功时由 outPlateForRegister 触发，此处仅负责入库）
                 isRecognition = false
-                recognizeSuccess("${System.currentTimeMillis()}")
             }
             loadLogInfo("---------------------------------")
             collectCount = 0
@@ -995,6 +1088,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                 loadLogInfo("leftCountDown.onFinish-人脸未离开，不跳转")
                 return@startCountDown
             }
+            // 确认用户已离开画面，重置识别失败计数，下次进入重新累计
+            retryFailCount = 0
             goInitActivity()
         })
     }

app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.view.inputmethod.InputMethodManager
 import androidx.lifecycle.lifecycleScope
 import com.sw.plate.utils.ToastUtils
+import com.sw.plate.utils.arcface.facedb.FaceDatabase
 import com.sw.plate.utils.arcface.faceserver.FaceServer
 import com.sw.platecabinet.databinding.ActivityPlcSettingBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
@@ -60,6 +61,7 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
         initAlarmButton()
         initParamButtons()
         initStatusButton()
+        initFaceCount()
         binding.btnSwitchEnv.setOnClickListener {
             EnvSwitchDialog(context = this, onEnvChanged = {
                 showWaitingDialog("重置人脸数据中……")
@@ -68,7 +70,7 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
                         FaceServer.getInstance().clearAllFaces()
                     }
                 }
-                userViewModel.getUserFaceCache(pageNo = 1, callback = { state, errMsg ->
+                netViewModelV2.getUserFaceCache(pageNo = 1, callback = { state, errMsg ->
                     hideWaitingDialog()
                     if (state) {
                         recognizeViewModel.refreshFaceList()
@@ -334,6 +336,30 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
         """.trimIndent()
     }
 
+    // ==================== 人脸库统计 ====================
+
+    /**
+     * 初始化人脸库统计区：页面加载时查询并显示人脸总数，绑定刷新按钮
+     */
+    private fun initFaceCount() {
+        refreshFaceCount()
+        binding.btnRefreshFaceCount.clickWithDebounce {
+            refreshFaceCount()
+        }
+    }
+
+    /**
+     * 从数据库查询人脸总数并更新 UI
+     */
+    private fun refreshFaceCount() {
+        lifecycleScope.launch {
+            val count = withContext(Dispatchers.IO) {
+                FaceDatabase.getInstance(this@PlcSettingActivity).faceDao().faceCount
+            }
+            binding.tvFaceCount.text = "人脸总数：${count}"
+        }
+    }
+
     // ==================== 生命周期 ====================
 
     /**

app/src/main/java/com/sw/platecabinet/dialog/EnvSwitchDialog.kt

@@ -39,8 +39,8 @@ class EnvSwitchDialog(
     override fun initView() {
         // 根据当前 appBaseUrl 预选对应 RadioButton，不匹配则不选
         when (GlobalData.appBaseUrl) {
-            GlobalData.TEST_BASE_URL -> binding.rbTest.isChecked = true
+            GlobalData.LOCAL_BASE_URL -> binding.rbTest.isChecked = true
-            GlobalData.UAT_BASE_URL  -> binding.rbUat.isChecked  = true
+            GlobalData.TEST_BASE_URL  -> binding.rbUat.isChecked  = true
             GlobalData.PROD_BASE_URL -> binding.rbProd.isChecked = true
         }
 
@@ -55,8 +55,8 @@ class EnvSwitchDialog(
                 return@setOnClickListener
             }
             val newUrl = when (binding.rgEnv.checkedRadioButtonId) {
-                binding.rbTest.id -> GlobalData.TEST_BASE_URL
+                binding.rbTest.id -> GlobalData.LOCAL_BASE_URL
-                binding.rbUat.id  -> GlobalData.UAT_BASE_URL
+                binding.rbUat.id  -> GlobalData.TEST_BASE_URL
                 binding.rbProd.id -> GlobalData.PROD_BASE_URL
                 else              -> return@setOnClickListener
             }

app/src/main/java/com/sw/platecabinet/model/ErrorInfo.kt

@@ -1,5 +1,7 @@
 package com.sw.platecabinet.model
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 错误信息 code == 200 成功
  */
@@ -19,6 +21,27 @@ data class DeviceConfig(
     var arcsoftActiveKey: String? = null
 )
 
+data class DeviceConfigV2(
+    /** 业务服务器 BASE URL */
+    val appPackageUrl: String? = null,
+    /** 食堂/餐厅名称 */
+    val canteenName: String? = null,
+    /** 食堂/餐厅 ID（后续所有业务 API 的 restId） */
+    val canteenId: String? = null,
+    /** 虹软人脸 SDK App ID */
+    val arcsoftAppId: String? = null,
+    /** 虹软人脸 SDK Key */
+    val arcsoftSdkKey: String? = null,
+    /** 虹软人脸 SDK Active Key */
+    val arcsoftActiveKey: String? = null,
+    /** MQTT 客户端服务器 IP */
+    val clientServerIp: String? = null,
+    /** 智慧食堂服务器 IP（MQTT 端口） */
+    val zhstServerIp: String? = null
+
+)
+
+
 data class CodeMsg(
     val code: String? = "",
     val msg: String? = ""

app/src/main/java/com/sw/platecabinet/model/request/FeatureBody.kt

@@ -0,0 +1,6 @@
+package com.sw.platecabinet.model.request
+
+data class FeatureBody(
+    val url:String,
+    val featureChar:String
+)

app/src/main/java/com/sw/platecabinet/model/request/IdDTO.kt

@@ -0,0 +1,13 @@
+package com.sw.platecabinet.model.request
+
+/**
+ * 通用 ID 请求体
+ *
+ * 用于按用户 id（餐盘号）查询或上报类的接口，例如：
+ * - P-09a 取餐盘（/neglect/pickup/plate-pickup）
+ *
+ * @property id 用户 id（餐盘号 = userId）
+ */
+data class IdDTO(
+    val id: Long
+)

app/src/main/java/com/sw/platecabinet/model/response/UserFaceModel.kt

@@ -9,19 +9,6 @@ import kotlinx.parcelize.Parcelize
  */
 @Parcelize
 data class UserFaceModel(
-//    @SerializedName("faceFeature")
-//    val faceFeature: String? = "",
-//    @SerializedName("faceFeatureString")
-//    val faceFeatureString: String? = "",
-//    @SerializedName("faceType")
-//    val faceType: String? = "",
-//    @SerializedName("userFaceId")
-//    val userFaceId: String? = "",
-//    @SerializedName("userId")
-//    val userId: String? = "",
-//    @SerializedName("updateTimeStamp")
-//    val updateTimeStamp: Long = 0,
-
     val userId: String? = "",
     val faceFeatureStr: String? = "",
     val faceUpdateTimestamp: Long? = null,
@@ -32,10 +19,10 @@ data class UserFaceModel(
     /**
      * 会员编号
      */
-    val cardNo: String,
+    val cardNo: String? = null,
 
     /**
      * 是否会员
      */
-    val member: Boolean
+    val member: Boolean? = null
 ) : Parcelable

app/src/main/java/com/sw/platecabinet/model/response/UserFaceModelV2.kt

@@ -0,0 +1,44 @@
+package com.sw.platecabinet.model.response
+
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
+import kotlinx.parcelize.Parcelize
+
+/**
+ * 用户人脸信息
+ */
+@Parcelize
+data class UserFaceModelV2(
+    val userFaceId: String? = null,
+    val userId: String? = null,
+    val faceFeature: String? = null,
+    val faceFeatureStr: String? = null,
+    val faceFeatureString: String? = null,
+    val faceUpdateTimestamp: Long? = null,
+    val cardNo: String? = null,
+    val member: Boolean? = false,
+    val faceDeleted: Boolean? = false,
+    val personType: String? = null
+) : Parcelable {
+    fun resolveFeatureStr(): String? {
+        return faceFeature?.takeIf { it.isNotEmpty() }
+            ?: faceFeatureStr?.takeIf { it.isNotEmpty() }
+            ?: faceFeatureString?.takeIf { it.isNotEmpty() }
+    }
+
+    fun toFaceEntity(): FaceEntity {
+        val featureBase64 = resolveFeatureStr()
+        return FaceEntity(
+            userId,
+            android.util.Base64.decode(featureBase64, android.util.Base64.DEFAULT),
+            personType,
+            cardNo,
+            userId,
+            userFaceId,
+            member ?: false,
+            faceUpdateTimestamp ?: 0L
+        )
+    }
+}

app/src/main/java/com/sw/platecabinet/network/ApiClient.kt

@@ -3,6 +3,7 @@ package com.sw.platecabinet.network
 import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.MyApp
 import com.sw.platecabinet.network.api.ApiService
+import com.sw.platecabinet.network.api.ApiServiceV2
 import com.sw.platecabinet.network.interceptor.RequestInterceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -37,4 +38,8 @@ object ApiClient {
     val apiService: ApiService by lazy {
         retrofit.create(ApiService::class.java)
     }
+
+    val apiServiceV2: ApiServiceV2 by lazy {
+        retrofit.create(ApiServiceV2::class.java)
+    }
 }

app/src/main/java/com/sw/platecabinet/network/api/ApiServiceV2.kt

@@ -0,0 +1,78 @@
+package com.sw.platecabinet.network.api
+
+import com.sw.platecabinet.GlobalData
+import com.sw.platecabinet.model.DeviceConfigV2
+import com.sw.platecabinet.model.request.FeatureBody
+import com.sw.platecabinet.model.request.IdDTO
+import com.sw.platecabinet.model.response.ApiResponse
+import com.sw.platecabinet.model.response.UserFaceModel
+import com.sw.platecabinet.model.response.UserFaceModelV2
+import okhttp3.MultipartBody
+import retrofit2.http.Body
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.GET
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.Url
+
+interface ApiServiceV2 {
+    /**
+     * 获取人脸缓存数据
+     */
+    @POST
+    suspend fun getUserFaceCache(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/common/face/page",
+        @Body param: Map<String, Int>
+    ): ApiResponse<List<UserFaceModelV2>>
+
+    /**
+     * 获取人脸增量数据
+     */
+    @POST
+    suspend fun getFaceIncrementList(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/common/face/increment",
+        @Body param: Map<String, Long>
+    ): ApiResponse<List<UserFaceModelV2>?>
+
+    /**
+     * 获取设备配置数据
+     */
+    @GET
+    suspend fun getDeviceConfig(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/pickup/device/config"
+    ): ApiResponse<DeviceConfigV2?>
+
+    /**
+     * 添加人脸数据
+     */
+    @POST
+    suspend fun addUserFace(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/user/add-by-face",
+        @Body faceData: FeatureBody
+    ): ApiResponse<UserFaceModelV2?>
+
+    /**
+     * 上传图片
+     */
+    @Multipart
+    @POST
+    suspend fun uploadImage(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/upload",
+        @Part file: MultipartBody.Part,
+    ): ApiResponse<String?>
+
+    /**
+     * 取餐盘（P-09a）：记录用户开始就餐时刻
+     * 调用一次即 upsert 到主单 plate_pickup_time，是 P-09 提交就餐记录的强前置。
+     * @param param IdDTO，id 为用户 id（餐盘号 = userId）
+     * @return ApiResponse<String?>，data 为主单 recordNo
+     */
+    @POST
+    suspend fun platePickup(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/pickup/plate-pickup",
+        @Body param: IdDTO
+    ): ApiResponse<String?>
+
+}

app/src/main/java/com/sw/platecabinet/repository/RemoteRepositoryV2.kt

@@ -0,0 +1,82 @@
+package com.sw.platecabinet.repository
+
+import com.sw.platecabinet.model.DeviceConfigV2
+import com.sw.platecabinet.model.request.FeatureBody
+import com.sw.platecabinet.model.request.IdDTO
+import com.sw.platecabinet.model.response.ApiResponse
+import com.sw.platecabinet.model.response.UserFaceModel
+import com.sw.platecabinet.model.response.UserFaceModelV2
+import com.sw.platecabinet.network.api.ApiServiceV2
+import com.sw.platecabinet.utils.FileUtils
+import java.io.File
+
+/**
+ * 远程数据处理
+ */
+class RemoteRepositoryV2 constructor(
+    private val apiService: ApiServiceV2
+) : BaseRepository() {
+
+    /**
+     * 获取人脸数据
+     */
+    suspend fun getUserFaceCache(
+        pageNum: Int,
+        pageSize: Int = 100,
+    ): ApiResponse<List<UserFaceModelV2>> {
+        return safeApiCall {
+            apiService.getUserFaceCache(
+                param = mapOf(
+                    "pageNum" to pageNum, "pageSize" to pageSize
+                )
+            )
+        }
+    }
+
+
+    suspend fun getFaceIncrementList(
+        pageNum: Long, pageSize: Long = 100L, timestamp: Long
+    ): ApiResponse<List<UserFaceModelV2>?> {
+        return safeApiCall {
+            apiService.getFaceIncrementList(
+                param = mapOf(
+                    "pageNum" to pageNum, "pageSize" to pageSize, "timestamp" to timestamp
+                )
+            )
+        }
+    }
+
+    suspend fun getDeviceConfig(): ApiResponse<DeviceConfigV2?> {
+        return safeApiCall { apiService.getDeviceConfig() }
+    }
+
+    suspend fun addUserFace(faceData: String, imageUrl: String): ApiResponse<UserFaceModelV2?> {
+        return safeApiCall {
+            apiService.addUserFace(
+                faceData = FeatureBody(
+                    url = imageUrl, featureChar = faceData
+                )
+            )
+        }
+    }
+
+    suspend fun uploadImage(file: File): ApiResponse<String?> {
+        return safeApiCall {
+            val part = FileUtils.genRequestPart(file)
+            if (part == null) {
+                ApiResponse(code = "-1", msg = "解析图片失败")
+            } else {
+                apiService.uploadImage(file = part)
+            }
+        }
+    }
+
+    /**
+     * 取餐盘（P-09a）：上报用户开始就餐时刻
+     * @param userId 用户 id（餐盘号 = userId）
+     * @return ApiResponse<String?>，data 为主单 recordNo
+     */
+    suspend fun platePickup(userId: Long): ApiResponse<String?> {
+        return safeApiCall { apiService.platePickup(param = IdDTO(id = userId)) }
+    }
+}

app/src/main/java/com/sw/platecabinet/utils/mego/PlcHelper.kt

@@ -4,10 +4,16 @@ import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import com.megoai.plc_aar.SDK
+import java.util.concurrent.atomic.AtomicBoolean
 
 /**
  * PLC 操作工具类（单例）
  * 封装 SDK 所有接口，统一回调到主线程
+ *
+ * 注意：底层 PLC SDK（Flutter MethodChannel 封装）的 Listener 只有 onMessage 一个回调，
+ * Flutter 侧 error()/notImplemented() 均为空实现，串口异常或引擎未就绪时不会回调。
+ * 因此本类对所有动作类、查询类接口统一加超时兜底：超时未响应则触发 onError，
+ * 保证上层回调链不会因“无响应”而永久挂起。
  */
 class PlcHelper private constructor(context: Context) {
 
@@ -28,6 +34,59 @@ class PlcHelper private constructor(context: Context) {
         }
     }
 
+    // ==================== 超时兜底封装 ====================
+
+    /**
+     * 包装 SDK 动作/查询调用：超时未响应时主动触发 onError。
+     *
+     * 背景：底层 SDK 的 Listener 仅在 Flutter 侧 success() 时回调 onMessage，
+     * error()/notImplemented() 为空实现，串口异常时 Android 侧收不到任何回调，
+     * 会导致上层回调永久挂起。本方法用定时器兜底，并保证 onSuccess/onError 至多触发一次。
+     *
+     * @param timeoutMs 超时时长（毫秒）
+     * @param callback  上层回调（统一在主线程回调）
+     * @param action    实际发起 SDK 调用的逻辑，参数为经过防重入包装的“安全回调”，
+     *                  内部所有成功/失败出口都应通过该回调触发
+     * @param <T>       回调结果类型
+     */
+    private inline fun <T> withTimeout(
+        timeoutMs: Long,
+        callback: PlcCallback<T>,
+        crossinline action: (safeCallback: PlcCallback<T>) -> Unit
+    ) {
+        // 标记回调是否已触发，保证 onSuccess/onError 至多执行一次
+        val fired = AtomicBoolean(false)
+        // 包装后的安全回调，所有出口都经过它，避免重复回调
+        val safeCallback = object : PlcCallback<T> {
+            override fun onSuccess(result: T) {
+                if (fired.compareAndSet(false, true)) callback.onSuccess(result)
+            }
+
+            override fun onError(message: String) {
+                if (fired.compareAndSet(false, true)) callback.onError(message)
+            }
+        }
+        // 超时定时器：到期未收到 SDK 回调则触发 onError
+        val timeoutRunnable = Runnable {
+            safeCallback.onError("PLC 操作超时（${timeoutMs}ms）未响应")
+        }
+        mainHandler.postDelayed(timeoutRunnable, timeoutMs)
+        // 发起实际 SDK 调用，所有成功/失败都通过 safeCallback 回调
+        action(object : PlcCallback<T> {
+            override fun onSuccess(result: T) {
+                // 成功后取消超时定时器
+                mainHandler.removeCallbacks(timeoutRunnable)
+                safeCallback.onSuccess(result)
+            }
+
+            override fun onError(message: String) {
+                // 失败同样取消超时定时器
+                mainHandler.removeCallbacks(timeoutRunnable)
+                safeCallback.onError(message)
+            }
+        })
+    }
+
     // ==================== 连接与模式 ====================
 
     /**
@@ -43,8 +102,10 @@ class PlcHelper private constructor(context: Context) {
      * 打开自动模式（应用启动时调用一次）
      */
     fun openAutoMode(callback: PlcCallback<String>) {
+        withTimeout(5000, callback) { safe ->
             sdk.actionOpenAutoMode { result ->
-            mainHandler.post { callback.onSuccess(result.toString()) }
+                mainHandler.post { safe.onSuccess(result.toString()) }
+            }
         }
     }
 
@@ -52,76 +113,90 @@ class PlcHelper private constructor(context: Context) {
      * 故障复位（出现 alarmCode 或补盘完成后调用）
      */
     fun alarmReset(callback: PlcCallback<String>) {
+        withTimeout(5000, callback) { safe ->
             sdk.actionAlarmReset { result ->
-            mainHandler.post { callback.onSuccess(result.toString()) }
+                mainHandler.post { safe.onSuccess(result.toString()) }
+            }
         }
     }
 
     // ==================== 出盘操作 ====================
 
     /**
-     * 出盘
+     * 出盘（机械动作，超时 10s）
      */
     fun outPlate(callback: PlcCallback<String>) {
+        withTimeout(10000, callback) { safe ->
             sdk.actionOutPlate { result ->
-            mainHandler.post { callback.onSuccess(result.toString()) }
+                mainHandler.post { safe.onSuccess(result.toString()) }
+            }
         }
     }
 
     // ==================== 平台控制 ====================
 
     /**
-     * 平台下降（开始补盘）
+     * 平台下降（开始补盘，超时 8s）
      */
     fun platformDown(callback: PlcCallback<String>) {
+        withTimeout(8000, callback) { safe ->
             sdk.actionPlatformDown { result ->
-            mainHandler.post { callback.onSuccess(result.toString()) }
+                mainHandler.post { safe.onSuccess(result.toString()) }
+            }
         }
     }
 
     /**
-     * 平台上升（补盘完成）
+     * 平台上升（补盘完成，超时 8s）
      */
     fun platformUp(callback: PlcCallback<String>) {
+        withTimeout(8000, callback) { safe ->
             sdk.actionPlatformDownStop { result ->
-            mainHandler.post { callback.onSuccess(result.toString()) }
+                mainHandler.post { safe.onSuccess(result.toString()) }
+            }
         }
     }
 
     /**
-     * 补盘完成返回营业（自动模式 + 故障复位）
+     * 补盘完成返回营业（自动模式 + 故障复位，超时 5s）
      */
     fun backToBusiness(callback: PlcCallback<String>) {
+        withTimeout(5000, callback) { safe ->
             sdk.actionOpenAutoModeAndActionAlarmReset { result ->
-            mainHandler.post { callback.onSuccess(result.toString()) }
+                mainHandler.post { safe.onSuccess(result.toString()) }
+            }
         }
     }
 
     // ==================== 状态查询 ====================
 
     /**
-     * 获取 PLC 状态（解析为 PlcStatus 对象）
+     * 获取 PLC 状态（解析为 PlcStatus 对象，超时 3s）
      */
     fun getStatus(callback: PlcCallback<PlcStatus>) {
+        withTimeout(3000, callback) { safe ->
             sdk.getPlcStatus { json ->
                 mainHandler.post {
                     if (json != null) {
-                    callback.onSuccess(PlcStatus.Companion.fromJson(json.toString()))
+                        safe.onSuccess(PlcStatus.Companion.fromJson(json.toString()))
                     } else {
-                    callback.onError("获取状态失败")
+                        safe.onError("获取状态失败")
+                    }
                 }
             }
         }
     }
 
     /**
-     * 获取 PLC 状态（原始 JSON 字符串）
+     * 获取 PLC 状态（原始 JSON 字符串，超时 3s）
      */
     fun getStatusJson(callback: PlcCallback<String>) {
+        withTimeout(3000, callback) { safe ->
             sdk.getPlcStatus { json ->
                 mainHandler.post {
-                if (json != null) callback.onSuccess(json.toString())
+                    if (json != null) safe.onSuccess(json.toString())
-                else callback.onError("获取状态失败")
+                    else safe.onError("获取状态失败")
+                }
             }
         }
     }
@@ -129,17 +204,19 @@ class PlcHelper private constructor(context: Context) {
     // ==================== 参数设置 ====================
 
     /**
-     * 设置 PLC 参数
+     * 设置 PLC 参数（超时 3s）
      * @param paramType 参数类型（如 "18FD" 表示主电机运行最长时间）
      * @param paramValue 参数值（int，单位 0.1s）
      */
     fun setParams(paramType: String, paramValue: Int, callback: PlcCallback<String>) {
+        withTimeout(3000, callback) { safe ->
             sdk.setPLCParams(
-            { result -> mainHandler.post { callback.onSuccess(result.toString()) } },
+                { result -> mainHandler.post { safe.onSuccess(result.toString()) } },
                 paramType,
                 paramValue
             )
         }
+    }
 
     // ==================== 生命周期 ====================
 

app/src/main/java/com/sw/platecabinet/viewmodel/BaseViewModel.kt

@@ -1,74 +1,74 @@
-package com.sw.platecabinet.viewmodel
+//package com.sw.platecabinet.viewmodel
-
+//
-import androidx.lifecycle.ViewModel
+//import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+//import androidx.lifecycle.viewModelScope
-import com.sw.plate.utils.ToastUtils
+//import com.sw.plate.utils.ToastUtils
-import com.sw.platecabinet.model.response.ApiResponse
+//import com.sw.platecabinet.model.response.ApiResponse
-import com.sw.platecabinet.network.ApiClient
+//import com.sw.platecabinet.network.ApiClient
-import com.sw.platecabinet.repository.RemoteRepository
+//import com.sw.platecabinet.repository.RemoteRepository
-import kotlinx.coroutines.flow.MutableStateFlow
+//import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+//import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
+//import kotlinx.coroutines.launch
-import timber.log.Timber
+//import timber.log.Timber
-
+//
-abstract class BaseViewModel() : ViewModel() {
+//abstract class BaseViewModel() : ViewModel() {
-    protected val repository = RemoteRepository(ApiClient.apiService)
+//    protected val repository = RemoteRepository(ApiClient.apiService)
-
+//
-    // 显示进度条
+//    // 显示进度条
-    private val _showLoading = MutableStateFlow<Boolean>(false)
+//    private val _showLoading = MutableStateFlow<Boolean>(false)
-    val showLoading: StateFlow<Boolean> = _showLoading
+//    val showLoading: StateFlow<Boolean> = _showLoading
-
+//
-    /**
+//    /**
-     * 带进度条的请求
+//     * 带进度条的请求
-     */
+//     */
-    protected fun launchWithLoading(block: suspend () -> Unit) {
+//    protected fun launchWithLoading(block: suspend () -> Unit) {
-        viewModelScope.launch {
+//        viewModelScope.launch {
-            try {
+//            try {
-                _showLoading.value = true
+//                _showLoading.value = true
-                block()
+//                block()
-            } catch (e: Exception) {
+//            } catch (e: Exception) {
-                // 错误处理可被子类重写
+//                // 错误处理可被子类重写
-                handleError(e)
+//                handleError(e)
-            } finally {
+//            } finally {
-                _showLoading.value = false
+//                _showLoading.value = false
-            }
-        }
-    }
-
-    /**
-     * 不带进度条的请求
-     */
-    protected fun launch(block: suspend () -> Unit) {
-        viewModelScope.launch() {
-            try {
-                block()
-            } catch (e: Exception) {
-                // 错误处理可被子类重写
-                handleError(e)
-            }
-        }
-    }
-
-    protected open fun parseResponse(response: ApiResponse<*>): Boolean {
-        if (response.isSuccess()) {
-            return true
-        }
-        Timber.d("msg = ${response.msg}, code = ${response.code}")
-        ToastUtils.showToast("${response.msg}(${response.code})")
-        return false
-    }
-
-
-    fun handleError(exception: Exception) {
-        Timber.d("handleError ${exception.message}")
-    }
-
-//    fun parseEquipmentInfo(equipmentInfo: EquipmentInfo) {
-////        GlobalData.appBaseUrl = equipmentInfo.appPackageUrl!!
-////        GlobalData.appBaseUrl="https://vip.shuziweidao.com"
-////        GlobalData.sdkKey = equipmentInfo.arcsoftSdkKey!!
-////        GlobalData.appId = equipmentInfo.arcsoftAppId!!
-////        GlobalData.activeKey = equipmentInfo.arcsoftActiveKey!!
-////        GlobalData.restId = equipmentInfo.canteenId!!
 //            }
-}
+//        }
+//    }
+//
+//    /**
+//     * 不带进度条的请求
+//     */
+//    protected fun launch(block: suspend () -> Unit) {
+//        viewModelScope.launch() {
+//            try {
+//                block()
+//            } catch (e: Exception) {
+//                // 错误处理可被子类重写
+//                handleError(e)
+//            }
+//        }
+//    }
+//
+//    protected open fun parseResponse(response: ApiResponse<*>): Boolean {
+//        if (response.isSuccess()) {
+//            return true
+//        }
+//        Timber.d("msg = ${response.msg}, code = ${response.code}")
+//        ToastUtils.showToast("${response.msg}(${response.code})")
+//        return false
+//    }
+//
+//
+//    fun handleError(exception: Exception) {
+//        Timber.d("handleError ${exception.message}")
+//    }
+//
+////    fun parseEquipmentInfo(equipmentInfo: EquipmentInfo) {
+//////        GlobalData.appBaseUrl = equipmentInfo.appPackageUrl!!
+//////        GlobalData.appBaseUrl="https://vip.shuziweidao.com"
+//////        GlobalData.sdkKey = equipmentInfo.arcsoftSdkKey!!
+//////        GlobalData.appId = equipmentInfo.arcsoftAppId!!
+//////        GlobalData.activeKey = equipmentInfo.arcsoftActiveKey!!
+//////        GlobalData.restId = equipmentInfo.canteenId!!
+////    }
+//}

app/src/main/java/com/sw/platecabinet/viewmodel/NetViewModelV2.kt

@@ -0,0 +1,325 @@
+package com.sw.platecabinet.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.arcsoft.face.ErrorInfo
+import com.sw.inbound.utils.SPUtil
+import com.sw.plate.App
+import com.sw.plate.utils.Base64
+import com.sw.plate.utils.ToastUtils
+import com.sw.plate.utils.arcface.FaceApi
+import com.sw.plate.utils.arcface.facedb.FaceDatabase
+import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
+import com.sw.platecabinet.GlobalData
+import com.sw.platecabinet.GlobalKey
+import com.sw.platecabinet.model.DeviceConfigV2
+import com.sw.platecabinet.model.response.UserFaceModel
+import com.sw.platecabinet.model.response.UserFaceModelV2
+import com.sw.platecabinet.network.ApiClient
+import com.sw.platecabinet.repository.RemoteRepositoryV2
+import com.sw.platecabinet.utils.SpTool
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+
+/**
+ * 用户viewmodel
+ */
+class NetViewModelV2 : ViewModel() {
+
+    companion object {
+        const val PAGE_SIZE = 100
+    }
+
+    private val faceApi: FaceApi = FaceApi()
+    private val repository = RemoteRepositoryV2(ApiClient.apiServiceV2)
+
+
+    //fun getUserFace(
+    //    pageNo: Int,
+    //    pageSize: Int,
+    //    callback: (Boolean, List<UserFaceModelV2>) -> Unit
+    //) {
+    //    viewModelScope.launch {
+    //        val response = repository.getUserFaceCache(pageNum = pageNo, pageSize = pageSize)
+    //        if (response.isSuccess()) callback(true, response.data ?: emptyList())
+    //        else callback(false, emptyList())
+    //    }
+    //}
+
+    /**
+     * 获取人脸数据
+     */
+    fun getUserFaceCache(
+        pageNo: Int = 1,
+        pageSize: Int = PAGE_SIZE,
+        callback: (Boolean, String?) -> Unit = { _, _ -> }
+    ) {
+        var currentPageNo = pageNo
+        viewModelScope.launch {
+            val response = repository.getUserFaceCache(pageNo, pageSize)
+            if (response.isSuccess().not()) {
+                callback(false, response.msg)
+                return@launch
+            }
+            // 获取成功一次后缓存状态
+            SPUtil.getInstance().put(GlobalKey.KEY_FIRST_RUN, true)
+            val list = response.data ?: emptyList()
+            if (pageNo == 1 && list.isEmpty()) {
+                callback(false, "暂无数据")
+                return@launch
+            }
+            val faceEntityList = list.mapNotNull { face ->
+                val featureBase64 = face.resolveFeatureStr()
+                if (featureBase64.isNullOrBlank()) null
+                else {
+                    val featureData = base64ToByteArray(featureBase64)
+                    if (featureData == null) null
+                    else face.toFaceEntity()
+                }
+            }
+            withContext(Dispatchers.Default) {
+                if (currentPageNo == 1) {
+                    //第一页数据删除本地数据库，同时重置时间戳
+                    faceApi.clearFaceData()
+                    faceTimestamp = 0L
+                }
+                faceApi.updateFaceData(pageNo, faceEntityList)
+                if (list.size >= pageSize) {
+                    // 取当前页最大时间戳，与已累积的比较取最大值
+                    val pageMaxTimestamp = maxFaceTimestamp(list)
+                    if (pageMaxTimestamp > faceTimestamp) {
+                        faceTimestamp = pageMaxTimestamp
+                    }
+                    currentPageNo++
+                    getUserFaceCache(
+                        pageNo = currentPageNo, callback = callback
+                    )
+                    return@withContext
+                }
+                if (list.isNotEmpty()) {
+                    // 最后一页：取当前页最大时间戳，与已累积的比较取最大值
+                    val pageMaxTimestamp = maxFaceTimestamp(list)
+                    if (pageMaxTimestamp > faceTimestamp) {
+                        faceTimestamp = pageMaxTimestamp
+                    }
+                }
+                SpTool.lastFaceTimestamp = faceTimestamp
+                callback(true, "查询完成")
+            }
+        }
+    }
+
+    private var faceTimestamp = 0L
+
+
+    /**
+     * 激活人脸识别引擎
+     */
+    fun activeEngine() {
+        Timber.d("activeEngine")
+
+        faceApi.activeEngine(
+            App.getContext(),
+            GlobalData.appId,
+            GlobalData.sdkKey,
+            GlobalData.activeKey,
+            object : FaceApi.ActiveCallback {
+                override fun onSuccess(activeCode: Int) {
+                    Timber.d("activeEngine activeCode = $activeCode")
+//                    ThreadUtils.launch {
+                    viewModelScope.launch(Dispatchers.Main) {
+                        when (activeCode) {
+                            ErrorInfo.MOK -> {
+                                ToastUtils.showToast("激活引擎成功")
+                            }
+
+                            ErrorInfo.MERR_ASF_ALREADY_ACTIVATED -> {
+//                                ToastUtils.showToast("引擎已激活，无需再次激活")
+                            }
+
+                            else -> {
+                                ToastUtils.showToast("激活引擎失败($activeCode)")
+                            }
+                        }
+                    }
+                }
+
+                override fun onFail(e: Exception?) {
+                    viewModelScope.launch(Dispatchers.Main) {
+                        ToastUtils.showToast("激活引擎异常,${e?.message}")
+                    }
+                }
+            })
+    }
+
+
+    fun getDeviceConfig(onSuccess: (DeviceConfigV2?) -> Unit, onFailure: (String?) -> Unit) {
+//        Timber.tag(TAG).d("getDeviceConfig")
+        viewModelScope.launch {
+            val response = repository.getDeviceConfig()
+            if (response.isSuccess()) {
+                onSuccess(response.data)
+            } else {
+                onFailure(response.msg)
+            }
+        }
+    }
+
+
+    /**
+     * 增量获取人脸数据（支持分页递归，取所有页中的最大时间戳）
+     */
+    fun getFaceIncrementList(
+        pageNo: Int = 1,
+        pageSize: Int = PAGE_SIZE,
+        timestamp: Long,
+        refreshFaceList: () -> Unit
+    ) {
+        var currentPageNo = pageNo
+        viewModelScope.launch {
+            val response = repository.getFaceIncrementList(
+                pageNum = currentPageNo.toLong(),
+                pageSize = pageSize.toLong(),
+                timestamp = timestamp
+            )
+            if (response.isSuccess().not()) {
+                return@launch
+            }
+            withContext(Dispatchers.IO) {
+                val list = response.data ?: emptyList()
+                updateFaceData(list)
+                // 取当前页最大时间戳，与已累积的比较取最大值
+                val pageMaxTimestamp = maxFaceTimestamp(list)
+                if (pageMaxTimestamp > faceTimestamp) {
+                    faceTimestamp = pageMaxTimestamp
+                }
+                if (list.size >= pageSize) {
+                    // 还有下一页，继续递归拉取
+                    currentPageNo++
+                    getFaceIncrementList(
+                        pageNo = currentPageNo,
+                        pageSize = pageSize,
+                        timestamp = timestamp,
+                        refreshFaceList = refreshFaceList
+                    )
+                    return@withContext
+                }
+                // 所有页拉取完毕，保存最终时间戳（只升不降）
+                val storedTimestamp = SpTool.lastFaceTimestamp
+                if (faceTimestamp > storedTimestamp) {
+                    SpTool.lastFaceTimestamp = faceTimestamp
+                }
+                try {
+                    refreshFaceList()
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+    }
+
+    private fun updateFaceData(list: List<UserFaceModelV2>) {
+        try {
+            list.forEach { model ->
+                if (model.faceDeleted == true) {
+                    //删除数据
+                    // 仅删除 userFaceId 对应的单条人脸记录，避免误删该用户名下所有特征
+                    val userFaceId = model.userFaceId
+                    if (!userFaceId.isNullOrEmpty()) {
+                        faceApi.deleteByUserFaceId(userFaceId)
+                    }
+                } else {
+                    // 优先按 userFaceId 精确判重，避免特征字段不一致导致重复入库
+                    val userFaceId = model.userFaceId
+                    if (!userFaceId.isNullOrEmpty() && faceApi.queryByUserFaceId(userFaceId) != null) {
+                        // 本地已存在该 userFaceId，跳过插入
+                        return@forEach
+                    }
+                    // userFaceId 为空时，回退到特征比较去重（修正字段来源，保证与入库一致）
+                    val featureStr = model.resolveFeatureStr()
+                    val existList = faceApi.queryAllByUserName(model.userId)
+                    val alreadyExists = existList.any { entity ->
+                        featureStr != null && Base64.encode(entity.featureData) == featureStr
+                    }
+                    if (!alreadyExists) {
+                        faceApi.insert(model.toFaceEntity())
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    /**
+     * 添加人脸数据
+     */
+    fun addUserFace(faceData: String, imageFile: File, block: (Boolean, UserFaceModelV2?) -> Unit) {
+        viewModelScope.launch {
+            try {
+                val imageResp = repository.uploadImage(imageFile)
+                val imageUrl = imageResp.data ?: ""
+                if (imageUrl.isBlank()) {
+                    block(false, null)
+                    return@launch
+                }
+                val faceResp = repository.addUserFace(faceData, imageUrl)
+                if (faceResp.isSuccess().not()) {
+                    block(false, null)
+                    return@launch
+                }
+                block(true, faceResp.data)
+            } catch (e: Exception) {
+                // 网络或解析异常时同样回调失败，避免 block 永不触发导致上层无反馈
+                e.printStackTrace()
+                block(false, null)
+            }
+        }
+    }
+
+    /**
+     * 取餐盘上报（P-09a）：记录用户开始就餐时刻，作为后续就餐记录（P-09）的强前置。
+     * 失败仅回调通知，不阻断吐盘等业务主流程。
+     *
+     * @param userId   用户 id（餐盘号 = userId）
+     * @param callback 上报结果回调：Boolean 是否成功，String? 成功为 recordNo、失败为错误信息
+     */
+    fun platePickup(
+        userId: Long,
+        callback: (Boolean, String?) -> Unit = { _, _ -> }
+    ) {
+        viewModelScope.launch {
+            try {
+                val response = repository.platePickup(userId)
+                if (response.isSuccess()) {
+                    callback(true, response.data)
+                } else {
+                    callback(false, response.msg)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                callback(false, e.message)
+            }
+        }
+    }
+
+    private fun base64ToByteArray(base64: String?): ByteArray? {
+        base64 ?: return null
+        return try {
+            Base64.decode(base64)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    /**
+     * 从人脸数据列表中取出最大的 faceUpdateTimestamp（跳过 null 值）
+     */
+    private fun maxFaceTimestamp(list: List<UserFaceModelV2>): Long {
+        return list.mapNotNull { it.faceUpdateTimestamp }.maxOrNull() ?: 0L
+    }
+
+}

app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt

@@ -1,201 +1,201 @@
-package com.sw.platecabinet.viewmodel
+//package com.sw.platecabinet.viewmodel
-
+//
-import androidx.lifecycle.viewModelScope
+//import androidx.lifecycle.viewModelScope
-import com.arcsoft.face.ErrorInfo
+//import com.arcsoft.face.ErrorInfo
-import com.sw.inbound.utils.SPUtil
+//import com.sw.inbound.utils.SPUtil
-import com.sw.plate.App
+//import com.sw.plate.App
-import com.sw.plate.utils.Base64
+//import com.sw.plate.utils.Base64
-import com.sw.plate.utils.ToastUtils
+//import com.sw.plate.utils.ToastUtils
-import com.sw.plate.utils.arcface.FaceApi
+//import com.sw.plate.utils.arcface.FaceApi
-import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
+//import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
-import com.sw.platecabinet.GlobalData
+//import com.sw.platecabinet.GlobalData
-import com.sw.platecabinet.GlobalKey
+//import com.sw.platecabinet.GlobalKey
-import com.sw.platecabinet.model.DeviceConfig
+//import com.sw.platecabinet.model.DeviceConfig
-import com.sw.platecabinet.model.response.UserFaceModel
+//import com.sw.platecabinet.model.response.UserFaceModel
-import com.sw.platecabinet.utils.SpTool
+//import com.sw.platecabinet.utils.SpTool
-import kotlinx.coroutines.Dispatchers
+//import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+//import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+//import kotlinx.coroutines.withContext
-import timber.log.Timber
+//import timber.log.Timber
-import java.io.File
+//import java.io.File
-
+//
-/**
+///**
- * 用户viewmodel
+// * 用户viewmodel
- */
+// */
-class UserViewModel : BaseViewModel() {
+//class UserViewModel : BaseViewModel() {
-
+//
-    companion object {
+//    companion object {
-        const val PAGE_SIZE = 100
+//        const val PAGE_SIZE = 100
-    }
+//    }
-
+//
-    private val faceApi: FaceApi = FaceApi()
+//    private val faceApi: FaceApi = FaceApi()
-
+//
-
+//
-    fun getUserFace(
+//    fun getUserFace(
-        pageNo: Int,
+//        pageNo: Int,
-        pageSize: Int,
+//        pageSize: Int,
-        callback: (List<UserFaceModel>) -> Unit
+//        callback: (List<UserFaceModel>) -> Unit
-    ) {
+//    ) {
-        launchWithLoading {
+//        launchWithLoading {
-            val response = repository.getUserFaceCache(pageNum = pageNo, pageSize = pageSize)
+//            val response = repository.getUserFaceCache(pageNum = pageNo, pageSize = pageSize)
-            val status = parseResponse(response)
+//            val status = parseResponse(response)
-            if (status) callback(response.data ?: emptyList())
+//            if (status) callback(response.data ?: emptyList())
-            else emptyList<UserFaceModel>()
+//            else emptyList<UserFaceModel>()
-        }
+//        }
-    }
+//    }
-
+//
-    /**
+//    /**
-     * 获取人脸数据
+//     * 获取人脸数据
-     */
+//     */
-    fun getUserFaceCache(
+//    fun getUserFaceCache(
-        pageNo: Int = 1,
+//        pageNo: Int = 1,
-        pageSize: Int = PAGE_SIZE,
+//        pageSize: Int = PAGE_SIZE,
-        callback: (Boolean, String?) -> Unit = { statue, msg -> }
+//        callback: (Boolean, String?) -> Unit = { statue, msg -> }
-    ) {
+//    ) {
-        var currentPageNo = pageNo
+//        var currentPageNo = pageNo
-        launchWithLoading {
+//        launchWithLoading {
-            val response = repository.getUserFaceCache(pageNum = pageNo, pageSize = pageSize)
+//            val response = repository.getUserFaceCache(pageNum = pageNo, pageSize = pageSize)
-            val status = parseResponse(response)
+//            val status = parseResponse(response)
-            if (status.not()) {
+//            if (status.not()) {
-                callback(false, response.msg)
+//                callback(false, response.msg)
-                return@launchWithLoading
+//                return@launchWithLoading
-            }
+//            }
-            // 获取成功一次后缓存状态
+//            // 获取成功一次后缓存状态
-            SPUtil.getInstance().put(GlobalKey.KEY_FIRST_RUN, true)
+//            SPUtil.getInstance().put(GlobalKey.KEY_FIRST_RUN, true)
-            val list: List<UserFaceModel> = response.data ?: emptyList()
+//            val list: List<UserFaceModel> = response.data ?: emptyList()
-            if (pageNo == 1 && list.isEmpty()) {
+//            if (pageNo == 1 && list.isEmpty()) {
-                callback(false, "暂无数据")
+//                callback(false, "暂无数据")
-                return@launchWithLoading
+//                return@launchWithLoading
-            }
+//            }
-            val faceEntityList = list.map {
+//            val faceEntityList = list.map {
-                FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr)).apply {
+//                FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr)).apply {
-                    userType = if (it.member) "1" else "2"
+//                    userType = if (it.member == true) "1" else "2"
-                }
+//                }
-            }
+//            }
-            withContext(Dispatchers.Default) {
+//            withContext(Dispatchers.Default) {
-                if (currentPageNo == 1) {
+//                if (currentPageNo == 1) {
-                    //第一页数据删除本地数据库
+//                    //第一页数据删除本地数据库
-                    faceApi.clearFaceData()
+//                    faceApi.clearFaceData()
-                }
+//                }
-                faceApi.updateFaceData(pageNo, faceEntityList)
+//                faceApi.updateFaceData(pageNo, faceEntityList)
-                if (list.size >= pageSize) {
+//                if (list.size >= pageSize) {
-                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
+//                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
-                    currentPageNo++
+//                    currentPageNo++
-                    getUserFaceCache(
+//                    getUserFaceCache(
-                        pageNo = currentPageNo,
+//                        pageNo = currentPageNo,
-                        callback = callback
+//                        callback = callback
-                    )
+//                    )
-                    return@withContext
+//                    return@withContext
-                }
+//                }
-                if (list.isNotEmpty()) {
+//                if (list.isNotEmpty()) {
-                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
+//                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
-                }
+//                }
-                SpTool.lastFaceTimestamp = faceTimestamp
+//                SpTool.lastFaceTimestamp = faceTimestamp
-                callback(true, "查询完成")
+//                callback(true, "查询完成")
-            }
+//            }
-        }
+//        }
-    }
+//    }
-
+//
-    private var faceTimestamp = 0L
+//    private var faceTimestamp = 0L
-
+//
-
+//
-    /**
+//    /**
-     * 激活人脸识别引擎
+//     * 激活人脸识别引擎
-     */
+//     */
-    fun activeEngine() {
+//    fun activeEngine() {
-        Timber.d("activeEngine")
+//        Timber.d("activeEngine")
-
+//
-        faceApi.activeEngine(
+//        faceApi.activeEngine(
-            App.getContext(),
+//            App.getContext(),
-            GlobalData.appId,
+//            GlobalData.appId,
-            GlobalData.sdkKey,
+//            GlobalData.sdkKey,
-            GlobalData.activeKey,
+//            GlobalData.activeKey,
-            object : FaceApi.ActiveCallback {
+//            object : FaceApi.ActiveCallback {
-                override fun onSuccess(activeCode: Int) {
+//                override fun onSuccess(activeCode: Int) {
-                    Timber.d("activeEngine activeCode = $activeCode")
+//                    Timber.d("activeEngine activeCode = $activeCode")
-//                    ThreadUtils.launch {
+////                    ThreadUtils.launch {
-                    viewModelScope.launch(Dispatchers.Main) {
+//                    viewModelScope.launch(Dispatchers.Main) {
-                        when (activeCode) {
+//                        when (activeCode) {
-                            ErrorInfo.MOK -> {
+//                            ErrorInfo.MOK -> {
-                                ToastUtils.showToast("激活引擎成功")
+//                                ToastUtils.showToast("激活引擎成功")
-                            }
+//                            }
-
+//
-                            ErrorInfo.MERR_ASF_ALREADY_ACTIVATED -> {
+//                            ErrorInfo.MERR_ASF_ALREADY_ACTIVATED -> {
-//                                ToastUtils.showToast("引擎已激活，无需再次激活")
+////                                ToastUtils.showToast("引擎已激活，无需再次激活")
-                            }
+//                            }
-
+//
-                            else -> {
+//                            else -> {
-                                ToastUtils.showToast("激活引擎失败($activeCode)")
+//                                ToastUtils.showToast("激活引擎失败($activeCode)")
-                            }
+//                            }
-                        }
+//                        }
-                    }
+//                    }
-                }
+//                }
-
+//
-                override fun onFail(e: Exception?) {
+//                override fun onFail(e: Exception?) {
-                    viewModelScope.launch(Dispatchers.Main) {
+//                    viewModelScope.launch(Dispatchers.Main) {
-                        ToastUtils.showToast("激活引擎异常,${e?.message}")
+//                        ToastUtils.showToast("激活引擎异常,${e?.message}")
-                    }
+//                    }
-                }
+//                }
-            })
+//            })
-    }
+//    }
-
+//
-
+//
-    fun getDeviceConfig(block: (DeviceConfig?) -> Unit) {
+//    fun getDeviceConfig(block: (DeviceConfig?) -> Unit) {
-//        Timber.tag(TAG).d("getDeviceConfig")
+////        Timber.tag(TAG).d("getDeviceConfig")
-        launch {
+//        launch {
-            val response = repository.getDeviceConfig()
+//            val response = repository.getDeviceConfig()
-            if (parseResponse(response)) {
+//            if (parseResponse(response)) {
-                block(response.data)
+//                block(response.data)
-            } else {
+//            } else {
-                block(null)
+//                block(null)
-            }
+//            }
-        }
+//        }
-    }
+//    }
-
+//
-
+//
-    /**
+//    /**
-     * 获取人脸数据
+//     * 获取人脸数据
-     */
+//     */
-    fun getFaceIncrementList(
+//    fun getFaceIncrementList(
-        pageNo: Int = 1,
+//        pageNo: Int = 1,
-        pageSize: Int = PAGE_SIZE,
+//        pageSize: Int = PAGE_SIZE,
-        timestamp: Long,
+//        timestamp: Long,
-        block: (List<UserFaceModel>) -> Unit
+//        block: (List<UserFaceModel>) -> Unit
-    ) {
+//    ) {
-        launch {
+//        launch {
-            val response = repository.getFaceIncrementList(
+//            val response = repository.getFaceIncrementList(
-                pageNum = pageNo.toLong(),
+//                pageNum = pageNo.toLong(),
-                pageSize = pageSize.toLong(),
+//                pageSize = pageSize.toLong(),
-                timestamp = timestamp
+//                timestamp = timestamp
-            )
+//            )
-            if (parseResponse(response)) {
+//            if (parseResponse(response)) {
-                withContext(Dispatchers.Default) {
+//                withContext(Dispatchers.Default) {
-                    val list: List<UserFaceModel> = response.data ?: emptyList()
+//                    val list: List<UserFaceModel> = response.data ?: emptyList()
-                    block(list)
+//                    block(list)
-                }
+//                }
-            }
+//            }
-        }
+//        }
-    }
+//    }
-
+//
-    /**
+//    /**
-     * 添加人脸数据
+//     * 添加人脸数据
-     */
+//     */
-    fun addUserFace(faceData: String, imageFile: File, block: (Boolean, UserFaceModel?) -> Unit) {
+//    fun addUserFace(faceData: String, imageFile: File, block: (Boolean, UserFaceModel?) -> Unit) {
-        launch {
+//        launch {
-            val imageResp = repository.uploadImage(imageFile)
+//            val imageResp = repository.uploadImage(imageFile)
-            val imageUrl = imageResp.data ?: ""
+//            val imageUrl = imageResp.data ?: ""
-            if (imageUrl.isBlank()) {
+//            if (imageUrl.isBlank()) {
-                block(false, null)
+//                block(false, null)
-                return@launch
+//                return@launch
-            }
+//            }
-            val faceResp = repository.addUserFace(faceData, imageUrl)
+//            val faceResp = repository.addUserFace(faceData, imageUrl)
-            val status = parseResponse(faceResp)
+//            val status = parseResponse(faceResp)
-            if (status.not()) {
+//            if (status.not()) {
-                block(false, null)
+//                block(false, null)
-                return@launch
+//                return@launch
-            }
+//            }
-            block(true, faceResp.data)
+//            block(true, faceResp.data)
-        }
+//        }
-    }
+//    }
-
+//
-}
+//}

app/src/main/res/layout/activity_plc_setting.xml

@@ -324,6 +324,54 @@
                 android:textColor="#FFCC99"
                 android:textSize="22sp" />
 
+            <!-- ===== 人脸库 ===== -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="人脸库"
+                android:textColor="#FFCC99"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tvFaceCount"
+                    android:layout_width="0dp"
+                    android:layout_height="60dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/btn_outline"
+                    android:gravity="center"
+                    android:text="人脸总数：--"
+                    android:textColor="#FFCC99"
+                    android:textSize="20sp" />
+
+                <View
+                    android:layout_width="20dp"
+                    android:layout_height="1dp" />
+
+                <TextView
+                    android:id="@+id/btnRefreshFaceCount"
+                    android:layout_width="0dp"
+                    android:layout_height="60dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/btn_outline"
+                    android:gravity="center"
+                    android:text="刷新"
+                    android:textColor="#FFCC99"
+                    android:textSize="20sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="30dp" />
+
         </LinearLayout>
     </ScrollView>
 

app/src/main/res/layout/item_title_time.xml

@@ -11,6 +11,9 @@
         android:id="@+id/tvLeftDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:minHeight="64dp"
+        android:gravity="center_vertical"
+        android:paddingHorizontal="12dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
@@ -36,6 +39,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
+        android:minHeight="64dp"
+        android:paddingHorizontal="12dp"
         android:textColor="#FFF0C8B4"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"

lib_face/build.gradle.kts

@@ -13,7 +13,7 @@ android {
         consumerProguardFiles("consumer-rules.pro")
 
         ndk {
-            abiFilters.addAll(listOf("armeabi-v7a"/*, "arm64-v8a"*/))
+            abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a"))
         }
     }
 

lib_face/src/main/java/com/sw/plate/utils/arcface/FaceApi.java

@@ -32,7 +32,7 @@ public class FaceApi {
      */
     public void updateFaceData(int index, List<FaceEntity> list) {
         Log.d(TAG, "updateFaceData: index = " + index + ", listSize = " + list.size());
-        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        FaceDao faceDao = getFaceDao();
         //if (index == 1) {
         //    faceDao.deleteAll();
         //    faceDao.resetId();
@@ -41,7 +41,7 @@ public class FaceApi {
     }
 
     public void clearFaceData() {
-        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        FaceDao faceDao = getFaceDao();
         faceDao.deleteAll();
         faceDao.resetId();
     }
@@ -88,29 +88,51 @@ public class FaceApi {
     }
 
     public void deleteByUserName(String userName) {
-        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        getFaceDao().deleteFaceById(userName);
-        faceDao.deleteFaceById(userName);
+    }
+
+    /**
+     * 按 userFaceId 删除单条人脸记录
+     */
+    public void deleteByUserFaceId(String userFaceId) {
+        getFaceDao().deleteFaceByUserFaceId(userFaceId);
+    }
+
+
+    /**
+     * 按 userFaceId 查询单条人脸记录
+     */
+    public FaceEntity queryByUserFaceId(String userFaceId) {
+        if (userFaceId == null || userFaceId.isEmpty()) {
+            return null;
+        }
+        return getFaceDao().queryByUserFaceId(userFaceId);
     }
 
     public Long insert(FaceEntity entity) {
         if (entity == null) {
             return 0L;
         }
-        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        return getFaceDao().insert(entity);
-        return faceDao.insert(entity);
     }
 
     public FaceEntity queryByUserName(String userName) {
         if (TextUtils.isEmpty(userName)) {
             return null;
         }
-        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        return getFaceDao().queryByUserName(userName);
-        return faceDao.queryByUserName(userName);
     }
 
     public int queryFaceCount() {
-        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        return getFaceDao().getFaceCount();
-        return faceDao.getFaceCount();
+    }
+
+    public List<FaceEntity> queryAllByUserName(String userName) {
+        return getFaceDao().queryAllByUserName(userName);
+    }
+
+    public FaceDao getFaceDao() {
+        return FaceDatabase.getInstance(App.getContext()).faceDao();
     }
 
 }

lib_face/src/main/java/com/sw/plate/utils/arcface/face/FaceHelper.java

@@ -39,7 +39,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
@@ -104,6 +103,10 @@ public class FaceHelper implements FaceListener {
      * 活体检测引擎
      */
     private FaceEngine flEngine;
+    /**
+     * 口罩检测引擎（5.0 独立引擎）
+     */
+    private FaceEngine maskEngine;
 
     private Camera.Size previewSize;
 
@@ -148,11 +151,6 @@ public class FaceHelper implements FaceListener {
      */
     private boolean onlyDetectLiveness;
 
-    /**
-     * 是否需要更新faceData
-     */
-    private boolean needUpdateFaceData;
-
     /**
      * 识别的配置项
      */
@@ -182,9 +180,9 @@ public class FaceHelper implements FaceListener {
     }
 
     private FaceHelper(Builder builder) {
-        needUpdateFaceData = builder.needUpdateFaceData;
         onlyDetectLiveness = builder.onlyDetectLiveness;
         ftEngine = builder.ftEngine;
+        maskEngine = builder.maskEngine;
         trackedFaceCount = builder.trackedFaceCount;
         previewSize = builder.previewSize;
         frEngine = builder.frEngine;
@@ -352,11 +350,11 @@ public class FaceHelper implements FaceListener {
                     return facePreviewInfoList;
                 }
             }
-            if (!onlyDetectLiveness) {
+            if (!onlyDetectLiveness && maskEngine != null) {
-                code = ftEngine.process(rgbNv21, previewSize.width, previewSize.height, FaceEngine.CP_PAF_NV21, faceInfoList,
+                code = maskEngine.process(rgbNv21, previewSize.width, previewSize.height, FaceEngine.CP_PAF_NV21, faceInfoList,
                         FaceEngine.ASF_MASK_DETECT);
                 if (code == ErrorInfo.MOK) {
-                    code = ftEngine.getMask(maskInfoList);
+                    code = maskEngine.getMask(maskInfoList);
                     if (code != ErrorInfo.MOK) {
                         onFail(new Exception("process getMask failed,code is " + code));
                         return facePreviewInfoList;
@@ -880,18 +878,7 @@ public class FaceHelper implements FaceListener {
                     int fdCode = flEngine.detectFaces(nv21Data, width, height, format, faceInfoList);
                     boolean isFaceExists = isFaceExists(faceInfoList, faceInfo);
                     if (fdCode == ErrorInfo.MOK && isFaceExists) {
-                        if (needUpdateFaceData) {
-                            /*
-                             * 若IR人脸框有偏移，则需要对IR的人脸数据进行updateFaceData处理，再将处理后的FaceInfo信息传输给活体检测接口
-                             */
-                            flCode = flEngine.updateFaceData(nv21Data, previewSize.width, previewSize.height, FaceEngine.CP_PAF_NV21,
-                                    new ArrayList<>(Collections.singletonList(faceInfo)));
-                            if (flCode == ErrorInfo.MOK) {
                         flCode = flEngine.processIr(nv21Data, width, height, format, Arrays.asList(faceInfo), FaceEngine.ASF_IR_LIVENESS);
-                            }
-                        } else {
-                            flCode = flEngine.processIr(nv21Data, width, height, format, Arrays.asList(faceInfo), FaceEngine.ASF_IR_LIVENESS);
-                        }
                     } else {
                         onFail(new Exception("ir detectFaces failed fdCode:" + fdCode + ",isFaceExists:" + isFaceExists));
                     }
@@ -1098,9 +1085,9 @@ public class FaceHelper implements FaceListener {
         private FaceEngine ftEngine;
         private FaceEngine frEngine;
         private FaceEngine flEngine;
+        private FaceEngine maskEngine;
         private Camera.Size previewSize;
         private boolean onlyDetectLiveness;
-        private boolean needUpdateFaceData;
         private RecognizeConfiguration recognizeConfiguration;
         private RecognizeCallback recognizeCallback;
         private IDualCameraFaceInfoTransformer dualCameraFaceInfoTransformer;
@@ -1141,6 +1128,11 @@ public class FaceHelper implements FaceListener {
             return this;
         }
 
+        public Builder maskEngine(FaceEngine val) {
+            maskEngine = val;
+            return this;
+        }
+
         public Builder previewSize(Camera.Size val) {
             previewSize = val;
             return this;
@@ -1166,11 +1158,6 @@ public class FaceHelper implements FaceListener {
             return this;
         }
 
-        public Builder needUpdateFaceData(boolean val) {
-            needUpdateFaceData = val;
-            return this;
-        }
-
         public FaceHelper build() {
             return new FaceHelper(this);
         }

lib_face/src/main/java/com/sw/plate/utils/arcface/facedb/FaceDatabase.java

@@ -9,7 +9,7 @@ import androidx.room.RoomDatabase;
 import com.sw.plate.utils.arcface.facedb.dao.FaceDao;
 import com.sw.plate.utils.arcface.facedb.entity.FaceEntity;
 
-@Database(entities = {FaceEntity.class}, version = 1, exportSchema = false)
+@Database(entities = {FaceEntity.class}, version = 2, exportSchema = false)
 public abstract class FaceDatabase extends RoomDatabase {
     public abstract FaceDao faceDao();
 
@@ -22,7 +22,10 @@ public abstract class FaceDatabase extends RoomDatabase {
                     faceDatabase = Room.databaseBuilder(context, FaceDatabase.class,
                             context.getDatabasePath("faceDB.db").getPath()
 //                            context.getExternalFilesDir("database") + File.separator + "faceDB.db"
-                    ).build();
+                    )
+                    // 5.0 特征模型不兼容，升级时直接删除旧表重建
+                    .fallbackToDestructiveMigration()
+                    .build();
                 }
             }
         }

lib_face/src/main/java/com/sw/plate/utils/arcface/facedb/dao/FaceDao.java

@@ -55,6 +55,18 @@ public interface FaceDao {
     @Query("DELETE from face  WHERE user_name = :userName")
     int deleteFaceById(String userName);
 
+    /**
+     * 按 userFaceId 删除单条人脸记录
+     */
+    @Query("DELETE from face WHERE user_face_id = :userFaceId")
+    int deleteFaceByUserFaceId(String userFaceId);
+
+    /**
+     * 按 userFaceId 查询单条人脸记录
+     */
+    @Query("SELECT * FROM face WHERE user_face_id = :userFaceId LIMIT 1")
+    FaceEntity queryByUserFaceId(String userFaceId);
+
     /**
      * 删除所有已注册的人脸
      *
@@ -104,13 +116,13 @@ public interface FaceDao {
     /**
      * @return 删除临时用户人脸
      */
-    @Query("DELETE from face WHERE user_type = '2'")
+    @Query("DELETE from face WHERE user_type = :userType")
-    int deleteTempUserFaceData();
+    int deleteUserFaceData(int userType);
 
     /**
      * 查询用户人脸数
      * @param userType 1-会员，2-临时用户
      */
     @Query("SELECT COUNT(1) FROM face WHERE user_type = :userType")
-    int getFaceCount(String userType);
+    int getFaceCountByUserType(int userType);
 }

lib_face/src/main/java/com/sw/plate/utils/arcface/facedb/entity/FaceEntity.java

@@ -52,12 +52,39 @@ public class FaceEntity implements Parcelable {
     /**
      * 会员编号
      */
-    @ColumnInfo(name = "cardNo")
+    @ColumnInfo(name = "card_no")
     private String cardNo;
 
     @Ignore
     private int trackId;//人脸追踪ID
 
+    @ColumnInfo(name = "user_id")
+    private String userId;
+    @ColumnInfo(name = "user_face_id")
+    private String userFaceId;
+    @ColumnInfo(name = "member")
+    private boolean member;
+    @ColumnInfo(name = "face_update_timestamp")
+    private long faceUpdateTimestamp;
+
+    public FaceEntity() {
+        registerTime = System.currentTimeMillis();
+    }
+
+    @Ignore
+    public FaceEntity(String userName, byte[] featureData, String userType, String cardNo, String userId, String userFaceId, boolean member, long faceUpdateTimestamp) {
+        this.userName = userName;
+        this.featureData = featureData;
+        this.userType = userType;
+        this.cardNo = cardNo;
+        this.userId = userId;
+        this.userFaceId = userFaceId;
+        this.member = member;
+        this.faceUpdateTimestamp = faceUpdateTimestamp;
+        registerTime = System.currentTimeMillis();
+    }
+
+    @Ignore
     public FaceEntity(String userName, String imagePath, byte[] featureData) {
         this.userName = userName;
         this.imagePath = imagePath;
@@ -65,6 +92,7 @@ public class FaceEntity implements Parcelable {
         registerTime = System.currentTimeMillis();
     }
 
+    @Ignore
     public FaceEntity(FaceEntity faceEntity) {
         this.faceId = faceEntity.faceId;
         this.userName = faceEntity.userName;
@@ -73,9 +101,14 @@ public class FaceEntity implements Parcelable {
         this.registerTime = faceEntity.registerTime;
         this.userType = faceEntity.getUserType();
         this.cardNo = faceEntity.getCardNo();
+        this.userId = faceEntity.getUserId();
+        this.userFaceId = faceEntity.getUserFaceId();
+        this.member = faceEntity.isMember();
+        this.faceUpdateTimestamp = faceEntity.getFaceUpdateTimestamp();
     }
 
 
+    @Ignore
     protected FaceEntity(Parcel in) {
         faceId = in.readLong();
         registerTime = in.readLong();
@@ -84,6 +117,10 @@ public class FaceEntity implements Parcelable {
         featureData = in.createByteArray();
         userType = in.readString();
         cardNo = in.readString();
+        userId = in.readString();
+        userFaceId = in.readString();
+        member = in.readByte() != 0;
+        faceUpdateTimestamp = in.readLong();
     }
 
     public static final Creator<FaceEntity> CREATOR = new Creator<FaceEntity>() {
@@ -162,7 +199,37 @@ public class FaceEntity implements Parcelable {
         this.cardNo = cardNo;
     }
 
+    public String getUserId() {
+        return userId;
+    }
 
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserFaceId() {
+        return userFaceId;
+    }
+
+    public void setUserFaceId(String userFaceId) {
+        this.userFaceId = userFaceId;
+    }
+
+    public boolean isMember() {
+        return member;
+    }
+
+    public void setMember(boolean member) {
+        this.member = member;
+    }
+
+    public long getFaceUpdateTimestamp() {
+        return faceUpdateTimestamp;
+    }
+
+    public void setFaceUpdateTimestamp(long faceUpdateTimestamp) {
+        this.faceUpdateTimestamp = faceUpdateTimestamp;
+    }
 
     @Override
     public int describeContents() {
@@ -178,6 +245,10 @@ public class FaceEntity implements Parcelable {
         dest.writeByteArray(featureData);
         dest.writeString(userType);
         dest.writeString(cardNo);
+        dest.writeString(userId);
+        dest.writeString(userFaceId);
+        dest.writeByte((byte) (member ? 1 : 0));
+        dest.writeLong(faceUpdateTimestamp);
     }
 
     @Override
@@ -195,12 +266,16 @@ public class FaceEntity implements Parcelable {
                 TextUtils.equals(this.imagePath, that.imagePath) &&
                 Arrays.equals(featureData, that.featureData) &&
                 TextUtils.equals(this.userType, that.userType) &&
-                TextUtils.equals(this.cardNo, that.cardNo);
+                TextUtils.equals(this.cardNo, that.cardNo) &&
+                TextUtils.equals(this.userId, that.userId) &&
+                TextUtils.equals(this.userFaceId, that.userFaceId) &&
+                this.member == that.member &&
+                this.faceUpdateTimestamp == that.faceUpdateTimestamp;
     }
 
     @Override
     public int hashCode() {
-        int result = Objects.hash(faceId, registerTime, userName, imagePath, userType, cardNo);
+        int result = Objects.hash(faceId, registerTime, userName, imagePath, userType, cardNo, userId, userFaceId, member, faceUpdateTimestamp);
         result = 31 * result + Arrays.hashCode(featureData);
         return result;
     }

lib_face/src/main/java/com/sw/plate/utils/arcface/viewmodel/RecognizeViewModel.java

@@ -12,7 +12,6 @@ import androidx.lifecycle.ViewModel;
 
 import com.arcsoft.face.AgeInfo;
 import com.arcsoft.face.ErrorInfo;
-import com.arcsoft.face.FaceAttributeParam;
 import com.arcsoft.face.FaceEngine;
 import com.arcsoft.face.FaceInfo;
 import com.arcsoft.face.GenderInfo;
@@ -132,13 +131,14 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
     private MutableLiveData<Integer> ftInitCode = new MutableLiveData<>();
     private MutableLiveData<Integer> frInitCode = new MutableLiveData<>();
     private MutableLiveData<Integer> flInitCode = new MutableLiveData<>();
+    private MutableLiveData<Integer> maskInitCode = new MutableLiveData<>();
 
     /**
      * 人脸操作辅助类，推帧即可，内部会进行特征提取、识别
      */
     private FaceHelper faceHelper;
     /**
-     * VIDEO模式人脸检测引擎，用于预览帧人脸追踪及图像质量检测
+     * VIDEO模式人脸检测引擎，用于预览帧人脸追踪
      */
     private FaceEngine ftEngine;
     /**
@@ -149,6 +149,10 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
      * IMAGE模式活体检测引擎，用于预览帧人脸活体检测
      */
     private FaceEngine flEngine;
+    /**
+     * IMAGE模式口罩检测引擎（5.0 独立引擎）
+     */
+    private FaceEngine maskEngine;
 
     private PreviewConfig previewConfig;
 
@@ -160,10 +164,6 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
 
     private MutableLiveData<CompareResult> recognizeUserId = new MutableLiveData<>();
 
-    /**
-     * 检测ir活体前，是否需要更新faceData
-     */
-    private boolean needUpdateFaceData;
     /**
      * 当前活体检测的检测类型
      */
@@ -297,22 +297,22 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
                 .similarThreshold(ConfigUtil.getRecognizeThreshold(context))
                 .imageQualityNoMaskRecognizeThreshold(ConfigUtil.getImageQualityNoMaskRecognizeThreshold(context))
                 .imageQualityMaskRecognizeThreshold(ConfigUtil.getImageQualityMaskRecognizeThreshold(context))
-                .livenessParam(new LivenessParam(ConfigUtil.getRgbLivenessThreshold(context), ConfigUtil.getIrLivenessThreshold(context),
+                .livenessParam(new LivenessParam(ConfigUtil.getRgbLivenessThreshold(context), ConfigUtil.getIrLivenessThreshold(context)))
-                        ConfigUtil.getLivenessFqThreshold(context)))
                 .build();
-        int cameraOffsetX = ConfigUtil.getDualCameraHorizontalOffset(context);
-        int cameraOffsetY = ConfigUtil.getDualCameraVerticalOffset(context);
-        needUpdateFaceData = (livenessType == LivenessType.IR && (cameraOffsetX != 0 || cameraOffsetY != 0));
 
+        // 人脸追踪引擎（VIDEO模式，仅检测）
         ftEngine = new FaceEngine();
-        int ftEngineMask = FaceEngine.ASF_FACE_DETECT | FaceEngine.ASF_MASK_DETECT;
+        int ftEngineMask = FaceEngine.ASF_FACE_DETECT;
         ftInitCode.postValue(ftEngine.init(context, DetectMode.ASF_DETECT_MODE_VIDEO, ConfigUtil.getFtOrient(context),
                 ConfigUtil.getRecognizeMaxDetectFaceNum(context), ftEngineMask));
-        FaceAttributeParam attributeParam = new FaceAttributeParam(
-                ConfigUtil.getRecognizeEyeOpenThreshold(context), ConfigUtil.getRecognizeMouthCloseThreshold(context),
-                ConfigUtil.getRecognizeWearGlassesThreshold(context));
-        ftEngine.setFaceAttributeParam(attributeParam);
 
+        // 口罩检测引擎（5.0 独立引擎）
+        maskEngine = new FaceEngine();
+        maskInitCode.postValue(maskEngine.init(context, DetectMode.ASF_DETECT_MODE_IMAGE,
+                DetectFaceOrientPriority.ASF_OP_ALL_OUT,
+                ConfigUtil.getRecognizeMaxDetectFaceNum(context), FaceEngine.ASF_MASK_DETECT));
+
+        // 特征提取引擎
         frEngine = new FaceEngine();
         int frEngineMask = FaceEngine.ASF_FACE_RECOGNITION;
         if (enableFaceQualityDetect) {
@@ -322,16 +322,13 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
                 10, frEngineMask));
         FaceServer.getInstance().initFaceList(context, frEngine, faceCount -> loadFaceList = true, true);
 
-        //启用活体检测时，才初始化活体引擎
+        // 启用活体检测时，才初始化活体引擎
         if (enableLive) {
             flEngine = new FaceEngine();
             int flEngineMask = (livenessType == LivenessType.RGB ? FaceEngine.ASF_LIVENESS : (FaceEngine.ASF_IR_LIVENESS | FaceEngine.ASF_FACE_DETECT));
-            if (needUpdateFaceData) {
-                flEngineMask |= FaceEngine.ASF_UPDATE_FACEDATA;
-            }
             flInitCode.postValue(flEngine.init(context, DetectMode.ASF_DETECT_MODE_IMAGE,
                     DetectFaceOrientPriority.ASF_OP_ALL_OUT, 10, flEngineMask));
-            LivenessParam livenessParam = new LivenessParam(ConfigUtil.getRgbLivenessThreshold(context), ConfigUtil.getIrLivenessThreshold(context), ConfigUtil.getLivenessFqThreshold(context));
+            LivenessParam livenessParam = new LivenessParam(ConfigUtil.getRgbLivenessThreshold(context), ConfigUtil.getIrLivenessThreshold(context));
             flEngine.setLivenessParam(livenessParam);
         }
 
@@ -356,19 +353,25 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
         if (ftEngine != null) {
             synchronized (ftEngine) {
                 int ftUnInitCode = ftEngine.unInit();
-                Log.i(TAG, "unInitEngine: " + ftUnInitCode);
+                Log.i(TAG, "unInitEngine ft: " + ftUnInitCode);
+            }
+        }
+        if (maskEngine != null) {
+            synchronized (maskEngine) {
+                int maskUnInitCode = maskEngine.unInit();
+                Log.i(TAG, "unInitEngine mask: " + maskUnInitCode);
             }
         }
         if (frEngine != null) {
             synchronized (frEngine) {
                 int frUnInitCode = frEngine.unInit();
-                Log.i(TAG, "unInitEngine: " + frUnInitCode);
+                Log.i(TAG, "unInitEngine fr: " + frUnInitCode);
             }
         }
         if (flEngine != null) {
             synchronized (flEngine) {
                 int flUnInitCode = flEngine.unInit();
-                Log.i(TAG, "unInitEngine: " + flUnInitCode);
+                Log.i(TAG, "unInitEngine fl: " + flUnInitCode);
             }
         }
     }
@@ -469,7 +472,7 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
                     .ftEngine(ftEngine)
                     .frEngine(frEngine)
                     .flEngine(flEngine)
-                    .needUpdateFaceData(needUpdateFaceData)
+                    .maskEngine(maskEngine)
                     .frQueueSize(maxDetectFaceNum)
                     .flQueueSize(maxDetectFaceNum)
                     .previewSize(previewSize)