fix: 优化人脸采集日志及提示界面交互

- LoginByFaceActivity: 新增人脸采集关键节点调试日志 - PlcSettingActivity: 添加点击提示区域关闭提示布局功能，格式化代码 - activity_plc_setting.xml: 给提示 TextView 添加 id，字体调整为 32sp Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
feat(plc): 添加餐盘平台复位功能和无餐盘提示界面
2026-06-01 18:10:16 +08:00 · 2026-04-16 18:06:47 +08:00 · 2026-04-15 16:53:45 +08:00 · 2026-04-14 15:02:36 +08:00 · 2026-04-14 14:59:09 +08:00 · 2026-04-14 14:13:54 +08:00
20 changed files with 561 additions and 96 deletions
@@ -34,10 +34,13 @@ object GlobalData {
     * 具体业务baseurl
     */
    var appBaseUrl: String = ""
-    //测试环境
-    const val TEST_URL: String = "http://192.168.1.201:14801"
-    //生产环境
-    const val PRO_URL: String = "https://dev.yixiong-tech.com:8081"
+
+    /**
+     * 具体业务 BaseUrl
+     */
+    const val TEST_BASE_URL: String = "http://192.168.1.201:14801"
+    const val UAT_BASE_URL: String = "https://dev.yixiong-tech.com:8083"
+    const val PROD_BASE_URL: String = "https://api.dm.yixiong-tech.com:8443"

    /**
     * 设备id
@@ -65,4 +68,5 @@ object GlobalKey {
    const val KEY_FIRST_RUN = "firstRun"
    const val KEY_USER_INFO = "userInfoKey"
    const val PARAM_EQUIPMENT_INFO = "equipmentUserInfo"
+    const val KEY_BASE_URL = "baseUrlKey"
 }
@@ -5,6 +5,7 @@ import android.util.Log
 import com.sw.plate.App
 import com.sw.plate.utils.AppUtil
 import com.sw.platecabinet.utils.CrashHandler
+import com.sw.platecabinet.utils.SpTool
 import timber.log.Timber

 class MyApp : App() {
@@ -35,7 +36,16 @@ class MyApp : App() {
        Log.d("MyApp", "initialize: deviceId=$deviceId")
        GlobalData.deviceId = deviceId

-        GlobalData.appBaseUrl = if ("14d2dad5-7d33-3ced-8a59-f14cb1ef2d21" == deviceId) GlobalData.TEST_URL else GlobalData.PRO_URL
+        val url = SpTool.baseUrl
+        if (url.isNotBlank()) {
+            GlobalData.appBaseUrl = url
+        } else {
+            GlobalData.appBaseUrl =
+                if ("14d2dad5-7d33-3ced-8a59-f14cb1ef2d21" == deviceId)
+                    GlobalData.TEST_BASE_URL
+                else
+                    GlobalData.PROD_BASE_URL
+        }

        // TODO: 临时测试----------------
 //        if ("2987f0c5-5754-33e9-b00a-251db5e2e55f" == deviceId) {
@@ -256,6 +256,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
            mDialogWaiting = CustomLoadingDialog(this, view, R.style.MyDialog)
            mDialogWaiting!!.show()
            mDialogWaiting!!.setCancelable(true)
+            mDialogWaiting!!.setCanceledOnTouchOutside(true)
        }
    }

@@ -54,7 +54,6 @@ import com.sw.platecabinet.utils.BitmapSaver
 import com.sw.platecabinet.utils.CountDownUtil
 import com.sw.platecabinet.utils.Debouncer
 import com.sw.platecabinet.utils.LogFileUtil
-import com.sw.platecabinet.utils.PlateUtils
 import com.sw.platecabinet.utils.RegisterCallbackHandler
 import com.sw.platecabinet.utils.SoundPoolUtil
 import com.sw.platecabinet.utils.mego.PlcCallback
@@ -95,7 +94,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
    override fun initialize() {
        userViewModel.activeEngine()

-        PlcHelper.getInstance(this).openSerialPort(object : PlcCallback<String> {
+        PlcHelper.getInstance(this@LoginByFaceActivity)
+            .openSerialPort(object : PlcCallback<String> {
                override fun onSuccess(result: String) {
                    ToastUtils.showToast("打开串口 → 成功: ${result}")
                }
@@ -221,6 +221,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
    private fun isFitData(userFaceInfo: UserFaceInfo?): Boolean {
        if (userFaceInfo == null) return false
        val headBmp = userFaceInfo.headBmp
+        loadLogInfo("collectFace,isFitData:w=${headBmp?.width},height=${headBmp?.height}")
        if (headBmp == null) return false
 //        if (headBmp.width <= 200 || headBmp.height <= 200) {
 //            loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小-----------")
@@ -234,9 +235,12 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        recognizeViewModel.prepareRegister()
        recognizeViewModel.setOnRegisterFinishedCallback { facePreviewInfo, userFaceInfo ->
            registerHandler?.setCallback {
+                loadLogInfo("collectFace,registerHandler?.setCallback")
                if (!isCollectFace || !isCollecting.get()) {
+                    loadLogInfo("collectFace,isCollectFace=${isCollectFace},isCollecting=${isCollecting.get()}")
                    return@setCallback
                }
+                loadLogInfo("collectFace,userFaceInfo==null:${userFaceInfo==null}")
                if (this.userFaceInfo == null && isFitData(userFaceInfo)) {
                    val headBmp = userFaceInfo.headBmp ?: run {
                        loadLogInfo("collectFace,isFitData:headBmp 为 null，跳过")
@@ -295,7 +299,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        }

        recognizeViewModel.recognizeUserId.observe(this) { result: CompareResult? ->
-            loadLogInfo("collectFace,recognizeUserId observe userId = ${result?.faceEntity?.userName}")
+            loadLogInfo("collectFace,recognizeUserId observe userId=${result?.faceEntity?.userName},similar=${result?.similar},userType=${result?.faceEntity?.userType}")
            loadFaceRecognizeResult3(result)
        }

@@ -319,7 +323,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     */
    private val faceSuccessThreshold by lazy { ConfigUtil.getRecognizeThreshold(this) }

-    private val openPlateDebouncer = Debouncer(5000)
+    private val openPlateDebouncer = Debouncer(3000)
    private val isCollecting = AtomicBoolean(false)

    private fun loadFaceRecognizeResult3(result: CompareResult?) {
@@ -371,7 +375,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        currentUserId = userId

        // 防抖，防止重复开闸
-        openPlateDebouncer.debounce {
+        openPlateDebouncer.debounce("openPlateDebouncer") {
            openPlate(userId)
        }
    }
@@ -400,52 +404,70 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
            text = "新用户采集"
        }
        binding.ivCollectPhoto.gone()
+        openPlateDebouncer.reset()
+        plateEnable = true
        resumeCamera()
    }

    private var plateEnable = false

    /**
-     * 打开餐盘柜：先获取 PLC 状态，有盘则出盘，无盘则播放提示音
+     * 打开餐盘柜：执行出盘，出盘后查询剩余餐盘状态并播放对应提示音
     */
    private fun openPlate(userId: String?) {
+        loadLogInfo("collectFace,openPlate: userId=$userId,plateEnable=$plateEnable")
        if (plateEnable.not()) return
-        loadLogInfo("collectFace,openPlate: userId=$userId")
-        showWaitingDialog("检测餐盘中，请稍候……")
-        PlcHelper.getInstance(this).getStatus(object : PlcCallback<PlcStatus> {
-            override fun onSuccess(result: PlcStatus) {
-                hideWaitingDialog()
-                if (result.isEmptyPlate) {
-                    // 无餐盘，播放提示音并返回首页
-                    loadLogInfo("collectFace,openPlate: 暂无餐盘，isEmptyPlate=true，isCollectFace=$isCollectFace")
+
+        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: 检测到餐盘，开始出盘")
+                    loadLogInfo("collectFace,openPlate: 出盘完成，result=$result，开始查询剩余餐盘")
+                    // result 为 true，出盘成功，再查询是否还有剩余餐盘
                    SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
-                plateEnable = false
-                recognizeCountDownUtil.cancelCountDown()
-                PlcHelper.getInstance(this@LoginByFaceActivity)
-                    .outPlate(object : PlcCallback<String> {
-                        override fun onSuccess(result: String) {
-                            loadLogInfo("collectFace,openPlate: 出盘成功，result=$result")
-                            goInitActivity()
+                    checkRemainingPlate()
                }

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

-            override fun onError(message: String) {
-                hideWaitingDialog()
-                // 状态获取失败，保底播放无盘提示
-                loadLogInfo("collectFace,openPlate: 获取PLC状态失败，message=$message")
+    /**
+     * 出盘成功后查询剩余餐盘状态，无盘则播放提示音
+     */
+    private fun checkRemainingPlate() {
+        PlcHelper.getInstance(this@LoginByFaceActivity)
+            .getStatus(object : PlcCallback<PlcStatus> {
+                override fun onSuccess(result: PlcStatus) {
+                    if (isFinishing || isDestroyed) return
+                    loadLogInfo("collectFace,checkRemainingPlate: isEmptyPlate=${result.isEmptyPlate}")
+                    if (result.isEmptyPlate) {
+                        // 餐盘已空，播放无盘提示音
                        SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0)
+                        //跳转到餐盘设置页面
+                        PlcSettingActivity.start(this@LoginByFaceActivity, showTips = true)
+                    } else {
+                        loadLogInfo("collectFace,checkRemainingPlate: 剩余餐盘，继续使用")
+                        goInitActivity()
+                    }
+                }
+
+                override fun onError(message: String) {
+                    if (isFinishing || isDestroyed) return
+                    // 状态查询失败，不影响主流程，直接跳转
+                    loadLogInfo("collectFace,checkRemainingPlate: 获取PLC状态失败，message=$message")
                    goInitActivity()
                }
            })
@@ -467,6 +489,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),

        recognizeViewModel.destroy()

+        PlcHelper.getInstance(this@LoginByFaceActivity).release()
+
        EventBus.getDefault().unregister(this)
        super.onDestroy()
    }
@@ -598,9 +622,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                    binding.btnCollect.tag = ""
                    binding.tvSimilarValue.text = ""
                    retryFailCount = 0
-
+                    // 人脸离开时，发送空帧清除 ViewModel 内部识别缓存，防止再次进入时使用旧数据
+                    recognizeViewModel.onPreviewFrame(emptyFrame, true)
                    if (binding.llCollectButton.isVisible) {
-                        leftDebouncer.debounce { leftCountDown() }
+                        leftDebouncer.debounce("leftDebouncer") { leftCountDown() }
                    }
                }
                recognizeViewModel.clearLeftFace(facePreviewInfoList)
@@ -724,6 +749,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 //    private var tempUserId: String = ""
    override fun onResume() {
        super.onResume()
+        plateEnable = true
        try {
            if (isFirstOpen) {
                isFirstOpen = false
@@ -764,6 +790,9 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        plateEnable = true
        collectCount = 0
 //        tempUserId = "${System.currentTimeMillis()}"
+        openPlateDebouncer.reset()
+        // 清空上次识别结果和 FaceHelper 内部状态，防止短时间内再次识别无法触发
+        recognizeViewModel.resetFaceState()
        resumeCamera()
        registerHandler = RegisterCallbackHandler()

@@ -772,13 +801,13 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
            lifecycleScope = lifecycleScope,
            onTick = { remaining ->
                loadLogInfo("resetRecognizeState剩余时间：$remaining 秒")
-                if (judgeRecognizeState()) return@startCountDown
+//                if (judgeRecognizeState()) return@startCountDown
                loadLogInfo("initCountTime onTick = $remaining")
                binding.tvToInit.text = "$remaining"
            },
            onFinish = {
                loadLogInfo("resetRecognizeState倒计时结束")
-                if (judgeRecognizeState()) return@startCountDown
+//                if (judgeRecognizeState()) return@startCountDown
                if (facePreviewInfoList.isNullOrEmpty()) {
                    goInitActivity()
                } else {
@@ -799,23 +828,23 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),

    private fun pauseCamera() {
        isRecognition = false
-//        recognizeViewModel.onPreviewFrame(emptyFrame, true)
+        recognizeViewModel.onPreviewFrame(emptyFrame, true)
    }

-    private fun judgeRecognizeState(): Boolean {
-        val rectColor = binding.dualCameraFaceRectView.rectColor
-        if (rectColor == RecognizeColor.COLOR_SUCCESS && currentUserId.isNullOrBlank()
-                .not() && facePreviewInfoList.isNullOrEmpty().not()
-        ) {
-            //人未离开，再次识别
-            loadLogInfo("userId=$currentUserId")
-            openPlateDebouncer.debounce {
-                openPlate(currentUserId)
-            }
-            return true
-        }
-        return false
-    }
+//    private fun judgeRecognizeState(): Boolean {
+//        val rectColor = binding.dualCameraFaceRectView.rectColor
+//        if (rectColor == RecognizeColor.COLOR_SUCCESS && currentUserId.isNullOrBlank()
+//                .not() && facePreviewInfoList.isNullOrEmpty().not()
+//        ) {
+//            //人未离开，再次识别
+//            loadLogInfo("userId=$currentUserId")
+//            openPlateDebouncer.debounce {
+//                openPlate(currentUserId)
+//            }
+//            return true
+//        }
+//        return false
+//    }

    fun goInitActivity() {
        val intent = Intent(context, InitActivity::class.java)
@@ -852,7 +881,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
            ToastUtils.showToast("获取人脸照片失败")
            return
        }
-        uploadFaceDebouncer.debounce {
+        uploadFaceDebouncer.debounce("uploadFaceDebouncer") {
            addUserFace(faceData, imageFile)
        }
    }
@@ -3,13 +3,19 @@ package com.sw.platecabinet.activity
 import android.content.Context
 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.faceserver.FaceServer
 import com.sw.platecabinet.databinding.ActivityPlcSettingBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.dialog.EnvSwitchDialog
 import com.sw.platecabinet.ext.clickWithDebounce
 import com.sw.platecabinet.utils.mego.PlcCallback
 import com.sw.platecabinet.utils.mego.PlcHelper
 import com.sw.platecabinet.utils.mego.PlcStatus
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext

 /**
 * PLC 控制设置界面
@@ -18,14 +24,21 @@ import com.sw.platecabinet.utils.mego.PlcStatus
 class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {

    companion object {
+        /** Intent Extra 键：是否显示 tips 界面 */
+        private const val EXTRA_SHOW_TIPS = "extra_show_tips"
+
        /**
         * 启动 PlcSettingActivity
+         * @param showTips 是否显示 tips 界面（暂无餐盘提示）
         */
-        fun start(context: Context) {
-            context.startActivity(Intent(context, PlcSettingActivity::class.java))
+        fun start(context: Context, showTips: Boolean = false) {
+            val intent = Intent(context, PlcSettingActivity::class.java)
+            intent.putExtra(EXTRA_SHOW_TIPS, showTips)
+            context.startActivity(intent)
        }
    }

+
    override fun inflateViewBinding(): ActivityPlcSettingBinding {
        return ActivityPlcSettingBinding.inflate(layoutInflater)
    }
@@ -35,12 +48,41 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
    }

    override fun initialize() {
+        // 根据传入参数控制 tips 界面显示
+        val showTips = intent.getBooleanExtra(EXTRA_SHOW_TIPS, false)
+        binding.layoutTips.visibility =
+            if (showTips) android.view.View.VISIBLE else android.view.View.GONE
+
        initConnectButtons()
        initOutPlateButton()
        initPlatformButtons()
+        initPlatformResetButton()
        initAlarmButton()
        initParamButtons()
        initStatusButton()
+        binding.btnSwitchEnv.setOnClickListener {
+            EnvSwitchDialog(context = this, onEnvChanged = {
+                showWaitingDialog("重置人脸数据中……")
+                lifecycleScope.launch {
+                    withContext(Dispatchers.IO) {
+                        FaceServer.getInstance().clearAllFaces()
+                    }
+                }
+                userViewModel.getUserFaceCache(pageNo = 1, callback = { state, errMsg ->
+                    hideWaitingDialog()
+                    if (state) {
+                        recognizeViewModel.refreshFaceList()
+                        ToastUtils.showToast("人脸数据已更新")
+                    } else {
+                        ToastUtils.showToast(errMsg)
+                    }
+                })
+            }).show()
+        }
+
+        binding.tvTips.clickWithDebounce {
+            binding.layoutTips.visibility = android.view.View.GONE
+        }
    }

    // ==================== 连接控制 ====================
@@ -157,6 +199,38 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {

    // ==================== 故障处理 ====================

+    /**
+     * 初始化平台复位按钮：先执行平台上升，成功后自动执行返回营业
+     */
+    private fun initPlatformResetButton() {
+        binding.btnPlatformReset.clickWithDebounce {
+            showWaitingDialog("正在复位平台……")
+            PlcHelper.getInstance(this).platformUp(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    // 平台上升完成，继续执行返回营业
+                    PlcHelper.getInstance(this@PlcSettingActivity)
+                        .backToBusiness(object : PlcCallback<String> {
+                            override fun onSuccess(result: String) {
+                                hideWaitingDialog()
+                                ToastUtils.showToast("平台复位成功")
+                                finish()
+                            }
+
+                            override fun onError(message: String) {
+                                hideWaitingDialog()
+                                ToastUtils.showToast("返回营业失败：$message")
+                            }
+                        })
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("平台上升失败：$message")
+                }
+            })
+        }
+    }
+
    /**
     * 初始化故障复位按钮
     */
@@ -0,0 +1,38 @@
+package com.sw.platecabinet.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import com.sw.platecabinet.R
+import com.sw.platecabinet.ext.dp
+import com.sw.platecabinet.ext.hideKeyboard
+
+abstract class BaseDialog(
+    context: Context,
+    var defWidth: Int = 400.dp,
+    var defHeight: Int = 300.dp
+) : Dialog(context, R.style.MyDialog) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val rootView = getRootView()
+        setContentView(rootView)
+        setCancelable(false)
+        setCanceledOnTouchOutside(false)
+        window?.apply {
+            setLayout(defWidth, defHeight)
+            setBackgroundDrawable(ColorDrawable())
+            setGravity(Gravity.CENTER)
+        }
+        rootView.setOnClickListener { it.hideKeyboard() }
+        initView()
+    }
+
+    abstract fun getRootView(): View
+
+    abstract fun initView()
+
+}
@@ -0,0 +1,69 @@
+package com.sw.platecabinet.dialog
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.WindowManager
+import com.sw.plate.utils.ToastUtils
+import com.sw.platecabinet.GlobalData
+import com.sw.platecabinet.databinding.DialogEnvSwitchBinding
+import com.sw.platecabinet.ext.dp
+import com.sw.platecabinet.utils.SpTool
+
+/**
+ * 环境切换弹窗
+ *
+ * 提供 TEST / UAT / PROD 三套环境的切换功能，
+ * 初始化时自动根据 [GlobalData.appBaseUrl] 选中当前环境，
+ * 确认后更新 [GlobalData.appBaseUrl] 并通过 [onEnvChanged] 回调通知外部。
+ *
+ * @param context       上下文
+ * @param onEnvChanged  确认切换后的回调，参数为新的 baseUrl
+ */
+class EnvSwitchDialog(
+    context: Context,
+    private val onEnvChanged: (newBaseUrl: String) -> Unit = {}
+) : BaseDialog(
+    context,
+    defWidth = 600.dp,
+    defHeight = WindowManager.LayoutParams.WRAP_CONTENT
+) {
+
+    private lateinit var binding: DialogEnvSwitchBinding
+
+    override fun getRootView(): View {
+        binding = DialogEnvSwitchBinding.inflate(LayoutInflater.from(context))
+        return binding.root
+    }
+
+    override fun initView() {
+        // 根据当前 appBaseUrl 预选对应 RadioButton，不匹配则不选
+        when (GlobalData.appBaseUrl) {
+            GlobalData.TEST_BASE_URL -> binding.rbTest.isChecked = true
+            GlobalData.UAT_BASE_URL  -> binding.rbUat.isChecked  = true
+            GlobalData.PROD_BASE_URL -> binding.rbProd.isChecked = true
+        }
+
+        // 取消按钮
+        binding.btnCancel.setOnClickListener { dismiss() }
+
+        // 确认按钮
+        binding.btnConfirm.setOnClickListener {
+            // 未选中任何选项时提示用户
+            if (binding.rgEnv.checkedRadioButtonId == -1) {
+                ToastUtils.showToast("请选择环境")
+                return@setOnClickListener
+            }
+            val newUrl = when (binding.rgEnv.checkedRadioButtonId) {
+                binding.rbTest.id -> GlobalData.TEST_BASE_URL
+                binding.rbUat.id  -> GlobalData.UAT_BASE_URL
+                binding.rbProd.id -> GlobalData.PROD_BASE_URL
+                else              -> return@setOnClickListener
+            }
+            GlobalData.appBaseUrl = newUrl
+            SpTool.baseUrl = newUrl
+            onEnvChanged(newUrl)
+            dismiss()
+        }
+    }
+}
@@ -1,8 +1,10 @@
 package com.sw.platecabinet.ext

+import android.content.Context
 import android.content.res.Resources
 import android.util.TypedValue
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import androidx.annotation.Dimension

 /**
@@ -64,3 +66,11 @@ fun View.invisible() {
 fun View.gone() {
    visibility = View.GONE
 }
+
+/**
+ * 隐藏软键盘
+ */
+fun View.hideKeyboard() {
+    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    imm.hideSoftInputFromWindow(windowToken, 0)
+}
@@ -1,6 +1,11 @@
 package com.sw.platecabinet.utils

+import timber.log.Timber
+
 class Debouncer(private val delayMillis: Long) {
+    companion object {
+        const val TAG = "Debouncer"
+    }
    private var lastActionTime = 0L

    /**
@@ -8,13 +13,15 @@ class Debouncer(private val delayMillis: Long) {
     * @param action 要执行的操作
     * @return Boolean 是否执行了操作 (true=已执行, false=被防抖)
     */
-    fun debounce(action: () -> Unit): Boolean {
+    fun debounce(tag:String = TAG, action: () -> Unit): Boolean {
        val currentTime = System.currentTimeMillis()
        if (currentTime - lastActionTime >= delayMillis) {
+            Timber.tag(tag).d("collectFace,recognizeUserId防止重复操作:执行action回调")
            lastActionTime = currentTime
            action()
            return true
        }
+        Timber.tag(tag).d("collectFace,recognizeUserId防止重复操作-----------------------")
        return false
    }

@@ -19,10 +19,15 @@ import java.io.StringReader;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;

 public class LogFileUtil {
    private static boolean isSaveLog = true;
-    public static final String FILE_STR_PATH = App.getContext().getExternalCacheDir().getAbsolutePath();
+    // 使用内部存储，不会被系统缓存清理策略影响
+    public static final String FILE_STR_PATH = new File(App.getContext().getFilesDir(), "logs").getAbsolutePath();
+    // 单线程执行器，保证日志串行写入，避免多线程并发竞争
+    private static final ExecutorService LOG_EXECUTOR = Executors.newSingleThreadExecutor();

    public static final int SIZETYPE_B = 1;//获取文件大小单位为B的double值
    public static final int SIZETYPE_KB = 2;//获取文件大小单位为KB的double值
@@ -610,10 +615,8 @@ public class LogFileUtil {
        if (!isSaveLog) {
            return;
        }
-        new Thread() {
-            @Override
-            public void run() {
-                super.run();
+        // 提交到单线程队列，串行执行，避免并发写入竞争
+        LOG_EXECUTOR.execute(() -> {
            StringBuilder sb = new StringBuilder();
            for (String log : logs) {
                sb.append("===")
@@ -625,9 +628,7 @@ public class LogFileUtil {
            }
            String fileName = "log" + AppUtil.formatDateGetDay(System.currentTimeMillis()) + ".txt";
            LogFileUtil.saveStrFile(sb.toString(), fileName, FILE_STR_PATH, true);
-
-            }
-        }.start();
+        });
    }

    private static final String[][] MIME_MapTable = {
@@ -2,6 +2,7 @@ package com.sw.platecabinet.utils

 import com.sw.inbound.utils.SPUtil
 import com.sw.inbound.utils.SPUtil.Companion.getInstance
+import com.sw.platecabinet.GlobalKey
 import com.sw.platecabinet.MyApp

 object SpTool {
@@ -45,4 +46,10 @@ object SpTool {
            spUtil?.boolean(IS_FIRST_GET_FACE, value)
        }

+    var baseUrl: String
+        get() = spUtil?.get(GlobalKey.KEY_BASE_URL, "") ?: ""
+        set(value) {
+            spUtil?.put(GlobalKey.KEY_BASE_URL, value)
+        }
+
 }
@@ -64,7 +64,7 @@ class UserViewModel : BaseViewModel() {
            SPUtil.getInstance().put(GlobalKey.KEY_FIRST_RUN, true)
            val list: List<UserFaceModel> = response.data ?: emptyList()
            if (pageNo == 1 && list.isEmpty()) {
-                callback(true, "暂无数据")
+                callback(false, "暂无数据")
                return@launchWithLoading
            }
            val faceEntityList = list.map {
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#30000000">
+    <item>
+        <shape android:shape="rectangle">
+
+            <solid android:color="@color/white" />
+            <corners android:radius="8dp" />
+            <stroke
+                android:width="1dp"
+                android:color="#5C77F7" />
+        </shape>
+    </item>
+</ripple>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#30000000">
+    <item>
+        <shape android:shape="rectangle">
+
+            <solid android:color="#5C77F7" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</ripple>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white"/>
+    <corners android:radius="12dp"/>
+</shape>
@@ -11,6 +11,29 @@
        android:id="@+id/includeHeader"
        layout="@layout/item_title_time" />

+    <RelativeLayout
+        android:id="@+id/layout_tips"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:src="@mipmap/img_error_tips"
+            tools:ignore="ContentDescription" />
+
+        <TextView android:id="@+id/tv_tips"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="144dp"
+            android:text="暂无餐盘    请联系管理人员"
+            android:textColor="#fff0c8b4"
+            android:textSize="32sp" />
+    </RelativeLayout>
+
    <ScrollView
        android:layout_width="match_parent"
        android:layout_height="0dp"
@@ -143,6 +166,17 @@
                android:textColor="#FFCC99"
                android:textSize="22sp" />

+            <TextView
+                android:id="@+id/btnPlatformReset"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_marginTop="12dp"
+                android:background="@drawable/btn_outline"
+                android:gravity="center"
+                android:text="餐盘平台复位"
+                android:textColor="#FFCC99"
+                android:textSize="22sp" />
+
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -268,6 +302,28 @@
                    android:layout_width="match_parent"
                    android:layout_height="30dp" />
            </LinearLayout>
+
+            <!-- ===== 出盘操作 ===== -->
+            <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" />
+
+            <TextView
+                android:id="@+id/btnSwitchEnv"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/btn_outline"
+                android:gravity="center"
+                android:text="切换环境"
+                android:textColor="#FFCC99"
+                android:textSize="22sp" />
+
        </LinearLayout>
    </ScrollView>

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="600dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_white_radius12"
+    android:orientation="vertical"
+    android:paddingHorizontal="40dp"
+    android:paddingVertical="36dp">
+
+    <!-- 标题 -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="环境切换"
+        android:textColor="#ff141428"
+        android:textSize="36sp"
+        android:textStyle="bold" />
+
+    <!-- 分割线 -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_marginTop="24dp"
+        android:background="#FFDCDCF0" />
+
+    <!-- 环境选项 -->
+    <RadioGroup
+        android:id="@+id/rgEnv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/rbTest"
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:text="测试环境"
+            android:textColor="#ff141428"
+            android:textSize="28sp" />
+
+        <RadioButton
+            android:id="@+id/rbUat"
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:text="UAT 环境"
+            android:textColor="#ff141428"
+            android:textSize="28sp" />
+
+        <RadioButton
+            android:id="@+id/rbProd"
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:text="生产环境"
+            android:textColor="#ff141428"
+            android:textSize="28sp" />
+
+    </RadioGroup>
+
+    <!-- 分割线 -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_marginTop="24dp"
+        android:background="#FFDCDCF0" />
+
+    <!-- 底部按钮 -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="88dp"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnCancel"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="20dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_cancel"
+            android:text="取消"
+            android:textColor="#5C77F7"
+            android:textSize="28sp" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnConfirm"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="20dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_confirm"
+            android:text="确认"
+            android:textColor="#FFFFFF"
+            android:textSize="28sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
@@ -343,6 +343,14 @@ public class FaceHelper implements FaceListener {
            refreshTrackId(faceInfoList);
            if (faceInfoList.isEmpty()) {
                return facePreviewInfoList;
+            } else {
+                FaceInfo currentFaceInfo = faceInfoList.get(0);
+//                L.e("currentFaceInfo  width=" + currentFaceInfo.getRect().width() +
+//                        "---height" + currentFaceInfo.getRect().height());
+                if (currentFaceInfo.getRect().width() < 200) {//距离远（人脸小），不识别
+                    clearLeftFace(facePreviewInfoList);
+                    return facePreviewInfoList;
+                }
            }
            if (!onlyDetectLiveness) {
                code = ftEngine.process(rgbNv21, previewSize.width, previewSize.height, FaceEngine.CP_PAF_NV21, faceInfoList,
@@ -397,6 +397,20 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
        }
    }

+    /**
+     * 重置人脸识别状态：清空上次识别结果及 FaceHelper 内部的 recognizeInfoMap，
+     * 使下一帧进入时能重新触发识别流程。
+     * 适用场景：短时间内再次识别、点击重试按钮等需要重新开始识别的时机。
+     */
+    public void resetFaceState() {
+        // 清空粘性 LiveData，防止旧结果被重新投递给 observer
+        recognizeUserId.postValue(null);
+        // 清空 FaceHelper 内部所有人脸状态，让 trackId 对应的状态回到 TO_RETRY
+        if (faceHelper != null) {
+            faceHelper.clearFacePreviewInfoList();
+        }
+    }
+
    /**
     * 释放操作
     */
Author	SHA1	Message	Date
mazengfeiandClaude Sonnet 4.6	e8735db27b	fix: 优化人脸采集日志及提示界面交互 - LoginByFaceActivity: 新增人脸采集关键节点调试日志 - PlcSettingActivity: 添加点击提示区域关闭提示布局功能，格式化代码 - activity_plc_setting.xml: 给提示 TextView 添加 id，字体调整为 32sp Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>	2026-06-01 18:10:16 +08:00
mazengfei	e1e4bc5123	feat(plc): 添加餐盘平台复位功能和无餐盘提示界面 - 在PLC设置页面添加餐盘平台复位按钮 - 实现平台复位功能，先执行平台上升再返回营业状态 - 添加无餐盘提示界面，包含图片和文字提示 - 修改启动方法支持显示提示界面参数传递 - 在人脸识别登录页面检测到无餐盘时自动显示提示界面	2026-04-16 18:06:47 +08:00
mazengfei	18f45e7821	修改uat环境域名端口	2026-04-15 16:53:45 +08:00
mazengfei	1826ac0f60	fix(login): 修复人脸登录后餐盘状态判断逻辑 - 当检测到餐盘已空时跳转到餐盘设置页面 - 当检测到剩余餐盘时继续执行初始化操作 - 添加餐盘状态检查的日志记录功能	2026-04-14 15:02:36 +08:00
mazengfei	d81381ae6f	fix(login): 修复人脸识别登录后的流程处理 - 移除出盘完成日志的重复打印 - 添加餐盘已空时的页面跳转功能	2026-04-14 14:59:09 +08:00
mazengfei	f35411a8a0	refactor(login): 优化人脸识别登录页面的串口操作实现 - 使用正确的实例引用调用PlcHelper的openSerialPort方法 - 在activity销毁时添加串口资源释放操作 - 改进代码格式化以提高可读性 - 确保串口资源在页面关闭时得到正确清理	2026-04-14 14:13:54 +08:00
mazengfei	93b46e38d4	refactor(login): 优化餐盘出盘及剩余状态提示逻辑 - 出盘后改为直接查询剩余餐盘状态以决定提示音播放 - result为false时播放无盘提示音并跳转首页 - result为true时播放出盘成功音效，继续查询剩余餐盘 - 新增checkRemainingPlate方法，查询餐盘状态并播放相应提示音 - 错误时跳过播放，确保流程顺畅跳转首页 - 删除之前注释的旧版餐盘检测逻辑代码	2026-04-14 14:00:17 +08:00
mazengfei	ba1a364ee8	临时版本	2026-04-14 11:50:39 +08:00
mazengfei	50b1023a44	fix(login): 修复人脸识别登录界面返回时串口连接超时问题 - 每次回到识别界面时重新打开串口连接 - 防止PLC SDK内部连接超时导致出盘失败 - 添加串口开启成功和失败的日志记录	2026-04-13 18:17:21 +08:00
mazengfeiandClaude Sonnet 4.6	385ada4a0d	fix(face): 修复短时间内再次识别无法触发的问题新增 RecognizeViewModel.resetFaceState()，在 resetRecognizeState() 时同时清空粘性 LiveData 和 FaceHelper 内部 recognizeInfoMap，防止旧 trackId 状态残留导致识别流程无法重新触发。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-08 15:57:50 +08:00
mazengfei	ae708eeeed	优化	2026-04-08 15:41:42 +08:00
mazengfeiandClaude Sonnet 4.6	2886e7d4a3	fix: 优化等待弹窗交互、人脸数据刷新及相机暂停逻辑 - BaseActivity: 等待对话框允许点击外部区域关闭 - LoginByFaceActivity: 恢复暂停相机时的预览帧处理 - PlcSettingActivity: 人脸数据更新成功后刷新人脸列表 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-03 10:41:25 +08:00
lvmeng	66a0c399ec	feat(face): 添加人脸识别距离检测和环境切换时的人脸数据重置功能 - 在FaceHelper中添加人脸宽度小于200像素时的过滤逻辑，避免远距离识别人脸 - 注释掉LoginByFaceActivity中的重复识别状态判断逻辑 - 在PlcSettingActivity中添加协程支持用于异步处理人脸数据清除操作 - 实现环境切换时清空所有人脸数据并重新获取用户人脸缓存的功能 - 修改UserViewModel中回调逻辑，当第一页无数据时返回false而非true	2026-04-02 19:11:51 +08:00
lvmeng	4cbe318ab2	feat(plc): 添加环境切换功能 - 在PLC设置页面增加环境切换按钮 - 集成EnvSwitchDialog对话框组件 - 实现切换环境按钮点击事件处理 - 配置环境切换界面布局和样式 - 添加环境相关的UI元素和交互逻辑	2026-03-31 18:12:52 +08:00
lvmengandClaude Sonnet 4.6	1cbad71eaf	feat(dialog): 添加环境切换对话框并修复包名引用 - 新增 BaseDialog 抽象基类，统一对话框样式和行为 - 新增 EnvSwitchDialog 支持 TEST/UAT/PROD 三环境切换 - 修复 BaseDialog 和 EnvSwitchDialog 的包名（com.shuwei.intelligent.shelves → com.sw.platecabinet） - 新增 View.hideKeyboard() 扩展函数到 CommonExt.kt - 重构 GlobalData 环境 URL 常量命名（TEST_URL/PRO_URL → TEST_BASE_URL/UAT_BASE_URL/PROD_BASE_URL） - MyApp 启动时从 SpTool 读取已保存的环境配置 - SpTool 新增 baseUrl 持久化支持 - 修正 drawable 资源颜色引用为硬编码值 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-03-31 18:12:22 +08:00