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

- LoginByFaceActivity: 新增人脸采集关键节点调试日志
- PlcSettingActivity: 添加点击提示区域关闭提示布局功能，格式化代码
- activity_plc_setting.xml: 给提示 TextView 添加 id，字体调整为 32sp

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

.idea/.name

@@ -1 +1 @@
-SmartPlateCabinet
+SmartTakePlate

.idea/MarsCodeWorkspaceAppSettings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="com.codeverse.userSettings.MarscodeWorkspaceAppSettingsState">
+    <option name="progress" value="1.0" />
+  </component>
+</project>

.idea/appInsightsSettings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Firebase Crashlytics" />
+  </component>
+</project>

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-01-22T07:28:00.026342Z">
+        <DropdownSelection timestamp="2026-03-18T06:09:00.079142300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.1.128:5555;connection=c168ec92" />
+              <DeviceId pluginId="Default" identifier="serial=192.168.1.161:5555;connection=2c537abb" />
             </handle>
           </Target>
         </DropdownSelection>

.idea/deviceManager.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>

app/build.gradle.kts

@@ -18,7 +18,7 @@ android {
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.sw.platecabinet"
+        applicationId = "com.sw.take.plate"
         minSdk = 24
         targetSdk = 35
         versionCode = 1
@@ -59,7 +59,10 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
-    implementation(project(":lib_face"))
+    implementation(project(":lib_face")) {
+        exclude(group = "com.licheedev", module = "android-serialport")
+    }
+    implementation(files("libs/plc_aar_104.aar"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/main/AndroidManifest.xml

@@ -10,7 +10,8 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
@@ -21,9 +22,9 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_logo512"
+        android:icon="@drawable/logo_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_logo512"
+        android:roundIcon="@drawable/logo_launcher"
         android:supportsRtl="true"
         android:theme="@style/Theme.SmartPlateCabinet"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -38,19 +39,13 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <activity
+
-            android:name=".activity.UnBindDialogActivity"
-            android:exported="false"
-            android:theme="@style/DialogActivity" />
         <activity
             android:name=".activity.InitActivity"
             android:exported="false"
             android:launchMode="singleTask">
         </activity>
-        <activity
+
-            android:name=".activity.LoginByPwdActivity"
-            android:exported="false"
-            android:launchMode="singleTask"/>
         <activity
             android:name=".activity.LoginByFaceActivity"
             android:exported="true"
@@ -69,6 +64,10 @@
             android:name=".activity.MainActivity"
             android:exported="false">
         </activity>
+        <activity
+            android:name=".activity.PlcSettingActivity"
+            android:exported="false" />
+<!--        <activity android:name="com.sw.platecabinet.activity.FunActivity" />-->
     </application>
 
 </manifest>

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

@@ -33,7 +33,14 @@ object GlobalData {
     /**
      * 具体业务baseurl
      */
-    var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
+    var appBaseUrl: String = ""
+
+    /**
+     * 具体业务 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
@@ -61,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"
 }

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

@@ -1,17 +1,18 @@
 package com.sw.platecabinet
 
+import android.annotation.SuppressLint
 import android.util.Log
 import com.sw.plate.App
 import com.sw.plate.utils.AppUtil
-import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.CrashHandler
+import com.sw.platecabinet.utils.SpTool
 import timber.log.Timber
 
 class MyApp : App() {
     companion object {
         const val DEBUG: Boolean = true
         var instance: MyApp? = null
-        var plateList: List<EquipmentUserInfo>? = null
+//        var plateList: List<EquipmentUserInfo>? = null
     }
 
     override fun onCreate() {
@@ -28,12 +29,24 @@ class MyApp : App() {
     /**
      * 初始化全局数据
      */
+    @SuppressLint("LogNotTimber")
     private fun initGlobalData() {
-        var deviceId = AppUtil.getUDID(this)
+        val deviceId = AppUtil.getUDID(this)
 //        deviceId = "be154831-3466-3ba2-a2ea-57652c919fed"
         Log.d("MyApp", "initialize: deviceId=$deviceId")
         GlobalData.deviceId = deviceId
 
+        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) {
 //            GlobalData.deviceId = "79814f20-f253-397c-9da7-8430ffa5ef00"

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

@@ -1,45 +1,39 @@
 package com.sw.platecabinet.activity
 
 import android.content.Context
+import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
-import android.view.KeyEvent
 import android.view.View
 import android.view.WindowInsetsController
 import android.view.WindowManager
 import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
-import com.google.gson.Gson
 import com.sw.inbound.utils.DateTimeUtils
 import com.sw.plate.App
 import com.sw.plate.utils.Base64
-import com.sw.plate.utils.ScanGunKeyEventHelper
 import com.sw.plate.utils.arcface.facedb.FaceDatabase
 import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
 import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
-import com.sw.platecabinet.MyApp
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.ext.clickWithCoroutines
-import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.UserFaceModel
 import com.sw.platecabinet.utils.IntervalExecutor
-import com.sw.platecabinet.utils.PermissionHelper
-import com.sw.platecabinet.utils.PlateUtils
 import com.sw.platecabinet.utils.SpTool
 import com.sw.platecabinet.view.CustomLoadingDialog
-import com.sw.platecabinet.viewmodel.SettingViewModel
 import com.sw.platecabinet.viewmodel.UserViewModel
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 /**
@@ -51,15 +45,14 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     protected lateinit var context: Context
     private var timeJob: Job? = null
     private var mDialogWaiting: CustomLoadingDialog? = null
-    private val permissionHelpers = mutableMapOf<Int, PermissionHelper>()
+//    private val permissionHelpers = mutableMapOf<Int, PermissionHelper>()
-    protected var keyEventHelper: ScanGunKeyEventHelper? = null
+//    protected var keyEventHelper: ScanGunKeyEventHelper? = null
-
-    // 管理员对应的viewmodel
-    val settingViewModel by viewModels<SettingViewModel>()
 
     // 用户对应的viewModel
     protected val userViewModel by viewModels<UserViewModel>()
 
+    public val recognizeViewModel by viewModels<RecognizeViewModel>()
+
     private var startTime: Long = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -80,62 +73,62 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         updateTime()
         registerDataChange()
         initialize()
-        registerKeyEvent()
+//        registerKeyEvent()
         val durationTime = System.currentTimeMillis() - startTime
         Timber.d("启动时间：$durationTime")
     }
 
-    /**
+//    /**
-     * 监听扫描枪扫描事件
+//     * 监听扫描枪扫描事件
-     */
+//     */
-    protected fun registerKeyEvent() {
+//    protected fun registerKeyEvent() {
-        keyEventHelper =
+//        keyEventHelper =
-            ScanGunKeyEventHelper(context, object : ScanGunKeyEventHelper.OnScanSuccessListener {
+//            ScanGunKeyEventHelper(context, object : ScanGunKeyEventHelper.OnScanSuccessListener {
-                override fun onScanSuccess(barcode: String?) {
+//                override fun onScanSuccess(barcode: String?) {
-                    Timber.d("onScanSuccess barcode = $barcode")
+//                    Timber.d("onScanSuccess barcode = $barcode")
-                    if (barcode == null) return
+//                    if (barcode == null) return
-                    handleScanKeyInfo(barcode)
+//                    handleScanKeyInfo(barcode)
-                }
+//                }
-            })
+//            })
-    }
+//    }
 
     /**
      * 处理扫描枪数据
      */
     protected open fun handleScanKeyInfo(scanInfo: String) {
-//        settingViewModel.findByPlateNumber(plateNumber = scanInfo)
+////        settingViewModel.findByPlateNumber(plateNumber = scanInfo)
-        var plateNumber = scanInfo
+//        var plateNumber = scanInfo
-        if (scanInfo.length > 6) {
+//        if (scanInfo.length > 6) {
-            plateNumber = scanInfo.take(6)
+//            plateNumber = scanInfo.take(6)
-        }
+//        }
-        Log.d("TAG", "handleScanKeyInfo: " + Gson().toJson(MyApp.plateList))
+//        Log.d("TAG", "handleScanKeyInfo: " + Gson().toJson(MyApp.plateList))
-        if (MyApp.plateList == null) {
+//        if (MyApp.plateList == null) {
-            initPlateList()
+//            initPlateList()
-        }
+//        }
-        //柜子未关联该餐盘，直接找空位置放入盘子
+//        //柜子未关联该餐盘，直接找空位置放入盘子
-        val item = MyApp.plateList?.firstOrNull { it.plateNumber.isNullOrBlank() }
+//        val item = MyApp.plateList?.firstOrNull { it.plateNumber.isNullOrBlank() }
-        if (item == null) {
+//        if (item == null) {
-            //柜子已满
+//            //柜子已满
-            MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
+//            MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
-            return
+//            return
-        }
+//        }
-        //找到位置，放入餐盘，清除已有id和时间
+//        //找到位置，放入餐盘，清除已有id和时间
-        item.plateNumber = plateNumber
+//        item.plateNumber = plateNumber
-        item.faceId = null
+//        item.faceId = null
-        item.updateTime = null
+//        item.updateTime = null
-        PlateUtils.open(this, item.equipmentBoxCode, true)
+//        PlateUtils.open(this, item.equipmentBoxCode, true)
-        SpTool.savePlateData(MyApp.plateList!!)
+//        SpTool.savePlateData(MyApp.plateList!!)
     }
 
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+//    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        if (keyEventHelper != null) {
+//        if (keyEventHelper != null) {
-            if (keyEventHelper!!.isScanGunEvent(event)) {
+//            if (keyEventHelper!!.isScanGunEvent(event)) {
-                keyEventHelper!!.analysisKeyEvent(event)
+//                keyEventHelper!!.analysisKeyEvent(event)
-                return true
+//                return true
-            }
+//            }
-        }
+//        }
-        return super.dispatchKeyEvent(event)
+//        return super.dispatchKeyEvent(event)
-    }
+//    }
 
     fun updateTime() {
         headerBinding?.let {
@@ -149,12 +142,10 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
                     onRightDoubleClick()
                 }
             )
-            val scope = CoroutineScope(Dispatchers.Main)
+            timeJob = lifecycleScope.launch {
-            timeJob = scope.launch {
                 DateTimeUtils.realTimeChineseDateFlow()
-                    .collect { (date, time) ->
+                    .collect { date ->
-                        it.tvLeftDate.text = date
+                        it.tvRightTime.text = date
-                        it.tvRightTime.text = time
                     }
             }
         }
@@ -171,36 +162,36 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
      * 右侧时间双击
      */
     open fun onRightDoubleClick() {
-        MainActivity.start(context, pageType = PageType.SETTING_LIST)
+        //MainActivity.start(context, pageType = PageType.SETTING_LIST)
     }
 
-    override fun onRequestPermissionsResult(
+//    override fun onRequestPermissionsResult(
-        requestCode: Int,
+//        requestCode: Int,
-        permissions: Array<out String>,
+//        permissions: Array<out String>,
-        grantResults: IntArray
+//        grantResults: IntArray
-    ) {
+//    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+//        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
+//
-        val helper = permissionHelpers[requestCode]
+//        val helper = permissionHelpers[requestCode]
-        val allGranted = PermissionHelper.handlePermissionResult(
+//        val allGranted = PermissionHelper.handlePermissionResult(
-            this,
+//            this,
-            requestCode,
+//            requestCode,
-            permissions,
+//            permissions,
-            grantResults,
+//            grantResults,
-            permissionHelper = helper
+//            permissionHelper = helper
-        )
+//        )
-
+//
-        if (allGranted) {
+//        if (allGranted) {
-            permissionHelpers.remove(requestCode)
+//            permissionHelpers.remove(requestCode)
-        }
+//        }
-    }
+//    }
-
+//
-    /**
+//    /**
-     * 注册PermissionHelper以便处理结果
+//     * 注册PermissionHelper以便处理结果
-     */
+//     */
-    fun registerPermissionHelper(helper: PermissionHelper) {
+//    fun registerPermissionHelper(helper: PermissionHelper) {
-        permissionHelpers[helper.requestCode] = helper
+//        permissionHelpers[helper.requestCode] = helper
-    }
+//    }
 
     override fun onResume() {
         super.onResume()
@@ -265,6 +256,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             mDialogWaiting = CustomLoadingDialog(this, view, R.style.MyDialog)
             mDialogWaiting!!.show()
             mDialogWaiting!!.setCancelable(true)
+            mDialogWaiting!!.setCanceledOnTouchOutside(true)
         }
     }
 
@@ -289,125 +281,12 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
      */
     protected open fun registerDataChange() {
         Timber.d("registerDataChange")
-//        lifecycleScope.launch {
-//            viewModel.showLoading.collect {
-//                Timber.d("registerDataChange 用户 showLoading = $it")
-//                if (it) {
-//                    showWaitingDialog("")
-//                } else {
-//                    hideWaitingDialog()
-//                }
-//            }
-//        }
-//        lifecycleScope.launch {
-//            viewModel.currentUserInfo.collect {
-//                if (it == null) return@collect
-////                it.showBalanceNotEnoughDialog = true
-//                handleLoginSuccess(it, false)
-//            }
-//        }
-//        lifecycleScope.launch {
-//            settingViewModel.showLoading.collect {
-//                Timber.d("registerDataChange 管理员 showLoading = $it")
-//                if (it) {
-//                    showWaitingDialog("")
-//                } else {
-//                    hideWaitingDialog()
-//                }
-//            }
-//        }
-//        lifecycleScope.launch {
-//            settingViewModel.searchUserInfo.collect {
-//                Timber.d("registerDataChange 管理员 currentUserInfo = $it")
-//                if (it == null) return@collect
-//                handleLoginSuccess(it, true)
-//            }
-//        }
-//        lifecycleScope.launch {
-//            settingViewModel.equipmentList.collect {
-//               loadEquipmentList(it)
-//            }
-//        }
     }
 
-//    private fun loadEquipmentList(items: List<EquipmentUserInfo>) {
-//        if (items.isEmpty()) return
-//        val unbindList = items.filter { !it.isBound() }
-//        if (unbindList.isEmpty()) {
-//            MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
-//        } else {
-//            val firstInfo = unbindList[0]
-//            val currentUserInfo = settingViewModel.searchUserInfo.value
-//            firstInfo.plateNumber = currentUserInfo?.plateNumber ?: ""
-//            MainActivity.start(
-//                context = context,
-//                pageType = PageType.BIND_PLATE,
-//                equipmentUserInfo = firstInfo
-//            )
-//        }
-//    }
-
-    /**
-     * 处理登录成功操作
-     * @param isAdmin  true 管理员 执行绑盘此操作   false 用户，提示错误
-     */
-    open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
-//        Timber.d("handleLoginSuccess isAdmin = $isAdmin")
-//        equipmentUserInfo.isIntercept = false
-//        val cardBalance = equipmentUserInfo.cardBalance ?: 0.toDouble()
-//        val balanceIsNotEnough = cardBalance <= 0.toDouble()
-//        if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) {
-//            //提示余额不足弹窗
-//            equipmentUserInfo.isIntercept = true
-//            BalanceNotEnoughDialog(this).show()
-//            return
-//        }
-//        viewModel.resetUserInfo()
-////        if (equipmentUserInfo.isOtherEquipment()) {
-////            MainActivity.start(
-////                context,
-////                pageType = PageType.PLATE_TIP,
-////                equipmentUserInfo = equipmentUserInfo,
-////                isAdmin
-////            )
-////            return
-////        }
-//        if (equipmentUserInfo.equipmentBoxCode?.isNotEmpty() == true) {
-//            SerialApi.openPlate(
-//                equipmentUserInfo.equipmentBoxCode!!.toInt(),
-//                object : SerialPortManager.SendCallback {
-//                    override fun onSuccess() {
-//                        MainActivity.start(
-//                            context,
-//                            pageType = PageType.PLATE_TIP,
-//                            isAdmin = isAdmin
-//                        )
-//                    }
-//
-//                    override fun onFail(e: Exception?) {
-//                        ToastUtils.showToast("柜门打开失败")
-//                    }
-//                })
-//        } else {
-//            if (isAdmin) {
-//                settingViewModel.getEquipmentList {
-//                    loadEquipmentList(it)
-//                }
-//            } else {
-//                Timber.d("无餐盘信息")
-//                MainActivity.start(
-//                    context,
-//                    pageType = PageType.PLATE_TIP,
-//                    equipmentUserInfo = equipmentUserInfo,
-//                    isAdmin = isAdmin
-//                )
-//            }
-//        }
-    }
 
     override fun onDestroy() {
         timeJob?.cancel()
-        keyEventHelper?.onDestroy()
+//        keyEventHelper?.onDestroy()
         super.onDestroy()
     }
 
@@ -417,8 +296,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
     //    private val initialDelay = 5 * 60 * 1000L
 //    private val dealyMillis = 10 * 60 * 1000L
-    private val initialDelay = 5 * 60 * 1000L
+    private val initialDelay = 1 * 1000L
-    private val dealyMillis = 5 * 60 * 1000L
+    private val dealyMillis = 10 * 1000L
     fun startFaceTask(block: (List<String?>) -> Unit) {
         faceTaskJob =
             intervalExecutor.startIntervalTaskWithInitialDelay(initialDelay, dealyMillis) {
@@ -429,29 +308,19 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     private var faceTimestamp = 0L
 
     //private var taskPageNo = 1
-    private fun getFaceIncrementList(pageNo: Int = 1, action:(List<String?>)-> Unit) {
+    private fun getFaceIncrementList(pageNo: Int = 1, action: (List<String?>) -> Unit) {
         val timestamp = SpTool.lastFaceTimestamp
-        if (timestamp == 0L) {
+        userViewModel.getFaceIncrementList(
-            return
-        }
-        settingViewModel.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.size >= settingViewModel.PAGE_SIZE) {
-                //    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
-                //    taskPageNo++
-                //    getFaceIncrementList(taskPageNo)
-                //    return@runOnUiThread
-                //}
                 if (list.isNotEmpty()) {
                     faceTimestamp = list.last().faceUpdateTimestamp ?: 0
                 }
@@ -460,30 +329,27 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         }
     }
 
-    public val recognizeViewModel by viewModels<RecognizeViewModel>()
     private fun updateFaceData(list: List<UserFaceModel>) {
-        Thread {
+        lifecycleScope.launch(Dispatchers.IO) {
             val faceList = mutableListOf<FaceEntity>()
-            val faceDao = FaceDatabase.getInstance(this).faceDao()
+            val faceDao = FaceDatabase.getInstance(this@BaseActivity).faceDao()
             try {
                 list.forEach { model ->
                     if (model.faceDeleted == true) {
                         //删除数据
                         faceDao.deleteFaceById(model.userId)
                     } else {
-                        val faceData = faceDao.queryByUserName(model.userId)
+                        // 获取该用户所有已存特征，判断当前特征是否已存在
-                        if (faceData == null) {
+                        val existList = faceDao.queryAllByUserName(model.userId)
-                            //保存数据
+                        val featureMatches =
-                            val faceEntity = FaceEntity(
+                            existList.map { Base64.encode(it.featureData) == model.faceFeatureStr }
-                                model.userId,
+                        Timber.d("userId=${model.userId}, 已存记录数=${existList.size}, 各条特征是否与服务器一致=$featureMatches")
-                                null,
+                        val alreadyExists = featureMatches.any { it }
-                                Base64.decode(model.faceFeatureStr)
+                        if (!alreadyExists) {
-                            ).also {
+                            //当前特征不存在，保存
-                                //1-会员、2-临时用户
+                            runCatching { getNewFaceEntity(model) }
-                                it.userType = if (model.isMember) "1" else "2"
+                                .onSuccess { faceList.add(it) }
-                                it.cardNo = model.cardNo
+                                .onFailure { Timber.e(it, "人脸特征解码失败: userId=${model.userId}") }
-                            }
-                            faceList.add(faceEntity)
                         }
                     }
                 }
@@ -492,34 +358,62 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             }
             try {
                 if (faceList.isNotEmpty()) {
-                    FaceDatabase.getInstance(this).faceDao().insert(faceList)
+                    FaceDatabase.getInstance(this@BaseActivity).faceDao().insert(faceList)
-                    recognizeViewModel.refreshFaceList()
                 }
+                recognizeViewModel.refreshFaceList()
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-        }.start()
+        }
     }
 
-    fun initPlateList() {
+    private fun getNewFaceEntity(model: UserFaceModel): FaceEntity {
-//        SpTool.putString(SpTool.PLATE_BOX_DATA, "")
+        return FaceEntity(
-//        var list = SpTool.getPlateData()
+            model.userId,
-        val list: MutableList<EquipmentUserInfo> = mutableListOf()
+            null,
-        repeat(22) { index ->
+            Base64.decode(model.faceFeatureStr)
-            list.add(
+        ).also {
-                EquipmentUserInfo(equipmentBoxCode = "${index + 1}")
+            //1-会员、2-临时用户
-            )
+            it.userType = if (model.member) "1" else "2"
+            it.cardNo = model.cardNo
         }
-        MyApp.plateList = list
     }
 
     fun clearAllFace(block: () -> Unit) {
-        Thread {
+        lifecycleScope.launch(Dispatchers.IO) {
             val faceDao = FaceDatabase.getInstance(App.getContext()).faceDao()
             faceDao.deleteAll()
             faceDao.resetId()
-            runOnUiThread { block() }
+            recognizeViewModel.refreshFaceList()
-        }.start()
+            withContext(Dispatchers.Main) { block() }
+        }
+    }
+
+    private var permissionCallback: ((isGranted: Boolean) -> Unit)? = null
+    private var activityCallback: ((intent: Intent?) -> Unit)? = null
+
+    fun requestPermission(permission: String, callback: (isGranted: Boolean) -> Unit) {
+        this.permissionCallback = callback
+        requestPermissionLauncher.launch(permission)
+    }
+
+    // 权限请求回调
+    val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted ->
+        permissionCallback?.invoke(isGranted)
+    }
+
+    fun startActivity(intent: Intent, callback: (Intent?) -> Unit) {
+        this.activityCallback = callback
+        startActivityLauncher.launch(intent)
+    }
+
+    // activity页面返回的回调
+    private val startActivityLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) {
+        activityCallback?.invoke(it.data)
     }
 
 }

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

@@ -7,6 +7,7 @@ import com.sw.plate.utils.arcface.FaceApi
 import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.databinding.ActivityDeviceInitBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.utils.SpTool
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -25,32 +26,14 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
     }
 
     override fun initialize() {
-//        val isSuccess = deviceViewModel.checkEquipmentInfo()
-//        if (isSuccess) {
-//            goLoginActivity()
-//            return
-//        }
-//        binding.ivQrCode.setImageBitmap(
-//            QRCodeUtil.generateQRCode(
-//                content = GlobalData.deviceId,
-//                size = 200
-//            )
-//        )
-//        binding.btnInit.setOnClickListener {
-//            deviceViewModel.getDeviceToken()
-//        }
-//        binding.btnInit.gone()
-//        binding.ivQrCode.invisible()
-//        binding.root.postDelayed({
-//            goLoginActivity()
-//        }, 1000)
-        initPlateList()
         showWaitingDialog("加载中……")
         lifecycleScope.launch {
             withContext(Dispatchers.Default) {
-                val count = FaceApi().queryFaceCount()
+                //val count = FaceApi().queryFaceCount()
-                if (count == 0) {
+                //if (count == 0) {
+                if (SpTool.firstGetFace) {
                     userViewModel.getUserFaceCache { status, msg ->
+                        SpTool.firstGetFace = false
                         getDeviceConfig()
                     }
                 } else {

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

@@ -0,0 +1,152 @@
+//package com.sw.platecabinet.activity
+//
+//import androidx.activity.viewModels
+//import androidx.lifecycle.lifecycleScope
+//import com.sw.plate.utils.Base64
+//import com.sw.plate.utils.ToastUtils
+//import com.sw.plate.utils.arcface.facedb.FaceDatabase
+//import com.sw.platecabinet.MyApp
+//import com.sw.platecabinet.databinding.ActivityFunBinding
+//import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+//import com.sw.platecabinet.dialog.CustomDialog
+//import com.sw.platecabinet.ext.clickWithDebounce
+//import com.sw.platecabinet.utils.PlateUtils
+//import com.sw.platecabinet.utils.SpTool
+//import com.sw.platecabinet.viewmodel.UserViewModel
+//import kotlinx.coroutines.Dispatchers
+//import kotlinx.coroutines.delay
+//import kotlinx.coroutines.launch
+//import kotlinx.coroutines.withContext
+//import kotlin.getValue
+//
+//class FunActivity : BaseActivity<ActivityFunBinding>() {
+//
+//    override fun inflateTitleBinding(): ItemTitleTimeBinding? {
+//        return binding.includeHeader
+//    }
+//
+//    override fun inflateViewBinding() = ActivityFunBinding.inflate(layoutInflater)
+//
+//    override fun initialize() {
+//        binding.btnClearFace.clickWithDebounce { clearFace() }
+//        binding.btnClearAndGetAll.clickWithDebounce { clearFaceAndGetAll() }
+//        binding.btnOpenAllPlate.clickWithDebounce {
+//            lifecycleScope.launch {
+//                openAllPlate()
+//            }
+//        }
+//        binding.btnPutPlate.clickWithDebounce { putPlate() }
+//
+//        queryUserCount()
+//
+//        binding.btnTestFeature.clickWithDebounce {
+//            testFeature()
+//        }
+//    }
+//    private fun testFeature() {
+//        userViewModel.getUserFace(1, 1) {list ->
+//            lifecycleScope.launch {
+//                withContext(Dispatchers.IO) {
+//                    if (list.isEmpty()) return@withContext
+//                    val userId = list[0].userId
+//                    val base64Feature = list[0].faceFeatureStr
+//                    val faceDao = FaceDatabase.getInstance(this@FunActivity).faceDao()
+//                    val entityList = faceDao.queryAllByUserName(userId)
+//                    val resultList = entityList.map { base64Feature == Base64.encode(it.featureData) }
+//                    val isEqual = resultList.any { true }
+//                    ToastUtils.showToast("比较结果：$isEqual")
+//                }
+//            }
+//        }
+//    }
+//
+//    private fun clearFace() {
+//        loadClearDialog("请确认是否清除本地所有数据？") {
+//            showWaitingDialog("加载中……")
+//            clearAllFace {
+//                binding.root.postDelayed(
+//                    {
+//                        hideWaitingDialog()
+//                        ToastUtils.showToast("已清除")
+//                        queryUserCount()
+//                    }, 500
+//                )
+//            }
+//        }
+//    }
+//
+//    private fun clearFaceAndGetAll() {
+//        loadClearDialog("请确认是否清除本地所有数据，并重新拉取全量人脸数据？") {
+//            showWaitingDialog("加载中……")
+//            clearAllFace {
+//                userViewModel.getUserFaceCache { status, msg ->
+//                    hideWaitingDialog()
+//                    ToastUtils.showToast(
+//                        if (status) "请求成功，$msg" else "请求失败，$msg"
+//                    )
+//                    queryUserCount()
+//                }
+//            }
+//        }
+//    }
+//
+//    private suspend fun openAllPlate() {
+//        MyApp.plateList?.let { plateList ->
+//            val boxCodeList = plateList.filter { it.equipmentBoxCode.isNullOrBlank().not() }
+//                .map { it.equipmentBoxCode }
+//            boxCodeList.forEach { boxCode ->
+//                withContext(Dispatchers.Default) {
+//                    PlateUtils.openDirect(boxCode)
+//                    delay(500)
+//                }
+//            }
+//        }
+//    }
+//
+//    private fun putPlate() {
+//        showWaitingDialog("加载中……")
+//        MyApp.plateList?.forEachIndexed { index, item ->
+//            val num = index + 1
+//            val realNum = if (num < 10) "0${num}" else "${num}"
+//            item.plateNumber = realNum + realNum + realNum
+//            item.faceId = null
+//            item.updateTime = null
+//        }
+//        SpTool.savePlateData(MyApp.plateList!!)
+//        binding.root.postDelayed({
+//            hideWaitingDialog()
+//            ToastUtils.showToast("已完成")
+//        }, 1000)
+//    }
+//
+//    /**
+//     * 加载清除数据弹窗
+//     */
+//    private fun loadClearDialog(msg: String, callback: () -> Unit) {
+//        CustomDialog(
+//            activity = this,
+//            content = msg,
+//            onConfirm = {
+//                callback()
+//            }).show()
+//    }
+//
+//    override fun onLeftDoubleClick() {
+//        finish()
+//    }
+//
+//    override fun onRightDoubleClick() {
+//
+//    }
+//
+//    private fun queryUserCount() {
+//        lifecycleScope.launch {
+//            val faceDao = FaceDatabase.getInstance(this@FunActivity).faceDao()
+//            val memberUserCount = withContext(Dispatchers.IO) { faceDao.getFaceCount("1") }
+//            val tempUserCount = withContext(Dispatchers.IO) { faceDao.getFaceCount("2") }
+//            binding.tvMemberUserCount.text = "会员用户：${memberUserCount}人"
+//            binding.tvTempUserCount.text = "临时用户：${tempUserCount}人"
+//        }
+//    }
+//
+//}

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

@@ -41,4 +41,8 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
         finish()
     }
 
+    override fun onRightDoubleClick() {
+        PlcSettingActivity.start(this)
+    }
+
 }

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

@@ -1,62 +0,0 @@
-//package com.sw.platecabinet.activity
-//
-//import android.content.Intent
-//import com.sw.plate.utils.ToastUtils
-//import com.sw.platecabinet.databinding.ActivityLoginByPwdBinding
-//import com.sw.platecabinet.databinding.ItemTitleTimeBinding
-//import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
-//import com.sw.platecabinet.model.request.LoginParam
-//import com.sw.platecabinet.model.response.EquipmentUserInfo
-//import com.sw.platecabinet.utils.KeyboardUtils
-//
-///**
-// * 密码登录
-// */
-//class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
-//
-//    override fun inflateViewBinding(): ActivityLoginByPwdBinding {
-//        return ActivityLoginByPwdBinding.inflate(layoutInflater)
-//    }
-//
-//    override fun inflateTitleBinding(): ItemTitleTimeBinding {
-//        return binding.includeHeader
-//    }
-//
-//    override fun initialize() {
-//        binding.btnLogin.setOnClickListener {
-//            val phone = binding.etPhone.text.toString()
-//            val pwd = binding.etPwd.text.toString()
-//            if (phone.isEmpty() || pwd.isEmpty()) {
-//                ToastUtils.showToast("手机或校验码不能为空")
-//                return@setOnClickListener
-//            }
-//            val loginParam = LoginParam(
-//                //equipmentId = equipmentId,
-//                phone = phone,
-//                password = pwd
-//            )
-//            viewModel.loginWithPwd(loginParam)
-//            KeyboardUtils.hideKeyboard(this)
-//        }
-//        binding.tvFaceRec.setOnClickListener {
-//            val intent = Intent(this, LoginByFaceActivity::class.java)
-//            startActivity(intent)
-//        }
-//    }
-//
-//    override fun onResume() {
-//        super.onResume()
-//        viewModel.resetUserInfo()
-//    }
-//
-//    override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
-//        super.handleLoginSuccess(equipmentUserInfo, isAdmin)
-////        val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble()
-////        val balanceIsNotEnough = cardBalance <= 0.toDouble()
-//        if (equipmentUserInfo.isIntercept) {
-//            return
-//        }
-//        LoginByFaceActivity.goInitActivity()
-//        finish()
-//    }
-//}

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

@@ -2,14 +2,11 @@ package com.sw.platecabinet.activity
 
 import android.content.Context
 import android.content.Intent
-import com.sw.plate.utils.ToastUtils
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ActivityMainBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
-import com.sw.platecabinet.dialog.CustomDialog
 import com.sw.platecabinet.fragment.PlateCabinetFullFragment
 import com.sw.platecabinet.fragment.PlateOpenFragment
-import com.sw.platecabinet.fragment.SettingListFragment
 import com.sw.platecabinet.utils.FragmentHelper
 
 typealias Callback = (String) -> Unit
@@ -65,7 +62,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         pageType = param?.let { PageType.valueOf(param) } ?: PageType.SETTING_LIST
         fragmentHelper = FragmentHelper(supportFragmentManager, R.id.fragment_container)
         val page = when (pageType) {
-            PageType.SETTING_LIST -> SettingListFragment()
+//            PageType.SETTING_LIST -> SettingListFragment()
 //            PageType.BIND_PLATE -> BindPlateFragment.newInstance(equipmentUserInfo)
 //            PageType.PLATE_TIP -> PlateOpenFragment.newInstance(equipmentUserInfo, isAdmin)
             PageType.PLATE_TIP -> PlateOpenFragment.newInstance(isScanCode)
@@ -86,7 +83,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
     override fun onRightDoubleClick() {
         if (pageType == PageType.SETTING_LIST) {
-            loadClearDialog()
+//            startActivity(Intent(this, FunActivity::class.java))
         }
     }
 
@@ -104,25 +101,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         super.registerDataChange()
     }
 
-    /**
+
-     * 加载清除数据弹窗
-     */
-    private fun loadClearDialog() {
-        CustomDialog(
-            activity = this,
-            content = "请确认是否清除本地所有数据，并重新拉取全量人脸数据？",
-            onConfirm = {
-                showWaitingDialog("加载中……")
-                clearAllFace {
-                    userViewModel.getUserFaceCache { status, msg ->
-                        hideWaitingDialog()
-                        ToastUtils.showToast(
-                            if (status) "请求成功，$msg" else "请求失败，$msg"
-                        )
-                    }
-                }
-            }).show()
-    }
 }
 
 /**

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

@@ -0,0 +1,362 @@
+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 控制设置界面
+ * 通过右侧时间双击（onRightDoubleClick）打开，提供全套 PLC 控制操作入口
+ */
+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, 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)
+    }
+
+    override fun inflateTitleBinding(): ItemTitleTimeBinding {
+        return binding.includeHeader
+    }
+
+    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
+        }
+    }
+
+    // ==================== 连接控制 ====================
+
+    /**
+     * 初始化连接控制区按钮：打开串口、打开自动模式
+     */
+    private fun initConnectButtons() {
+        binding.btnOpenSerialPort.clickWithDebounce {
+            showWaitingDialog("正在打开串口……")
+            PlcHelper.getInstance(this).openSerialPort(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("打开串口成功：$result")
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("打开串口失败：$message")
+                }
+            })
+        }
+
+        binding.btnOpenAutoMode.clickWithDebounce {
+            showWaitingDialog("正在打开自动模式……")
+            PlcHelper.getInstance(this).openAutoMode(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("打开自动模式成功：$result")
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("打开自动模式失败：$message")
+                }
+            })
+        }
+    }
+
+    // ==================== 出盘操作 ====================
+
+    /**
+     * 初始化出盘操作按钮
+     */
+    private fun initOutPlateButton() {
+        binding.btnOutPlate.clickWithDebounce {
+            showWaitingDialog("正在出盘……")
+            PlcHelper.getInstance(this).outPlate(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("出盘成功：$result")
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("出盘失败：$message")
+                }
+            })
+        }
+    }
+
+    // ==================== 平台控制 ====================
+
+    /**
+     * 初始化平台控制区按钮：平台下降、平台上升、返回营业
+     */
+    private fun initPlatformButtons() {
+        binding.btnPlatformDown.clickWithDebounce {
+            showWaitingDialog("正在执行平台下降……")
+            PlcHelper.getInstance(this).platformDown(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("平台下降成功：$result")
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("平台下降失败：$message")
+                }
+            })
+        }
+
+        binding.btnPlatformUp.clickWithDebounce {
+            showWaitingDialog("正在执行平台上升……")
+            PlcHelper.getInstance(this).platformUp(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("平台上升成功：$result")
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("平台上升失败：$message")
+                }
+            })
+        }
+
+        binding.btnBackToBusiness.clickWithDebounce {
+            showWaitingDialog("正在返回营业状态……")
+            PlcHelper.getInstance(this).backToBusiness(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("返回营业成功：$result")
+                    finish()
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("返回营业失败：$message")
+                }
+            })
+        }
+    }
+
+    // ==================== 故障处理 ====================
+
+    /**
+     * 初始化平台复位按钮：先执行平台上升，成功后自动执行返回营业
+     */
+    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")
+                }
+            })
+        }
+    }
+
+    /**
+     * 初始化故障复位按钮
+     */
+    private fun initAlarmButton() {
+        binding.btnAlarmReset.clickWithDebounce {
+            showWaitingDialog("正在故障复位……")
+            PlcHelper.getInstance(this).alarmReset(object : PlcCallback<String> {
+                override fun onSuccess(result: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("故障复位成功：$result")
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("故障复位失败：$message")
+                }
+            })
+        }
+    }
+
+    // ==================== 参数设置 ====================
+
+    /**
+     * 初始化参数设置按钮
+     * 读取参数类型和参数值输入框内容，调用 setParams
+     */
+    private fun initParamButtons() {
+        binding.btnSetParams.clickWithDebounce {
+            val paramType = binding.etParamType.text.toString().trim()
+            val paramValueStr = binding.etParamValue.text.toString().trim()
+
+            if (paramType.isEmpty()) {
+                ToastUtils.showToast("请输入参数类型")
+                return@clickWithDebounce
+            }
+            if (paramValueStr.isEmpty()) {
+                ToastUtils.showToast("请输入参数值")
+                return@clickWithDebounce
+            }
+            val paramValue = paramValueStr.toIntOrNull()
+            if (paramValue == null) {
+                ToastUtils.showToast("参数值须为整数")
+                return@clickWithDebounce
+            }
+
+            // 隐藏键盘
+            hideKeyboard()
+
+            showWaitingDialog("正在设置参数……")
+            PlcHelper.getInstance(this).setParams(
+                paramType,
+                paramValue,
+                object : PlcCallback<String> {
+                    override fun onSuccess(result: String) {
+                        hideWaitingDialog()
+                        ToastUtils.showToast("参数设置成功：$result")
+                    }
+
+                    override fun onError(message: String) {
+                        hideWaitingDialog()
+                        ToastUtils.showToast("参数设置失败：$message")
+                    }
+                }
+            )
+        }
+    }
+
+    // ==================== 状态显示 ====================
+
+    /**
+     * 初始化状态刷新按钮，获取 PLC 状态并格式化展示
+     */
+    private fun initStatusButton() {
+        binding.btnRefreshStatus.clickWithDebounce {
+            showWaitingDialog("正在获取状态……")
+            PlcHelper.getInstance(this).getStatus(object : PlcCallback<PlcStatus> {
+                override fun onSuccess(result: PlcStatus) {
+                    hideWaitingDialog()
+                    binding.tvStatusInfo.text = buildStatusText(result)
+                }
+
+                override fun onError(message: String) {
+                    hideWaitingDialog()
+                    binding.tvStatusInfo.text = "获取状态失败：$message"
+                    ToastUtils.showToast("获取状态失败：$message")
+                }
+            })
+        }
+    }
+
+    /**
+     * 将 PlcStatus 格式化为多行可读文本
+     */
+    private fun buildStatusText(status: PlcStatus): String {
+        return """
+            空盘状态：${if (status.isEmptyPlate) "是（无餐盘）" else "否（有餐盘）"}
+            平台下位：${if (status.isPlateformDown) "是" else "否"}
+            平台上位：${if (status.isPlateformUp) "是" else "否"}
+            取盘红外：${if (status.isTakePlateInfrared) "已触发" else "未触发"}
+            报警代码：${if (status.alarmCode == 0) "正常（0）" else "异常（${status.alarmCode}）"}
+        """.trimIndent()
+    }
+
+    // ==================== 生命周期 ====================
+
+    /**
+     * 左侧日期双击 → 关闭设置界面
+     */
+    override fun onLeftDoubleClick() {
+        finish()
+    }
+
+    /**
+     * 右侧时间双击 → 不做操作，防止循环打开
+     */
+    override fun onRightDoubleClick() {
+        // 空实现，避免在设置页再次触发跳转
+    }
+
+    // ==================== 工具方法 ====================
+
+    /**
+     * 隐藏软键盘
+     */
+    private fun hideKeyboard() {
+        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.hideSoftInputFromWindow(currentFocus?.windowToken, 0)
+    }
+}

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

@@ -1,97 +0,0 @@
-package com.sw.platecabinet.activity
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.sw.platecabinet.R
-import kotlin.math.ceil
-
-class TestActivity : AppCompatActivity() {
-    private lateinit var parentRecyclerView: RecyclerView
-    private lateinit var pageAdapter: PageAdapter
-    private val itemsPerPage = 22 // 每行2个，每列11个，共22个
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_test)
-
-        parentRecyclerView = findViewById(R.id.parentRecyclerView)
-        parentRecyclerView.layoutManager = LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)
-
-        // 假设有100个数据项
-        val allItems = (1..30).map { "Item $it" }
-        val pages = allItems.chunked(itemsPerPage)
-
-        pageAdapter = PageAdapter(pages)
-        parentRecyclerView.adapter = pageAdapter
-    }
-
-    private fun convertToColumnFirst(original: List<String>, cols: Int): List<String> {
-        val rows = ceil(original.size.toDouble() / cols).toInt()
-        return List(original.size) { pos ->
-            val row = pos % rows
-            val col = pos / rows
-            val originalPos = col + row * cols
-            original.getOrElse(originalPos) { "" }
-        }
-    }
-
-    inner class PageAdapter(private val pages: List<List<String>>) :
-        RecyclerView.Adapter<PageAdapter.PageViewHolder>() {
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PageViewHolder {
-            val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.page_item_layout, parent, false)
-            return PageViewHolder(view)
-        }
-
-        override fun onBindViewHolder(holder: PageViewHolder, position: Int) {
-            holder.bind(pages[position])
-        }
-
-        override fun getItemCount(): Int = pages.size
-
-        inner class PageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-            private val childRecyclerView: RecyclerView =
-                itemView.findViewById(R.id.childRecyclerView)
-
-            fun bind(items: List<String>) {
-                childRecyclerView.layoutManager = GridLayoutManager(itemView.context, 2)
-                childRecyclerView.adapter = ChildAdapter(items)
-            }
-        }
-    }
-
-    inner class ChildAdapter(private val items: List<String>) :
-        RecyclerView.Adapter<ChildAdapter.ItemViewHolder>() {
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
-            val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.item_bind_view, parent, false)
-            return ItemViewHolder(view)
-        }
-
-        override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-            holder.bind(position, items[position])
-        }
-
-        override fun getItemCount(): Int = items.size
-
-        inner class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-            private val llRoot: LinearLayout = itemView.findViewById(R.id.ll_root)
-            private val tvNum: TextView = itemView.findViewById(R.id.tv_num)
-
-            fun bind(position: Int, item: String) {
-                tvNum.text = item
-                llRoot.setBackgroundResource(if (position % 3 == 0) R.drawable.grid_item_bind else R.drawable.grid_item_unbind)
-            }
-        }
-    }
-}

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

@@ -1,57 +0,0 @@
-//package com.sw.platecabinet.activity
-//
-//import android.graphics.Color
-//import android.view.Gravity
-//import android.view.ViewGroup
-//import androidx.core.graphics.drawable.toDrawable
-//import androidx.core.view.WindowCompat
-//import com.sw.platecabinet.GlobalKey
-//import com.sw.platecabinet.databinding.ActivityUnbindDialogBinding
-//import com.sw.platecabinet.databinding.ItemTitleTimeBinding
-//import com.sw.platecabinet.ext.dp
-//import com.sw.platecabinet.model.response.EquipmentUserInfo
-//
-///**
-// * 解绑确认弹窗界面
-// */
-//class UnBindDialogActivity : BaseActivity<ActivityUnbindDialogBinding>() {
-//    private var equipmentUserInfo: EquipmentUserInfo? = null
-//
-//    override fun inflateViewBinding(): ActivityUnbindDialogBinding {
-//        return ActivityUnbindDialogBinding.inflate(layoutInflater)
-//    }
-//
-//    override fun inflateTitleBinding(): ItemTitleTimeBinding? {
-//        return null
-//    }
-//
-//    override fun initialize() {
-//        window?.apply {
-//            WindowCompat.setDecorFitsSystemWindows(this, false)
-//            setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
-//
-//            attributes = attributes.apply {
-//                y = 314.dp
-//                width = (context.resources.displayMetrics.widthPixels * 0.8).toInt()
-//                height = ViewGroup.LayoutParams.MATCH_PARENT
-//                gravity = Gravity.CENTER
-//            }
-//        }
-//        equipmentUserInfo =
-//            intent.getParcelableExtra<EquipmentUserInfo>(GlobalKey.PARAM_EQUIPMENT_INFO)
-//        if (equipmentUserInfo == null) return
-//        binding.tvTipInfo.text = "即将解除【${equipmentUserInfo!!.name}】的餐盘"
-//        binding.tvCancel.setOnClickListener {
-//            finish()
-//        }
-//        binding.tvConfirm.setOnClickListener {
-//            setResult(RESULT_OK)
-//            finish()
-//        }
-//    }
-//
-//    override fun finish() {
-//        super.finish()
-//        overridePendingTransition(0, 0) // 确保退出也无动画
-//    }
-//}

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

@@ -1,36 +1,36 @@
-package com.sw.platecabinet.dialog
+//package com.sw.platecabinet.dialog
-
+//
-import android.app.Dialog
+//import android.app.Dialog
-import android.graphics.drawable.ColorDrawable
+//import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
+//import android.os.Bundle
-import android.view.Window
+//import android.view.Window
-import androidx.fragment.app.FragmentActivity
+//import androidx.fragment.app.FragmentActivity
-import com.sw.platecabinet.databinding.DialogBalanceNotEnoughBinding
+//import com.sw.platecabinet.databinding.DialogBalanceNotEnoughBinding
-import com.sw.platecabinet.ext.dp
+//import com.sw.platecabinet.ext.dp
-
+//
-open class BalanceNotEnoughDialog(
+//open class BalanceNotEnoughDialog(
-    private var activity: FragmentActivity
+//    private var activity: FragmentActivity
-) : Dialog(activity) {
+//) : Dialog(activity) {
-
+//
-    private lateinit var binding: DialogBalanceNotEnoughBinding
+//    private lateinit var binding: DialogBalanceNotEnoughBinding
-
+//
-    override fun onCreate(savedInstanceState: Bundle?) {
+//    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+//        super.onCreate(savedInstanceState)
-        requestWindowFeature(Window.FEATURE_NO_TITLE)
+//        requestWindowFeature(Window.FEATURE_NO_TITLE)
-        binding = DialogBalanceNotEnoughBinding.inflate(layoutInflater)
+//        binding = DialogBalanceNotEnoughBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+//        setContentView(binding.root)
-        window?.run {
+//        window?.run {
-            attributes = attributes.apply {
+//            attributes = attributes.apply {
-                width = 480.dp
+//                width = 480.dp
-            }
+//            }
-            setBackgroundDrawable(ColorDrawable())
+//            setBackgroundDrawable(ColorDrawable())
-            setCancelable(false)
+//            setCancelable(false)
-        }
+//        }
-        addListener()
+//        addListener()
-    }
+//    }
-
+//
-    private fun addListener() {
+//    private fun addListener() {
-        binding.tvConfirm.setOnClickListener { dismiss() }
+//        binding.tvConfirm.setOnClickListener { dismiss() }
-    }
+//    }
-
+//
-}
+//}

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

@@ -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()
+
+}

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

@@ -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()
+        }
+    }
+}

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

@@ -1,38 +1,38 @@
-package com.sw.platecabinet.dialog
+//package com.sw.platecabinet.dialog
-
+//
-import android.app.Dialog
+//import android.app.Dialog
-import android.graphics.drawable.ColorDrawable
+//import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
+//import android.os.Bundle
-import android.view.Window
+//import android.view.Window
-import androidx.fragment.app.FragmentActivity
+//import androidx.fragment.app.FragmentActivity
-import com.sw.platecabinet.databinding.DialogUserBindRemindBinding
+//import com.sw.platecabinet.databinding.DialogUserBindRemindBinding
-import com.sw.platecabinet.ext.dp
+//import com.sw.platecabinet.ext.dp
-
+//
-open class UserBindRemindDialog(
+//open class UserBindRemindDialog(
-    private var activity: FragmentActivity,
+//    private var activity: FragmentActivity,
-    var content:String
+//    var content:String
-) : Dialog(activity) {
+//) : Dialog(activity) {
-
+//
-    private lateinit var binding: DialogUserBindRemindBinding
+//    private lateinit var binding: DialogUserBindRemindBinding
-
+//
-    override fun onCreate(savedInstanceState: Bundle?) {
+//    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+//        super.onCreate(savedInstanceState)
-        requestWindowFeature(Window.FEATURE_NO_TITLE)
+//        requestWindowFeature(Window.FEATURE_NO_TITLE)
-        binding = DialogUserBindRemindBinding.inflate(layoutInflater)
+//        binding = DialogUserBindRemindBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+//        setContentView(binding.root)
-        window?.run {
+//        window?.run {
-            attributes = attributes.apply {
+//            attributes = attributes.apply {
-                width = 480.dp
+//                width = 480.dp
-            }
+//            }
-            setBackgroundDrawable(ColorDrawable())
+//            setBackgroundDrawable(ColorDrawable())
-            setCancelable(false)
+//            setCancelable(false)
-        }
+//        }
-        binding.tvBindContent.text = content
+//        binding.tvBindContent.text = content
-        addListener()
+//        addListener()
-    }
+//    }
-
+//
-    private fun addListener() {
+//    private fun addListener() {
-        binding.tvConfirm.setOnClickListener { dismiss() }
+//        binding.tvConfirm.setOnClickListener { dismiss() }
-    }
+//    }
-
+//
-}
+//}

app/src/main/java/com/sw/platecabinet/ext/CommonExt.kt

@@ -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)
+}

app/src/main/java/com/sw/platecabinet/ext/TextViewExt.kt

@@ -70,3 +70,35 @@ fun View.clickWithCoroutines(
         }
     }
 }
+
+//fun View.clickWithDebounce(delay: Long = 500, action: () -> Unit) {
+//    var job: Job? = null
+//    setOnClickListener {
+//        job?.cancel()
+//        job = CoroutineScope(Dispatchers.Main).launch {
+//            delay(delay)
+//            action()
+//        }
+//    }
+//}
+
+/**
+ * 极简版防重复点击扩展函数
+ * @param delay 防抖时间（默认300ms）
+ * @param action 点击执行逻辑
+ */
+fun View.clickWithDebounce(delay: Long = 500, action: () -> Unit) {
+    setOnClickListener {
+        // 用View的tag存储是否可点击的状态（默认可点击）
+        if (tag as? Boolean ?: true) {
+            tag = false // 标记为不可点击
+            action() // 立即执行点击逻辑
+
+            // 启动协程，延迟后恢复可点击状态
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(delay)
+                tag = true // 恢复可点击
+            }
+        }
+    }
+}

app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt

@@ -8,21 +8,16 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
 import com.sw.platecabinet.R
 import com.sw.platecabinet.view.CustomLoadingDialog
-import com.sw.platecabinet.viewmodel.SettingViewModel
-import kotlinx.coroutines.launch
 
 abstract class BaseFragment<VB : ViewBinding>(
     private val bindingInflater: (inflater: LayoutInflater, parent: ViewGroup?, attachToParent: Boolean) -> VB
 ) : Fragment() {
-    private var _binding: VB? = null
+    protected var _binding: VB? = null
     protected val binding get() = _binding!!
     private var mDialogWaiting: CustomLoadingDialog? = null
-    protected val viewModel by viewModels<SettingViewModel>()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -39,15 +34,7 @@ abstract class BaseFragment<VB : ViewBinding>(
      * 注册数据变化监听
      */
     open fun registerDataChange() {
-        lifecycleScope.launch {
+
-            viewModel.showLoading.collect {
-                if (it) {
-                    showWaitingDialog("")
-                } else {
-                    hideWaitingDialog()
-                }
-            }
-        }
     }
 
     abstract fun initialize()

app/src/main/java/com/sw/platecabinet/fragment/PlateCabinetFullFragment.kt

@@ -11,6 +11,7 @@ import timber.log.Timber
 class PlateCabinetFullFragment :
     BaseFragment<FragmentPlateCabinetFullBinding>(FragmentPlateCabinetFullBinding::inflate) {
     private var totalTimeInMillis: Long = Constants.AUTO_CLOSE_TIME * 1000
+    private var countDownTimer: CountDownTimer? = null
 
     override fun initialize() {
         Timber.d("initialize")
@@ -18,15 +19,22 @@ class PlateCabinetFullFragment :
     }
 
     fun initCountTime() {
-        object : CountDownTimer(totalTimeInMillis, 1000) {
+        countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) {
             override fun onTick(millisUntilFinished: Long) {
-                binding.tvAutoClose.text = "${(millisUntilFinished / 1000).toInt() + 1}秒后返回主屏"
+                _binding?.tvAutoClose?.text = "${(millisUntilFinished / 1000).toInt() + 1}秒后返回主屏"
             }
 
             override fun onFinish() {
                 activity?.finish()
             }
-        }.start()
+        }
+        countDownTimer?.start()
+    }
+
+    override fun onDestroyView() {
+        countDownTimer?.cancel()
+        countDownTimer = null
+        super.onDestroyView()
     }
 
 }

app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt

@@ -7,7 +7,6 @@ import com.sw.platecabinet.Constants
 import com.sw.platecabinet.R
 import com.sw.platecabinet.activity.InitActivity
 import com.sw.platecabinet.databinding.FragmentPlateOpenBinding
-import com.sw.platecabinet.model.response.EquipmentUserInfo
 
 /**
  * 餐盘柜提示界面
@@ -21,6 +20,7 @@ class PlateOpenFragment :
 //    private var isAdmin: Boolean = false
 
     private var isScanCode = false
+    private var countDownTimer: CountDownTimer? = null
     companion object {
         const val IS_SCAN_CODE = "isScanCode"
 //        @JvmStatic
@@ -76,19 +76,23 @@ class PlateOpenFragment :
     }
 
     fun initCountTime() {
-        object : CountDownTimer(totalTimeInMillis, 1000) {
+        countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) {
             override fun onTick(millisUntilFinished: Long) {
-                binding.tvAutoClose.text = ((millisUntilFinished / 1000).toInt() + 1).toString()
+                _binding?.tvAutoClose?.text = ((millisUntilFinished / 1000).toInt() + 1).toString()
             }
 
             override fun onFinish() {
+                val ctx = context ?: return
                 activity?.finish()
-//                if (!isAdmin) {
+                ctx.startActivity(Intent(ctx, InitActivity::class.java))
-                val intent = Intent(context, InitActivity::class.java)
-                startActivity(intent)
-//                }
-
             }
-        }.start()
+        }
+        countDownTimer?.start()
+    }
+
+    override fun onDestroyView() {
+        countDownTimer?.cancel()
+        countDownTimer = null
+        super.onDestroyView()
     }
 }

app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt

@@ -1,241 +1,241 @@
-package com.sw.platecabinet.fragment
+//package com.sw.platecabinet.fragment
-
+//
-import android.view.View
+//import android.view.View
-import androidx.core.view.isVisible
+//import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
+//import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
+//import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
+//import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+//import androidx.recyclerview.widget.RecyclerView
-import com.sw.inbound.utils.DateTimeUtils
+//import com.sw.inbound.utils.DateTimeUtils
-import com.sw.plate.utils.ToastUtils
+//import com.sw.plate.utils.ToastUtils
-import com.sw.plate.utils.comn.SerialApi
+//import com.sw.plate.utils.comn.SerialApi
-import com.sw.plate.utils.comn.SerialPortManager
+//import com.sw.plate.utils.comn.SerialPortManager
-import com.sw.platecabinet.GlobalData
+//import com.sw.platecabinet.GlobalData
-import com.sw.platecabinet.MyApp
+//import com.sw.platecabinet.MyApp
-import com.sw.platecabinet.R
+//import com.sw.platecabinet.R
-import com.sw.platecabinet.activity.BaseActivity
+//import com.sw.platecabinet.activity.BaseActivity
-import com.sw.platecabinet.activity.MainActivity
+//import com.sw.platecabinet.activity.MainActivity
-import com.sw.platecabinet.activity.PageType
+//import com.sw.platecabinet.activity.PageType
-import com.sw.platecabinet.adapter.GenericItemAdapter
+//import com.sw.platecabinet.adapter.GenericItemAdapter
-import com.sw.platecabinet.adapter.GenericPageAdapter
+//import com.sw.platecabinet.adapter.GenericPageAdapter
-import com.sw.platecabinet.adapter.GridSpacingItemDecoration
+//import com.sw.platecabinet.adapter.GridSpacingItemDecoration
-import com.sw.platecabinet.adapter.dpToPx
+//import com.sw.platecabinet.adapter.dpToPx
-import com.sw.platecabinet.databinding.FragmentSettingListBinding
+//import com.sw.platecabinet.databinding.FragmentSettingListBinding
-import com.sw.platecabinet.databinding.ItemBindViewBinding
+//import com.sw.platecabinet.databinding.ItemBindViewBinding
-import com.sw.platecabinet.ext.formatNumber
+//import com.sw.platecabinet.ext.formatNumber
-import com.sw.platecabinet.ext.maskName
+//import com.sw.platecabinet.ext.maskName
-import com.sw.platecabinet.model.response.EquipmentUserInfo
+//import com.sw.platecabinet.model.response.EquipmentUserInfo
-import com.sw.platecabinet.utils.ListArrangementUtil
+//import com.sw.platecabinet.utils.ListArrangementUtil
-import com.sw.platecabinet.utils.PlateUtils
+//import com.sw.platecabinet.utils.PlateUtils
-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
-
+//
-/**
+///**
- * 餐盘柜绑定的用户列表界面
+// * 餐盘柜绑定的用户列表界面
- */
+// */
-class SettingListFragment :
+//class SettingListFragment :
-    BaseFragment<FragmentSettingListBinding>(FragmentSettingListBinding::inflate) {
+//    BaseFragment<FragmentSettingListBinding>(FragmentSettingListBinding::inflate) {
-
+//
-    /**
+//    /**
-     * 需要横向滚动的adapter
+//     * 需要横向滚动的adapter
-     */
+//     */
-    private var pageAdapter: GenericPageAdapter<EquipmentUserInfo, ItemBindViewBinding>? = null
+//    private var pageAdapter: GenericPageAdapter<EquipmentUserInfo, ItemBindViewBinding>? = null
-
+//
-    /**
+//    /**
-     * 垂直滚动的adapter
+//     * 垂直滚动的adapter
-     */
+//     */
-    private var itemAdapter: GenericItemAdapter<EquipmentUserInfo, ItemBindViewBinding>? = null
+//    private var itemAdapter: GenericItemAdapter<EquipmentUserInfo, ItemBindViewBinding>? = null
-
+//
-    override fun registerDataChange() {
+//    override fun registerDataChange() {
-        super.registerDataChange()
+//        super.registerDataChange()
-//        lifecycleScope.launch {
+////        lifecycleScope.launch {
-//            viewModel.equipmentList.collect { it ->
+////            viewModel.equipmentList.collect { it ->
-//                Timber.d("registerDateChange updateAdapter it = $it")
+////                Timber.d("registerDateChange updateAdapter it = $it")
-//                updateAdapter(it)
+////                updateAdapter(it)
-//            }
+////            }
-//        }
-    }
-
-    override fun initialize() {
-        binding.mainRecyclerView.apply {
-            if (GlobalData.arrayCross > 2) {
-                layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
-                pageAdapter = createPageAdapter()
-                adapter = pageAdapter
-            } else {
-                layoutManager = GridLayoutManager(context, 2)
-                // 添加间距装饰(12dp)
-                addItemDecoration(
-                    GridSpacingItemDecoration(
-                        spanCount = 2,
-                        spacing = requireContext().dpToPx(12),
-                        includeEdge = true // 包含边缘间距
-                    )
-                )
-                itemAdapter = createItemAdapter()
-                adapter = itemAdapter
-            }
-        }
-
-    }
-
-    override fun onResume() {
-        super.onResume()
-//        viewModel.getEquipmentList{
-//            updateAdapter(it)
-//        }
-        MyApp.plateList?.let {
-            updateAdapter(it)
-        }
-    }
-
-//    private fun getPlateData(block: (List<EquipmentUserInfo>) -> Unit) {
-//        MyApp.plateList?.let {
-//            block(it)
-//        }
-////        viewModel.getEquipmentList { items ->
-////            block(items)
 ////        }
 //    }
-
+//
-    private fun createItemAdapter(): GenericItemAdapter<EquipmentUserInfo, ItemBindViewBinding> {
+//    override fun initialize() {
-        return GenericItemAdapter(
+//        binding.mainRecyclerView.apply {
-            items = emptyList(),
+//            if (GlobalData.arrayCross > 2) {
-            bindingInflater = ItemBindViewBinding::inflate,
+//                layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
-            bindCallback = { item, position ->
+//                pageAdapter = createPageAdapter()
-                setItemInfo(item, position)
+//                adapter = pageAdapter
-            }
-        )
-    }
-
-    private fun createPageAdapter(): GenericPageAdapter<EquipmentUserInfo, ItemBindViewBinding> {
-        return GenericPageAdapter(
-            pages = emptyList(),
-            pageLayoutId = R.layout.page_item_layout,
-            itemBindingInflater = ItemBindViewBinding::inflate,
-            itemBindCallback = { item, position ->
-                setItemInfo(item, position)
-            }
-        )
-    }
-
-    private fun ItemBindViewBinding.setItemInfo(
-        item: EquipmentUserInfo,
-        position: Int
-    ) {
-//        if (item.isPlaceholder()) {
-//            this.llRoot.isVisible = false
-//            return
-//        }
-        this.llRoot.isVisible = true
-        this.tvNum.text = formatNumber(item.equipmentBoxCode ?: "")
-        if (item.plateNumber.isNullOrBlank().not()) {
-//            val date = DateTimeUtils.parseDateTime(item.updateTime)
-//            val timeInMillis = date?.time ?: 0L
-//            val isOldTime = DateTimeUtils.isMoreThanHoursFromNow(timeInMillis)
-
-            this.llRoot.setBackgroundResource(R.drawable.grid_item_bind)
-            this.tvNum.setTextColor(resources.getColor(R.color.bind_4E535D))
-//            this.tvLastTime.setTextColor(
-//                if (isOldTime) resources.getColor(R.color.bind_time_old) else resources.getColor(
-//                    R.color.bind_585868
-//                )
-//            )
-            this.llOpen.setBackgroundResource(R.drawable.grid_button_bind)
-            this.tvOpen.setTextColor(resources.getColor(R.color.bind_FFCC99))
-            this.llBindInfo.visibility = View.VISIBLE
-            this.tvUnbind.visibility = View.GONE
-
-//            this.tvName.text = item.name.maskName()
-            this.tvName.text = item.plateNumber
-
-//            this.tvLastTime.text = DateTimeUtils.getTimeAgo(date)
-        } else {
-            this.llRoot.setBackgroundResource(R.drawable.grid_item_unbind)
-            this.tvNum.setTextColor(resources.getColor(R.color.bind_FFCC99))
-            this.llOpen.setBackgroundResource(R.drawable.grid_button_unbind)
-            this.tvOpen.setTextColor(resources.getColor(R.color.unbind_32283C))
-            this.llBindInfo.visibility = View.GONE
-            this.tvUnbind.visibility = View.VISIBLE
-//            this.tvUnbind.text = "未绑定"
-        }
-//        this.llRoot.setOnClickListener {
-////            Timber.d("itemClick llRoot ${item.name}, position = $position")
-//            if (item.isBound()) {
-//                MainActivity.start(
-//                    requireContext(),
-//                    pageType = PageType.UNBIND_PLATE,
-//                    equipmentUserInfo = item
-//                )
 //            } else {
-//                MainActivity.start(
+//                layoutManager = GridLayoutManager(context, 2)
-//                    requireContext(),
+//                // 添加间距装饰(12dp)
-//                    pageType = PageType.BIND_PLATE,
+//                addItemDecoration(
-//                    equipmentUserInfo = item
+//                    GridSpacingItemDecoration(
+//                        spanCount = 2,
+//                        spacing = requireContext().dpToPx(12),
+//                        includeEdge = true // 包含边缘间距
+//                    )
+//                )
+//                itemAdapter = createItemAdapter()
+//                adapter = itemAdapter
+//            }
+//        }
+//
+//    }
+//
+//    override fun onResume() {
+//        super.onResume()
+////        viewModel.getEquipmentList{
+////            updateAdapter(it)
+////        }
+//        MyApp.plateList?.let {
+//            updateAdapter(it)
+//        }
+//    }
+//
+////    private fun getPlateData(block: (List<EquipmentUserInfo>) -> Unit) {
+////        MyApp.plateList?.let {
+////            block(it)
+////        }
+//////        viewModel.getEquipmentList { items ->
+//////            block(items)
+//////        }
+////    }
+//
+//    private fun createItemAdapter(): GenericItemAdapter<EquipmentUserInfo, ItemBindViewBinding> {
+//        return GenericItemAdapter(
+//            items = emptyList(),
+//            bindingInflater = ItemBindViewBinding::inflate,
+//            bindCallback = { item, position ->
+//                setItemInfo(item, position)
+//            }
+//        )
+//    }
+//
+//    private fun createPageAdapter(): GenericPageAdapter<EquipmentUserInfo, ItemBindViewBinding> {
+//        return GenericPageAdapter(
+//            pages = emptyList(),
+//            pageLayoutId = R.layout.page_item_layout,
+//            itemBindingInflater = ItemBindViewBinding::inflate,
+//            itemBindCallback = { item, position ->
+//                setItemInfo(item, position)
+//            }
+//        )
+//    }
+//
+//    private fun ItemBindViewBinding.setItemInfo(
+//        item: EquipmentUserInfo,
+//        position: Int
+//    ) {
+////        if (item.isPlaceholder()) {
+////            this.llRoot.isVisible = false
+////            return
+////        }
+//        this.llRoot.isVisible = true
+//        this.tvNum.text = formatNumber(item.equipmentBoxCode ?: "")
+//        if (item.plateNumber.isNullOrBlank().not()) {
+////            val date = DateTimeUtils.parseDateTime(item.updateTime)
+////            val timeInMillis = date?.time ?: 0L
+////            val isOldTime = DateTimeUtils.isMoreThanHoursFromNow(timeInMillis)
+//
+//            this.llRoot.setBackgroundResource(R.drawable.grid_item_bind)
+//            this.tvNum.setTextColor(resources.getColor(R.color.bind_4E535D))
+////            this.tvLastTime.setTextColor(
+////                if (isOldTime) resources.getColor(R.color.bind_time_old) else resources.getColor(
+////                    R.color.bind_585868
+////                )
+////            )
+//            this.llOpen.setBackgroundResource(R.drawable.grid_button_bind)
+//            this.tvOpen.setTextColor(resources.getColor(R.color.bind_FFCC99))
+//            this.llBindInfo.visibility = View.VISIBLE
+//            this.tvUnbind.visibility = View.GONE
+//
+////            this.tvName.text = item.name.maskName()
+//            this.tvName.text = item.plateNumber
+//
+////            this.tvLastTime.text = DateTimeUtils.getTimeAgo(date)
+//        } else {
+//            this.llRoot.setBackgroundResource(R.drawable.grid_item_unbind)
+//            this.tvNum.setTextColor(resources.getColor(R.color.bind_FFCC99))
+//            this.llOpen.setBackgroundResource(R.drawable.grid_button_unbind)
+//            this.tvOpen.setTextColor(resources.getColor(R.color.unbind_32283C))
+//            this.llBindInfo.visibility = View.GONE
+//            this.tvUnbind.visibility = View.VISIBLE
+////            this.tvUnbind.text = "未绑定"
+//        }
+////        this.llRoot.setOnClickListener {
+//////            Timber.d("itemClick llRoot ${item.name}, position = $position")
+////            if (item.isBound()) {
+////                MainActivity.start(
+////                    requireContext(),
+////                    pageType = PageType.UNBIND_PLATE,
+////                    equipmentUserInfo = item
+////                )
+////            } else {
+////                MainActivity.start(
+////                    requireContext(),
+////                    pageType = PageType.BIND_PLATE,
+////                    equipmentUserInfo = item
+////                )
+////            }
+////        }
+//        this.llOpen.setOnClickListener {
+////            item.faceId = null
+//            PlateUtils.open(
+//                fragmentActivity = requireActivity(),
+//                code = item.equipmentBoxCode,
+//                isScanCode = false,
+//                isSetting = true
 //            )
 //        }
 //    }
-        this.llOpen.setOnClickListener {
+//
-//            item.faceId = null
+//    fun updateAdapter(items: List<EquipmentUserInfo>) {
-            PlateUtils.open(
+//        val itemsPerPage = 2 * GlobalData.arrayVertical // 每行2个，每列11个，共22个
-                fragmentActivity = requireActivity(),
+//        if (GlobalData.arrayCross > 2) {
-                code = item.equipmentBoxCode,
+//            lifecycleScope.launch(Dispatchers.Default) {
-                isScanCode = false,
+//                // 多recyclerview
-                isSetting = true
+//                var pages = if (items.size > itemsPerPage) {
-            )
+//                    if (GlobalData.arrayMode == 0) {
-        }
+//                        val pageList = items.chunked(itemsPerPage)
-    }
+//                        pageList.mapIndexed { index, it ->
-
+//                            var itemList: MutableList<EquipmentUserInfo> = it.toMutableList()
-    fun updateAdapter(items: List<EquipmentUserInfo>) {
+//                            if (index == pageList.size - 1) {
-        val itemsPerPage = 2 * GlobalData.arrayVertical // 每行2个，每列11个，共22个
+//                                // 补全剩余item
-        if (GlobalData.arrayCross > 2) {
+//                                itemList = (itemList + List(itemsPerPage - itemList.size) {
-            lifecycleScope.launch(Dispatchers.Default) {
+//                                    EquipmentUserInfo()
-                // 多recyclerview
+//                                }) as MutableList<EquipmentUserInfo>
-                var pages = if (items.size > itemsPerPage) {
+//                            }
-                    if (GlobalData.arrayMode == 0) {
+//                            ListArrangementUtil.convertToColumnFirst(
-                        val pageList = items.chunked(itemsPerPage)
+//                                itemList,
-                        pageList.mapIndexed { index, it ->
+//                                GlobalData.arrayVertical
-                            var itemList: MutableList<EquipmentUserInfo> = it.toMutableList()
+//                            )
-                            if (index == pageList.size - 1) {
+//                        }
-                                // 补全剩余item
+//                    } else {
-                                itemList = (itemList + List(itemsPerPage - itemList.size) {
+//                        val newItems =
-                                    EquipmentUserInfo()
+//                            ListArrangementUtil.horizontalSortPageItem(items, GlobalData.arrayCross)
-                                }) as MutableList<EquipmentUserInfo>
+//                        newItems.chunked(itemsPerPage)
-                            }
+//                    }
-                            ListArrangementUtil.convertToColumnFirst(
+//                } else {
-                                itemList,
+//                    listOf(
-                                GlobalData.arrayVertical
+//                        items
-                            )
+//                    )
-                        }
+//                }
-                    } else {
+//                withContext(Dispatchers.Main) {
-                        val newItems =
+//                    pageAdapter?.updatePages(pages)
-                            ListArrangementUtil.horizontalSortPageItem(items, GlobalData.arrayCross)
+//                }
-                        newItems.chunked(itemsPerPage)
+//            }
-                    }
+//        } else {
-                } else {
+//            // 单 recyclerview
-                    listOf(
+//            lifecycleScope.launch(Dispatchers.Default) {
-                        items
+//                var pages = items
-                    )
+//                if (GlobalData.arrayMode == 0) {
-                }
+//                    pages = ListArrangementUtil.verticalSortItem(pages)
-                withContext(Dispatchers.Main) {
+//                }
-                    pageAdapter?.updatePages(pages)
+//                withContext(Dispatchers.Main) {
-                }
+//                    itemAdapter?.updateData(pages)
-            }
+//                }
-        } else {
+//            }
-            // 单 recyclerview
+//        }
-            lifecycleScope.launch(Dispatchers.Default) {
+//        binding.mainRecyclerView.scrollToPosition(0)
-                var pages = items
+//    }
-                if (GlobalData.arrayMode == 0) {
+//}
-                    pages = ListArrangementUtil.verticalSortItem(pages)
-                }
-                withContext(Dispatchers.Main) {
-                    itemAdapter?.updateData(pages)
-                }
-            }
-        }
-        binding.mainRecyclerView.scrollToPosition(0)
-    }
-}

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

@@ -1,19 +1,17 @@
 package com.sw.platecabinet.model
 
-import com.sw.platecabinet.model.response.EquipmentUserInfo
-
 /**
  * 错误信息 code == 200 成功
  */
-data class ErrorInfo(
+//data class ErrorInfo(
-    val code: String = "00000",
+//    val code: String = "00000",
-    val msg: String = "",
+//    val msg: String = "",
-    val equipmentUserInfo: EquipmentUserInfo? = null
+//    val equipmentUserInfo: EquipmentUserInfo? = null
-) {
+//) {
-    fun isSuccess(): Boolean {
+//    fun isSuccess(): Boolean {
-        return code == "00000"
+//        return code == "00000"
-    }
+//    }
-}
+//}
 
 data class DeviceConfig(
     var arcsoftAppId: String? = null,

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

@@ -1,72 +1,72 @@
-package com.sw.platecabinet.model.response
+//package com.sw.platecabinet.model.response
-
+//
-
+//
-import android.os.Parcelable
+//import android.os.Parcelable
-import com.google.gson.annotations.SerializedName
+//import com.google.gson.annotations.SerializedName
-import kotlinx.parcelize.Parcelize
+//import kotlinx.parcelize.Parcelize
-
+//
-@Parcelize
+//@Parcelize
-data class EquipmentInfo(
+//data class EquipmentInfo(
-    @SerializedName("appPackageLocalUrl")
+//    @SerializedName("appPackageLocalUrl")
-    val appPackageLocalUrl: String? = "",
+//    val appPackageLocalUrl: String? = "",
-    @SerializedName("appPackageUrl")
+//    @SerializedName("appPackageUrl")
-    val appPackageUrl: String? = "",
+//    val appPackageUrl: String? = "",
-    @SerializedName("arcsoftActiveKey")
+//    @SerializedName("arcsoftActiveKey")
-    val arcsoftActiveKey: String? = "",
+//    val arcsoftActiveKey: String? = "",
-    @SerializedName("arcsoftAppId")
+//    @SerializedName("arcsoftAppId")
-    val arcsoftAppId: String? = "",
+//    val arcsoftAppId: String? = "",
-    @SerializedName("arcsoftSdkKey")
+//    @SerializedName("arcsoftSdkKey")
-    val arcsoftSdkKey: String? = "",
+//    val arcsoftSdkKey: String? = "",
-    @SerializedName("arrayCross")
+//    @SerializedName("arrayCross")
-    val arrayCross: Int? = 0,
+//    val arrayCross: Int? = 0,
-    @SerializedName("arrayMode")
+//    @SerializedName("arrayMode")
-    val arrayMode: String? = "",
+//    val arrayMode: String? = "",
-    @SerializedName("arrayVertical")
+//    @SerializedName("arrayVertical")
-    val arrayVertical: Int? = 0,
+//    val arrayVertical: Int? = 0,
-    @SerializedName("canteenId")
+//    @SerializedName("canteenId")
-    val canteenId: String? = "",
+//    val canteenId: String? = "",
-    @SerializedName("canteenName")
+//    @SerializedName("canteenName")
-    val canteenName: String? = "",
+//    val canteenName: String? = "",
-    @SerializedName("clientServerIp")
+//    @SerializedName("clientServerIp")
-    val clientServerIp: String? = "",
+//    val clientServerIp: String? = "",
-    @SerializedName("createBy")
+//    @SerializedName("createBy")
-    val createBy: String? = "",
+//    val createBy: String? = "",
-    @SerializedName("createTime")
+//    @SerializedName("createTime")
-    val createTime: String? = "",
+//    val createTime: String? = "",
-    @SerializedName("customerName")
+//    @SerializedName("customerName")
-    val customerName: String? = "",
+//    val customerName: String? = "",
-    @SerializedName("equipmentCode")
+//    @SerializedName("equipmentCode")
-    val equipmentCode: String? = "",
+//    val equipmentCode: String? = "",
-    @SerializedName("equipmentName")
+//    @SerializedName("equipmentName")
-    val equipmentName: String? = "",
+//    val equipmentName: String? = "",
-    @SerializedName("equipmentName_dictText")
+//    @SerializedName("equipmentName_dictText")
-    val equipmentNameDictText: String? = "",
+//    val equipmentNameDictText: String? = "",
-    @SerializedName("id")
+//    @SerializedName("id")
-    val id: String? = "",
+//    val id: String? = "",
-    @SerializedName("isSync")
+//    @SerializedName("isSync")
-    val isSync: Int? = 0,
+//    val isSync: Int? = 0,
-    @SerializedName("mqName")
+//    @SerializedName("mqName")
-    val mqName: String? = "",
+//    val mqName: String? = "",
-    @SerializedName("mqPassword")
+//    @SerializedName("mqPassword")
-    val mqPassword: String? = "",
+//    val mqPassword: String? = "",
-    @SerializedName("orgCode")
+//    @SerializedName("orgCode")
-    val orgCode: String? = "",
+//    val orgCode: String? = "",
-    @SerializedName("owningTrack")
+//    @SerializedName("owningTrack")
-    val owningTrack: Int? = 0,
+//    val owningTrack: Int? = 0,
-    @SerializedName("owningTrackOrder")
+//    @SerializedName("owningTrackOrder")
-    val owningTrackOrder: Int? = 0,
+//    val owningTrackOrder: Int? = 0,
-    @SerializedName("screenHtml")
+//    @SerializedName("screenHtml")
-    val screenHtml: String? = "",
+//    val screenHtml: String? = "",
-    @SerializedName("serviceRequestAddress")
+//    @SerializedName("serviceRequestAddress")
-    val serviceRequestAddress: String? = "",
+//    val serviceRequestAddress: String? = "",
-    @SerializedName("status")
+//    @SerializedName("status")
-    val status: Int? = 0,
+//    val status: Int? = 0,
-    @SerializedName("sysOrgCode")
+//    @SerializedName("sysOrgCode")
-    val sysOrgCode: String? = "",
+//    val sysOrgCode: String? = "",
-    @SerializedName("updateBy")
+//    @SerializedName("updateBy")
-    val updateBy: String? = "",
+//    val updateBy: String? = "",
-    @SerializedName("updateTime")
+//    @SerializedName("updateTime")
-    val updateTime: String? = "",
+//    val updateTime: String? = "",
-    @SerializedName("zhstServerIp")
+//    @SerializedName("zhstServerIp")
-    val zhstServerIp: String? = ""
+//    val zhstServerIp: String? = ""
-) : Parcelable
+//) : Parcelable

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

@@ -1,90 +1,90 @@
-package com.sw.platecabinet.model.response
+//package com.sw.platecabinet.model.response
-
+//
-import android.os.Parcelable
+//import android.os.Parcelable
-import android.text.TextUtils
+//import android.text.TextUtils
-//import com.google.gson.annotations.SerializedName
+////import com.google.gson.annotations.SerializedName
-import com.sw.platecabinet.GlobalData
+//import com.sw.platecabinet.GlobalData
-import kotlinx.parcelize.Parcelize
+//import kotlinx.parcelize.Parcelize
-
+//
-/**
+///**
- * 设备绑定用户信息
+// * 设备绑定用户信息
- */
-@Parcelize
-data class EquipmentUserInfo(
-//    /**
-//     * 主键
 // */
-//    val id: Long? = 0,
+//@Parcelize
+//data class EquipmentUserInfo(
+////    /**
+////     * 主键
+////     */
+////    val id: Long? = 0,
+////    /**
+////     *
+////     * 设备Id
+////     */
+////    val equipmentId: String? = "",
+////    /**
+////     * 设备编号
+////     */
+////    var equipmentCode: String? = "",
+//    /**
+//     * 设备盒子编号
+//     */
+//    var equipmentBoxCode: String? = "",
+//    /**
+//     * 会员Id
+//     */
+//    var faceId: String? = "",
+//    /**
+//     * 餐盘编号
+//     */
+//    var plateNumber: String? = "",
+////    /**
+////     * 设备名称
+////     */
+////    val equipmentName: String? = "",
+//
+////    val orderNo: String? = "",
 //    /**
 //     *
-//     * 设备Id
+//     * 更新时间
 //     */
-//    val equipmentId: String? = "",
+//    var updateTime: String? = "",
-//    /**
-//     * 设备编号
-//     */
-//    var equipmentCode: String? = "",
-    /**
-     * 设备盒子编号
-     */
-    var equipmentBoxCode: String? = "",
-    /**
-     * 会员Id
-     */
-    var faceId: String? = "",
-    /**
-     * 餐盘编号
-     */
-    var plateNumber: String? = "",
-//    /**
-//     * 设备名称
-//     */
-//    val equipmentName: String? = "",
-
-//    val orderNo: String? = "",
-    /**
-     *
-     * 更新时间
-     */
-    var updateTime: String? = "",
-
-//    val name: String? = "",
-//    val phone: String? = "",
-//    val faceUrl: String? = "",
-//    val mealTime: String? = "",
-//    val mealTimeInterval: String? = "",
-//    val openTime: String? = "",
-//    val openTimeInterval: String? = "",
-//    val eatCount: Int? = 0,
 //
-//    var cardBalance: Double? = 0.toDouble(),
+////    val name: String? = "",
-
+////    val phone: String? = "",
-//    /**
+////    val faceUrl: String? = "",
-//     * 用于cardBalance后续拦截判断
+////    val mealTime: String? = "",
-//     */
+////    val mealTimeInterval: String? = "",
-//    var showBalanceNotEnoughDialog: Boolean = false,
+////    val openTime: String? = "",
-//    var isIntercept: Boolean = false
+////    val openTimeInterval: String? = "",
-) : Parcelable {
+////    val eatCount: Int? = 0,
-
+////
-//    /**
+////    var cardBalance: Double? = 0.toDouble(),
-//     * 是否已绑定
-//     */
-//    fun isBound(): Boolean {
-//        return faceId.isNullOrBlank().not()
-//    }
-
-//    /**
-//     * 是否是其他设备
-//     */
-//    fun isOtherEquipment(): Boolean {
-//        return equipmentCode != null && equipmentCode != "" && GlobalData.globalEquipmentCode != equipmentCode
-//    }
-
-//    fun hasEquipmentBox(): Boolean {
-//        return !TextUtils.isEmpty(equipmentBoxCode)
-//    }
 //
-//    fun isPlaceholder(): Boolean {
+////    /**
-//        return equipmentBoxCode.isNullOrBlank()
+////     * 用于cardBalance后续拦截判断
-//    }
+////     */
-}
+////    var showBalanceNotEnoughDialog: Boolean = false,
+////    var isIntercept: Boolean = false
+//) : Parcelable {
+//
+////    /**
+////     * 是否已绑定
+////     */
+////    fun isBound(): Boolean {
+////        return faceId.isNullOrBlank().not()
+////    }
+//
+////    /**
+////     * 是否是其他设备
+////     */
+////    fun isOtherEquipment(): Boolean {
+////        return equipmentCode != null && equipmentCode != "" && GlobalData.globalEquipmentCode != equipmentCode
+////    }
+//
+////    fun hasEquipmentBox(): Boolean {
+////        return !TextUtils.isEmpty(equipmentBoxCode)
+////    }
+////
+////    fun isPlaceholder(): Boolean {
+////        return equipmentBoxCode.isNullOrBlank()
+////    }
+//}

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

@@ -1,85 +1,85 @@
-package com.sw.platecabinet.model.response
+//package com.sw.platecabinet.model.response
-
+//
-
+//
-import android.os.Parcelable
+//import android.os.Parcelable
-import com.google.gson.annotations.SerializedName
+//import com.google.gson.annotations.SerializedName
-import kotlinx.parcelize.Parcelize
+//import kotlinx.parcelize.Parcelize
-
+//
-/**
+///**
- * 搜索会员信息结果
+// * 搜索会员信息结果
- */
+// */
-@Parcelize
+//@Parcelize
-data class SearchResult(
+//data class SearchResult(
-    @SerializedName("endRow")
+//    @SerializedName("endRow")
-    val endRow: Int? = 0,
+//    val endRow: Int? = 0,
-    @SerializedName("hasNextPage")
+//    @SerializedName("hasNextPage")
-    val hasNextPage: Boolean? = false,
+//    val hasNextPage: Boolean? = false,
-    @SerializedName("hasPreviousPage")
+//    @SerializedName("hasPreviousPage")
-    val hasPreviousPage: Boolean? = false,
+//    val hasPreviousPage: Boolean? = false,
-    @SerializedName("isFirstPage")
+//    @SerializedName("isFirstPage")
-    val isFirstPage: Boolean? = false,
+//    val isFirstPage: Boolean? = false,
-    @SerializedName("isLastPage")
+//    @SerializedName("isLastPage")
-    val isLastPage: Boolean? = false,
+//    val isLastPage: Boolean? = false,
-    @SerializedName("list")
+//    @SerializedName("list")
-    val list: List<Member>? = listOf(),
+//    val list: List<Member>? = listOf(),
-    @SerializedName("navigateFirstPage")
+//    @SerializedName("navigateFirstPage")
-    val navigateFirstPage: Int? = 0,
+//    val navigateFirstPage: Int? = 0,
-    @SerializedName("navigateLastPage")
+//    @SerializedName("navigateLastPage")
-    val navigateLastPage: Int? = 0,
+//    val navigateLastPage: Int? = 0,
-    @SerializedName("navigatePages")
+//    @SerializedName("navigatePages")
-    val navigatePages: Int? = 0,
+//    val navigatePages: Int? = 0,
-    @SerializedName("navigatepageNums")
+//    @SerializedName("navigatepageNums")
-    val navigatepageNums: List<Int?>? = listOf(),
+//    val navigatepageNums: List<Int?>? = listOf(),
-    @SerializedName("nextPage")
+//    @SerializedName("nextPage")
-    val nextPage: Int? = 0,
+//    val nextPage: Int? = 0,
-    @SerializedName("pageNum")
+//    @SerializedName("pageNum")
-    val pageNum: Int? = 0,
+//    val pageNum: Int? = 0,
-    @SerializedName("pageSize")
+//    @SerializedName("pageSize")
-    val pageSize: Int? = 0,
+//    val pageSize: Int? = 0,
-    @SerializedName("pages")
+//    @SerializedName("pages")
-    val pages: Int? = 0,
+//    val pages: Int? = 0,
-    @SerializedName("prePage")
+//    @SerializedName("prePage")
-    val prePage: Int? = 0,
+//    val prePage: Int? = 0,
-    @SerializedName("size")
+//    @SerializedName("size")
-    val size: Int? = 0,
+//    val size: Int? = 0,
-    @SerializedName("startRow")
+//    @SerializedName("startRow")
-    val startRow: Int? = 0,
+//    val startRow: Int? = 0,
-    @SerializedName("total")
+//    @SerializedName("total")
-    val total: Int? = 0
+//    val total: Int? = 0
-) : Parcelable {
+//) : Parcelable {
-    @Parcelize
+//    @Parcelize
-    data class Member(
+//    data class Member(
-//        @SerializedName("cardBalance")
+////        @SerializedName("cardBalance")
-//        val cardBalance: String? = "",
+////        val cardBalance: String? = "",
-//        @SerializedName("cardCode")
+////        @SerializedName("cardCode")
-//        val cardCode: String? = "",
+////        val cardCode: String? = "",
-//        @SerializedName("consumptionCount")
+////        @SerializedName("consumptionCount")
-//        val consumptionCount: Int? = 0,
+////        val consumptionCount: Int? = 0,
-//        @SerializedName("consumptionTotal")
+////        @SerializedName("consumptionTotal")
-//        val consumptionTotal: String? = "",
+////        val consumptionTotal: String? = "",
-//        @SerializedName("createTime")
+////        @SerializedName("createTime")
-//        val createTime: String? = "",
+////        val createTime: String? = "",
-//        @SerializedName("firstTopUpTime")
+////        @SerializedName("firstTopUpTime")
-//        val firstTopUpTime: String? = "",
+////        val firstTopUpTime: String? = "",
-//        @SerializedName("id")
+////        @SerializedName("id")
-//        val id: Int? = 0,
+////        val id: Int? = 0,
-//        @SerializedName("integralBalance")
+////        @SerializedName("integralBalance")
-//        val integralBalance: Int? = 0,
+////        val integralBalance: Int? = 0,
-//        @SerializedName("lastConsumptionTime")
+////        @SerializedName("lastConsumptionTime")
-//        val lastConsumptionTime: String? = "",
+////        val lastConsumptionTime: String? = "",
-//        @SerializedName("memberFrom")
+////        @SerializedName("memberFrom")
-//        val memberFrom: Int? = 0,
+////        val memberFrom: Int? = 0,
-//        @SerializedName("name")
+////        @SerializedName("name")
+////        val name: String? = "",
+////        @SerializedName("phone")
+////        val phone: String? = "",
+////        @SerializedName("rewardBalance")
+////        val rewardBalance: String? = "",
+////        @SerializedName("topUpBalance")
+////        val topUpBalance: String? = ""
+//        val id: String? = "",
+//        val faceId: String? = "",
 //        val name: String? = "",
-//        @SerializedName("phone")
 //        val phone: String? = "",
-//        @SerializedName("rewardBalance")
+//    ) : Parcelable
-//        val rewardBalance: String? = "",
+//}
-//        @SerializedName("topUpBalance")
-//        val topUpBalance: String? = ""
-        val id: String? = "",
-        val faceId: String? = "",
-        val name: String? = "",
-        val phone: String? = "",
-    ) : Parcelable
-}

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

@@ -2,7 +2,6 @@ package com.sw.platecabinet.model.response
 
 
 import android.os.Parcelable
-import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -38,5 +37,5 @@ data class UserFaceModel(
     /**
      * 是否会员
      */
-    val isMember: Boolean
+    val member: Boolean
 ) : Parcelable

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

@@ -12,35 +12,27 @@ import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 object ApiClient {
-    //private const val BASE_URL = "https://vip.shuziweidao.com"
-//    private const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889/"
-    private var DEVICE_BASE_URL = GlobalData.appBaseUrl
-        //    private const val BASE_URL = "http://192.168.1.8:9092"
-//    private const val TIME_OUT = 30L // 超时时间(秒)
-    private const val TIME_OUT = 60L // 超时时间(秒)
 
-    val okHttpClient = OkHttpClient.Builder()
+    private const val TIME_OUT = 60L // 超时时间（秒）
+
+    private val okHttpClient = OkHttpClient.Builder()
         .connectTimeout(TIME_OUT, TimeUnit.SECONDS)
         .readTimeout(TIME_OUT, TimeUnit.SECONDS)
         .writeTimeout(TIME_OUT, TimeUnit.SECONDS)
-        .addNetworkInterceptor(HttpLoggingInterceptor(logger = {
+        .addNetworkInterceptor(HttpLoggingInterceptor { Timber.d("okhttp ==>${it}") }.apply {
-            Timber.d("okhttp logger ==>${it}")
+            level = if (MyApp.DEBUG) HttpLoggingInterceptor.Level.BODY
-        }).apply {
+                    else HttpLoggingInterceptor.Level.NONE
-            level = if (MyApp.DEBUG) {
-                HttpLoggingInterceptor.Level.BODY
-            } else {
-                HttpLoggingInterceptor.Level.NONE
-            }
         })
         .addInterceptor(RequestInterceptor())
         .build()
 
-    private val retrofit = Retrofit.Builder()
+    private val retrofit by lazy {
-        .baseUrl(DEVICE_BASE_URL)
+        Retrofit.Builder()
+            .baseUrl(GlobalData.appBaseUrl)
             .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
-//        .addCallAdapterFactory(CoroutineCallAdapterFactory()) // 协程适配器
             .build()
+    }
 
     val apiService: ApiService by lazy {
         retrofit.create(ApiService::class.java)

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

@@ -2,173 +2,28 @@ package com.sw.platecabinet.network.api
 
 import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.model.DeviceConfig
-import com.sw.platecabinet.model.request.BindParam
-import com.sw.platecabinet.model.request.EquipmentParam
-import com.sw.platecabinet.model.request.LoginParam
-import com.sw.platecabinet.model.request.SearchParam
 import com.sw.platecabinet.model.response.ApiResponse
-import com.sw.platecabinet.model.response.EquipmentInfo
-import com.sw.platecabinet.model.response.EquipmentUserInfo
-import com.sw.platecabinet.model.response.SearchResult
 import com.sw.platecabinet.model.response.UserFaceModel
 import okhttp3.MultipartBody
 import retrofit2.http.Body
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
 import retrofit2.http.GET
-import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.Part
-import retrofit2.http.Query
 import retrofit2.http.Url
 
 interface ApiService {
-//    /**
-//     * device获取token
-//     */
-//    @GET("sys/getEquipmentToken")
-//    suspend fun getDeviceToken(
-//        @Query("qrcodeId") qrcodeId: String,
-//        @Query("appVersion") appVersion: String = GlobalData.appVersion
-//    ): ApiResponse<String>
-//
-//    /**
-//     *获取配置信息
-//     */
-//    @GET("equipment/stEquipment/queryByEquipmentCode")
-//    suspend fun getDeviceInfo(
-//        @Query("equipmentCode") equipmentCode: String,
-//        @Query("appVersion") appVersion: String = GlobalData.appVersion,
-//        @Header("X-Access-Token") token: String
-//    ): ApiResponse<EquipmentInfo>
-//
-//    /**
-//     * 生成token
-//     */
-//    @GET//("/shuwei-zhct/scales/generateToken")
-//    suspend fun generateToken(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-zhct/scales/generateToken",
-//        @Query("deviceId") deviceId: String,
-//        @Query("appVersion") appVersion: String,
-//        @Query("equipmentCode") equipmentCode: String
-//    ): ApiResponse<String>
-
     /**
-     * 获取人脸数据
+     * 获取人脸缓存数据
      */
-//    @GET//("/shuwei-zhct/scales/getUserFaceCache")
-//    suspend fun getUserFaceCache(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-zhct/scales/getUserFaceCache",
-//        @Query("appVersion") appVersion: String,
-//        @Query("equipmentCode") equipmentCode: String
-//    ): ApiResponse<List<UserFaceModel>>
     @POST
     suspend fun getUserFaceCache(
         @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/faceFeature/list",
         @Body param: Map<String, Int>
     ): ApiResponse<List<UserFaceModel>>
 
-//    /**
-//     * 餐盘用户信息获取
-//     */
-//    @POST//("/shuwei-zhct/swEquipmentRelUser/equipmentBoxLogin")
-//    suspend fun equipmentBoxLogin(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-zhct/swEquipmentRelUser/equipmentBoxLogin",
-//        @Body param: LoginParam
-//    ): ApiResponse<EquipmentUserInfo>
-
-    /**
-     * 餐盘用户信息获取
-     */
-    @POST//("/shuwei-zhct/swEquipmentRelUser/equipmentBoxLogin")
-    suspend fun equipmentBoxLogin(
-        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/sideboard/app/getPlateBoxUserInfo",
-        @Body param: LoginParam
-    ): ApiResponse<EquipmentUserInfo>
-
-    /**
-     * 餐盘用户信息列表查询
-     */
-//    @POST//("/shuwei-zhct/swEquipmentRelUser/list")
-//    suspend fun getEquipmentList(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-zhct/swEquipmentRelUser/list",
-//        @Body param: EquipmentParam
-//    ): ApiResponse<List<EquipmentUserInfo>>
-
-    @GET
-    suspend fun getEquipmentList(
-        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/sideboard/app/getYxMemberRefPlateByEquipmentCode",
-    ): ApiResponse<List<EquipmentUserInfo>>
-//    /**
-//     * 餐盘用户信息绑定解绑
-//     */
-//    @POST//("/shuwei-zhct/swEquipmentRelUser/addOrEdit")
-//    suspend fun bindEquipment(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-zhct/swEquipmentRelUser/addOrEdit",
-//        @Body param: BindParam
-//    ): ApiResponse<EquipmentUserInfo?>
-
-    /**
-     * 餐盘绑定
-     */
-    @POST
-    suspend fun plateBind(
-        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/sideboard/app/plateBinding",
-        @Body param: BindParam
-    ): ApiResponse<EquipmentUserInfo?>
-
-    /**
-     * 餐盘解绑
-     */
-    @POST
-    @FormUrlEncoded
-    suspend fun plateUnbind(
-        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/sideboard/app/plateUnbind",
-        @Field("id") id: Long?
-    ): ApiResponse<Any?>
-
-    /**
-     * 用户信息模糊搜索
-     */
-    @POST//("/shuwei-user/swclientUserInfoShop/selectList")
-    suspend fun searchUser(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-user/swclientUserInfoShop/selectList",
-        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/getUserInfoByNameOrPhone",
-        @Body param: SearchParam
-    ): ApiResponse<List<SearchResult.Member>?>
-
-//    /**
-//     * 通过餐盘号获取信息
-//     */
-//    @POST//("/shuwei-zhct/swEquipmentRelUser/findByPlateNumber")
-//    suspend fun findByPlateNumber(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-zhct/swEquipmentRelUser/findByPlateNumber",
-//        @Body param: BindParam
-//    ): ApiResponse<EquipmentUserInfo>
-
-
-    /**
-     * 通过餐盘号获取信息
-     */
-    @GET
-    suspend fun findByPlateNumber(
-        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/sideboard/app/getMemberRefPlateByPlateNumber",
-        @Query("plateNumber") plateNumber: String
-    ): ApiResponse<EquipmentUserInfo>
-
-
-    /**
-     * 获取人脸增量数据
-     *
-     * @param timeDate 时间戳(毫秒级)
-     */
-//    @GET//("/shuwei-zhct/scales/getHeartbeatInterface")
-//    suspend fun getHeartbeatInterface(
-//        @Url url: String = "${GlobalData.appBaseUrl}/shuwei-zhct/scales/getHeartbeatInterface",
-//        @Query("timeDate") timeDate: Long
-//    ): ApiResponse<List<UserFaceModel>>
-
     /**
      * 获取人脸增量数据
      */
@@ -193,10 +48,13 @@ interface ApiService {
     @FormUrlEncoded
     suspend fun addUserFace(
         @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/addUserByFace",
-        @Field("featureChar") faceData:String,
+        @Field("featureChar") faceData: String,
-        @Field("url") imageUr:String
+        @Field("url") imageUr: String
     ): ApiResponse<UserFaceModel?>
 
+    /**
+     * 上传图片
+     */
     @Multipart
     @POST
     suspend fun uploadImage(

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

@@ -1,10 +1,7 @@
 package com.sw.platecabinet.repository
 
 import com.sw.platecabinet.model.DeviceConfig
-import com.sw.platecabinet.model.request.SearchParam
 import com.sw.platecabinet.model.response.ApiResponse
-import com.sw.platecabinet.model.response.EquipmentUserInfo
-import com.sw.platecabinet.model.response.SearchResult
 import com.sw.platecabinet.model.response.UserFaceModel
 import com.sw.platecabinet.network.api.ApiService
 import com.sw.platecabinet.utils.FileUtils
@@ -17,42 +14,6 @@ class RemoteRepository constructor(
     private val apiService: ApiService
 ) : BaseRepository() {
 
-//    /**
-//     * 生成token
-//     */
-//    suspend fun getDeviceToken(qrcodeId: String): ApiResponse<String> {
-//        return safeApiCall {
-//            apiService.getDeviceToken(
-//                qrcodeId
-//            )
-//        }
-//    }
-//
-//    /**
-//     * 获取设备信息
-//     */
-//    suspend fun getDeviceInfo(equipmentCode: String, token: String): ApiResponse<EquipmentInfo> {
-//        return safeApiCall {
-//            apiService.getDeviceInfo(
-//                equipmentCode,
-//                token = token
-//            )
-//        }
-//    }
-//
-//    /**
-//     * 生成token
-//     */
-//    suspend fun generateToken(deviceId: String): ApiResponse<String> {
-//        return safeApiCall {
-//            apiService.generateToken(
-//                deviceId = deviceId,
-//                appVersion = GlobalData.appVersion,
-//                equipmentCode = GlobalData.globalEquipmentCode
-//            )
-//        }
-//    }
-
     /**
      * 获取人脸数据
      */
@@ -70,57 +31,6 @@ class RemoteRepository constructor(
         }
     }
 
-//    /**
-//     * 登录
-//     */
-//    suspend fun equipmentBoxLogin(param: LoginParam): ApiResponse<EquipmentUserInfo> {
-//        return safeApiCall { apiService.equipmentBoxLogin(param = param) }
-//    }
-
-//    /**
-//     * 获取设备绑定用户列表
-//     */
-//    suspend fun getEquipmentList(): ApiResponse<List<EquipmentUserInfo>> {
-//        return safeApiCall { apiService.getEquipmentList() }
-//    }
-
-//    /**
-//     * 餐盘用户信息绑定解绑
-//     */
-//    suspend fun bindEquipment(param: BindParam): ApiResponse<EquipmentUserInfo?> {
-//        return safeApiCall { apiService.bindEquipment(param = param) }
-//    }
-
-//    suspend fun plateBind(param: BindParam): ApiResponse<EquipmentUserInfo?> {
-//        return safeApiCall { apiService.plateBind(param = param) }
-//    }
-
-//    suspend fun plateUnbind(id: Long?): ApiResponse<Any?> {
-//        return safeApiCall { apiService.plateUnbind(id = id) }
-//    }
-
-    /**
-     * 用户信息模糊搜索
-     */
-    suspend fun searchUser(param: SearchParam): ApiResponse<List<SearchResult.Member>?> {
-        return safeApiCall { apiService.searchUser(param = param) }
-    }
-
-    /**
-     * 通过餐盘编号获取绑定信息
-     */
-    suspend fun findByPlateNumber(plateNumber: String): ApiResponse<EquipmentUserInfo> {
-        return safeApiCall { apiService.findByPlateNumber(plateNumber = plateNumber) }
-    }
-
-//    /**
-//     * 获取人脸增量数据
-//     *
-//     * @param timeDate 时间戳(毫秒级)
-//     */
-//    suspend fun getHeartbeatInterface(timeDate: Long): ApiResponse<List<UserFaceModel>> {
-//        return safeApiCall { apiService.getHeartbeatInterface(timeDate = timeDate) }
-//    }
 
     suspend fun getFaceIncrementList(
         pageNum: Long,
@@ -142,7 +52,7 @@ class RemoteRepository constructor(
         return safeApiCall { apiService.getDeviceConfig() }
     }
 
-    suspend fun addUserFace(faceData: String, imageUr:String): ApiResponse<UserFaceModel?> {
+    suspend fun addUserFace(faceData: String, imageUr: String): ApiResponse<UserFaceModel?> {
         return safeApiCall { apiService.addUserFace(faceData = faceData, imageUr = imageUr) }
     }
 

app/src/main/java/com/sw/platecabinet/utils/CountDownUtil.kt

@@ -0,0 +1,79 @@
+package com.sw.platecabinet.utils
+
+import android.util.Log
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * 基于协程的倒计时工具类（实例化使用，各调用方持有独立实例，互不干扰）
+ * 修复：onCompletion 区分正常结束与取消，手动取消时不触发 onFinish
+ */
+class CountDownUtil {
+
+    private val isCounting = AtomicBoolean(false)
+    private var currentJob: Job? = null
+
+    /**
+     * 启动倒计时（若已在运行则忽略，需重启请先调用 cancelCountDown）
+     * @param total 总秒数
+     * @param lifecycleScope Activity/Fragment 的 lifecycleScope
+     * @param onStart 启动回调（主线程）
+     * @param onTick 每秒回调剩余秒数（主线程）
+     * @param onFinish 正常结束回调（主线程，手动取消时不触发）
+     */
+    fun startCountDown(
+        total: Int = 15,
+        lifecycleScope: CoroutineScope,
+        onStart: () -> Unit = {},
+        onTick: (Int) -> Unit = {},
+        onFinish: () -> Unit
+    ) {
+        if (isCounting.get()) return
+
+        isCounting.set(true)
+
+        currentJob = flow {
+            for (i in total downTo 1) {
+                emit(i)
+                delay(1000L)
+            }
+        }
+            .flowOn(Dispatchers.IO)
+            .onStart {
+                withContext(Dispatchers.Main) { onStart() }
+            }
+            .onEach { remaining ->
+                withContext(Dispatchers.Main) { onTick(remaining) }
+            }
+            .onCompletion { cause ->
+                withContext(Dispatchers.Main) {
+                    isCounting.set(false)
+                    currentJob = null
+                    // cause == null 为正常结束，有异常（含 CancellationException）时不触发 onFinish
+                    if (cause == null) {
+                        Log.d("CountDownUtil", "倒计时正常结束")
+                        onFinish()
+                    } else {
+                        Log.d("CountDownUtil", "倒计时被取消：${cause.message}")
+                    }
+                }
+            }
+            .catch { e ->
+                Log.e("CountDownUtil", "倒计时异常：${e.message}", e)
+                isCounting.set(false)
+                currentJob = null
+            }
+            .launchIn(lifecycleScope)
+    }
+
+    /**
+     * 取消倒计时（不触发 onFinish）
+     */
+    fun cancelCountDown() {
+        currentJob?.cancel()
+        currentJob = null
+        isCounting.set(false)
+        Log.d("CountDownUtil", "倒计时已取消")
+    }
+}

app/src/main/java/com/sw/platecabinet/utils/CrashHandler.kt

@@ -154,7 +154,7 @@ class CrashHandler private constructor(private val context: Context) :
             // 设备信息
             sb.append("Vendor: ${Build.MANUFACTURER}\n")
             sb.append("Model: ${Build.MODEL}\n")
-            sb.append("CPU ABI: ${Build.SUPPORTED_ABIS[0]}\n")
+            sb.append("CPU ABI: ${Build.SUPPORTED_ABIS.firstOrNull() ?: "unknown"}\n")
 
             // 其他信息
             sb.append("Locale: ${Locale.getDefault()}\n")

app/src/main/java/com/sw/platecabinet/utils/DateTimeUtils.kt

@@ -28,10 +28,10 @@ object DateTimeUtils {
     }
 
     /**
-     * 获取带时间的完整中文格式（示例：2025年6月11日 星期三 14:30）
+     * 获取带时间的完整中文格式（示例：2025年06月11日 星期三 14:30）
      */
     fun getChineseDateTimeString(date: Date = Date()): String {
-        return SimpleDateFormat("yyyy年M月d日 EEEE HH:mm:ss", Locale.CHINA).format(date)
+        return SimpleDateFormat("yyyy年MM月dd日 EEEE HH:mm", Locale.CHINA).format(date)
     }
 
     // 使用线程安全的日期格式化（避免 SimpleDateFormat 的线程安全问题）
@@ -52,7 +52,7 @@ object DateTimeUtils {
      */
     fun realTimeChineseDateFlow(intervalMillis: Long = 1000) = flow {
         while (true) {
-            emit(getChineseDateTimePair())
+            emit(getChineseDateTimeString())
             delay(intervalMillis)
         }
     }

app/src/main/java/com/sw/platecabinet/utils/Debouncer.kt

@@ -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
     }
 

app/src/main/java/com/sw/platecabinet/utils/ListArrangementUtil.kt

@@ -1,88 +1,88 @@
-package com.sw.platecabinet.utils
+//package com.sw.platecabinet.utils
-
+//
-import com.sw.platecabinet.model.response.EquipmentUserInfo
+//import com.sw.platecabinet.model.response.EquipmentUserInfo
-import timber.log.Timber
+//import timber.log.Timber
-import kotlin.math.ceil
+//import kotlin.math.ceil
-
+//
-/**
+///**
- * 列表排序工具类
+// * 列表排序工具类
- */
+// */
-object ListArrangementUtil {
+//object ListArrangementUtil {
-
+//
-    /**
+//    /**
-     * page item水平排序
+//     * page item水平排序
-     */
+//     */
-    fun horizontalSortPageItem(
+//    fun horizontalSortPageItem(
-        list: List<EquipmentUserInfo>,
+//        list: List<EquipmentUserInfo>,
-        columns: Int,
+//        columns: Int,
-        defaultValue: EquipmentUserInfo = EquipmentUserInfo()
+//        defaultValue: EquipmentUserInfo = EquipmentUserInfo()
-    ): List<EquipmentUserInfo> {
+//    ): List<EquipmentUserInfo> {
-        Timber.d("horizontalSortPageItem")
+//        Timber.d("horizontalSortPageItem")
-        require(columns > 0) { "Columns must be positive" }
+//        require(columns > 0) { "Columns must be positive" }
-
+//
-        val filledList = list.padToMultiple(columns, defaultValue)
+//        val filledList = list.padToMultiple(columns, defaultValue)
-        val chunks = filledList.chunked(columns)
+//        val chunks = filledList.chunked(columns)
-
+//
-        return (0 until columns)
+//        return (0 until columns)
-            .windowed(2, 2, partialWindows = true)
+//            .windowed(2, 2, partialWindows = true)
-            .flatMap { group ->
+//            .flatMap { group ->
-                when (group.size) {
+//                when (group.size) {
-                    2 -> chunks.flatMap { listOf(it[group[0]], it[group[1]]) }
+//                    2 -> chunks.flatMap { listOf(it[group[0]], it[group[1]]) }
-                    1 -> chunks.flatMap {
+//                    1 -> chunks.flatMap {
-                        listOf(it[group[0]], EquipmentUserInfo(equipmentBoxCode = null))
+//                        listOf(it[group[0]], EquipmentUserInfo(equipmentBoxCode = null))
-                    }.dropLast(1)
+//                    }.dropLast(1)
-                    else -> error("Unexpected group size")
+//                    else -> error("Unexpected group size")
-                }
+//                }
-            }
+//            }
-    }
+//    }
-
+//
-    /**
+//    /**
-     * item 垂直排序
+//     * item 垂直排序
-     */
+//     */
-    fun verticalSortItem(list: List<EquipmentUserInfo>): List<EquipmentUserInfo> {
+//    fun verticalSortItem(list: List<EquipmentUserInfo>): List<EquipmentUserInfo> {
-        Timber.d("verticalSortItem")
+//        Timber.d("verticalSortItem")
-        val users = list.padToEvenSize()
+//        val users = list.padToEvenSize()
-        val half = users.size / 2
+//        val half = users.size / 2
-
+//
-        return users.take(half)
+//        return users.take(half)
-            .zip(users.drop(half)) { a, b -> listOf(a, b) }
+//            .zip(users.drop(half)) { a, b -> listOf(a, b) }
-            .flatten()
+//            .flatten()
-    }
+//    }
-
+//
-    /**
+//    /**
-     * page item垂直排序
+//     * page item垂直排序
-     */
+//     */
-    fun convertToColumnFirst(
+//    fun convertToColumnFirst(
-        original: List<EquipmentUserInfo>,
+//        original: List<EquipmentUserInfo>,
-        cols: Int
+//        cols: Int
-    ): List<EquipmentUserInfo> {
+//    ): List<EquipmentUserInfo> {
-        Timber.d("convertToColumnFirst")
+//        Timber.d("convertToColumnFirst")
-        require(cols > 0) { "Columns must be positive" }
+//        require(cols > 0) { "Columns must be positive" }
-
+//
-        val rows = ceil(original.size.toDouble() / cols).toInt()
+//        val rows = ceil(original.size.toDouble() / cols).toInt()
-        return List(original.size) { pos ->
+//        return List(original.size) { pos ->
-            original.getOrNull(pos % rows * cols + pos / rows) ?: EquipmentUserInfo()
+//            original.getOrNull(pos % rows * cols + pos / rows) ?: EquipmentUserInfo()
-        }
+//        }
-    }
+//    }
-
+//
-    // 提取的扩展函数
+//    // 提取的扩展函数
-    private fun List<EquipmentUserInfo>.padToMultiple(
+//    private fun List<EquipmentUserInfo>.padToMultiple(
-        multiple: Int,
+//        multiple: Int,
-        defaultValue: EquipmentUserInfo
+//        defaultValue: EquipmentUserInfo
-    ): List<EquipmentUserInfo> {
+//    ): List<EquipmentUserInfo> {
-        return if (size % multiple != 0) {
+//        return if (size % multiple != 0) {
-            this + List(multiple - (size % multiple)) { defaultValue }
+//            this + List(multiple - (size % multiple)) { defaultValue }
-        } else {
+//        } else {
-            this
+//            this
-        }
+//        }
-    }
+//    }
-
+//
-    private fun List<EquipmentUserInfo>.padToEvenSize(): List<EquipmentUserInfo> {
+//    private fun List<EquipmentUserInfo>.padToEvenSize(): List<EquipmentUserInfo> {
-        return if (size % 2 != 0) {
+//        return if (size % 2 != 0) {
-            Timber.d("列表长度必须是偶数")
+//            Timber.d("列表长度必须是偶数")
-            this + EquipmentUserInfo()
+//            this + EquipmentUserInfo()
-        } else {
+//        } else {
-            this
+//            this
-        }
+//        }
-    }
+//    }
-}
+//}

app/src/main/java/com/sw/platecabinet/utils/LogFileUtil.java

@@ -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
+        LOG_EXECUTOR.execute(() -> {
-            public void run() {
-                super.run();
             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 = {

app/src/main/java/com/sw/platecabinet/utils/PermissionHelper.kt

@@ -77,11 +77,7 @@ class PermissionHelper private constructor(
             val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
                 data = Uri.fromParts("package", context.packageName, null)
             }
-            if (context is Activity) {
             context.startActivity(intent)
-            } else if (context is Fragment) {
-                context.startActivity(intent)
-            }
         }
     }
 

app/src/main/java/com/sw/platecabinet/utils/PlateUtils.kt

@@ -1,13 +1,7 @@
 package com.sw.platecabinet.utils
 
 import androidx.fragment.app.FragmentActivity
-import com.sw.plate.utils.ToastUtils
-import com.sw.plate.utils.comn.SerialApi
-import com.sw.plate.utils.comn.SerialPortManager
 import com.sw.platecabinet.activity.BaseActivity
-import com.sw.platecabinet.activity.MainActivity
-import com.sw.platecabinet.activity.PageType
-import timber.log.Timber
 
 object PlateUtils {
 
@@ -15,36 +9,58 @@ object PlateUtils {
         fragmentActivity: FragmentActivity,
         code: String?,
         isScanCode: Boolean,
-        isSetting: Boolean = false
+        isSetting: Boolean = false,
+        callback: () -> Unit = {}
     ) {
         val activity = fragmentActivity as BaseActivity<*>
-        Timber.d("itemClick llOpen equipmentBoxCode = ${code}")
-        val equipmentBoxCode: Int = code?.toInt() ?: -1
-        if (equipmentBoxCode < 0) {
-            ToastUtils.showToast("餐盘柜编号错误")
-            return
-        }
-        activity.showWaitingDialog("请稍等")
-        SerialApi.openPlate(equipmentBoxCode, object : SerialPortManager.SendCallback {
-            override fun onSuccess() {
-                activity.hideWaitingDialog()
-                if (isSetting.not()) {
-                    MainActivity.start(
-                        activity,
-                        pageType = PageType.PLATE_TIP,
-                        isScanCode = isScanCode
-                    )
-                } else {
-                    ToastUtils.showToast("柜门打开成功")
-                }
-            }
 
-            override fun onFail(e: Exception?) {
+        activity.window.decorView.postDelayed({
-                activity.hideWaitingDialog()
+            callback()
-                ToastUtils.showToast("柜门打开失败")
+        }, 1500)
-            }
+
-        })
+//        activity.showWaitingDialog("请稍等")
+//        Timber.d("itemClick llOpen equipmentBoxCode = ${code}")
+//        val equipmentBoxCode: Int = code?.toInt() ?: -1
+//        if (equipmentBoxCode < 0) {
+//            ToastUtils.showToast("餐盘柜编号错误")
+//            return
+//        }
+//        activity.showWaitingDialog("请稍等")
+//        SerialApi.openPlate(equipmentBoxCode, object : SerialPortManager.SendCallback {
+//            override fun onSuccess() {
+//                activity.hideWaitingDialog()
+//                if (isSetting.not()) {
+//                    MainActivity.start(
+//                        activity,
+//                        pageType = PageType.PLATE_TIP,
+//                        isScanCode = isScanCode
+//                    )
+//                } else {
+//                    ToastUtils.showToast("柜门打开成功")
+//                    callback()
+//                }
+//            }
+//
+//            override fun onFail(e: Exception?) {
+//                activity.hideWaitingDialog()
+//                ToastUtils.showToast("柜门打开失败")
+//                callback()
+//            }
+//        })
     }
 
+//    fun openDirect(boxCode: String?) {
+//        val boxNumber = boxCode?.toIntOrNull() ?: -1
+//        if (boxNumber < 0) return
+//        SerialApi.openPlate(boxNumber, object : SerialPortManager.SendCallback {
+//            override fun onSuccess() {
+//
+//            }
+//
+//            override fun onFail(e: Exception?) {
+//
+//            }
+//        })
+//    }
 
 }

app/src/main/java/com/sw/platecabinet/utils/SpTool.kt

@@ -1,15 +1,16 @@
 package com.sw.platecabinet.utils
 
-import com.google.gson.Gson
-import com.sw.inbound.utils.GsonUtils
 import com.sw.inbound.utils.SPUtil
 import com.sw.inbound.utils.SPUtil.Companion.getInstance
+import com.sw.platecabinet.GlobalKey
 import com.sw.platecabinet.MyApp
-import com.sw.platecabinet.model.response.EquipmentUserInfo
 
 object SpTool {
     const val LAST_FACE_TIMESTAMP: String = "faceTimestamp"
     const val PLATE_BOX_DATA: String = "plateBoxBind"
+
+    const val IS_FIRST_GET_FACE = "isFirstGetFace"
+
     private var spUtil: SPUtil? = null
 
     init {
@@ -26,17 +27,29 @@ object SpTool {
             spUtil?.put(LAST_FACE_TIMESTAMP, timestamp)
         }
 
-    fun savePlateData(items: List<EquipmentUserInfo>) {
+//    fun savePlateData(items: List<EquipmentUserInfo>) {
-        val jsonData = Gson().toJson(items)
+//        val jsonData = Gson().toJson(items)
-        putString(PLATE_BOX_DATA, jsonData)
+//        putString(PLATE_BOX_DATA, jsonData)
+//    }
+//
+//    fun getPlateData(): List<EquipmentUserInfo>? {
+//        val jsonData = spUtil?.get(PLATE_BOX_DATA, "")
+//        if (jsonData.isNullOrBlank()) {
+//            return null
+//        }
+//        return GsonUtils.fromJsonList(jsonData, EquipmentUserInfo::class.java)
+//    }
+
+    var firstGetFace: Boolean
+        get() = spUtil?.get(IS_FIRST_GET_FACE, true)?:true
+        set(value) {
+            spUtil?.boolean(IS_FIRST_GET_FACE, value)
         }
 
-    fun getPlateData(): List<EquipmentUserInfo>? {
+    var baseUrl: String
-        val jsonData = spUtil?.get(PLATE_BOX_DATA, "")
+        get() = spUtil?.get(GlobalKey.KEY_BASE_URL, "") ?: ""
-        if (jsonData.isNullOrBlank()) {
+        set(value) {
-            return null
+            spUtil?.put(GlobalKey.KEY_BASE_URL, value)
-        }
-        return GsonUtils.fromJsonList(jsonData, EquipmentUserInfo::class.java)
         }
 
 }

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

@@ -0,0 +1,16 @@
+package com.sw.platecabinet.utils.mego
+
+/**
+ * PLC 操作统一回调接口
+ */
+interface PlcCallback<T> {
+    /**
+     * 操作成功回调（主线程）
+     */
+    fun onSuccess(result: T)
+
+    /**
+     * 操作失败回调（主线程）
+     */
+    fun onError(message: String)
+}

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

@@ -0,0 +1,152 @@
+package com.sw.platecabinet.utils.mego
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import com.megoai.plc_aar.SDK
+
+/**
+ * PLC 操作工具类（单例）
+ * 封装 SDK 所有接口，统一回调到主线程
+ */
+class PlcHelper private constructor(context: Context) {
+
+    private val sdk: SDK = SDK.getInstance(context)
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    companion object {
+        @Volatile
+        private var instance: PlcHelper? = null
+
+        /**
+         * 获取单例实例
+         */
+        fun getInstance(context: Context): PlcHelper {
+            return instance ?: synchronized(this) {
+                instance ?: PlcHelper(context.applicationContext).also { instance = it }
+            }
+        }
+    }
+
+    // ==================== 连接与模式 ====================
+
+    /**
+     * 打开出盘串口（应用启动时调用）
+     */
+    fun openSerialPort(callback: PlcCallback<String>) {
+        sdk.openPlcSerialPort { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
+        }
+    }
+
+    /**
+     * 打开自动模式（应用启动时调用一次）
+     */
+    fun openAutoMode(callback: PlcCallback<String>) {
+        sdk.actionOpenAutoMode { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
+        }
+    }
+
+    /**
+     * 故障复位（出现 alarmCode 或补盘完成后调用）
+     */
+    fun alarmReset(callback: PlcCallback<String>) {
+        sdk.actionAlarmReset { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
+        }
+    }
+
+    // ==================== 出盘操作 ====================
+
+    /**
+     * 出盘
+     */
+    fun outPlate(callback: PlcCallback<String>) {
+        sdk.actionOutPlate { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
+        }
+    }
+
+    // ==================== 平台控制 ====================
+
+    /**
+     * 平台下降（开始补盘）
+     */
+    fun platformDown(callback: PlcCallback<String>) {
+        sdk.actionPlatformDown { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
+        }
+    }
+
+    /**
+     * 平台上升（补盘完成）
+     */
+    fun platformUp(callback: PlcCallback<String>) {
+        sdk.actionPlatformDownStop { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
+        }
+    }
+
+    /**
+     * 补盘完成返回营业（自动模式 + 故障复位）
+     */
+    fun backToBusiness(callback: PlcCallback<String>) {
+        sdk.actionOpenAutoModeAndActionAlarmReset { result ->
+            mainHandler.post { callback.onSuccess(result.toString()) }
+        }
+    }
+
+    // ==================== 状态查询 ====================
+
+    /**
+     * 获取 PLC 状态（解析为 PlcStatus 对象）
+     */
+    fun getStatus(callback: PlcCallback<PlcStatus>) {
+        sdk.getPlcStatus { json ->
+            mainHandler.post {
+                if (json != null) {
+                    callback.onSuccess(PlcStatus.Companion.fromJson(json.toString()))
+                } else {
+                    callback.onError("获取状态失败")
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取 PLC 状态（原始 JSON 字符串）
+     */
+    fun getStatusJson(callback: PlcCallback<String>) {
+        sdk.getPlcStatus { json ->
+            mainHandler.post {
+                if (json != null) callback.onSuccess(json.toString())
+                else callback.onError("获取状态失败")
+            }
+        }
+    }
+
+    // ==================== 参数设置 ====================
+
+    /**
+     * 设置 PLC 参数
+     * @param paramType 参数类型（如 "18FD" 表示主电机运行最长时间）
+     * @param paramValue 参数值（int，单位 0.1s）
+     */
+    fun setParams(paramType: String, paramValue: Int, callback: PlcCallback<String>) {
+        sdk.setPLCParams(
+            { result -> mainHandler.post { callback.onSuccess(result.toString()) } },
+            paramType,
+            paramValue
+        )
+    }
+
+    // ==================== 生命周期 ====================
+
+    /**
+     * 释放资源，清除单例
+     */
+    fun release() {
+        instance = null
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.sw.platecabinet.utils.mego
+
+import org.json.JSONObject
+
+/**
+ * PLC 状态数据类
+ */
+data class PlcStatus(
+    val isEmptyPlate: Boolean = false,        // 是否空盘
+    val isPlateformDown: Boolean = false,     // 平台是否在下位
+    val isPlateformUp: Boolean = false,       // 平台是否在上位
+    val isTakePlateInfrared: Boolean = false, // 取盘红外是否触发
+    val alarmCode: Int = 0                    // 报警代码
+) {
+    companion object {
+        /**
+         * 从 JSON 字符串解析状态
+         */
+        fun fromJson(json: String): PlcStatus {
+            return try {
+                val obj = JSONObject(json)
+                PlcStatus(
+                    isEmptyPlate = obj.optBoolean("isEmptyPlate", false),
+                    isPlateformDown = obj.optBoolean("isPlateformDown", false),
+                    isPlateformUp = obj.optBoolean("isPlateformUp", false),
+                    isTakePlateInfrared = obj.optBoolean("isTakePlateInfrared", false),
+                    alarmCode = obj.optInt("alarmCode", 0)
+                )
+            } catch (e: Exception) {
+                PlcStatus()
+            }
+        }
+    }
+}

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

@@ -3,9 +3,7 @@ package com.sw.platecabinet.viewmodel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sw.plate.utils.ToastUtils
-import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.model.response.ApiResponse
-import com.sw.platecabinet.model.response.EquipmentInfo
 import com.sw.platecabinet.network.ApiClient
 import com.sw.platecabinet.repository.RemoteRepository
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -65,12 +63,12 @@ abstract class BaseViewModel() : ViewModel() {
         Timber.d("handleError ${exception.message}")
     }
 
-    fun parseEquipmentInfo(equipmentInfo: EquipmentInfo) {
+//    fun parseEquipmentInfo(equipmentInfo: EquipmentInfo) {
-//        GlobalData.appBaseUrl = equipmentInfo.appPackageUrl!!
+////        GlobalData.appBaseUrl = equipmentInfo.appPackageUrl!!
-//        GlobalData.appBaseUrl="https://vip.shuziweidao.com"
+////        GlobalData.appBaseUrl="https://vip.shuziweidao.com"
-//        GlobalData.sdkKey = equipmentInfo.arcsoftSdkKey!!
+////        GlobalData.sdkKey = equipmentInfo.arcsoftSdkKey!!
-//        GlobalData.appId = equipmentInfo.arcsoftAppId!!
+////        GlobalData.appId = equipmentInfo.arcsoftAppId!!
-//        GlobalData.activeKey = equipmentInfo.arcsoftActiveKey!!
+////        GlobalData.activeKey = equipmentInfo.arcsoftActiveKey!!
-//        GlobalData.restId = equipmentInfo.canteenId!!
+////        GlobalData.restId = equipmentInfo.canteenId!!
-    }
+//    }
 }

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

@@ -1,250 +1,62 @@
-package com.sw.platecabinet.viewmodel
+//package com.sw.platecabinet.viewmodel
-
+//
-import com.sw.platecabinet.GlobalData.globalEquipmentCode
+//import com.sw.platecabinet.model.response.UserFaceModel
-import com.sw.platecabinet.model.response.EquipmentUserInfo
+//import kotlinx.coroutines.Dispatchers
-import com.sw.platecabinet.model.response.SearchResult
+//import kotlinx.coroutines.withContext
-import com.sw.platecabinet.model.response.UserFaceModel
+//import java.io.File
-import kotlinx.coroutines.Dispatchers
+//
-import kotlinx.coroutines.flow.MutableStateFlow
+///**
-import kotlinx.coroutines.flow.StateFlow
+// * 管理员操作viewmodel
-import kotlinx.coroutines.withContext
+// */
-import java.io.File
+//class SettingViewModel : BaseViewModel() {
-
+//
-/**
+//    companion object {
- * 管理员操作viewmodel
+//        const val PAGE_SIZE = 100
- */
+//    }
-class SettingViewModel : BaseViewModel() {
+//
-    // 设备绑定列表
+//    /**
-//    private val _equipmentList = MutableStateFlow<List<EquipmentUserInfo>>(emptyList())
+//     * 获取人脸数据
-//    val equipmentList: StateFlow<List<EquipmentUserInfo>> = _equipmentList
+//     */
-
+//    fun getFaceIncrementList(
-    private val _searchMemberList = MutableStateFlow<List<SearchResult.Member>>(emptyList())
+//        pageNo: Int = 1,
-    val searchMemberList: StateFlow<List<SearchResult.Member>> = _searchMemberList
+//        pageSize: Int = PAGE_SIZE,
-
+//        timestamp: Long,
-    private val _searchUserInfo = MutableStateFlow<EquipmentUserInfo?>(null)
+//        block: (List<UserFaceModel>) -> Unit
-    val searchUserInfo: StateFlow<EquipmentUserInfo?> = _searchUserInfo
+//    ) {
-
+//        launch {
-    var currentPage = 1
+//            val response = repository.getFaceIncrementList(
-    var isLoading = false
+//                pageNum = pageNo.toLong(),
-    var canLoadMore = true
+//                pageSize = pageSize.toLong(),
-
+//                timestamp = timestamp
-    /**
+//            )
-     * 绑定/解绑状态 <绑定/解绑， 错误信息，>
-     */
-//    private val _bindStateChange = MutableStateFlow<Pair<Boolean?, ErrorInfo>>(null to ErrorInfo())
-//    val bindStateChange: StateFlow<Pair<Boolean?, ErrorInfo>> = _bindStateChange
-
-
-    /**
-     * 获取设备绑定用户信息列表
-     */
-//    fun getEquipmentList(equipmentCode: String = globalEquipmentCode) {
-//        launchWithLoading {
-//            val param =
-//                EquipmentParam(appVersion = GlobalData.appVersion, equipmentCode = equipmentCode)
-//            val response = repository.getEquipmentList(param)
 //            if (parseResponse(response)) {
-//                _equipmentList.value = response.data ?: emptyList()
+//                withContext(Dispatchers.Default) {
-//            }
+//                    val list: List<UserFaceModel> = response.data ?: emptyList()
-//        }
-////        val list = mutableListOf<EquipmentUserInfo>()
-////        for (i in 1 .. 30){
-////            list.add(EquipmentUserInfo(id = i, equipmentBoxCode = i.toString()))
-////        }
-////        _equipmentList.value = list
-//    }
-//    fun getEquipmentList(block: (List<EquipmentUserInfo>) -> Unit) {
-//        launchWithLoading {
-//            val response = repository.getEquipmentList()
-//            if (parseResponse(response)) {
-//                val list = response.data ?: emptyList()
 //                    block(list)
 //                }
 //            }
 //        }
-
+//    }
+//
 //    /**
-//     * 搜索会员信息列表
+//     * 添加人脸数据
 //     */
-//    fun getSearchMemberList(param:String, pageNum: Int = 1, pageSize: Int = 50) {
+//    fun addUserFace(faceData: String, imageFile: File, block: (Boolean, UserFaceModel?) -> Unit) {
-//        if (TextUtils.isEmpty(param)) return
-//        currentPage = pageNum
-//        var name =""
-//        var phone =""
-//        val num = param.toIntOrNull()
-//        if (num != null) {
-//            phone = param
-//        } else {
-//            name = param
-//        }
 //        launch {
-//            val searchParam = SearchParam(
+//            val imageResp = repository.uploadImage(imageFile)
-////                appVersion = GlobalData.appVersion,
+//            val imageUrl = imageResp.data ?: ""
-//                name = name,
+//            if (imageUrl.isBlank()) {
-//                phone = phone,
+//                block(false, null)
-//                pageNum = pageNum,
+//                return@launch
-//                pageSize = pageSize
-//            )
-//            isLoading = true
-//            val response = repository.searchUser(searchParam)
-//            isLoading = false
-//            if (parseResponse(response)) {
-//                response.data?.let { list ->
-//                    if (pageNum == 1) {
-//                        _searchMemberList.value = list
-//                    } else {
-//                        _searchMemberList.value = _searchMemberList.value.plus(list)
 //            }
-//                    if (list.size >= pageSize) currentPage++
+//            val faceResp = repository.addUserFace(faceData, imageUrl)
+//            val status = parseResponse(faceResp)
+//            if (status.not()) {
+//                block(false, null)
+//                return@launch
+//            }
+//            block(true, faceResp.data)
 //        }
 //    }
-//        }
+//
-//    }
+//}
-
-//    fun bindPlate(
-//        equipmentBoxCode: String,
-//        equipmentCode: String = globalEquipmentCode,
-//        memberId: Int,
-//        plateNumber: String
-//    ) {
-//        _bindStateChange.value = null to ErrorInfo()
-//        launchWithLoading {
-//            val bindParam = BindParam(
-//                appVersion = GlobalData.appVersion,
-//                equipmentBoxCode = equipmentBoxCode,
-//                equipmentCode = equipmentCode,
-//                memberId = memberId,
-//                plateNumber = plateNumber
-//            )
-//            val response = repository.bindEquipment(bindParam)
-//            if (parseResponse(response)) {
-//                var userInfo = response.data
-//                if (userInfo == null) {
-//                    userInfo = EquipmentUserInfo()
-//                    userInfo.equipmentBoxCode = equipmentBoxCode
-//                    userInfo.plateNumber = plateNumber
-//                    userInfo.equipmentCode = equipmentCode
-//                }
-//                _bindStateChange.value = true to ErrorInfo(equipmentUserInfo = userInfo)
-//            } else {
-//                _bindStateChange.value = true to ErrorInfo(response.code, response.msg.toString())
-//            }
-//        }
-//    }
-//    fun unbindPlate(
-//        equipmentBoxCode: String,
-//        equipmentCode: String = globalEquipmentCode
-//    ) {
-//        launchWithLoading {
-//            val bindParam = BindParam(
-//                appVersion = GlobalData.appVersion,
-//                equipmentBoxCode = equipmentBoxCode,
-//                equipmentCode = equipmentCode
-//            )
-//            val response = repository.bindEquipment(bindParam)
-//            if (parseResponse(response)) {
-//                _bindStateChange.value = false to ErrorInfo()
-//            } else {
-//                _bindStateChange.value = false to ErrorInfo(response.code, response.msg.toString())
-//            }
-//        }
-//    }
-
-//    fun unbindPlate(id: Long?, block:(Pair<Boolean?, ErrorInfo>)-> Unit) {
-//        block(null to ErrorInfo())
-//        launchWithLoading {
-//            val response = repository.plateUnbind(id)
-//            if (parseResponse(response)) {
-//                block(false to ErrorInfo())
-//            } else {
-//                block(false to ErrorInfo(response.code, response.msg.toString()))
-//            }
-//        }
-//    }
-
-//    fun bindPlate(bindParam: BindParam, block:(Pair<Boolean?, ErrorInfo>)-> Unit) {
-//        launchWithLoading {
-////            val response = repository.plateBind(bindParam)
-////            if (parseResponse(response)) {
-////                var userInfo = response.data
-////                if (userInfo == null) {
-////                    userInfo = EquipmentUserInfo()
-////                    userInfo.equipmentBoxCode = bindParam.equipmentBoxCode
-////                    userInfo.plateNumber = bindParam.plateNumber
-////                    userInfo.equipmentCode = bindParam.equipmentCode
-////                }
-////                block(true to ErrorInfo(equipmentUserInfo = userInfo))
-////            } else {
-////                block(true to ErrorInfo(response.code, response.msg.toString()))
-////            }
-//        }
-//    }
-
-    fun findByPlateNumber(
-        plateNumber: String,
-        equipmentCode: String = globalEquipmentCode
-    ) {
-//        _searchUserInfo.value = null
-//        launchWithLoading {
-////            val bindParam = BindParam(plateNumber = plateNumber)
-//            val response = repository.findByPlateNumber(plateNumber)
-//            if (response.code == "00000") {
-//                _searchUserInfo.value = response.data
-//            } else {
-//                _searchUserInfo.value = EquipmentUserInfo(
-//                    plateNumber = plateNumber,
-//                    equipmentCode = equipmentCode,
-//                    updateTime = DateTimeUtils.getDateTimeString()
-//                )
-//            }
-//        }
-    }
-
-    val PAGE_SIZE = 100
-
-    /**
-     * 获取人脸数据
-     */
-    fun getFaceIncrementList(
-        pageNo: Int = 1,
-        pageSize: Int = PAGE_SIZE,
-        timestamp: Long,
-        block: (List<UserFaceModel>) -> Unit
-    ) {
-        launch {
-            val response = repository.getFaceIncrementList(
-                pageNum = pageNo.toLong(),
-                pageSize = pageSize.toLong(),
-                timestamp = timestamp
-            )
-            if (parseResponse(response)) {
-                withContext(Dispatchers.Default) {
-                    val list: List<UserFaceModel> = response.data ?: emptyList()
-                    block(list)
-                }
-            }
-        }
-    }
-
-    /**
-     * 添加人脸数据
-     */
-    fun addUserFace(faceData: String, imageFile: File, block: (Boolean, UserFaceModel?) -> Unit) {
-        launch {
-            val imageResp = repository.uploadImage(imageFile)
-            val imageUrl = imageResp.data?:""
-            if (imageUrl.isBlank()) {
-                block(false, null)
-                return@launch
-            }
-            val faceResp = repository.addUserFace(faceData, imageUrl)
-            val status = parseResponse(faceResp)
-            if (status.not()) {
-                block(false, null)
-                return@launch
-            }
-            block(true, faceResp.data)
-        }
-    }
-
-}

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

@@ -9,19 +9,15 @@ import com.sw.plate.utils.ToastUtils
 import com.sw.plate.utils.arcface.FaceApi
 import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
 import com.sw.platecabinet.GlobalData
-import com.sw.platecabinet.GlobalData.globalEquipmentCode
 import com.sw.platecabinet.GlobalKey
 import com.sw.platecabinet.model.DeviceConfig
-import com.sw.platecabinet.model.request.LoginParam
-import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.UserFaceModel
 import com.sw.platecabinet.utils.SpTool
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.io.File
 
 /**
  * 用户viewmodel
@@ -32,28 +28,21 @@ class UserViewModel : BaseViewModel() {
         const val PAGE_SIZE = 100
     }
 
-    // 通过人脸获取到的用户信息
-//    private val _currentUserInfo = MutableStateFlow<EquipmentUserInfo?>(null)
-//    val currentUserInfo: StateFlow<EquipmentUserInfo?> = _currentUserInfo
-
     private val faceApi: FaceApi = FaceApi()
 
-    /**
+
-     * 获取token
+    fun getUserFace(
-     */
+        pageNo: Int,
-//    fun generateToken(deviceId: String = "SWSN:88:12:AC:4E:D9:CC") {
+        pageSize: Int,
-//        launchWithLoading {
+        callback: (List<UserFaceModel>) -> Unit
-//            val response = repository.generateToken(deviceId)
+    ) {
-//            if (parseResponse(response)) {
+        launchWithLoading {
-//                // 缓存token
+            val response = repository.getUserFaceCache(pageNum = pageNo, pageSize = pageSize)
-//                SPUtil.getInstance().put(GlobalKey.KEY_TOKEN, response.data)
+            val status = parseResponse(response)
-//                // 首次运行获取人脸数据
+            if (status) callback(response.data ?: emptyList())
-//                if (SPUtil.getInstance().get(GlobalKey.KEY_FIRST_RUN, false) != true) {
+            else emptyList<UserFaceModel>()
-//                    getUserFaceCache()
+        }
-//                }
+    }
-//            }
-//        }
-//    }
 
     /**
      * 获取人脸数据
@@ -75,13 +64,19 @@ 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 {
-                FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr))
+                FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr)).apply {
+                    userType = if (it.member) "1" else "2"
+                }
             }
             withContext(Dispatchers.Default) {
+                if (currentPageNo == 1) {
+                    //第一页数据删除本地数据库
+                    faceApi.clearFaceData()
+                }
                 faceApi.updateFaceData(pageNo, faceEntityList)
                 if (list.size >= pageSize) {
                     faceTimestamp = list.last().faceUpdateTimestamp ?: 0
@@ -103,6 +98,7 @@ class UserViewModel : BaseViewModel() {
 
     private var faceTimestamp = 0L
 
+
     /**
      * 激活人脸识别引擎
      */
@@ -143,40 +139,6 @@ class UserViewModel : BaseViewModel() {
             })
     }
 
-    /**
-     * 校验码登录
-     */
-    fun loginWithPwd(loginParam: LoginParam) {
-//        launchWithLoading {
-//            val response = repository.equipmentBoxLogin(loginParam)
-//            if (parseResponse(response)) {
-//                _currentUserInfo.value = response.data
-//            }
-//        }
-    }
-
-    /**
-     * 通过用户id获取用户信息
-     */
-//    fun getUserInfoById(memberId: String?, action: (EquipmentUserInfo?) -> Unit = {}) {
-//        _currentUserInfo.value = null
-//        launchWithLoading {
-//            val loginParam = LoginParam(faceId = memberId)
-//            val response = repository.equipmentBoxLogin(loginParam)
-//            if (parseResponse(response)) {
-//                _currentUserInfo.value = response.data
-//                action(response.data)
-//            }
-//        }
-//    }
-
-    /**
-     * 重置用户信息
-     */
-    fun resetUserInfo() {
-        Timber.d("resetUserInfo")
-//        _currentUserInfo.value = null
-    }
 
     fun getDeviceConfig(block: (DeviceConfig?) -> Unit) {
 //        Timber.tag(TAG).d("getDeviceConfig")
@@ -190,4 +152,50 @@ class UserViewModel : BaseViewModel() {
         }
     }
 
+
+    /**
+     * 获取人脸数据
+     */
+    fun getFaceIncrementList(
+        pageNo: Int = 1,
+        pageSize: Int = PAGE_SIZE,
+        timestamp: Long,
+        block: (List<UserFaceModel>) -> Unit
+    ) {
+        launch {
+            val response = repository.getFaceIncrementList(
+                pageNum = pageNo.toLong(),
+                pageSize = pageSize.toLong(),
+                timestamp = timestamp
+            )
+            if (parseResponse(response)) {
+                withContext(Dispatchers.Default) {
+                    val list: List<UserFaceModel> = response.data ?: emptyList()
+                    block(list)
+                }
+            }
+        }
+    }
+
+    /**
+     * 添加人脸数据
+     */
+    fun addUserFace(faceData: String, imageFile: File, block: (Boolean, UserFaceModel?) -> Unit) {
+        launch {
+            val imageResp = repository.uploadImage(imageFile)
+            val imageUrl = imageResp.data ?: ""
+            if (imageUrl.isBlank()) {
+                block(false, null)
+                return@launch
+            }
+            val faceResp = repository.addUserFace(faceData, imageUrl)
+            val status = parseResponse(faceResp)
+            if (status.not()) {
+                block(false, null)
+                return@launch
+            }
+            block(true, faceResp.data)
+        }
+    }
+
 }

app/src/main/res/drawable/bg_cancel.xml

@@ -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>

app/src/main/res/drawable/bg_confirm.xml

@@ -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>

app/src/main/res/drawable/bg_splash.xml

@@ -2,34 +2,20 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:width="600dp"
+        android:width="1920px"
-        android:height="1024dp">
+        android:height="1080px">
-        <bitmap android:src="@drawable/bg" />
+        <bitmap
+            android:scaleType="centerCrop"
+            android:src="@drawable/bg_collect_page3" />
     </item>
     <item
-        android:width="337dp"
+        android:width="506dp"
-        android:height="322dp"
+        android:height="483dp"
         android:gravity="top|center_horizontal"
-        android:top="112dp">
+        android:top="150dp">
         <bitmap
             android:scaleType="fitCenter"
             android:src="@drawable/img_init" />
     </item>
 
-    <!-- TODO  临时测试 -->
-<!--    <item-->
-<!--        android:width="828dp"-->
-<!--        android:height="1768dp">-->
-<!--        <bitmap android:src="@drawable/bg" />-->
-<!--    </item>-->
-
-<!--    <item-->
-<!--        android:width="337dp"-->
-<!--        android:height="322dp"-->
-<!--        android:gravity="top|center_horizontal"-->
-<!--        android:top="360dp">-->
-<!--        <bitmap-->
-<!--            android:scaleType="fitCenter"-->
-<!--            android:src="@drawable/img_init" />-->
-<!--    </item>-->
 </layer-list>

app/src/main/res/drawable/bg_white_radius12.xml

@@ -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>

app/src/main/res/drawable/btn_outline.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="12dp" />
+    <corners android:radius="16dp" />
     <stroke
-        android:width="2dp"
+        android:width="3dp"
-        android:color="#FFCC99" />
+        android:color="#FFC08A6F" />
 </shape>

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

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <include
+        android:id="@+id/includeHeader"
+        layout="@layout/item_title_time" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="30dp">
+
+        <TextView
+            android:id="@+id/tvMemberUserCount"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:textSize="16sp"
+            android:textColor="@color/white"
+            android:gravity="center"
+            tools:text="会员用户：100人"/>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:background="@color/white"/>
+
+        <TextView
+            android:id="@+id/tvTempUserCount"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:textSize="16sp"
+            android:textColor="@color/white"
+            android:gravity="center"
+            tools:text="临时用户：100人"/>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/btnClearFace"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginTop="30dp"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:layout_marginHorizontal="50dp"
+        android:paddingHorizontal="30dp"
+        android:background="@drawable/btn_outline"
+        android:text="清除人脸数据"
+        android:textColor="#FFCC99" />
+
+    <TextView
+        android:id="@+id/btnClearAndGetAll"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginTop="30dp"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:layout_marginHorizontal="50dp"
+        android:paddingHorizontal="30dp"
+        android:background="@drawable/btn_outline"
+        android:text="清除并拉取全量数据"
+        android:textColor="#FFCC99" />
+
+    <TextView
+        android:id="@+id/btnOpenAllPlate"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginTop="30dp"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:layout_marginHorizontal="50dp"
+        android:paddingHorizontal="30dp"
+        android:background="@drawable/btn_outline"
+        android:text="打开全部柜子"
+        android:textColor="#FFCC99" />
+
+    <TextView
+        android:id="@+id/btnPutPlate"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginTop="30dp"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:layout_marginHorizontal="50dp"
+        android:paddingHorizontal="30dp"
+        android:background="@drawable/btn_outline"
+        android:text="模拟放置餐盘"
+        android:textColor="#FFCC99" />
+
+    <TextView
+        android:id="@+id/btnTestFeature"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginTop="30dp"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:layout_marginHorizontal="50dp"
+        android:paddingHorizontal="30dp"
+        android:background="@drawable/btn_outline"
+        android:text="人脸特征比较"
+        android:textColor="#FFCC99"
+        android:visibility="gone"/>
+</LinearLayout>

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

@@ -4,7 +4,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg"
+    android:background="@drawable/bg_collect_page3"
     android:orientation="vertical"
     tools:context=".activity.InitActivity">
 
@@ -12,10 +12,10 @@
         android:id="@+id/includeHeader"
         layout="@layout/item_title_time" />
 
-    <View
+    <Space
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="2"/>
+        android:layout_weight="1"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,34 +26,28 @@
 
         <ImageView
             android:layout_width="wrap_content"
-            android:layout_height="142dp"
+            android:layout_height="wrap_content"
             android:src="@drawable/ic_init_text"
             android:adjustViewBounds="true"/>
 
         <ImageView
             android:layout_width="wrap_content"
-            android:layout_height="345dp"
+            android:layout_height="wrap_content"
-            android:layout_marginTop="90dp"
+            android:layout_marginTop="60dp"
             android:src="@drawable/ic_init_img"
             android:adjustViewBounds="true" />
 
-        <!--        <ImageView-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginTop="20dp"-->
-        <!--            android:src="@drawable/ic_init_press" />-->
-
         <FrameLayout
             android:id="@+id/takeButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="-35dp">
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="360dp"
-                android:layout_height="60dp"
+                android:layout_height="110dp"
                 android:text="点击取盘"
                 android:textColor="#FFCC99"
-                android:textSize="24sp"
+                android:textSize="36sp"
                 android:layout_marginHorizontal="60dp"
                 android:layout_marginVertical="50dp"
                 android:paddingHorizontal="45dp"
@@ -63,7 +57,7 @@
         </FrameLayout>
     </LinearLayout>
 
-    <View
+    <Space
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"/>

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

@@ -1,178 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg"
     android:fitsSystemWindows="false"
-    android:orientation="vertical"
+    tools:context=".activity.LoginByFaceActivity"
-    tools:context=".activity.LoginByFaceActivity">
+    tools:ignore="HardcodedText,ContentDescription,PxUsage">
+
+    <FrameLayout
+        android:layout_width="776px"
+        android:layout_height="582px"
+        android:layout_gravity="center">
+
+        <TextureView
+            android:id="@+id/dual_camera_texture_preview_rgb"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <com.sw.plate.utils.arcface.FaceRectView
+            android:id="@+id/dual_camera_face_rect_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:src="@drawable/bg_face_area" />
 
     <include
         android:id="@+id/includeHeader"
         layout="@layout/item_title_time" />
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="165dp"
+        android:layout_gravity="center_horizontal|top"
+        android:layout_marginTop="95dp"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:visibility="visible">
-
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="0dp"
-                android:paddingTop="1dp">
-
-                <TextureView
-                    android:id="@+id/dual_camera_texture_preview_rgb"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="visible" />
-
-                <com.sw.plate.utils.arcface.FaceRectView
-                    android:id="@+id/dual_camera_face_rect_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="visible" />
-            </FrameLayout>
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginTop="0dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/bg_face"
-                android:visibility="visible" />
-
         <TextView
             android:id="@+id/tv_tip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-                android:layout_marginTop="129dp"
+            android:maxLines="1"
             android:text="请正视屏幕"
-                android:textColor="#FFCC99"
+            android:textColor="#FFF0C8B4"
-                android:textSize="36sp"
+            android:textSize="48sp"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/tvSimilarValue"
             android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            android:layout_height="20dp"
-                android:textSize="26sp"
-                android:layout_marginTop="80dp"
-                tools:text="0.618，3次"
             android:layout_gravity="center_horizontal"
-                android:textColor="@color/white"/>
+            android:layout_marginTop="0dp"
-
+            android:maxLines="1"
-            <!--            <LinearLayout-->
+            android:textColor="@color/white"
-            <!--                android:id="@+id/ll_to_pwd"-->
+            android:textSize="12sp"
-            <!--                android:layout_width="wrap_content"-->
+            tools:text="0.618，3次" />
-            <!--                android:layout_height="wrap_content"-->
-            <!--                android:layout_marginStart="208dp"-->
-            <!--                android:layout_marginTop="730dp"-->
-            <!--                android:background="@drawable/btn_outline"-->
-            <!--                android:gravity="center"-->
-            <!--                android:paddingHorizontal="45dp"-->
-            <!--                android:paddingVertical="18dp"-->
-            <!--                android:visibility="gone">-->
-
-            <!--                <TextView-->
-            <!--                    android:layout_width="wrap_content"-->
-            <!--                    android:layout_height="wrap_content"-->
-            <!--                    android:text="密码登录"-->
-            <!--                    android:textColor="#FFCC99"-->
-            <!--                    android:textSize="24sp" />-->
-            <!--            </LinearLayout>-->
 
         <TextView
             android:id="@+id/tv_to_init"
-                android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:layout_marginTop="185dp"
+            android:layout_marginTop="0dp"
             android:gravity="center"
-                android:padding="12dp"
+            android:includeFontPadding="false"
-                android:textColor="#FFCC99"
+            android:maxLines="1"
-                android:textSize="36sp"
+            android:textColor="#FFF0C8B4"
+            android:textSize="48sp"
             tools:text="30" />
 
-            <!--            <LinearLayout-->
-            <!--                android:layout_width="wrap_content"-->
-            <!--                android:layout_height="wrap_content"-->
-            <!--                android:gravity="center_horizontal"-->
-            <!--                android:layout_gravity="bottom|center_horizontal"-->
-            <!--                android:layout_marginBottom="130dp"-->
-            <!--                android:orientation="vertical">-->
-
-            <!--                <LinearLayout-->
-            <!--                    android:id="@+id/layoutState"-->
-            <!--                    android:layout_width="wrap_content"-->
-            <!--                    android:layout_height="50dp"-->
-            <!--                    android:gravity="center_vertical"-->
-            <!--                    android:orientation="horizontal"-->
-            <!--                    android:visibility="invisible">-->
-
-            <!--                    <ProgressBar-->
-            <!--                        android:id="@+id/pbCollectLoading"-->
-            <!--                        android:layout_width="32dp"-->
-            <!--                        android:layout_height="32dp"-->
-            <!--                        android:indeterminateTint="@color/white" />-->
-
-            <!--                    <TextView-->
-            <!--                        android:id="@+id/tvCollectState"-->
-            <!--                        android:layout_width="wrap_content"-->
-            <!--                        android:layout_height="wrap_content"-->
-            <!--                        android:layout_marginStart="10dp"-->
-            <!--                        android:text="采集中......"-->
-            <!--                        android:textColor="@color/white"-->
-            <!--                        android:textSize="24sp" />-->
-            <!--                </LinearLayout>-->
-
-            <!--                <TextView-->
-            <!--                    android:id="@+id/btnCollectFace"-->
-            <!--                    android:layout_width="wrap_content"-->
-            <!--                    android:layout_height="60dp"-->
-            <!--                    android:background="@drawable/btn_outline"-->
-            <!--                    android:gravity="center"-->
-            <!--                    android:layout_marginTop="10dp"-->
-            <!--                    android:paddingHorizontal="45dp"-->
-            <!--                    android:text="开始采集"-->
-            <!--                    android:textColor="#FFCC99"-->
-            <!--                    android:textSize="24sp"-->
-            <!--                    tools:ignore="HardcodedText" />-->
-            <!--            </LinearLayout>-->
-
-<!--            <androidx.recyclerview.widget.RecyclerView-->
-<!--                android:id="@+id/rvLogInfo"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="match_parent"-->
-<!--                android:layout_gravity="bottom"-->
-<!--                android:overScrollMode="never"-->
-<!--                android:visibility="gone"-->
-<!--                android:background="@color/black"-->
-<!--                tools:listitem="@layout/list_item_log_info" />-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/btnLogState"-->
-<!--                android:layout_width="60dp"-->
-<!--                android:layout_height="60dp"-->
-<!--                android:layout_gravity="bottom|end"-->
-<!--                android:background="@drawable/shape_white_circle"-->
-<!--                android:padding="10dp"-->
-<!--                android:layout_marginEnd="10dp"-->
-<!--                android:layout_marginBottom="10dp"-->
-<!--                android:src="@drawable/ic_log_show"-->
-<!--                android:textSize="16sp" />-->
-
-        </FrameLayout>
     </LinearLayout>
-</LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/llCollectButton"
+        android:layout_width="wrap_content"
+        android:layout_height="265dp"
+        android:layout_gravity="center_horizontal|bottom"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="visible">
+
+        <TextView
+            android:id="@+id/btnRetry"
+            android:layout_width="360dp"
+            android:layout_height="110dp"
+            android:layout_marginHorizontal="20dp"
+            android:background="@drawable/btn_outline"
+            android:gravity="center"
+            android:text="再次重试"
+            android:textColor="#FFC08A6F"
+            android:textSize="36sp"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/btnCollect"
+            android:layout_width="360dp"
+            android:layout_height="110dp"
+            android:layout_marginHorizontal="20dp"
+            android:background="@drawable/btn_outline"
+            android:gravity="center"
+            android:text="新用户采集"
+            android:textColor="#FFC08A6F"
+            android:textSize="36sp"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/ivCollectPhoto"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="64dp"
+        android:adjustViewBounds="true"
+        android:visibility="gone"
+        tools:src="@drawable/logo_launcher" />
+</FrameLayout>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/bg"
+    android:background="@drawable/bg_collect_page3"
     tools:context=".activity.MainActivity">
 
     <include

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

@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg"
+    android:orientation="vertical"
+    tools:context=".activity.PlcSettingActivity">
+
+    <include
+        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"
+        android:layout_weight="1"
+        android:clipToPadding="false"
+        android:paddingHorizontal="50dp"
+        android:paddingVertical="20dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!-- ===== 连接控制 ===== -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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/btnOpenSerialPort"
+                    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="22sp" />
+
+                <View
+                    android:layout_width="20dp"
+                    android:layout_height="1dp" />
+
+                <TextView
+                    android:id="@+id/btnOpenAutoMode"
+                    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="22sp" />
+
+            </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/btnOutPlate"
+                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" />
+
+            <!-- ===== 平台控制 ===== -->
+            <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/btnPlatformDown"
+                    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="22sp" />
+
+                <View
+                    android:layout_width="20dp"
+                    android:layout_height="1dp" />
+
+                <TextView
+                    android:id="@+id/btnPlatformUp"
+                    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="22sp" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/btnBackToBusiness"
+                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" />
+
+            <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"
+                android:orientation="vertical"
+                android:visibility="gone">
+                <!-- ===== 故障处理 ===== -->
+                <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/btnAlarmReset"
+                    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" />
+
+                <!-- ===== 参数设置 ===== -->
+                <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">
+
+                    <EditText
+                        android:id="@+id/etParamType"
+                        android:layout_width="0dp"
+                        android:layout_height="60dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/btn_outline"
+                        android:gravity="center"
+                        android:hint="参数类型（如 18FD）"
+                        android:inputType="text"
+                        android:paddingHorizontal="12dp"
+                        android:textColor="#FFCC99"
+                        android:textColorHint="#99885566"
+                        android:textSize="18sp" />
+
+                    <View
+                        android:layout_width="20dp"
+                        android:layout_height="1dp" />
+
+                    <EditText
+                        android:id="@+id/etParamValue"
+                        android:layout_width="0dp"
+                        android:layout_height="60dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/btn_outline"
+                        android:gravity="center"
+                        android:hint="参数值（整数）"
+                        android:inputType="number"
+                        android:paddingHorizontal="12dp"
+                        android:textColor="#FFCC99"
+                        android:textColorHint="#99885566"
+                        android:textSize="18sp" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/btnSetParams"
+                    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" />
+
+                <!-- ===== 状态显示 ===== -->
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:text="PLC 状态"
+                    android:textColor="#FFCC99"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/btnRefreshStatus"
+                    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" />
+
+                <TextView
+                    android:id="@+id/tvStatusInfo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:background="@drawable/btn_outline"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="14dp"
+                    android:text="暂无状态数据"
+                    android:textColor="#FFCC99"
+                    android:textSize="16sp"
+                    tools:text="空盘：false | 平台下位：false | 平台上位：true | 取盘红外：false | 报警码：0" />
+
+                <View
+                    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>
+
+</LinearLayout>

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

@@ -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>

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

@@ -4,15 +4,16 @@
     android:layout_height="wrap_content">
 
     <LinearLayout
-        android:layout_width="240dp"
+        android:layout_width="wrap_content"
         android:layout_height="80dp"
         android:gravity="center_vertical"
+        android:maxWidth="200dp"
         android:background="@drawable/dialog_waiting">
 
         <ProgressBar
-            android:layout_width="wrap_content"
+            android:layout_width="50dp"
-            android:layout_height="wrap_content"
+            android:layout_height="50dp"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="10dp"
             android:indeterminateTint="@color/teal_200"
             android:indeterminateTintMode="src_atop" />
 
@@ -20,10 +21,10 @@
             android:id="@+id/tvTip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginHorizontal="10dp"
             android:textColor="@color/white"
             android:text="请稍等"
-            android:textSize="22sp" />
+            android:textSize="26sp" />
 
     </LinearLayout>
 </FrameLayout>

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

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main"
     android:layout_width="match_parent"

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

@@ -3,30 +3,44 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="40dp"
+    android:layout_height="100dp"
-    android:paddingHorizontal="24dp">
+    android:paddingHorizontal="65dp"
+    tools:ignore="HardcodedText,ContentDescription,UseCompoundDrawables">
 
-    <TextView
+    <LinearLayout
         android:id="@+id/tvLeftDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
+        app:layout_constraintTop_toTopOf="parent"
-        android:textColor="#FFCC99"
-        android:textSize="18sp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
-        tools:text="2025年6月18日 星期三" />
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/logo_launcher" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:layout_marginStart="25dp"
+            android:textColor="#FFF0C8B4"
+            android:textSize="30sp"
+            android:text="欢迎光临数味餐厅" />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/tvRightTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:textColor="#FFCC99"
+        android:textColor="#FFF0C8B4"
-        android:textSize="18sp"
+        android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tvLeftDate"
         app:layout_constraintBottom_toBottomOf="@id/tvLeftDate"
-        tools:text="14:02:39" />
+        tools:text="2026年03月27日 星期五 12:08" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">餐盘柜</string>
+    <string name="app_name">发盘机</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 

lib_face/build.gradle.kts

@@ -62,6 +62,6 @@ dependencies {
     implementation("com.google.code.gson:gson:2.8.6")
 
     val glideVersion = "4.12.0"
-    implementation("com.github.bumptech.glide:glide:$glideVersion")
+    api("com.github.bumptech.glide:glide:$glideVersion")
     annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
 }

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

@@ -87,10 +87,10 @@ public class ConfigUtil {
     /**
      * 默认相机分辨率
      */
-    private static final String DEFAULT_PREVIEW_SIZE = "1280x720";
+//    private static final String DEFAULT_PREVIEW_SIZE = "1280x720";
+    private static final String DEFAULT_PREVIEW_SIZE = "1024x768";
 //    private static final String DEFAULT_PREVIEW_SIZE = "400x640";
 
-
     /**
      * 获取String类型的preference
      *

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

@@ -40,6 +40,12 @@ public class FaceApi {
         faceDao.insert(list);
     }
 
+    public void clearFaceData() {
+        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        faceDao.deleteAll();
+        faceDao.resetId();
+    }
+
     /**
      * 激活arcsoft 人脸
      *

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

@@ -46,6 +46,10 @@ public class FaceRectView extends View {
         }
     }
 
+    public int getRectColor() {
+        return paint.getColor();
+    }
+
     public void clearFaceInfo() {
         drawInfoList.clear();
         postInvalidate();

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

@@ -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,

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

@@ -92,9 +92,25 @@ public interface FaceDao {
     @Query("SELECT * FROM face WHERE user_name = :userName limit 1")
     FaceEntity queryByUserName(String userName);
 
+    /**
+     * 查询指定用户的所有人脸记录（同一用户可能存有多条特征数据）
+     *
+     * @param userName 用户ID
+     * @return 该用户所有人脸记录列表
+     */
+    @Query("SELECT * FROM face WHERE user_name = :userName")
+    List<FaceEntity> queryAllByUserName(String userName);
+
     /**
      * @return 删除临时用户人脸
      */
     @Query("DELETE from face WHERE user_type = '2'")
     int deleteTempUserFaceData();
+
+    /**
+     * 查询用户人脸数
+     * @param userType 1-会员，2-临时用户
+     */
+    @Query("SELECT COUNT(1) FROM face WHERE user_type = :userType")
+    int getFaceCount(String userType);
 }

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

@@ -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();
+        }
+    }
+
     /**
      * 释放操作
      */

settings.gradle.kts

@@ -25,6 +25,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "SmartPlateCabinet"
+rootProject.name = "SmartTakePlate"
 include(":app")
 include(":lib_face")