refactor(api): 重构人脸数据添加接口参数结构

- 将 addUserFace 接口从表单参数改为请求体参数 - 新增 FeatureBody 数据类封装人脸特征和图片URL - 更新 RemoteRepository 中的人脸数据添加方法实现 - 优化参数传递方式，提高代码可读性 - 移除 @FormUrlEncoded 注解，改用 @Body 注解 - 调整方法参数命名，统一使用 imageUrl 命名规范
2026-07-01 15:57:34 +08:00
31 changed files with 145 additions and 1840 deletions
@@ -2,26 +2,5 @@
 <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>
@@ -2,11 +2,16 @@
 <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>
@@ -6,7 +6,7 @@
      <GradleProjectSettings>
        <option name="testRunner" value="CHOOSE_PER_TEST" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-17" />
+        <option name="gradleJvm" value="azul-17" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
@@ -1,6 +0,0 @@
-<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>
@@ -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="corretto-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="zulu-17" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
@@ -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}")
    }
@@ -40,7 +40,7 @@ object GlobalData {
     */
    const val LOCAL_BASE_URL: String = "http://192.168.10.101:24801"
    const val TEST_BASE_URL: String = "https://dev.yixiong-tech.com:8081"
-    const val PROD_BASE_URL: String = "https://platform-api.uat.shuziweidao.com"
+    const val PROD_BASE_URL: String = "https://api.dm.yixiong-tech.com:8443"

    /**
     * 设备id
@@ -129,16 +129,12 @@ 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()
                }
@@ -417,96 +417,29 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        PlcHelper.getInstance(this@LoginByFaceActivity)
            .outPlate(object : PlcCallback<String> {
                override fun onSuccess(result: String) {
+                    plateEnable = false
+                    recognizeCountDownUtil.cancelCountDown()
+                    // result 为 false 时表示出盘后无餐盘，直接播放无盘提示音
+                    if (result.equals("false", ignoreCase = true)) {
+                        loadLogInfo("collectFace,openPlate: result=false，餐盘已空")
+                        SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0)
+                        goInitActivity()
+                        return
+                    }
                    loadLogInfo("collectFace,openPlate: 出盘完成，result=$result，开始查询剩余餐盘")
-                    onOutPlateSuccess(result, RECOGNIZE_SUCCESS)
+                    // result 为 true，出盘成功，再查询是否还有剩余餐盘
+                    SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
+                    checkRemainingPlate()
                }

                override fun onError(message: String) {
-                    onOutPlateError(message)
+                    ToastUtils.showToast("出盘失败，message=$message")
+                    loadLogInfo("collectFace,openPlate: 出盘失败，message=$message")
+                    goInitActivity()
                }
            })
    }

-    /**
-     * 新用户注册采集成功后立即出盘（与上传后台并行，互不阻塞）。
-     * 故意不经过 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()
-        if (result.equals("false", ignoreCase = true)) {
-            loadLogInfo("collectFace,onOutPlateSuccess: result=false，餐盘已空")
-            SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0)
-            goInitActivity()
-            return
-        }
-        SoundPoolUtil.getInstance().play(successSound, 0)
-        // 已注册用户：出盘成功且有盘时，上报取餐盘时刻（P-09a）
-        if (successSound == RECOGNIZE_SUCCESS) {
-            reportPlatePickup(currentUserId, "recognize")
-        }
-        checkRemainingPlate()
-    }
-
-    /**
-     * 出盘失败后的统一处理：提示失败并跳转回初始页
-     */
-    private fun onOutPlateError(message: String) {
-        ToastUtils.showToast("出盘失败，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")
-        }
-    }
-
    /**
     * 出盘成功后查询剩余餐盘状态，无盘则播放提示音
     */
@@ -684,9 +617,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                    userFaceInfo = null
                    binding.btnCollect.tag = ""
                    binding.tvSimilarValue.text = ""
-                    // 注意：此处不再重置 retryFailCount。
-                    // 人脸检测会抖动（短暂丢帧），若每次无人脸就清零，"尝试几次失败"将无法累计。
-                    // 失败计数仅在识别成功、会话重启、确认用户离开时清零。
+                    retryFailCount = 0
                    // 人脸离开时，发送空帧清除 ViewModel 内部识别缓存，防止再次进入时使用旧数据
                    recognizeViewModel.onPreviewFrame(emptyFrame, true)
                    if (binding.llCollectButton.isVisible) {
@@ -698,8 +629,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),

            override fun onCameraClosed() {
                Timber.i("initRgbCamera onCameraClosed: ")
-                // 相机关闭时清空预览画面，防止 TextureView 冻结残留上一位用户的帧
-                clearPreviewFrame()
            }

            override fun onCameraError(e: java.lang.Exception) {
@@ -765,30 +694,11 @@ 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 {
@@ -985,8 +895,6 @@ 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 {
@@ -1014,9 +922,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        //block(faceData, headBmp)
        isCollecting.set(false)
        isCollectFace = false
-        // 采集成功后立即出盘，与上传后台并行执行，确保上传失败时仍能吐盘
-        outPlateForRegister()
-        // 异步上传后台（上传成功后才入库），不阻塞出盘
        sendFaceData(faceData, headBmp)
    }

@@ -1039,24 +944,15 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
            loadLogInfo("collectFace,saveFaceInfo: ----------8,保存人脸取特征数据-----------")
            val faceDao = FaceDatabase.getInstance(this).faceDao()
            val faceEntity = faceModel.toFaceEntity()
-            // 先查后插：按 userFaceId 判重，避免采集入库与增量同步各插一条
-            val userFaceId = faceModel.userFaceId
-            val existing = if (!userFaceId.isNullOrEmpty()) faceDao.queryByUserFaceId(userFaceId) else null
-            val faceId = if (existing != null) {
-                // 已存在记录，更新特征等字段并复用主键，避免重复
-                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
@@ -1088,8 +984,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                loadLogInfo("leftCountDown.onFinish-人脸未离开，不跳转")
                return@startCountDown
            }
-            // 确认用户已离开画面，重置识别失败计数，下次进入重新累计
-            retryFailCount = 0
            goInitActivity()
        })
    }
@@ -5,7 +5,6 @@ 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
@@ -61,7 +60,6 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
        initAlarmButton()
        initParamButtons()
        initStatusButton()
-        initFaceCount()
        binding.btnSwitchEnv.setOnClickListener {
            EnvSwitchDialog(context = this, onEnvChanged = {
                showWaitingDialog("重置人脸数据中……")
@@ -336,30 +334,6 @@ 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}"
-        }
-    }
-
    // ==================== 生命周期 ====================

    /**
@@ -1,13 +0,0 @@
-package com.sw.platecabinet.model.request
-
-/**
- * 通用 ID 请求体
- *
- * 用于按用户 id（餐盘号）查询或上报类的接口，例如：
- * - P-09a 取餐盘（/neglect/pickup/plate-pickup）
- *
- * @property id 用户 id（餐盘号 = userId）
- */
-data class IdDTO(
-    val id: Long
-)
@@ -3,7 +3,6 @@ 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
@@ -63,16 +62,4 @@ interface ApiServiceV2 {
        @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?>
-
 }
@@ -2,7 +2,6 @@ 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
@@ -70,13 +69,4 @@ class RemoteRepositoryV2 constructor(
            }
        }
    }
-
-    /**
-     * 取餐盘（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)) }
-    }
 }
@@ -4,16 +4,10 @@ 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) {

@@ -34,59 +28,6 @@ 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)
-            }
-        })
-    }
-
    // ==================== 连接与模式 ====================

    /**
@@ -102,10 +43,8 @@ class PlcHelper private constructor(context: Context) {
     * 打开自动模式（应用启动时调用一次）
     */
    fun openAutoMode(callback: PlcCallback<String>) {
-        withTimeout(5000, callback) { safe ->
-            sdk.actionOpenAutoMode { result ->
-                mainHandler.post { safe.onSuccess(result.toString()) }
-            }
+        sdk.actionOpenAutoMode { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
        }
    }

@@ -113,90 +52,76 @@ class PlcHelper private constructor(context: Context) {
     * 故障复位（出现 alarmCode 或补盘完成后调用）
     */
    fun alarmReset(callback: PlcCallback<String>) {
-        withTimeout(5000, callback) { safe ->
-            sdk.actionAlarmReset { result ->
-                mainHandler.post { safe.onSuccess(result.toString()) }
-            }
+        sdk.actionAlarmReset { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
        }
    }

    // ==================== 出盘操作 ====================

    /**
-     * 出盘（机械动作，超时 10s）
+     * 出盘
     */
    fun outPlate(callback: PlcCallback<String>) {
-        withTimeout(10000, callback) { safe ->
-            sdk.actionOutPlate { result ->
-                mainHandler.post { safe.onSuccess(result.toString()) }
-            }
+        sdk.actionOutPlate { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
        }
    }

    // ==================== 平台控制 ====================

    /**
-     * 平台下降（开始补盘，超时 8s）
+     * 平台下降（开始补盘）
     */
    fun platformDown(callback: PlcCallback<String>) {
-        withTimeout(8000, callback) { safe ->
-            sdk.actionPlatformDown { result ->
-                mainHandler.post { safe.onSuccess(result.toString()) }
-            }
+        sdk.actionPlatformDown { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
        }
    }

    /**
-     * 平台上升（补盘完成，超时 8s）
+     * 平台上升（补盘完成）
     */
    fun platformUp(callback: PlcCallback<String>) {
-        withTimeout(8000, callback) { safe ->
-            sdk.actionPlatformDownStop { result ->
-                mainHandler.post { safe.onSuccess(result.toString()) }
-            }
+        sdk.actionPlatformDownStop { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
        }
    }

    /**
-     * 补盘完成返回营业（自动模式 + 故障复位，超时 5s）
+     * 补盘完成返回营业（自动模式 + 故障复位）
     */
    fun backToBusiness(callback: PlcCallback<String>) {
-        withTimeout(5000, callback) { safe ->
-            sdk.actionOpenAutoModeAndActionAlarmReset { result ->
-                mainHandler.post { safe.onSuccess(result.toString()) }
-            }
+        sdk.actionOpenAutoModeAndActionAlarmReset { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
        }
    }

    // ==================== 状态查询 ====================

    /**
-     * 获取 PLC 状态（解析为 PlcStatus 对象，超时 3s）
+     * 获取 PLC 状态（解析为 PlcStatus 对象）
     */
    fun getStatus(callback: PlcCallback<PlcStatus>) {
-        withTimeout(3000, callback) { safe ->
-            sdk.getPlcStatus { json ->
-                mainHandler.post {
-                    if (json != null) {
-                        safe.onSuccess(PlcStatus.Companion.fromJson(json.toString()))
-                    } else {
-                        safe.onError("获取状态失败")
-                    }
+        sdk.getPlcStatus { json ->
+            mainHandler.post {
+                if (json != null) {
+                    callback.onSuccess(PlcStatus.Companion.fromJson(json.toString()))
+                } else {
+                    callback.onError("获取状态失败")
                }
            }
        }
    }

    /**
-     * 获取 PLC 状态（原始 JSON 字符串，超时 3s）
+     * 获取 PLC 状态（原始 JSON 字符串）
     */
    fun getStatusJson(callback: PlcCallback<String>) {
-        withTimeout(3000, callback) { safe ->
-            sdk.getPlcStatus { json ->
-                mainHandler.post {
-                    if (json != null) safe.onSuccess(json.toString())
-                    else safe.onError("获取状态失败")
-                }
+        sdk.getPlcStatus { json ->
+            mainHandler.post {
+                if (json != null) callback.onSuccess(json.toString())
+                else callback.onError("获取状态失败")
            }
        }
    }
@@ -204,18 +129,16 @@ class PlcHelper private constructor(context: Context) {
    // ==================== 参数设置 ====================

    /**
-     * 设置 PLC 参数（超时 3s）
+     * 设置 PLC 参数
     * @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 { safe.onSuccess(result.toString()) } },
-                paramType,
-                paramValue
-            )
-        }
+        sdk.setPLCParams(
+            { result -> mainHandler.post { callback.onSuccess(result.toString()) } },
+            paramType,
+            paramValue
+        )
    }

    // ==================== 生命周期 ====================
@@ -82,17 +82,12 @@ class NetViewModelV2 : ViewModel() {
            }
            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
-                    }
+                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
                    currentPageNo++
                    getUserFaceCache(
                        pageNo = currentPageNo, callback = callback
@@ -100,11 +95,7 @@ class NetViewModelV2 : ViewModel() {
                    return@withContext
                }
                if (list.isNotEmpty()) {
-                    // 最后一页：取当前页最大时间戳，与已累积的比较取最大值
-                    val pageMaxTimestamp = maxFaceTimestamp(list)
-                    if (pageMaxTimestamp > faceTimestamp) {
-                        faceTimestamp = pageMaxTimestamp
-                    }
+                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
                }
                SpTool.lastFaceTimestamp = faceTimestamp
                callback(true, "查询完成")
@@ -170,7 +161,7 @@ class NetViewModelV2 : ViewModel() {


    /**
-     * 增量获取人脸数据（支持分页递归，取所有页中的最大时间戳）
+     * 获取人脸数据
     */
    fun getFaceIncrementList(
        pageNo: Int = 1,
@@ -178,10 +169,9 @@ class NetViewModelV2 : ViewModel() {
        timestamp: Long,
        refreshFaceList: () -> Unit
    ) {
-        var currentPageNo = pageNo
        viewModelScope.launch {
            val response = repository.getFaceIncrementList(
-                pageNum = currentPageNo.toLong(),
+                pageNum = pageNo.toLong(),
                pageSize = pageSize.toLong(),
                timestamp = timestamp
            )
@@ -191,27 +181,10 @@ class NetViewModelV2 : ViewModel() {
            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
+                if (list.isNotEmpty()) {
+                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
                }
+                SpTool.lastFaceTimestamp = faceTimestamp
                try {
                    refreshFaceList()
                } catch (e: Exception) {
@@ -226,24 +199,14 @@ class NetViewModelV2 : ViewModel() {
            list.forEach { model ->
                if (model.faceDeleted == true) {
                    //删除数据
-                    // 仅删除 userFaceId 对应的单条人脸记录，避免误删该用户名下所有特征
-                    val userFaceId = model.userFaceId
-                    if (!userFaceId.isNullOrEmpty()) {
-                        faceApi.deleteByUserFaceId(userFaceId)
-                    }
+                    faceApi.deleteByUserName(model.userId)
                } 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
-                    }
+                    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) {
                        faceApi.insert(model.toFaceEntity())
                    }
@@ -259,50 +222,18 @@ class NetViewModelV2 : ViewModel() {
     */
    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()
+            val imageResp = repository.uploadImage(imageFile)
+            val imageUrl = imageResp.data ?: ""
+            if (imageUrl.isBlank()) {
                block(false, null)
+                return@launch
            }
-        }
-    }
-
-    /**
-     * 取餐盘上报（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)
+            val faceResp = repository.addUserFace(faceData, imageUrl)
+            if (faceResp.isSuccess().not()) {
+                block(false, null)
+                return@launch
            }
+            block(true, faceResp.data)
        }
    }

@@ -315,11 +246,4 @@ class NetViewModelV2 : ViewModel() {
        }
    }

-    /**
-     * 从人脸数据列表中取出最大的 faceUpdateTimestamp（跳过 null 值）
-     */
-    private fun maxFaceTimestamp(list: List<UserFaceModelV2>): Long {
-        return list.mapNotNull { it.faceUpdateTimestamp }.maxOrNull() ?: 0L
-    }
-
 }
@@ -324,54 +324,6 @@
                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>

@@ -11,9 +11,6 @@
        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">
@@ -39,8 +36,6 @@
        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"
@@ -13,7 +13,7 @@ android {
        consumerProguardFiles("consumer-rules.pro")

        ndk {
-            abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a"))
+            abiFilters.addAll(listOf("armeabi-v7a"/*, "arm64-v8a"*/))
        }
    }

@@ -91,24 +91,6 @@ public class FaceApi {
        getFaceDao().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;
@@ -39,6 +39,7 @@ 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;
@@ -103,10 +104,6 @@ public class FaceHelper implements FaceListener {
     * 活体检测引擎
     */
    private FaceEngine flEngine;
-    /**
-     * 口罩检测引擎（5.0 独立引擎）
-     */
-    private FaceEngine maskEngine;

    private Camera.Size previewSize;

@@ -151,6 +148,11 @@ public class FaceHelper implements FaceListener {
     */
    private boolean onlyDetectLiveness;

+    /**
+     * 是否需要更新faceData
+     */
+    private boolean needUpdateFaceData;
+
    /**
     * 识别的配置项
     */
@@ -180,9 +182,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;
@@ -350,11 +352,11 @@ public class FaceHelper implements FaceListener {
                    return facePreviewInfoList;
                }
            }
-            if (!onlyDetectLiveness && maskEngine != null) {
-                code = maskEngine.process(rgbNv21, previewSize.width, previewSize.height, FaceEngine.CP_PAF_NV21, faceInfoList,
+            if (!onlyDetectLiveness) {
+                code = ftEngine.process(rgbNv21, previewSize.width, previewSize.height, FaceEngine.CP_PAF_NV21, faceInfoList,
                        FaceEngine.ASF_MASK_DETECT);
                if (code == ErrorInfo.MOK) {
-                    code = maskEngine.getMask(maskInfoList);
+                    code = ftEngine.getMask(maskInfoList);
                    if (code != ErrorInfo.MOK) {
                        onFail(new Exception("process getMask failed,code is " + code));
                        return facePreviewInfoList;
@@ -878,7 +880,18 @@ public class FaceHelper implements FaceListener {
                    int fdCode = flEngine.detectFaces(nv21Data, width, height, format, faceInfoList);
                    boolean isFaceExists = isFaceExists(faceInfoList, faceInfo);
                    if (fdCode == ErrorInfo.MOK && isFaceExists) {
-                        flCode = flEngine.processIr(nv21Data, width, height, format, Arrays.asList(faceInfo), FaceEngine.ASF_IR_LIVENESS);
+                        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));
                    }
@@ -1085,9 +1098,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;
@@ -1128,11 +1141,6 @@ 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;
@@ -1158,6 +1166,11 @@ public class FaceHelper implements FaceListener {
            return this;
        }

+        public Builder needUpdateFaceData(boolean val) {
+            needUpdateFaceData = val;
+            return this;
+        }
+
        public FaceHelper build() {
            return new FaceHelper(this);
        }
@@ -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 = 2, exportSchema = false)
+@Database(entities = {FaceEntity.class}, version = 1, exportSchema = false)
 public abstract class FaceDatabase extends RoomDatabase {
    public abstract FaceDao faceDao();

@@ -22,10 +22,7 @@ public abstract class FaceDatabase extends RoomDatabase {
                    faceDatabase = Room.databaseBuilder(context, FaceDatabase.class,
                            context.getDatabasePath("faceDB.db").getPath()
 //                            context.getExternalFilesDir("database") + File.separator + "faceDB.db"
-                    )
-                    // 5.0 特征模型不兼容，升级时直接删除旧表重建
-                    .fallbackToDestructiveMigration()
-                    .build();
+                    ).build();
                }
            }
        }
@@ -55,18 +55,6 @@ 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);
-
    /**
     * 删除所有已注册的人脸
     *
@@ -58,7 +58,7 @@ public class FaceEntity implements Parcelable {
    @Ignore
    private int trackId;//人脸追踪ID

-    @ColumnInfo(name = "user_id")
+    @ColumnInfo(name = "user_idd")
    private String userId;
    @ColumnInfo(name = "user_face_id")
    private String userFaceId;
@@ -12,6 +12,7 @@ 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;
@@ -131,14 +132,13 @@ 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,10 +149,6 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
     * IMAGE模式活体检测引擎，用于预览帧人脸活体检测
     */
    private FaceEngine flEngine;
-    /**
-     * IMAGE模式口罩检测引擎（5.0 独立引擎）
-     */
-    private FaceEngine maskEngine;

    private PreviewConfig previewConfig;

@@ -164,6 +160,10 @@ 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;
+        int ftEngineMask = FaceEngine.ASF_FACE_DETECT | FaceEngine.ASF_MASK_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,13 +322,16 @@ 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));
+            LivenessParam livenessParam = new LivenessParam(ConfigUtil.getRgbLivenessThreshold(context), ConfigUtil.getIrLivenessThreshold(context), ConfigUtil.getLivenessFqThreshold(context));
            flEngine.setLivenessParam(livenessParam);
        }

@@ -353,25 +356,19 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
        if (ftEngine != null) {
            synchronized (ftEngine) {
                int ftUnInitCode = ftEngine.unInit();
-                Log.i(TAG, "unInitEngine ft: " + ftUnInitCode);
-            }
-        }
-        if (maskEngine != null) {
-            synchronized (maskEngine) {
-                int maskUnInitCode = maskEngine.unInit();
-                Log.i(TAG, "unInitEngine mask: " + maskUnInitCode);
+                Log.i(TAG, "unInitEngine: " + ftUnInitCode);
            }
        }
        if (frEngine != null) {
            synchronized (frEngine) {
                int frUnInitCode = frEngine.unInit();
-                Log.i(TAG, "unInitEngine fr: " + frUnInitCode);
+                Log.i(TAG, "unInitEngine: " + frUnInitCode);
            }
        }
        if (flEngine != null) {
            synchronized (flEngine) {
                int flUnInitCode = flEngine.unInit();
-                Log.i(TAG, "unInitEngine fl: " + flUnInitCode);
+                Log.i(TAG, "unInitEngine: " + flUnInitCode);
            }
        }
    }
@@ -472,7 +469,7 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
                    .ftEngine(ftEngine)
                    .frEngine(frEngine)
                    .flEngine(flEngine)
-                    .maskEngine(maskEngine)
+                    .needUpdateFaceData(needUpdateFaceData)
                    .frQueueSize(maxDetectFaceNum)
                    .flQueueSize(maxDetectFaceNum)
                    .previewSize(previewSize)