绑定解绑功能调试；其它优化

.idea/.name

@@ -0,0 +1 @@
+SmartPlateCabinet

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>

.idea/deploymentTargetSelector.xml

@@ -2,8 +2,16 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
-      <SelectionState runConfigName="SmartPlateCabinet.app">
+      <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-11-06T09:21:30.965681400Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="Default" identifier="serial=?;connection=3c39678a" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>

.idea/gradle.xml

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

.idea/misc.xml

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

app/build.gradle.kts

@@ -22,14 +22,14 @@ android {
         minSdk = 24
         targetSdk = 35
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-//        ndk {
-//            abiFilters.addAll(listOf("armeabi-v7a"/*, "arm64-v8a"*/))
-//        }
-        setProperty("archivesBaseName", "智能餐盘柜_${versionName}")
+        ndk {
+            abiFilters.addAll(listOf("armeabi-v7a"/*, "arm64-v8a"*/))
+        }
+        setProperty("archivesBaseName", "zncpg_${versionName}")
     }
 
     buildTypes {
@@ -93,4 +93,11 @@ dependencies {
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.fragment.ktx)
 //    implementation(libs.adapter.coroutines)
+
+    implementation("androidx.work:work-runtime-ktx:2.8.1")
+
+    implementation(libs.core)
+    implementation(libs.android.core)
+
+    implementation("org.greenrobot:eventbus:3.3.1")
 }

app/src/main/AndroidManifest.xml

@@ -14,34 +14,50 @@
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:name=".MyApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_logo512"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_logo512"
         android:supportsRtl="true"
         android:theme="@style/Theme.SmartPlateCabinet"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <!-- 注册BootReceiver，监听开机完成广播 -->
+        <receiver
+            android:name=".receiver.BootReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
         <activity
-            android:name=".activity.TestActivity"
-            android:exported="true"></activity>
+            android:name=".activity.UnBindDialogActivity"
+            android:exported="false"
+            android:theme="@style/DialogActivity" />
         <activity
-            android:name=".activity.LoginByPwdActivity"
-            android:exported="true"
+            android:name=".activity.InitActivity"
+            android:exported="false"
             android:launchMode="singleTask">
-            <!--            <intent-filter>-->
-            <!--                <action android:name="android.intent.action.MAIN" />-->
-
-            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
-            <!--            </intent-filter>-->
         </activity>
+        <activity
+            android:name=".activity.LoginByPwdActivity"
+            android:exported="false"
+            android:launchMode="singleTask"/>
         <activity
             android:name=".activity.LoginByFaceActivity"
             android:exported="true"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".activity.DeviceInitActivity"
+            android:exported="true"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -51,14 +67,7 @@
         </activity>
         <activity
             android:name=".activity.MainActivity"
-            android:exported="true">
-
-            <!-- <intent-filter> -->
-            <!-- <action android:name="android.intent.action.MAIN" /> -->
-
-
-            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
-            <!-- </intent-filter> -->
+            android:exported="false">
         </activity>
     </application>
 

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

@@ -15,19 +15,31 @@ object GlobalData {
     /**
      * 横排数量
      */
-    var arrayCross: Int = 3
+    var arrayCross: Int = 2
 
     /**
      * 竖排数量
      */
     var arrayVertical: Int = 11
-
     /**
      * 排列方式 0 垂直 1 水平
      */
     var arrayMode: Int = 0
 
+    var appId = "Hkz1rBk6PZXbS8KwKr67K2eZtsz8bRoMHLg64bUdgCZj"
+    var sdkKey = "AabXs3sHM8UhhE7oCGf4LVMLrdkGb1nJNksbjjTdVt7k"
+    var activeKey ="085F-118G-Q3J6-35UX" //"085F-118G-Q391-53YL"
 
+    /**
+     * 具体业务baseurl
+     */
+    var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
+
+    /**
+     * 设备id
+     */
+    var deviceId: String = ""
+    var restId: String = ""
 }
 
 /**
@@ -44,7 +56,9 @@ object Constants {
  * key
  */
 object GlobalKey {
+    const val KEY_EQUIPMENT_INFO = "equipmentInfo"
     const val KEY_TOKEN = "tokenKey"
     const val KEY_FIRST_RUN = "firstRun"
     const val KEY_USER_INFO = "userInfoKey"
+    const val PARAM_EQUIPMENT_INFO = "equipmentUserInfo"
 }

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

@@ -1,7 +1,9 @@
 package com.sw.platecabinet
 
+import android.util.Log
 import com.sw.plate.App
 import com.sw.plate.utils.AppUtil
+import com.sw.platecabinet.utils.CrashHandler
 import timber.log.Timber
 
 class MyApp : App() {
@@ -14,13 +16,23 @@ class MyApp : App() {
         Timber.plant(Timber.DebugTree())
         Timber.d("初始化")
         initGlobalData()
+
+        // 初始化崩溃处理器
+        CrashHandler.init(this)
     }
 
     /**
      * 初始化全局数据
      */
     private fun initGlobalData() {
+        var deviceId = AppUtil.getUDID(this)
+        deviceId = "be154831-3466-3ba2-a2ea-57652c919fed"
+        Log.d("MyApp", "initialize: deviceId=$deviceId")
+        GlobalData.deviceId = deviceId
+
         GlobalData.appVersion = AppUtil.getAppVersionCode(this).toString()
         GlobalData.globalEquipmentCode = "202501171634"
+
+//        GlobalData.appBaseUrl = "http://192.168.1.201:14801"
     }
 }

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

@@ -17,22 +17,29 @@ import androidx.core.view.WindowCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
 import com.sw.inbound.utils.DateTimeUtils
+import com.sw.plate.utils.Base64
 import com.sw.plate.utils.ScanGunKeyEventHelper
 import com.sw.plate.utils.ToastUtils
+import com.sw.plate.utils.arcface.facedb.FaceDatabase
+import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
+import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
 import com.sw.plate.utils.comn.SerialApi
 import com.sw.plate.utils.comn.SerialPortManager
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
 import com.sw.platecabinet.ext.setClickListeners
 import com.sw.platecabinet.model.response.EquipmentUserInfo
+import com.sw.platecabinet.model.response.UserFaceModel
+import com.sw.platecabinet.utils.IntervalExecutor
 import com.sw.platecabinet.utils.PermissionHelper
-import com.sw.platecabinet.view.CustomDialog
+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.flow.drop
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -44,7 +51,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     private var headerBinding: ItemTitleTimeBinding? = null
     protected lateinit var context: Context
     private var timeJob: Job? = null
-    private var mDialogWaiting: CustomDialog? = null
+    private var mDialogWaiting: CustomLoadingDialog? = null
     private val permissionHelpers = mutableMapOf<Int, PermissionHelper>()
     protected var keyEventHelper: ScanGunKeyEventHelper? = null
 
@@ -77,6 +84,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         registerKeyEvent()
         val durationTime = System.currentTimeMillis() - startTime
         Timber.d("启动时间：$durationTime")
+
+        startFaceTask()
     }
 
     /**
@@ -181,7 +190,15 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         enforceImmersiveMode()
     }
 
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) {
+            disableSystemUICompletely()
+        }
+    }
+
     private fun disableSystemUICompletely() {
+        Timber.d("disableSystemUICompletely")
         // 禁用系统手势（Android 10+）
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             window.insetsController?.systemBarsBehavior =
@@ -206,6 +223,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
 
     private fun enforceImmersiveMode() {
+        Timber.d("enforceImmersiveMode")
         // 持续强制隐藏系统栏（防止手势触发）
         window.decorView.postDelayed({
             window.decorView.systemUiVisibility = (
@@ -223,7 +241,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         hideWaitingDialog()
         val view = View.inflate(this, R.layout.dialog_waiting, null)
         if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).setText(tip)
-        mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
+        mDialogWaiting = CustomLoadingDialog(this, view, R.style.MyDialog)
         mDialogWaiting!!.show()
         mDialogWaiting!!.setCancelable(true)
         return mDialogWaiting
@@ -259,8 +277,9 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             }
         }
         lifecycleScope.launch {
-            viewModel.currentUserInfo.drop(1).collect {
+            viewModel.currentUserInfo.collect {
                 if (it == null) return@collect
+                it.showBalanceNotEnoughDialog = true
                 handleLoginSuccess(it, false)
             }
         }
@@ -275,29 +294,33 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             }
         }
         lifecycleScope.launch {
-            settingViewModel.searchUserInfo.drop(1).collect {
+            settingViewModel.searchUserInfo.collect {
                 Timber.d("registerDataChange 管理员 currentUserInfo = $it")
                 if (it == null) return@collect
                 handleLoginSuccess(it, true)
             }
         }
-        lifecycleScope.launch {
-            settingViewModel.equipmentList.drop(1).collect {
-                if (it.isEmpty()) return@collect
-                val unbindList = it.filter { !it.isBound() }
-                if (unbindList.isEmpty()) {
-                    MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
-                } else {
-                    val firstInfo = unbindList[0]
-                    val currentUserInfo = settingViewModel.searchUserInfo.value
-                    firstInfo.plateNumber = currentUserInfo?.plateNumber ?: ""
-                    MainActivity.start(
-                        context = context,
-                        pageType = PageType.BIND_PLATE,
-                        equipmentUserInfo = firstInfo
-                    )
-                }
-            }
+//        lifecycleScope.launch {
+//            settingViewModel.equipmentList.collect {
+//               loadEquipmentList(it)
+//            }
+//        }
+    }
+
+    private fun loadEquipmentList(items: List<EquipmentUserInfo>) {
+        if (items.isEmpty()) return
+        val unbindList = items.filter { !it.isBound() }
+        if (unbindList.isEmpty()) {
+            MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
+        } else {
+            val firstInfo = unbindList[0]
+            val currentUserInfo = settingViewModel.searchUserInfo.value
+            firstInfo.plateNumber = currentUserInfo?.plateNumber ?: ""
+            MainActivity.start(
+                context = context,
+                pageType = PageType.BIND_PLATE,
+                equipmentUserInfo = firstInfo
+            )
         }
     }
 
@@ -305,23 +328,37 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
      * 处理登录成功操作
      * @param isAdmin  true 管理员 执行绑盘此操作   false 用户，提示错误
      */
-    fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
+    open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
         Timber.d("handleLoginSuccess isAdmin = $isAdmin")
-        viewModel.resetUserInfo()
-        if (equipmentUserInfo.isOtherEquipment()) {
-            MainActivity.start(
-                context,
-                pageType = PageType.PLATE_TIP,
-                equipmentUserInfo = equipmentUserInfo
-            )
+        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(),
+                equipmentUserInfo.equipmentBoxCode!!.toInt(),
                 object : SerialPortManager.SendCallback {
                     override fun onSuccess() {
-                        MainActivity.start(context, pageType = PageType.PLATE_TIP)
+                        MainActivity.start(
+                            context,
+                            pageType = PageType.PLATE_TIP,
+                            isAdmin = isAdmin
+                        )
                     }
 
                     override fun onFail(e: Exception?) {
@@ -330,13 +367,16 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
                 })
         } else {
             if (isAdmin) {
-                settingViewModel.getEquipmentList()
+                settingViewModel.getEquipmentList {
+                    loadEquipmentList(it)
+                }
             } else {
                 Timber.d("无餐盘信息")
                 MainActivity.start(
                     context,
                     pageType = PageType.PLATE_TIP,
-                    equipmentUserInfo = equipmentUserInfo
+                    equipmentUserInfo = equipmentUserInfo,
+                    isAdmin = isAdmin
                 )
             }
         }
@@ -347,4 +387,87 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         keyEventHelper?.onDestroy()
         super.onDestroy()
     }
+
+
+    private val intervalExecutor by lazy { IntervalExecutor() }
+    private var faceTaskJob: Job? = null
+
+    //    private val initialDelay = 5 * 60 * 1000L
+//    private val dealyMillis = 10 * 60 * 1000L
+    private val initialDelay = 1 * 60 * 1000L
+    private val dealyMillis = 1 * 60 * 1000L
+    private var taskPageNo = 1
+    fun startFaceTask() {
+        faceTaskJob =
+            intervalExecutor.startIntervalTaskWithInitialDelay(initialDelay, dealyMillis) {
+                getFaceIncrementList()
+            }
+    }
+
+    private var faceTimestamp = 0L
+
+    private fun getFaceIncrementList() {
+        val timestamp = SpTool.getLastFaceTimestamp()
+        if (timestamp == 0L) {
+            return
+        }
+        settingViewModel.getFaceIncrementList(
+            pageNo = taskPageNo,
+            timestamp = timestamp
+        ) { list ->
+            runOnUiThread {
+                if (taskPageNo == 1 && list.isEmpty()) {
+                    //未查询到增量数据
+                    return@runOnUiThread
+                }
+                updateFaceData(list)
+                if (list.size >= settingViewModel.PAGE_SIZE) {
+                    faceTimestamp = list.last().faceUpdateTimestamp?:0
+                    taskPageNo++
+                    getFaceIncrementList()
+                    return@runOnUiThread
+                }
+                if (list.isNotEmpty()) {
+                    faceTimestamp = list.last().faceUpdateTimestamp?:0
+                }
+                SpTool.setLastFaceTimestamp(faceTimestamp)
+            }
+        }
+    }
+
+    private val recognizeViewModel by viewModels<RecognizeViewModel>()
+    private fun updateFaceData(list: List<UserFaceModel>) {
+        Thread {
+            val faceList = mutableListOf<FaceEntity>()
+            try {
+                list.forEach { model ->
+                    if (model.faceDeleted == true) {
+                        //删除数据
+                        FaceDatabase.getInstance(this).faceDao().deleteFaceById(model.userId)
+                    } else {
+                        //保存数据
+                        val faceEntity = FaceEntity(
+                            model.userId,
+                            null,
+                            Base64.decode(model.faceFeatureStr)
+                        ).also {
+                            it.userType = "1"
+                        }
+                        faceList.add(faceEntity)
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            try {
+                if (faceList.isNotEmpty()) {
+                    FaceDatabase.getInstance(this).faceDao().insert(faceList)
+                }
+                recognizeViewModel.refreshFaceList()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }.start()
+    }
+
 }

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

@@ -0,0 +1,91 @@
+package com.sw.platecabinet.activity
+
+import android.content.Intent
+import android.util.Log
+import androidx.activity.viewModels
+import com.sw.plate.utils.AppUtil
+import com.sw.plate.utils.ToastUtils
+import com.sw.platecabinet.GlobalData
+import com.sw.platecabinet.databinding.ActivityDeviceInitBinding
+import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.ext.gone
+import com.sw.platecabinet.ext.invisible
+import com.sw.platecabinet.viewmodel.SettingViewModel
+
+/**
+ * 设备初始化界面
+ */
+class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
+
+    override fun inflateViewBinding(): ActivityDeviceInitBinding {
+        return ActivityDeviceInitBinding.inflate(layoutInflater)
+    }
+
+    override fun inflateTitleBinding(): ItemTitleTimeBinding? {
+        return null
+    }
+
+    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)
+        showWaitingDialog("加载中……")
+        viewModel.getDeviceConfig { deviceConfig ->
+            runOnUiThread {
+                if (deviceConfig == null) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("获取设备配置数据失败")
+                    hideWaitingDialog()
+                    goLoginActivity()
+                    return@runOnUiThread
+                }
+                GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
+                GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
+                GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
+                binding.root.postDelayed({
+                    hideWaitingDialog()
+                    goLoginActivity()
+                }, 500)
+            }
+        }
+//        goLoginActivity()
+    }
+
+    override fun registerDataChange() {
+        super.registerDataChange()
+//        lifecycleScope.launch {
+//            deviceViewModel.deviceInfoResult.collect { it ->
+//               if (it == true) {
+//                   goLoginActivity()
+//               }
+//            }
+//        }
+    }
+
+    private fun goLoginActivity() {
+        val intent = Intent(this, LoginByFaceActivity::class.java)
+        startActivity(intent)
+        finish()
+    }
+
+    override fun onLeftDoubleClick() {
+
+    }
+
+}

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

@@ -0,0 +1,42 @@
+package com.sw.platecabinet.activity
+
+import androidx.lifecycle.lifecycleScope
+import com.sw.plate.utils.arcface.FaceApi
+import com.sw.plate.utils.arcface.faceserver.FaceServer
+import com.sw.platecabinet.databinding.ActivityInitBinding
+import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+/**
+ * 待机界面
+ */
+class InitActivity : BaseActivity<ActivityInitBinding>() {
+    override fun inflateViewBinding(): ActivityInitBinding {
+        return ActivityInitBinding.inflate(layoutInflater)
+    }
+
+    override fun inflateTitleBinding(): ItemTitleTimeBinding? {
+        return binding.includeHeader
+    }
+
+    override fun initialize() {
+        binding.main.setOnClickListener {
+            finish()
+        }
+//        binding.takeButton.setOnClickListener {
+//
+//            lifecycleScope.launch(Dispatchers.IO) {
+//                FaceApi().deleteByUserName("288")
+//            }
+//
+//            finish()
+//        }
+    }
+
+
+    override fun onLeftDoubleClick() {
+        finish()
+    }
+
+}

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

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.graphics.Point
 import android.hardware.Camera
 import android.os.Build
+import android.os.CountDownTimer
 import android.util.DisplayMetrics
 import android.view.View
 import android.view.ViewGroup
@@ -25,12 +26,18 @@ import com.sw.plate.utils.arcface.camera.DualCameraHelper
 import com.sw.plate.utils.arcface.face.constants.LivenessType
 import com.sw.plate.utils.arcface.face.model.FacePreviewInfo
 import com.sw.plate.utils.arcface.face.model.RecognizeConfiguration
+import com.sw.plate.utils.arcface.faceserver.FaceServer
+import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
 import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ActivityLoginFaceBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.model.response.EquipmentUserInfo
+import com.sw.platecabinet.network.task.TaskManager
 import com.sw.platecabinet.utils.PermissionHelper
-import com.sw.platecabinet.utils.ThreadUtils
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import timber.log.Timber
 
 /**
@@ -39,6 +46,7 @@ import timber.log.Timber
 class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     ViewTreeObserver.OnGlobalLayoutListener {
     private val recognizeViewModel by viewModels<RecognizeViewModel>()
+    private var countDownTimer: CountDownTimer? = null
 
     private val CAMERA_PERMISSION_REQUEST_CODE = 100
     private val REQUIRED_PERMISSIONS: Array<String> = arrayOf(
@@ -55,20 +63,36 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         return binding.includeHeader
     }
 
-    override fun initialize() {
-        ThreadUtils.launch {
-            viewModel.activeEngine()
-        }
+    companion object {
+        private var instance: LoginByFaceActivity? = null
 
+        fun goInitActivity() {
+            instance?.goInitActivity()
+        }
+    }
+
+    override fun initialize() {
+        instance = this
+        viewModel.activeEngine()
+
+        initCountTime()
         initArcViewModel()
         initArcView()
         openRectInfoDraw = true
         recognizeViewModel.setDrawRectInfoTextValue(true)
-        viewModel.generateToken()
+        //viewModel.generateToken()
+//        viewModel.activeEngine()
+        viewModel.getUserFaceCache()
+
         binding.llToPwd.setOnClickListener {
             val intent = Intent(this, LoginByPwdActivity::class.java)
             startActivity(intent)
         }
+
+        // TODO: 测试请求
+        TaskManager.startTask()
+
+        EventBus.getDefault().register(this)
     }
 
     private fun checkCameraPermission() {
@@ -87,6 +111,13 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         permissionHelper.checkAndRequest()
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun getFaceEntity(insertEntity: FaceEntity) {
+        Timber.tag("performSync").e("-time=%s", insertEntity.registerTime)
+        recognizeViewModel.addFace(insertEntity)
+        Timber.tag("performSync over").e("-time=%s", insertEntity.registerTime)
+    }
+
     override fun onLeftDoubleClick() {
         finish()
     }
@@ -142,7 +173,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
         recognizeViewModel.recognizeUserId.observe(this, Observer { userId: String? ->
             Timber.i("recognizeUserId observe userId = $userId")
-            viewModel.getUserInfoById(memberId = userId?.toInt() ?: 0)
+            viewModel.getUserInfoById(memberId = userId)
         })
 
         recognizeViewModel.drawRectInfoText.observe(this, Observer { info ->
@@ -157,6 +188,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     }
 
     override fun onDestroy() {
+        Timber.d("onDestroy")
+        instance = null
         if (rgbCameraHelper != null) {
             rgbCameraHelper!!.release()
             rgbCameraHelper = null
@@ -164,6 +197,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
         recognizeViewModel.destroy()
 
+        EventBus.getDefault().unregister(this)
         super.onDestroy()
     }
 
@@ -237,25 +271,37 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                 displayOrientation: Int,
                 isMirror: Boolean
             ) {
+                Timber.d("initRgbCamera Rgb onCameraOpened: cameraId = $cameraId, displayOrientation = $displayOrientation")
                 runOnUiThread({
                     val previewSizeRgb = camera.getParameters().getPreviewSize()
                     val layoutParams = adjustPreviewViewSize(
                         binding.dualCameraTexturePreviewRgb,
                         binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
-                        previewSizeRgb, displayOrientation, 1f
+                        previewSizeRgb, displayOrientation, 0.6f
                     )
                     Timber.d("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
                     Timber.d("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
+                    Timber.d(
+                        "initRgbCamera isMirror = ${isMirror}, isDrawRgbRectHorizontalMirror = ${
+                            ConfigUtil.isDrawRgbRectHorizontalMirror(
+                                context
+                            )
+                        }, isDrawRgbRectVerticalMirror = ${
+                            ConfigUtil.isDrawRgbRectVerticalMirror(
+                                context
+                            )
+                        }"
+                    )
                     rgbFaceRectTransformer = FaceRectTransformer(
                         previewSizeRgb.width,
                         previewSizeRgb.height,
                         layoutParams.width,
                         layoutParams.height,
-                        displayOrientation,
+                        90,
                         cameraId,
                         isMirror,
-                        ConfigUtil.isDrawRgbRectHorizontalMirror(context),
-                        ConfigUtil.isDrawRgbRectVerticalMirror(context)
+                        true,
+                        true
                     )
 
                     recognizeViewModel.onRgbCameraOpened(camera)
@@ -278,20 +324,20 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
             }
 
             override fun onCameraClosed() {
-                Timber.i("onCameraClosed: ")
+                Timber.i("initRgbCamera onCameraClosed: ")
             }
 
             override fun onCameraError(e: java.lang.Exception) {
-                Timber.i("onCameraError: %s", e.message)
+                Timber.i("initRgbCamera onCameraError: %s", e.message)
                 e.printStackTrace()
             }
 
             override fun onCameraConfigurationChanged(cameraID: Int, displayOrientation: Int) {
-                Timber.i("onCameraConfigurationChanged: threadName = ${Thread.currentThread().name}")
+                Timber.i("initRgbCamera onCameraConfigurationChanged: threadName = ${Thread.currentThread().name}")
                 if (rgbFaceRectTransformer != null) {
                     rgbFaceRectTransformer!!.cameraDisplayOrientation = displayOrientation
                 }
-                Timber.i("onCameraConfigurationChanged: $cameraID  $displayOrientation")
+                Timber.i("initRgbCamera onCameraConfigurationChanged: $cameraID  $displayOrientation")
             }
         }
 
@@ -339,6 +385,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
 
     override fun onGlobalLayout() {
+        Timber.d("onGlobalLayout")
         binding.dualCameraTexturePreviewRgb.getViewTreeObserver().removeOnGlobalLayoutListener(this)
         // 请求权限
         checkCameraPermission()
@@ -355,11 +402,16 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         super.onResume()
         resumeCamera()
         viewModel.resetUserInfo()
+        countDownTimer?.let {
+            it.cancel()
+            it.start()
+        }
     }
 
     protected override fun onPause() {
         pauseCamera()
         super.onPause()
+        countDownTimer?.cancel()
     }
 
     private fun pauseCamera() {
@@ -368,4 +420,29 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         recognizeViewModel.onPreviewFrame(ByteArray(1382400), true)
     }
 
+    override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
+        super.handleLoginSuccess(equipmentUserInfo, isAdmin)
+//        goInitActivity()
+    }
+
+    fun initCountTime() {
+        val totalTimeInMillis = 30L * 1000
+        countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) {
+            override fun onTick(millisUntilFinished: Long) {
+                Timber.d("initCountTime onTick = ${(millisUntilFinished / 1000).toInt()}")
+                binding.tvToInit.text = "${(millisUntilFinished / 1000).toInt() + 1}"
+            }
+
+            override fun onFinish() {
+                goInitActivity()
+            }
+        }.start()
+    }
+
+    fun goInitActivity() {
+        val intent = Intent(context, InitActivity::class.java)
+        startActivity(intent)
+    }
+
+
 }

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

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

@@ -15,6 +15,9 @@ import com.sw.platecabinet.utils.FragmentHelper
 
 typealias Callback = (String) -> Unit
 
+/**
+ * 主界面，内部嵌套framgnet使用
+ */
 class MainActivity : BaseActivity<ActivityMainBinding>() {
     private lateinit var fragmentHelper: FragmentHelper
     private var pageType = PageType.SETTING_LIST
@@ -32,27 +35,31 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     companion object {
         private const val PARAM_PAGE_TYPE = "pageType"
         private const val PARAM_EQUIPMENT_INFO = "equipmentUserInfo"
+        private const val PARAM_IS_ADMIN = "isAdmin"
         fun start(
             context: Context,
             pageType: PageType,
-            equipmentUserInfo: EquipmentUserInfo? = null
+            equipmentUserInfo: EquipmentUserInfo? = null,
+            isAdmin: Boolean = false
         ) {
             val intent = Intent(context, MainActivity::class.java)
             intent.putExtra(PARAM_PAGE_TYPE, pageType.name)
             intent.putExtra(PARAM_EQUIPMENT_INFO, equipmentUserInfo)
+            intent.putExtra(PARAM_IS_ADMIN, isAdmin)
             context.startActivity(intent)
         }
     }
 
     override fun initialize() {
         val param = intent.getStringExtra(PARAM_PAGE_TYPE)
+        val isAdmin = intent.getBooleanExtra(PARAM_IS_ADMIN, false)
         val equipmentUserInfo = intent.getParcelableExtra<EquipmentUserInfo>(PARAM_EQUIPMENT_INFO)
         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.BIND_PLATE -> BindPlateFragment.newInstance(equipmentUserInfo)
-            PageType.PLATE_TIP -> PlateOpenFragment.newInstance(equipmentUserInfo)
+            PageType.PLATE_TIP -> PlateOpenFragment.newInstance(equipmentUserInfo, isAdmin)
             PageType.UNBIND_PLATE -> UnBindPlateFragment.newInstance(equipmentUserInfo)
             PageType.PLATE_CABINET_FULL -> PlateCabinetFullFragment()
         }

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

@@ -0,0 +1,57 @@
+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

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

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

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

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

@@ -2,6 +2,7 @@ package com.sw.platecabinet.ext
 
 import android.content.res.Resources
 import android.util.TypedValue
+import android.view.View
 import androidx.annotation.Dimension
 
 /**
@@ -50,4 +51,16 @@ val Float.sp: Float
 
 fun formatNumber(num: String): String {
     return num.padStart(2, '0')
+}
+
+fun View.visible() {
+    visibility = View.VISIBLE
+}
+
+fun View.invisible() {
+    visibility = View.INVISIBLE
+}
+
+fun View.gone() {
+    visibility = View.GONE
 }

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

@@ -12,7 +12,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
 import com.sw.platecabinet.R
-import com.sw.platecabinet.view.CustomDialog
+import com.sw.platecabinet.view.CustomLoadingDialog
 import com.sw.platecabinet.viewmodel.SettingViewModel
 import kotlinx.coroutines.launch
 
@@ -21,7 +21,7 @@ abstract class BaseFragment<VB : ViewBinding>(
 ) : Fragment() {
     private var _binding: VB? = null
     protected val binding get() = _binding!!
-    private var mDialogWaiting: CustomDialog? = null
+    private var mDialogWaiting: CustomLoadingDialog? = null
     protected val viewModel by viewModels<SettingViewModel>()
 
     override fun onCreateView(
@@ -59,13 +59,12 @@ abstract class BaseFragment<VB : ViewBinding>(
         hideWaitingDialog()
         val view = View.inflate(requireContext(), R.layout.dialog_waiting, null)
         if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).text = tip
-        mDialogWaiting = CustomDialog(requireContext(), view, R.style.MyDialog)
+        mDialogWaiting = CustomLoadingDialog(requireContext(), view, R.style.MyDialog)
         mDialogWaiting!!.show()
         mDialogWaiting!!.setCancelable(true)
         return mDialogWaiting
     }
 
-
     /**
      * 隐藏等待提示框
      */

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

@@ -1,16 +1,19 @@
 package com.sw.platecabinet.fragment
 
+import android.annotation.SuppressLint
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
+import android.view.inputmethod.EditorInfo
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.sw.plate.utils.ToastUtils
+import com.sw.plate.utils.comn.SerialApi
+import com.sw.plate.utils.comn.SerialPortManager
 import com.sw.platecabinet.R
 import com.sw.platecabinet.activity.MainActivity
 import com.sw.platecabinet.activity.PageType
@@ -19,12 +22,17 @@ import com.sw.platecabinet.adapter.GridSpacingItemDecoration
 import com.sw.platecabinet.adapter.dpToPx
 import com.sw.platecabinet.databinding.FragmentBindPlateBinding
 import com.sw.platecabinet.databinding.ItemSearchUserInfoBinding
+import com.sw.platecabinet.dialog.UserBindRemindDialog
 import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.ext.maskPhone
+import com.sw.platecabinet.model.ErrorInfo
+import com.sw.platecabinet.model.request.BindParam
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.SearchResult
+import com.sw.platecabinet.utils.Debouncer
 import com.sw.platecabinet.utils.KeyboardUtils
-import kotlinx.coroutines.flow.drop
+import com.sw.platecabinet.viewmodel.SettingViewModel
+import com.sw.platecabinet.viewmodel.UserViewModel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -39,6 +47,9 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
     private var info: EquipmentUserInfo? = null
     private var checkedItem: SearchResult.Member? = null
     private var lastText = ""
+    private val debouncer = Debouncer(2000)
+
+    private val userViewModel by viewModels<UserViewModel>()
 
     companion object {
         @JvmStatic
@@ -50,13 +61,18 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
             }
     }
 
+    @SuppressLint("SetTextI18n")
     override fun initialize() {
-        arguments?.let {
-            info = it.getParcelable(KEY_ACTION_TYPE)
+        arguments?.let { args ->
+            info = args.getParcelable(KEY_ACTION_TYPE)
             info?.let {
                 binding.tvNum.text = "${it.equipmentName}-${it.equipmentBoxCode}"
                 if (!TextUtils.isEmpty(it.plateNumber)) {
-                    binding.etCode.text = Editable.Factory.getInstance().newEditable(it.plateNumber)
+//                    binding.etCode.text = Editable.Factory.getInstance().newEditable(it.plateNumber)
+                    binding.etCode.apply {
+                        setText(it.plateNumber)
+                        setSelection(length())
+                    }
                 }
             }
         }
@@ -94,21 +110,39 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
             }
         })
         (activity as MainActivity).registerKeyEventInfo {
-            binding.etCode.text = Editable.Factory.getInstance().newEditable(it)
+//            binding.etCode.text.clear()
+//            binding.etCode.postDelayed({
+//                binding.etCode.text.clear()
+//                binding.etCode.text = Editable.Factory.getInstance().newEditable(it)
+               activity?.runOnUiThread {
+                   if (binding.etUserInfo.isFocused) {
+                       return@runOnUiThread
+                   }
+                   binding.etCode.apply {
+                       if (it.length > 6) {
+                           setText(it.substring(0, 6))
+                       } else {
+                           setText(it)
+                       }
+                       if (length() > 0) {
+                           setSelection(length())
+                       }
+                   }
+                   binding.etUserInfo.requestFocus()
+               }
+//            }, 50)
         }
     }
 
     private fun initListener() {
-        binding.etUserInfo.addTextChangedListener(object : TextWatcher {
-            private val handler = Handler(Looper.getMainLooper())
-            private val debounceDelay = 500L // 延迟 500 毫秒
-
+        binding.etCode.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(
                 s: CharSequence?,
                 start: Int,
                 count: Int,
                 after: Int
             ) {
+                Timber.d("beforeTextChanged s = ${s.toString()}, start = $start, count = $count, after = $after")
             }
 
             override fun onTextChanged(
@@ -117,21 +151,48 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
                 before: Int,
                 count: Int
             ) {
+                Timber.d("onTextChanged s = ${s.toString()}, start = $start, count = $count, before = $before")
             }
 
             override fun afterTextChanged(s: Editable?) {
-                val currentText = s.toString()
-                if (currentText == lastText) return // 内容未变化时不处理
-                lastText = currentText
-                handler.removeCallbacksAndMessages(null) // 取消之前的延迟任务
-                handler.postDelayed({
-//                    if (currentText.isNotEmpty()) {
-                    viewModel.getSearchMemberList(param = currentText, pageNum = 1)
-//                    }
-                }, debounceDelay)
+                Timber.d("afterTextChanged s = ${s.toString()}")
             }
         })
+        binding.etUserInfo.setOnEditorActionListener { _, actionId, keyEvent ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                val currentText = binding.etUserInfo.text.toString()
+                val containsNewlines = currentText.contains('\n') || currentText.contains('\r')
+                if (containsNewlines) {
+                    Timber.d("非用户主动搜索")
+                    true
+                }
+                debouncer.debounce {
+                    // 执行搜索操作
+                    viewModel.getSearchMemberList(param = currentText, pageNum = 1)
+                    // 隐藏键盘
+                    KeyboardUtils.hideKeyboard(requireActivity())
+                }
+                true // 表示已处理该事件
+            } else {
+                false // 未处理其他动作
+            }
+        }
+        binding.ivSearch.setOnClickListener {
+            debouncer.debounce {
+                // 执行搜索操作
+                viewModel.getSearchMemberList(
+                    param = binding.etUserInfo.text.toString(),
+                    pageNum = 1
+                )
+                // 隐藏键盘
+                KeyboardUtils.hideKeyboard(requireActivity())
+            }
+        }
         binding.llBind.setOnClickListener {
+            if (equipmentBoxCode.isNullOrBlank().not()) {
+                showBindDialog()
+                return@setOnClickListener
+            }
             if (info == null || info!!.equipmentCode?.isEmpty() == true || info!!.equipmentBoxCode?.isEmpty() == true) {
                 ToastUtils.showToast("传入的设备信息异常")
                 return@setOnClickListener
@@ -149,13 +210,16 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
                 ToastUtils.showToast("选中的会员信息异常")
                 return@setOnClickListener
             }
-
-            viewModel.bindPlate(
-                equipmentCode = info!!.equipmentCode!!,
-                equipmentBoxCode = info!!.equipmentBoxCode!!,
-                memberId = checkedItem!!.id!!,
+            val bindParam = BindParam(
+                equipmentId = info?.equipmentId,
+                equipmentCode = info?.equipmentCode,
+                equipmentBoxCode = info?.equipmentBoxCode,
+                faceId = checkedItem?.faceId,
                 plateNumber = plateNumber
             )
+            viewModel.bindPlate(bindParam) { pair ->
+                updateBindState(pair)
+            }
             KeyboardUtils.hideKeyboard(requireActivity())
         }
         binding.tvBack.setOnClickListener { activity?.finish() }
@@ -167,30 +231,15 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
     override fun registerDataChange() {
         super.registerDataChange()
         lifecycleScope.launch {
-            viewModel.searchMemberList.drop(1).collect {
+            viewModel.searchMemberList.collect {
                 adapter.updateData(it)
             }
         }
-        lifecycleScope.launch {
-            viewModel.bindStateChange.drop(1).collect {
-                if (it.first == null) return@collect // 解绑状态过滤
-                val errorInfo = it.second
-                if (errorInfo.isSuccess()) {
-                    if (errorInfo.equipmentUserInfo?.isOtherEquipment() == true) {
-                        MainActivity.start(
-                            requireContext(),
-                            pageType = PageType.PLATE_TIP,
-                            equipmentUserInfo = errorInfo.equipmentUserInfo
-                        )
-                    } else {
-                        ToastUtils.showToast("绑定成功")
-                        activity?.finish()
-                    }
-                } else {
-                    ToastUtils.showToast(errorInfo.msg)
-                }
-            }
-        }
+//        lifecycleScope.launch {
+//            viewModel.bindStateChange.collect {
+//                updateBindState(it)
+//            }
+//        }
     }
 
     private fun createAdapter(): GenericItemAdapter<SearchResult.Member, ItemSearchUserInfoBinding> {
@@ -210,8 +259,59 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
                     Timber.d("itemClick ${item.name}, position = $position")
                     checkedItem = item
                     adapter.notifyDataSetChanged()
+                    //TODO 调用接口查询用户是否已绑盘
+                    this@BindPlateFragment.equipmentBoxCode = null
+                    (activity as? MainActivity)?.showWaitingDialog("查询中，请稍后……")
+                    userViewModel.getUserInfoById(memberId = item.faceId) {
+                        (activity as? MainActivity)?.hideWaitingDialog()
+                        this@BindPlateFragment.equipmentBoxCode = it?.equipmentBoxCode
+                    }
                 }
             }
         )
     }
+
+    private var equipmentBoxCode:String? = null
+
+    private fun showBindDialog() {
+        UserBindRemindDialog(
+            activity = requireActivity(),
+            content = "您已绑定编号为${equipmentBoxCode}的柜子，请解绑后重试"
+        )
+            .show()
+    }
+
+    private fun updateBindState(pair: Pair<Boolean?, ErrorInfo>){
+        if (pair.first == null) return // 解绑状态过滤
+        val errorInfo = pair.second
+        if (errorInfo.isSuccess()) {
+            if (errorInfo.equipmentUserInfo == null) {
+                ToastUtils.showToast("数据异常")
+                return
+            }
+//            if (errorInfo.equipmentUserInfo.isOtherEquipment()) {
+//                MainActivity.start(
+//                    requireContext(),
+//                    pageType = PageType.PLATE_TIP,
+//                    equipmentUserInfo = errorInfo.equipmentUserInfo,
+//                    isAdmin = true
+//                )
+//            } else {
+                SerialApi.openPlate(
+                    errorInfo.equipmentUserInfo.equipmentBoxCode!!.toInt(),
+                    object : SerialPortManager.SendCallback {
+                        override fun onSuccess() {
+                            ToastUtils.showToast("绑定成功")
+                            activity?.finish()
+                        }
+
+                        override fun onFail(e: Exception?) {
+                            ToastUtils.showToast("绑定失败")
+                        }
+                    })
+//            }
+        } else {
+            ToastUtils.showToast(errorInfo.msg)
+        }
+    }
 }

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

@@ -20,7 +20,7 @@ class PlateCabinetFullFragment :
     fun initCountTime() {
         object : CountDownTimer(totalTimeInMillis, 1000) {
             override fun onTick(millisUntilFinished: Long) {
-                binding.tvAutoClose.text = "${(millisUntilFinished / 1000).toInt()}秒后返回主屏"
+                binding.tvAutoClose.text = "${(millisUntilFinished / 1000).toInt() + 1}秒后返回主屏"
             }
 
             override fun onFinish() {

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

@@ -1,9 +1,11 @@
 package com.sw.platecabinet.fragment
 
+import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
 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
 
@@ -14,14 +16,17 @@ class PlateOpenFragment :
     BaseFragment<FragmentPlateOpenBinding>(FragmentPlateOpenBinding::inflate) {
     private var totalTimeInMillis: Long = Constants.AUTO_CLOSE_TIME * 1000
     internal val KEY_ACTION_TYPE = "actionType"
+    internal val PARAM_IS_ADMIN = "isAdmin"
     private var info: EquipmentUserInfo? = null
+    private var isAdmin: Boolean = false
 
     companion object {
         @JvmStatic
-        fun newInstance(userInfo: EquipmentUserInfo?) =
+        fun newInstance(userInfo: EquipmentUserInfo?, isAdmin: Boolean) =
             PlateOpenFragment().apply {
                 arguments = Bundle().apply {
                     putParcelable(KEY_ACTION_TYPE, userInfo)
+                    putBoolean(PARAM_IS_ADMIN, isAdmin)
                 }
             }
     }
@@ -29,8 +34,9 @@ class PlateOpenFragment :
     override fun initialize() {
         arguments?.let {
             info = it.getParcelable(KEY_ACTION_TYPE)
+            isAdmin = it.getBoolean(PARAM_IS_ADMIN)
             info?.let {
-                if (!it.isBound()) {
+                if (!it.hasEquipmentBox()) {
                     binding.ivType.setImageResource(R.drawable.ic_tip_warn)
                     binding.tvTitle.text = "暂无餐盘信息"
                     binding.tvSubTitle.text = "请联系管理员"
@@ -55,11 +61,15 @@ class PlateOpenFragment :
     fun initCountTime() {
         object : CountDownTimer(totalTimeInMillis, 1000) {
             override fun onTick(millisUntilFinished: Long) {
-                binding.tvAutoClose.text = (millisUntilFinished / 1000).toInt().toString()
+                binding.tvAutoClose.text = ((millisUntilFinished / 1000).toInt() + 1).toString()
             }
 
             override fun onFinish() {
                 activity?.finish()
+                if (!isAdmin) {
+                    val intent = Intent(context, InitActivity::class.java)
+                    startActivity(intent)
+                }
             }
         }.start()
     }

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

@@ -1,6 +1,7 @@
 package com.sw.platecabinet.fragment
 
 import android.view.View
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -22,10 +23,11 @@ import com.sw.platecabinet.databinding.ItemBindViewBinding
 import com.sw.platecabinet.ext.formatNumber
 import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.model.response.EquipmentUserInfo
-import kotlinx.coroutines.flow.drop
+import com.sw.platecabinet.utils.ListArrangementUtil
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
-import kotlin.math.ceil
 
 /**
  * 餐盘柜绑定的用户列表界面
@@ -42,16 +44,15 @@ class SettingListFragment :
      * 垂直滚动的adapter
      */
     private var itemAdapter: GenericItemAdapter<EquipmentUserInfo, ItemBindViewBinding>? = null
-    private val itemsPerPage = GlobalData.arrayCross * GlobalData.arrayVertical // 每行2个，每列11个，共22个
 
     override fun registerDataChange() {
         super.registerDataChange()
-        lifecycleScope.launch {
-            viewModel.equipmentList.drop(1).collect { it ->
-                Timber.d("registerDateChange updateAdapter it = $it")
-                updateAdapter(it)
-            }
-        }
+//        lifecycleScope.launch {
+//            viewModel.equipmentList.collect { it ->
+//                Timber.d("registerDateChange updateAdapter it = $it")
+//                updateAdapter(it)
+//            }
+//        }
     }
 
     override fun initialize() {
@@ -79,7 +80,9 @@ class SettingListFragment :
 
     override fun onResume() {
         super.onResume()
-        viewModel.getEquipmentList()
+        viewModel.getEquipmentList{
+            updateAdapter(it)
+        }
     }
 
     private fun createItemAdapter(): GenericItemAdapter<EquipmentUserInfo, ItemBindViewBinding> {
@@ -107,6 +110,11 @@ class SettingListFragment :
         item: EquipmentUserInfo,
         position: Int
     ) {
+        if (item.isPlaceholder() == true) {
+            this.llRoot.isVisible = false
+            return
+        }
+        this.llRoot.isVisible = true
         this.tvNum.text = formatNumber(item.equipmentBoxCode ?: "")
         if (item.isBound()) {
             val date = DateTimeUtils.parseDateTime(item.updateTime)
@@ -121,7 +129,7 @@ class SettingListFragment :
                 )
             )
             this.llOpen.setBackgroundResource(R.drawable.grid_button_bind)
-            this.tvOpen.setTextColor(resources.getColor(R.color.bind_F0C8B4))
+            this.tvOpen.setTextColor(resources.getColor(R.color.bind_FFCC99))
             this.llBindInfo.visibility = View.VISIBLE
             this.tvUnbind.visibility = View.GONE
 
@@ -129,7 +137,7 @@ class SettingListFragment :
             this.tvLastTime.text = DateTimeUtils.getTimeAgo(date)
         } else {
             this.llRoot.setBackgroundResource(R.drawable.grid_item_unbind)
-            this.tvNum.setTextColor(resources.getColor(R.color.bind_F0C8B4))
+            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
@@ -162,7 +170,11 @@ class SettingListFragment :
             SerialApi.openPlate(equipmentBoxCode, object : SerialPortManager.SendCallback {
                 override fun onSuccess() {
                     hideWaitingDialog()
-                    MainActivity.start(requireContext(), pageType = PageType.PLATE_TIP)
+                    MainActivity.start(
+                        requireContext(),
+                        pageType = PageType.PLATE_TIP,
+                        isAdmin = true
+                    )
                 }
 
                 override fun onFail(e: Exception?) {
@@ -174,38 +186,52 @@ class SettingListFragment :
     }
 
     fun updateAdapter(items: List<EquipmentUserInfo>) {
+        val itemsPerPage = 2 * GlobalData.arrayVertical // 每行2个，每列11个，共22个
         if (GlobalData.arrayCross > 2) {
-            var pages = if (items.size > itemsPerPage) {
-                items.chunked(itemsPerPage) {
-                    convertToColumnFirst(it, 11)
+            lifecycleScope.launch(Dispatchers.Default) {
+                // 多recyclerview
+                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()
+                            if (index == pageList.size - 1) {
+                                // 补全剩余item
+                                itemList = (itemList + List(itemsPerPage - itemList.size) {
+                                    EquipmentUserInfo()
+                                }) as MutableList<EquipmentUserInfo>
+                            }
+                            ListArrangementUtil.convertToColumnFirst(
+                                itemList,
+                                GlobalData.arrayVertical
+                            )
+                        }
+                    } else {
+                        val newItems =
+                            ListArrangementUtil.horizontalSortPageItem(items, GlobalData.arrayCross)
+                        newItems.chunked(itemsPerPage)
+                    }
+                } else {
+                    listOf(
+                        items
+                    )
+                }
+                withContext(Dispatchers.Main) {
+                    pageAdapter?.updatePages(pages)
                 }
-            } else {
-                listOf(
-                    // 根据条件判断是否需要重新排列
-//                items
-                    convertToColumnFirst(items, 11)
-                )
             }
-            pageAdapter?.updatePages(pages)
         } else {
-            itemAdapter?.updateData(items)
+            // 单 recyclerview
+            lifecycleScope.launch(Dispatchers.Default) {
+                var pages = items
+                if (GlobalData.arrayMode == 0) {
+                    pages = ListArrangementUtil.verticalSortItem(pages)
+                }
+                withContext(Dispatchers.Main) {
+                    itemAdapter?.updateData(pages)
+                }
+            }
         }
         binding.mainRecyclerView.scrollToPosition(0)
     }
-
-    /**
-     * 重新排列数组
-     */
-    private fun convertToColumnFirst(
-        original: List<EquipmentUserInfo>,
-        cols: Int
-    ): List<EquipmentUserInfo> {
-        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[originalPos]
-        }
-    }
 }

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

@@ -1,14 +1,19 @@
 package com.sw.platecabinet.fragment
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import com.sw.inbound.utils.DateTimeUtils
 import com.sw.plate.utils.ToastUtils
+import com.sw.platecabinet.GlobalKey
+import com.sw.platecabinet.activity.UnBindDialogActivity
 import com.sw.platecabinet.databinding.FragmentUnbindPlateBinding
 import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.ext.maskPhone
+import com.sw.platecabinet.model.ErrorInfo
 import com.sw.platecabinet.model.response.EquipmentUserInfo
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 
 /**
@@ -30,9 +35,19 @@ class UnBindPlateFragment private constructor() : BaseFragment<FragmentUnbindPla
             }
     }
 
+    private val dialogLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            viewModel.unbindPlate(info?.id) { pair ->
+                updateBindState(pair)
+            }
+        }
+    }
+
     override fun initialize() {
-        arguments?.let {
-            info = it.getParcelable(ARG_PARAM1)
+        arguments?.let { args ->
+            info = args.getParcelable(ARG_PARAM1)
             info?.let {
                 binding.tvNum.text = "${it.equipmentName}-${it.equipmentBoxCode}"
                 binding.tvPlateNumberValue.text = it.plateNumber
@@ -45,10 +60,11 @@ class UnBindPlateFragment private constructor() : BaseFragment<FragmentUnbindPla
         }
         binding.llUnbind.setOnClickListener {
             if (info == null) return@setOnClickListener
-            viewModel.unbindPlate(
-                equipmentBoxCode = info!!.equipmentBoxCode!!,
-                equipmentCode = info!!.equipmentCode!!
-            )
+            val intent = Intent(requireContext(), UnBindDialogActivity::class.java).apply {
+                putExtra(GlobalKey.PARAM_EQUIPMENT_INFO, info)
+            }
+            dialogLauncher.launch(intent)
+            requireActivity().overridePendingTransition(0, 0)
         }
         binding.tvBack.setOnClickListener {
             activity?.finish()
@@ -57,17 +73,23 @@ class UnBindPlateFragment private constructor() : BaseFragment<FragmentUnbindPla
 
     override fun registerDataChange() {
         super.registerDataChange()
-        lifecycleScope.launch {
-            viewModel.bindStateChange.drop(1).collect {
-                if (it.first == null) return@collect // 绑定状态过滤
-                val errorInfo = it.second
-                if (errorInfo.isSuccess()) {
-                    ToastUtils.showToast("解绑成功")
-                    activity?.finish()
-                } else {
-                    ToastUtils.showToast(errorInfo.msg)
-                }
-            }
+//        lifecycleScope.launch {
+//            viewModel.bindStateChange.collect {
+//                updateBindState(it)
+//            }
+//        }
+    }
+    private fun updateBindState(pair: Pair<Boolean?, ErrorInfo>){
+        if (pair.first == null) return // 绑定状态过滤
+        val errorInfo = pair.second
+        if (errorInfo.isSuccess()) {
+            ToastUtils.showToast("解绑成功")
+//                    activity?.finish()
+            // 关闭宿主 Activity
+            requireActivity().finish()
+            requireActivity().overridePendingTransition(0, 0)
+        } else {
+            ToastUtils.showToast(errorInfo.msg)
         }
     }
 }

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

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

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

@@ -12,28 +12,25 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class BindParam(
     /**
-     * app版本号
+     * 设备Id
      */
-    var appVersion: String = "",
+    val equipmentId: String? = null,
     /**
-     * 设备ID
+     * 设备编号
      */
-    @SerializedName("equipmentCode")
-    var equipmentCode: String = "",
+    var equipmentCode: String? = "",
     /**
      *设备盒子编号
      */
-    @SerializedName("equipmentBoxCode")
     val equipmentBoxCode: String? = null,
     /**
      *
      * 会员Id
      */
-    @SerializedName("memberId")
-    val memberId: Int? = null,
+    val memberId: String? = null,
+    val faceId: String? = null,
     /**
      *餐盘编号
      */
-    @SerializedName("plateNumber")
     val plateNumber: String? = null
 ) : Parcelable

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

@@ -11,27 +11,20 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class LoginParam(
     /**
-     * app版本号
+     * 设备Id
      */
-    var appVersion: String = "",
-    /**
-     * 设备ID
-     */
-    @SerializedName("equipmentCode")
-    var equipmentCode: String = "",
+    val equipmentId: Int? = null,
     /**
      * 会员信息
      */
-    @SerializedName("memberId")
-    val memberId: Int? = null,
+//    val memberId: String? = null,
+    val faceId: String? = null,
     /**
      * 密码
      */
-    @SerializedName("password")
     val password: String? = null,
     /**
      * 手机号
      */
-    @SerializedName("phone")
     val phone: String? = null
 ) : Parcelable

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

@@ -10,25 +10,27 @@ import kotlinx.parcelize.Parcelize
  */
 @Parcelize
 data class SearchParam(
-    /**
-     * app版本号
-     */
-    var appVersion: String = "",
-    /**
-     * 设备ID
-     */
-    @SerializedName("equipmentCode")
-    var equipmentCode: String = "",
-    @SerializedName("consumptionTime")
-    val consumptionTime: List<String?>? = listOf(),
-    @SerializedName("createTime")
-    val createTime: List<String?>? = listOf(),
-    @SerializedName("memberFrom")
-    val memberFrom: Int? = 0,
-    @SerializedName("pageNum")
-    val pageNum: Int? = 0,
-    @SerializedName("pageSize")
-    val pageSize: Int? = 0,
-    @SerializedName("param")
-    val `param`: String? = ""
+//    /**
+//     * app版本号
+//     */
+//    var appVersion: String = "",
+//    /**
+//     * 设备ID
+//     */
+//    @SerializedName("equipmentCode")
+//    var equipmentCode: String = "",
+//    @SerializedName("consumptionTime")
+//    val consumptionTime: List<String?>? = listOf(),
+//    @SerializedName("createTime")
+//    val createTime: List<String?>? = listOf(),
+//    @SerializedName("memberFrom")
+//    val memberFrom: Int? = 0,
+//    @SerializedName("pageNum")
+    var pageNum: Int? = 0,
+//    @SerializedName("pageSize")
+    var pageSize: Int? = 0,
+//    @SerializedName("param")
+//    val `param`: String? = "",
+    var name:String?=null,
+    var phone:String?=null
 ) : Parcelable

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

@@ -1,10 +1,12 @@
 package com.sw.platecabinet.model.response
 
 data class ApiResponse<T>(
-    val code: Int,
-    val success: Boolean? = false,
+    val code: String,
+//    val success: Boolean? = false,
     val msg: String? = "",
-    val data: T? = null
+    val data: T? = null,
+//    val result: T? = null,
 ) {
-    fun isSuccess(): Boolean = code == 200
+//    fun isSuccess(): Boolean = code == 200
+    fun isSuccess(): Boolean = code == "00000"
 }

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

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

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

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

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

@@ -49,33 +49,37 @@ data class SearchResult(
 ) : Parcelable {
     @Parcelize
     data class Member(
-        @SerializedName("cardBalance")
-        val cardBalance: String? = "",
-        @SerializedName("cardCode")
-        val cardCode: String? = "",
-        @SerializedName("consumptionCount")
-        val consumptionCount: Int? = 0,
-        @SerializedName("consumptionTotal")
-        val consumptionTotal: String? = "",
-        @SerializedName("createTime")
-        val createTime: String? = "",
-        @SerializedName("firstTopUpTime")
-        val firstTopUpTime: String? = "",
-        @SerializedName("id")
-        val id: Int? = 0,
-        @SerializedName("integralBalance")
-        val integralBalance: Int? = 0,
-        @SerializedName("lastConsumptionTime")
-        val lastConsumptionTime: String? = "",
-        @SerializedName("memberFrom")
-        val memberFrom: Int? = 0,
-        @SerializedName("name")
+//        @SerializedName("cardBalance")
+//        val cardBalance: String? = "",
+//        @SerializedName("cardCode")
+//        val cardCode: String? = "",
+//        @SerializedName("consumptionCount")
+//        val consumptionCount: Int? = 0,
+//        @SerializedName("consumptionTotal")
+//        val consumptionTotal: String? = "",
+//        @SerializedName("createTime")
+//        val createTime: String? = "",
+//        @SerializedName("firstTopUpTime")
+//        val firstTopUpTime: String? = "",
+//        @SerializedName("id")
+//        val id: Int? = 0,
+//        @SerializedName("integralBalance")
+//        val integralBalance: Int? = 0,
+//        @SerializedName("lastConsumptionTime")
+//        val lastConsumptionTime: String? = "",
+//        @SerializedName("memberFrom")
+//        val memberFrom: Int? = 0,
+//        @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")
-        val rewardBalance: String? = "",
-        @SerializedName("topUpBalance")
-        val topUpBalance: String? = ""
     ) : Parcelable
 }

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

@@ -10,14 +10,21 @@ import kotlinx.parcelize.Parcelize
  */
 @Parcelize
 data class UserFaceModel(
-    @SerializedName("faceFeature")
-    val faceFeature: String? = "",
-    @SerializedName("faceFeatureString")
-    val faceFeatureString: String? = "",
-    @SerializedName("faceType")
-    val faceType: String? = "",
-    @SerializedName("userFaceId")
-    val userFaceId: String? = "",
-    @SerializedName("userId")
-    val userId: String? = ""
+//    @SerializedName("faceFeature")
+//    val faceFeature: String? = "",
+//    @SerializedName("faceFeatureString")
+//    val faceFeatureString: String? = "",
+//    @SerializedName("faceType")
+//    val faceType: String? = "",
+//    @SerializedName("userFaceId")
+//    val userFaceId: String? = "",
+//    @SerializedName("userId")
+//    val userId: String? = "",
+//    @SerializedName("updateTimeStamp")
+//    val updateTimeStamp: Long = 0,
+
+    val userId: String? = "",
+    val faceFeatureStr: String? = "",
+    val faceUpdateTimestamp:Long?=null,
+    val faceDeleted: Boolean?=false
 ) : Parcelable

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

@@ -1,5 +1,6 @@
 package com.sw.platecabinet.network
 
+import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.MyApp
 import com.sw.platecabinet.network.api.ApiService
 import com.sw.platecabinet.network.interceptor.RequestInterceptor
@@ -11,12 +12,13 @@ import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 object ApiClient {
-    private const val BASE_URL = "https://vip.shuziweidao.com"
-
-    //    private const val BASE_URL = "http://192.168.1.8:9092"
+    //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 val okHttpClient = OkHttpClient.Builder()
+    val okHttpClient = OkHttpClient.Builder()
         .connectTimeout(TIME_OUT, TimeUnit.SECONDS)
         .readTimeout(TIME_OUT, TimeUnit.SECONDS)
         .writeTimeout(TIME_OUT, TimeUnit.SECONDS)
@@ -33,7 +35,7 @@ object ApiClient {
         .build()
 
     private val retrofit = Retrofit.Builder()
-        .baseUrl(BASE_URL)
+        .baseUrl(DEVICE_BASE_URL)
         .client(okHttpClient)
         .addConverterFactory(GsonConverterFactory.create())
 //        .addCallAdapterFactory(CoroutineCallAdapterFactory()) // 协程适配器

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

@@ -1,66 +1,189 @@
 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 retrofit2.http.Body
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
 import retrofit2.http.GET
+import retrofit2.http.Header
 import retrofit2.http.POST
 import retrofit2.http.Query
+import retrofit2.http.Url
 
 interface ApiService {
-
-    /**
-     * 生成token
-     */
-    @GET("/shuwei-zhct/scales/generateToken")
-    suspend fun generateToken(
-        @Query("deviceId") deviceId: String,
-        @Query("appVersion") appVersion: String,
-        @Query("equipmentCode") equipmentCode: String
-    ): ApiResponse<String>
+//    /**
+//     * 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")
+//    @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(
-        @Query("appVersion") appVersion: String,
-        @Query("equipmentCode") equipmentCode: String
+        @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(@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(@Body param: EquipmentParam): ApiResponse<List<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("/shuwei-zhct/swEquipmentRelUser/addOrEdit")
-    suspend fun bindEquipment(@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(@Body param: SearchParam): ApiResponse<SearchResult>
+    @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>
+
+
+     /**
      * 通过餐盘号获取信息
      */
-    @POST("/shuwei-zhct/swEquipmentRelUser/findByPlateNumber")
-    suspend fun 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>>
+
+    /**
+     * 获取人脸增量数据
+     */
+    @POST
+    suspend fun getFaceIncrementList(
+        @Url url:String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/faceFeature/increment/list",
+        @Body param:Map<String, Long>
+    ): ApiResponse<List<UserFaceModel>?>
+
+    /**
+     * 获取设备配置数据
+     */
+    @GET
+    suspend fun getDeviceConfig(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/getYxEquipmentByEquipmentCode"
+    ): ApiResponse<DeviceConfig?>
+
+
 }

app/src/main/java/com/sw/platecabinet/network/interceptor/RequestInterceptor.kt

@@ -2,6 +2,7 @@ package com.sw.platecabinet.network.interceptor
 
 import com.sw.inbound.utils.SPUtil
 import com.sw.plate.App
+import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.GlobalKey
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -16,7 +17,10 @@ class RequestInterceptor : Interceptor {
             .header("Content-Type", "application/json")
             .header("Accept", "application/json")
 //            .header("Authorization", "Bearer ${getToken()}")
-            .header("Authorization", getToken())
+//            .header("Authorization", getToken())
+            .header("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiJiZTE1NDgzMS0zNDY2LTNiYTItYTJlYS01NzY1MmM5MTlmZWQiLCJ0eXBlIjoiNCIsInVzZXJJZCI6IjAwMDAwMDAwMDAwMDAwMDAwMDEifQ.sN40cOC-O5WQFrF4IDUs8fFlkNdUKLbJt_rHyTsgYYM")
+            .header("X-DEVICE-CODE", GlobalData.deviceId)
+            .header("authorization", "57ee87183f2a4fa59683ec9ef41c8f5d")
 
         val newRequest = requestBuilder.build()
 

app/src/main/java/com/sw/platecabinet/network/task/HeartBeatTask.kt

@@ -0,0 +1,104 @@
+package com.sw.platecabinet.network.task
+
+import android.content.Context
+import android.util.Log
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import com.arcsoft.face.FaceEngine
+import com.sw.inbound.utils.GsonUtils
+import com.sw.plate.App
+import com.sw.plate.utils.Base64
+import com.sw.plate.utils.PrefUtils
+import com.sw.plate.utils.arcface.FaceApi
+import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
+import com.sw.plate.utils.arcface.faceserver.FaceServer
+import com.sw.platecabinet.network.ApiClient
+import com.sw.platecabinet.repository.RemoteRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.EventBus
+import timber.log.Timber
+
+class HeartBeatTask(appContext: Context, workerParams: WorkerParameters) :
+    CoroutineWorker(appContext, workerParams) {
+
+    companion object {
+        private const val TAG = "HeartBeatTask"
+    }
+
+    override suspend fun doWork(): Result {
+        return try {
+            // 执行后台任务逻辑
+            performSync()
+
+            TaskManager.startTask()
+
+            Result.success()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            Result.retry()
+        }
+    }
+
+    private val repository: RemoteRepository by lazy {
+        RemoteRepository(ApiClient.apiService)
+    }
+
+    private val faceApi: FaceApi = FaceApi()
+
+    private suspend fun performSync() {
+//        withContext(Dispatchers.IO) {
+//            val faceUpdateTimeStamp = PrefUtils.getLong(App.getContext(), "faceUpdateTimeStamp", 0)
+//            if (faceUpdateTimeStamp == 0L) {
+//                val timestamp = System.currentTimeMillis()
+//                PrefUtils.setLong(App.getContext(), "faceUpdateTimeStamp", timestamp)
+//            }
+//            val resp = repository.getHeartbeatInterface(
+//                PrefUtils.getLong(
+//                    App.getContext(),
+//                    "faceUpdateTimeStamp",
+//                    0
+//                )
+//            )
+//            Timber.tag(TAG).d("performSync: ${GsonUtils.toJson(resp)}")
+//            val list = resp.data
+//            if (list.isNullOrEmpty()) {
+//                return@withContext
+//            }
+//            val faceServer = FaceServer.getInstance()
+//            val faceEngine: FaceEngine? = faceServer.faceEngine
+//
+//            list.forEachIndexed { index, it ->
+//                try {
+//                    if (index == list.size - 1) {
+//                        PrefUtils.setLong(
+//                            App.getContext(),
+//                            "faceUpdateTimeStamp",
+//                            it.updateTimeStamp
+//                        )
+//                    }
+//                    if (it.faceType == "1") {
+//                        if (it.userId.isNullOrBlank().not()) {
+//                            //userId非空，根据userId删除人脸数据
+//                            faceApi.deleteByUserName(it.userId)
+//                            faceEngine?.removeFaceFeature(it.userId.toInt())
+//                        }
+//                    } else if (it.faceType == "0") {
+//                        //新增人脸数据
+//                        val featureData = Base64.decode(it.faceFeature)
+//                        val insertEntity = FaceEntity(it.userId, null, featureData)
+//                        val faceId = faceApi.insert(insertEntity)
+//                        insertEntity.faceId = faceId
+////                        faceServer.registerFaceFeatureInfoFromDb(insertEntity, faceEngine)
+//
+//                        EventBus.getDefault().post(insertEntity)
+////                        callback(insertEntity)
+//                    }
+//                } catch (e: Exception) {
+//                    e.printStackTrace()
+//                }
+//            }
+//        }
+    }
+
+}

app/src/main/java/com/sw/platecabinet/network/task/TaskManager.kt

@@ -0,0 +1,40 @@
+package com.sw.platecabinet.network.task
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import com.sw.plate.App
+import java.util.concurrent.TimeUnit
+
+object TaskManager {
+    private const val TASK_NAME = "SmartPlateCabinetTask"
+//    private var owner: LifecycleOwner?=null
+//    fun setOwner(owner: LifecycleOwner) {
+//        this.owner = owner
+//    }
+    fun startTask() {
+        val nextRequest = OneTimeWorkRequestBuilder<HeartBeatTask>()
+            .setInitialDelay(1, TimeUnit.MINUTES)
+//            .setInputData(inputData)
+            .build()
+        WorkManager.getInstance(App.getContext())
+//            .apply{
+//                getWorkInfoByIdLiveData(nextRequest.id)
+//                    .observe(owner) { workInfo ->
+//                        if (workInfo?.state == WorkInfo.State.SUCCEEDED) {
+//                            val result = workInfo.outputData.getString("RESULT_KEY")
+//                            // 使用返回的结果
+//                        }
+//                    }
+//            }
+            .enqueueUniqueWork(TASK_NAME, ExistingWorkPolicy.REPLACE, nextRequest)
+    }
+
+    fun cancelTask() {
+        WorkManager.getInstance(App.getContext())
+            .cancelUniqueWork(TASK_NAME)
+    }
+
+}

app/src/main/java/com/sw/platecabinet/receiver/BootReceiver.kt

@@ -0,0 +1,21 @@
+package com.sw.platecabinet.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.sw.platecabinet.activity.DeviceInitActivity
+import com.sw.platecabinet.activity.LoginByFaceActivity
+import timber.log.Timber
+
+class BootReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (Intent.ACTION_BOOT_COMPLETED == intent.action) {
+            Timber.d("设备启动完成，开始执行自启动逻辑")
+//            val intent = Intent(context, LoginByFaceActivity::class.java)
+            val intent = Intent(context, DeviceInitActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.sw.platecabinet.repository
 
 import com.google.gson.JsonParseException
+import com.sw.inbound.utils.GsonUtils
+import com.sw.platecabinet.model.CodeMsg
 import com.sw.platecabinet.model.response.ApiResponse
 import retrofit2.HttpException
 import timber.log.Timber
@@ -18,31 +20,37 @@ abstract class BaseRepository {
 
             when (e) {
                 is HttpException -> {
-                    ApiResponse(code = e.code(), msg = e.message())
+                    val jsonData = e.response()?.errorBody()?.string()
+                    val codeMsg = GsonUtils.fromJson(jsonData, CodeMsg::class.java)
+                    if (codeMsg?.msg.isNullOrBlank()) {
+                        ApiResponse(code = "" + e.code(), msg = e.message())
+                    } else {
+                        ApiResponse(code = codeMsg?.code?:"", msg = codeMsg?.msg?:"")
+                    }
                 }
 
                 is SocketTimeoutException -> {
-                    ApiResponse(code = -2, msg = "请求超时: ${e.message}")
+                    ApiResponse(code = "-2", msg = "请求超时: ${e.message}")
                 }
 
                 is ConnectException -> {
-                    ApiResponse(code = -3, msg = "连接失败: ${e.message}")
+                    ApiResponse(code = "-3", msg = "连接失败: ${e.message}")
                 }
 
                 is SSLHandshakeException -> {
-                    ApiResponse(code = -4, msg = "SSL握手失败: ${e.message}")
+                    ApiResponse(code = "-4", msg = "SSL握手失败: ${e.message}")
                 }
 
                 is JsonParseException -> {
-                    ApiResponse(code = -5, msg = "JSON解析错误: ${e.message}")
+                    ApiResponse(code = "-5", msg = "JSON解析错误: ${e.message}")
                 }
 
                 is IOException -> {
-                    ApiResponse(code = -6, msg = "网络IO错误: ${e.message}")
+                    ApiResponse(code = "-6", msg = "网络IO错误: ${e.message}")
                 }
 
                 else -> {
-                    ApiResponse(code = -1, msg = "未知错误: ${e.message ?: "无错误信息"}")
+                    ApiResponse(code = "-1", msg = "未知错误: ${e.message ?: "无错误信息"}")
                 }
             }
         }

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

@@ -1,11 +1,13 @@
 package com.sw.platecabinet.repository
 
 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
@@ -17,27 +19,56 @@ import com.sw.platecabinet.network.api.ApiService
 class RemoteRepository constructor(
     private val apiService: ApiService
 ) : BaseRepository() {
-    /**
-     * 生成token
-     */
-    suspend fun generateToken(deviceId: String): ApiResponse<String> {
-        return safeApiCall {
-            apiService.generateToken(
-                deviceId,
-                GlobalData.appVersion,
-                GlobalData.globalEquipmentCode
-            )
-        }
-    }
+
+//    /**
+//     * 生成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
+//            )
+//        }
+//    }
 
     /**
      * 获取人脸数据
      */
-    suspend fun getUserFaceCache(): ApiResponse<List<UserFaceModel>> {
+    suspend fun getUserFaceCache(
+        pageNum: Int,
+        pageSize: Int = 100,
+    ): ApiResponse<List<UserFaceModel>> {
         return safeApiCall {
             apiService.getUserFaceCache(
-                GlobalData.appVersion,
-                GlobalData.globalEquipmentCode
+                param = mapOf(
+                    "pageNum" to pageNum,
+                    "pageSize" to pageSize
+                )
             )
         }
     }
@@ -46,34 +77,71 @@ class RemoteRepository constructor(
      * 登录
      */
     suspend fun equipmentBoxLogin(param: LoginParam): ApiResponse<EquipmentUserInfo> {
-        return safeApiCall { apiService.equipmentBoxLogin(param) }
+        return safeApiCall { apiService.equipmentBoxLogin(param = param) }
     }
 
     /**
      * 获取设备绑定用户列表
      */
-    suspend fun getEquipmentList(param: EquipmentParam): ApiResponse<List<EquipmentUserInfo>> {
-        return safeApiCall { apiService.getEquipmentList(param) }
+    suspend fun getEquipmentList(): ApiResponse<List<EquipmentUserInfo>> {
+        return safeApiCall { apiService.getEquipmentList() }
     }
 
-    /**
-     * 餐盘用户信息绑定解绑
-     */
-    suspend fun bindEquipment(param: BindParam): ApiResponse<EquipmentUserInfo?> {
-        return safeApiCall { apiService.bindEquipment(param) }
+//    /**
+//     * 餐盘用户信息绑定解绑
+//     */
+//    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<SearchResult> {
-        return safeApiCall { apiService.searchUser(param) }
+    suspend fun searchUser(param: SearchParam): ApiResponse<List<SearchResult.Member>?> {
+        return safeApiCall { apiService.searchUser(param = param) }
     }
 
     /**
      * 通过餐盘编号获取绑定信息
      */
-    suspend fun findByPlateNumber(param: BindParam): ApiResponse<EquipmentUserInfo> {
-        return safeApiCall { apiService.findByPlateNumber(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,
+        pageSize: Long = 100L,
+        timestamp: Long
+    ): ApiResponse<List<UserFaceModel>?> {
+        return safeApiCall {
+            apiService.getFaceIncrementList(
+                param = mapOf(
+                    "pageNum" to pageNum,
+                    "pageSize" to pageSize,
+                    "timestamp" to timestamp
+                )
+            )
+        }
+    }
+
+    suspend fun getDeviceConfig(): ApiResponse<DeviceConfig?> {
+        return safeApiCall { apiService.getDeviceConfig() }
     }
 }

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

@@ -0,0 +1,237 @@
+package com.sw.platecabinet.utils
+
+import android.app.ActivityManager
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.os.Process
+import com.sw.platecabinet.activity.InitActivity
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import kotlin.system.exitProcess
+
+/**
+ * 崩溃处理
+ */
+class CrashHandler private constructor(private val context: Context) :
+    Thread.UncaughtExceptionHandler {
+
+    companion object {
+        private const val TAG = "CrashHandler"
+        private const val CRASH_REPORTS_DIR = "crash_reports"
+        private const val LOG_LINES = 500 // 收集最近500行日志
+
+        @Volatile
+        private var instance: CrashHandler? = null
+
+        fun init(context: Context) {
+            if (instance == null) {
+                synchronized(CrashHandler::class.java) {
+                    if (instance == null) {
+                        instance = CrashHandler(context.applicationContext)
+                    }
+                }
+            }
+        }
+
+        fun getCrashReportFiles(context: Context): Array<File> {
+            val crashDir = File(context.getExternalFilesDir(null), CRASH_REPORTS_DIR)
+            return if (crashDir.exists() && crashDir.isDirectory) {
+                crashDir.listFiles { _, name -> name.endsWith(".log") } ?: emptyArray()
+            } else {
+                emptyArray()
+            }
+        }
+
+        fun clearCrashReports(context: Context) {
+            getCrashReportFiles(context).forEach { it.delete() }
+        }
+    }
+
+    private val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
+
+    init {
+        Thread.setDefaultUncaughtExceptionHandler(this)
+    }
+
+    override fun uncaughtException(thread: Thread, ex: Throwable) {
+        handleException(thread, ex)
+
+        // 如果系统提供了默认的异常处理器，则交给系统去结束程序
+        // 否则自己结束程序
+        defaultHandler?.uncaughtException(thread, ex) ?: run {
+            Process.killProcess(Process.myPid())
+            exitProcess(1)
+        }
+    }
+
+    /**
+     * 自动重启app
+     */
+    private fun restartApp() {
+        // 延迟1秒后重启应用
+        Handler(Looper.getMainLooper()).postDelayed({
+            val intent = Intent(context, InitActivity::class.java).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+
+            val pendingIntent = PendingIntent.getActivity(
+                context, 0, intent,
+                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+            alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + 100, pendingIntent)
+
+            Process.killProcess(Process.myPid())
+            exitProcess(1)
+        }, 1000)
+    }
+
+    private fun handleException(thread: Thread, ex: Throwable) {
+        // 收集设备信息和异常信息
+        val crashInfo = collectCrashInfo(thread, ex)
+
+        // 保存日志文件
+        saveCrashInfoToFile(crashInfo)
+
+        // 这里可以添加其他处理逻辑，比如上传到服务器等
+    }
+
+    private fun collectCrashInfo(thread: Thread, ex: Throwable): String {
+        return buildString {
+            // 收集设备信息
+            collectDeviceInfo(this)
+
+            // 收集应用日志
+            append("\n\n").append(collectLogs())
+
+            // 收集线程和异常信息
+            append("\n\n========== Thread & Exception Info ==========\n")
+            append("Thread: ${thread.name}\n")
+            append("Stack Trace:\n")
+
+            val sw = StringWriter()
+            val pw = PrintWriter(sw)
+            ex.printStackTrace(pw)
+            var cause: Throwable? = ex.cause
+            while (cause != null) {
+                cause.printStackTrace(pw)
+                cause = cause.cause
+            }
+            pw.close()
+            append(sw.toString())
+        }
+    }
+
+    private fun collectDeviceInfo(sb: StringBuilder) {
+        sb.append("========== Device Info ==========\n")
+        try {
+            // 应用信息
+            val pm = context.packageManager
+            val pi = pm.getPackageInfo(context.packageName, 0)
+
+            sb.append("App Version: ${pi.versionName}_${pi.versionCode}\n")
+
+            // Android 版本信息
+            sb.append("OS Version: ${Build.VERSION.RELEASE}_${Build.VERSION.SDK_INT}\n")
+
+            // 设备信息
+            sb.append("Vendor: ${Build.MANUFACTURER}\n")
+            sb.append("Model: ${Build.MODEL}\n")
+            sb.append("CPU ABI: ${Build.SUPPORTED_ABIS[0]}\n")
+
+            // 其他信息
+            sb.append("Locale: ${Locale.getDefault()}\n")
+            sb.append(
+                "Current Time: ${
+                    SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss",
+                        Locale.getDefault()
+                    ).format(Date())
+                }\n"
+            )
+
+            // 内存信息
+            val memoryInfo = ActivityManager.MemoryInfo()
+            val activityManager =
+                context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+            activityManager.getMemoryInfo(memoryInfo)
+            sb.append("Available Memory: ${memoryInfo.availMem / (1024 * 1024)}MB\n")
+            sb.append("Total Memory: ${memoryInfo.totalMem / (1024 * 1024)}MB\n")
+            sb.append("Low Memory: ${memoryInfo.lowMemory}\n")
+
+        } catch (e: Exception) {
+            Timber.e(e, "Error while collecting device info")
+            sb.append("Error while collecting device info: ${e.message}\n")
+        }
+    }
+
+    private fun collectLogs(): String {
+        return buildString {
+            append("========== Application Logs ==========\n")
+            try {
+                val process = Runtime.getRuntime().exec("logcat -d -v threadtime")
+                val reader = process.inputStream.bufferedReader()
+
+                val logLines = reader.readLines()
+                val start = kotlin.comparisons.maxOf(0, logLines.size - LOG_LINES)
+
+                logLines.subList(start, logLines.size).forEach {
+                    append(it).append("\n")
+                }
+            } catch (e: IOException) {
+                Timber.e(e, "Error collecting logs")
+                append("Error collecting logs: ${e.message}\n")
+            }
+        }
+    }
+
+    private fun saveCrashInfoToFile(crashInfo: String) {
+        try {
+            val time = SimpleDateFormat("yyyy-MM-dd_HH-mm-ss", Locale.getDefault()).format(Date())
+            val fileName = "crash_$time.log"
+
+            val crashDir = File(context.getExternalFilesDir(null), CRASH_REPORTS_DIR)
+            if (!crashDir.exists() && !crashDir.mkdirs()) {
+                Timber.tag(TAG).e("Failed to create crash report directory")
+                return
+            }
+
+            val crashFile = File(crashDir, fileName)
+            FileOutputStream(crashFile).use { it.write(crashInfo.toByteArray()) }
+
+            Timber.tag(TAG).d("Crash info saved to: ${crashFile.absolutePath}")
+        } catch (e: Exception) {
+            Timber.tag(TAG).e(e, "Error saving crash info to file")
+        }
+    }
+
+    /**
+     * 清理旧的崩溃日志
+     */
+    fun cleanupOldCrashReports(maxAgeDays: Int = 7) {
+        val crashDir = File(context.getExternalFilesDir(null), CRASH_REPORTS_DIR)
+        if (!crashDir.exists() || !crashDir.isDirectory) return
+
+        val now = System.currentTimeMillis()
+        val maxAgeMillis = maxAgeDays * 24 * 60 * 60 * 1000L
+
+        crashDir.listFiles()?.forEach { file ->
+            if (file.lastModified() < now - maxAgeMillis) {
+                file.delete()
+            }
+        }
+    }
+}

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

@@ -2,6 +2,7 @@ package com.sw.inbound.utils
 
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
+import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -67,7 +68,8 @@ object DateTimeUtils {
             val format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
             format.parse(timeString)
         } catch (e: Exception) {
-            e.printStackTrace()
+//            e.printStackTrace()
+            Timber.e(e.message)
             null
         }
     }

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

@@ -0,0 +1,25 @@
+package com.sw.platecabinet.utils
+
+class Debouncer(private val delayMillis: Long) {
+    private var lastActionTime = 0L
+
+    /**
+     * 执行防抖操作
+     * @param action 要执行的操作
+     * @return Boolean 是否执行了操作 (true=已执行, false=被防抖)
+     */
+    fun debounce(action: () -> Unit): Boolean {
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - lastActionTime >= delayMillis) {
+            lastActionTime = currentTime
+            action()
+            return true
+        }
+        return false
+    }
+
+    // 重置防抖计时
+    fun reset() {
+        lastActionTime = 0L
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.sw.platecabinet.utils
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+
+class IntervalExecutor {
+
+    /**
+     * 启动定时任务
+     * @param delayMillis 延迟时间（毫秒）
+     * @param action 要执行的方法
+     * @return Job 可用于取消任务
+     */
+    fun startIntervalTask(delayMillis: Long, action: suspend () -> Unit): Job {
+        return CoroutineScope(Dispatchers.Default).launch {
+            while (isActive) {
+                action()
+                delay(delayMillis)
+            }
+        }
+    }
+
+    /**
+     * 启动定时任务（带初始延迟）
+     * @param initialDelay 初始延迟时间（毫秒）
+     * @param delayMillis 后续执行间隔（毫秒）
+     * @param action 要执行的方法
+     * @return Job 可用于取消任务
+     */
+    fun startIntervalTaskWithInitialDelay(
+        initialDelay: Long,
+        delayMillis: Long,
+        action: suspend () -> Unit
+    ): Job {
+        return CoroutineScope(Dispatchers.Default).launch {
+            delay(initialDelay)
+            while (isActive) {
+                action()
+                delay(delayMillis)
+            }
+        }
+    }
+}
+
+// 使用示例
+fun main() = runBlocking {
+    val executor = IntervalExecutor()
+
+    // 示例1：每隔10秒执行一次
+    val job1 = executor.startIntervalTask(10000) {
+        println("定时任务执行: ${System.currentTimeMillis()}")
+        // 这里可以执行你的业务逻辑
+    }
+
+    // 示例2：先延迟5秒，然后每隔3秒执行一次
+    val job2 = executor.startIntervalTaskWithInitialDelay(5000, 3000) {
+        println("带初始延迟的定时任务: ${System.currentTimeMillis()}")
+    }
+
+    // 运行30秒后取消任务
+    delay(30000)
+    job1.cancel()
+    job2.cancel()
+    println("所有定时任务已取消")
+}

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

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

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

@@ -0,0 +1,103 @@
+package com.sw.platecabinet.utils
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.WriterException
+import com.google.zxing.common.BitMatrix
+import com.google.zxing.qrcode.QRCodeWriter
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import kotlin.apply
+import kotlin.ranges.until
+import kotlin.text.isEmpty
+
+/**
+ * 二维码生成工具类
+ */
+object QRCodeUtil {
+
+    /**
+     * 生成二维码（默认大小）
+     * @param content 二维码内容
+     * @return 生成的二维码Bitmap
+     */
+    @JvmOverloads
+    fun generateQRCode(content: String, size: Int = 500): Bitmap? {
+        return generateQRCode(content, size, Color.BLACK, Color.WHITE)
+    }
+
+    /**
+     * 生成二维码（自定义颜色）
+     * @param content 二维码内容
+     * @param size 二维码边长（像素）
+     * @param colorCode 二维码颜色
+     * @param backgroundColor 背景颜色
+     * @return 生成的二维码Bitmap
+     */
+    fun generateQRCode(
+        content: String,
+        size: Int,
+        colorCode: Int,
+        backgroundColor: Int
+    ): Bitmap? {
+        if (content.isEmpty()) {
+            return null
+        }
+
+        return try {
+            val hints = mutableMapOf<EncodeHintType, Any>().apply {
+                put(EncodeHintType.CHARACTER_SET, "UTF-8")
+                put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H) // 纠错级别
+                put(EncodeHintType.MARGIN, 1) // 边距
+            }
+
+            val bitMatrix = QRCodeWriter().encode(
+                content,
+                BarcodeFormat.QR_CODE,
+                size,
+                size,
+                hints
+            )
+
+            val pixels = IntArray(size * size).apply {
+                for (y in 0 until size) {
+                    for (x in 0 until size) {
+                        this[y * size + x] = if (bitMatrix.get(x, y)) colorCode else backgroundColor
+                    }
+                }
+            }
+
+            Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888).apply {
+                setPixels(pixels, 0, size, 0, 0, size, size)
+            }
+
+        } catch (e: WriterException) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+    /**
+     * 生成带Logo的二维码
+     * @param content 二维码内容
+     * @param size 二维码边长（像素）
+     * @param logo Logo Bitmap
+     * @return 带Logo的二维码Bitmap
+     */
+    fun generateQRCodeWithLogo(content: String, size: Int, logo: Bitmap?): Bitmap? {
+        val qrCode = generateQRCode(content, size) ?: return null
+        logo ?: return qrCode
+
+        val logoSize = size / 5 // Logo大小约为二维码的1/5
+        val scaledLogo = Bitmap.createScaledBitmap(logo, logoSize, logoSize, false)
+
+        val offset = (size - logoSize) / 2
+        return Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888).apply {
+            val canvas = Canvas(this)
+            canvas.drawBitmap(qrCode, 0f, 0f, null)
+            canvas.drawBitmap(scaledLogo, offset.toFloat(), offset.toFloat(), null)
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.sw.platecabinet.utils;
+
+import com.sw.inbound.utils.SPUtil;
+import com.sw.platecabinet.MyApp;
+
+public class SpTool {
+
+    public static final String LAST_FACE_TIMESTAMP = "faceTimestamp";
+
+    public static long getLastFaceTimestamp() {
+        return SPUtil.Companion.getInstance(MyApp.getContext(), "default_sp").get(LAST_FACE_TIMESTAMP, 0L);
+    }
+
+    public static void setLastFaceTimestamp(long timestamp) {
+        SPUtil.Companion.getInstance(MyApp.getContext(), "default_sp").put(LAST_FACE_TIMESTAMP, timestamp);
+    }
+
+
+
+}

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

@@ -1,124 +0,0 @@
-package com.sw.platecabinet.utils
-
-import android.os.Handler
-import android.os.Looper
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-import kotlin.coroutines.CoroutineContext
-
-/**
- * 多功能线程工具类
- * 结合协程、Handler和线程池实现线程切换
- */
-object ThreadUtils : CoroutineScope {
-    // 主线程Handler
-    private val mainHandler by lazy { Handler(Looper.getMainLooper()) }
-
-    // 后台线程池(IO密集型任务)
-    private val ioThreadPool: ExecutorService by lazy {
-        Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2)
-    }
-
-    // CPU密集型线程池
-    private val cpuThreadPool: ExecutorService by lazy {
-        Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors())
-    }
-
-    // 协程Job管理
-    private val job = Job()
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main + job
-
-    // ========== Handler相关方法 ==========
-
-    /**
-     * 在主线程执行任务
-     * @param delayMillis 延迟时间(毫秒)
-     */
-    fun runOnUiThread(delayMillis: Long = 0, block: () -> Unit) {
-        if (delayMillis > 0) {
-            mainHandler.postDelayed(block, delayMillis)
-        } else {
-            if (isOnMainThread()) {
-                block()
-            } else {
-                mainHandler.post(block)
-            }
-        }
-    }
-
-    /**
-     * 移除主线程任务
-     */
-    fun removeUiThreadTask(block: () -> Unit) {
-        mainHandler.removeCallbacks(block)
-    }
-
-    // ========== 线程池相关方法 ==========
-
-    /**
-     * 在IO线程执行任务
-     */
-    fun runOnIoThread(block: () -> Unit) {
-        ioThreadPool.execute(block)
-    }
-
-    /**
-     * 在CPU计算线程执行任务
-     */
-    fun runOnCpuThread(block: () -> Unit) {
-        cpuThreadPool.execute(block)
-    }
-
-    // ========== 协程相关方法 ==========
-
-    /**
-     * 启动协程(默认在主线程)
-     */
-    fun launch(block: suspend CoroutineScope.() -> Unit): Job {
-        return launch(coroutineContext, block = block)
-    }
-
-    /**
-     * 在IO线程启动协程
-     */
-    fun launchOnIo(block: suspend CoroutineScope.() -> Unit): Job {
-        return launch(Dispatchers.IO, block = block)
-    }
-
-    /**
-     * 切换到主线程(协程环境)
-     */
-    suspend fun <T> switchToMain(block: suspend CoroutineScope.() -> T): T {
-        return withContext(Dispatchers.Main, block)
-    }
-
-    /**
-     * 切换到IO线程(协程环境)
-     */
-    suspend fun <T> switchToIo(block: suspend CoroutineScope.() -> T): T {
-        return withContext(Dispatchers.IO, block)
-    }
-
-    /**
-     * 是否在主线程
-     */
-    fun isOnMainThread(): Boolean {
-        return Looper.myLooper() == Looper.getMainLooper()
-    }
-
-    /**
-     * 释放资源
-     */
-    fun release() {
-        job.cancel()
-        ioThreadPool.shutdown()
-        cpuThreadPool.shutdown()
-    }
-}

app/src/main/java/com/sw/platecabinet/view/CustomLoadingDialog.java

@@ -10,13 +10,16 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
-public class CustomDialog extends Dialog {
+/**
+ * 加载进度弹窗
+ */
+public class CustomLoadingDialog extends Dialog {
 
 
     /**
      * 宽高由布局文件中指定（但是最底层的宽度无效，可以多嵌套一层解决）
      */
-    public CustomDialog(Context context, View layout, int style) {
+    public CustomLoadingDialog(Context context, View layout, int style) {
 
         super(context, style);
 
@@ -35,8 +38,8 @@ public class CustomDialog extends Dialog {
     /**
      * 宽高由该方法的参数设置
      */
-    public CustomDialog(Context context, int width, int height, View layout,
-                        int style) {
+    public CustomLoadingDialog(Context context, int width, int height, View layout,
+                               int style) {
         super(context, style);
         // 设置内容
         setContentView(layout);

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

@@ -3,7 +3,9 @@ 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
@@ -62,4 +64,13 @@ abstract class BaseViewModel() : ViewModel() {
     fun handleError(exception: Exception) {
         Timber.d("handleError ${exception.message}")
     }
+
+    fun parseEquipmentInfo(equipmentInfo: EquipmentInfo) {
+//        GlobalData.appBaseUrl = equipmentInfo.appPackageUrl!!
+//        GlobalData.appBaseUrl="https://vip.shuziweidao.com"
+//        GlobalData.sdkKey = equipmentInfo.arcsoftSdkKey!!
+//        GlobalData.appId = equipmentInfo.arcsoftAppId!!
+//        GlobalData.activeKey = equipmentInfo.arcsoftActiveKey!!
+//        GlobalData.restId = equipmentInfo.canteenId!!
+    }
 }

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

@@ -0,0 +1,68 @@
+//package com.sw.platecabinet.viewmodel
+//
+//import com.sw.inbound.utils.GsonUtils
+//import com.sw.inbound.utils.SPUtil
+//import com.sw.platecabinet.GlobalData
+//import com.sw.platecabinet.GlobalKey
+//import com.sw.platecabinet.model.response.EquipmentInfo
+//import kotlinx.coroutines.flow.MutableStateFlow
+//import kotlinx.coroutines.flow.StateFlow
+//import timber.log.Timber
+//import kotlin.jvm.java
+//
+///**
+// * 初始化的viewmodel
+// */
+//class DeviceViewModel : BaseViewModel() {
+//    private val _deviceInfoResult = MutableStateFlow<Boolean?>(null)
+//    val deviceInfoResult: StateFlow<Boolean?> = _deviceInfoResult
+//
+//    /**
+//     * 获取token
+//     */
+//    fun getDeviceToken(deviceId: String = GlobalData.deviceId) {
+//        launchWithLoading {
+//            val response = repository.getDeviceToken(deviceId)
+//            if (parseResponse(response)) {
+//                val response1 = repository.getDeviceInfo(deviceId, response.result!!)
+//
+//                if (parseResponse(response1)) {
+//                    val equipmentInfo = response1.result
+//                    if (equipmentInfo == null) return@launchWithLoading
+//                    try {
+//                        parseEquipmentInfo(equipmentInfo)
+//                        SPUtil.getInstance()
+//                            .put(GlobalKey.KEY_EQUIPMENT_INFO, GsonUtils.toJson(equipmentInfo))
+//                        _deviceInfoResult.value = true
+//                    } catch (e: Exception) {
+//                        Timber.e(e)
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 检查缓存数据
+//     */
+//    fun checkEquipmentInfo(): Boolean {
+//        val equipmentInfoStr = SPUtil.getInstance().get(GlobalKey.KEY_EQUIPMENT_INFO, "")
+//        if (equipmentInfoStr == null) {
+//            Timber.e("获取缓存设备信息失败")
+//            return false
+//        }
+//        val equipmentInfo =
+//            GsonUtils.fromJson<EquipmentInfo>(equipmentInfoStr, EquipmentInfo::class.java)
+//        if (equipmentInfo == null) {
+//            Timber.e("解析缓存设备信息失败")
+//            return false
+//        }
+//        try {
+//            parseEquipmentInfo(equipmentInfo)
+//            return true
+//        } catch (e: Exception) {
+//            Timber.e(e)
+//            return false
+//        }
+//    }
+//}

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

@@ -1,5 +1,6 @@
 package com.sw.platecabinet.viewmodel
 
+import android.text.TextUtils
 import com.sw.inbound.utils.DateTimeUtils
 import com.sw.platecabinet.GlobalData
 import com.sw.platecabinet.GlobalData.globalEquipmentCode
@@ -9,13 +10,21 @@ import com.sw.platecabinet.model.request.EquipmentParam
 import com.sw.platecabinet.model.request.SearchParam
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.SearchResult
+import com.sw.platecabinet.model.response.UserFaceModel
+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
 
+/**
+ * 管理员操作viewmodel
+ */
 class SettingViewModel : BaseViewModel() {
     // 设备绑定列表
-    private val _equipmentList = MutableStateFlow<List<EquipmentUserInfo>>(emptyList())
-    val equipmentList: StateFlow<List<EquipmentUserInfo>> = _equipmentList
+//    private val _equipmentList = MutableStateFlow<List<EquipmentUserInfo>>(emptyList())
+//    val equipmentList: StateFlow<List<EquipmentUserInfo>> = _equipmentList
 
     private val _searchMemberList = MutableStateFlow<List<SearchResult.Member>>(emptyList())
     val searchMemberList: StateFlow<List<SearchResult.Member>> = _searchMemberList
@@ -30,20 +39,34 @@ class SettingViewModel : BaseViewModel() {
     /**
      * 绑定/解绑状态 <绑定/解绑， 错误信息，>
      */
-    private val _bindStateChange = MutableStateFlow<Pair<Boolean?, ErrorInfo>>(null to ErrorInfo())
-    val bindStateChange: StateFlow<Pair<Boolean?, ErrorInfo>> = _bindStateChange
+//    private val _bindStateChange = MutableStateFlow<Pair<Boolean?, ErrorInfo>>(null to ErrorInfo())
+//    val bindStateChange: StateFlow<Pair<Boolean?, ErrorInfo>> = _bindStateChange
 
 
     /**
      * 获取设备绑定用户信息列表
      */
-    fun getEquipmentList(equipmentCode: String = globalEquipmentCode) {
+//    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()
+//            }
+//        }
+////        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 param =
-                EquipmentParam(appVersion = GlobalData.appVersion, equipmentCode = equipmentCode)
-            val response = repository.getEquipmentList(param)
+            val response = repository.getEquipmentList()
             if (parseResponse(response)) {
-                _equipmentList.value = response.data ?: emptyList()
+                val list = response.data ?: emptyList()
+                block(list)
             }
         }
     }
@@ -51,72 +74,116 @@ class SettingViewModel : BaseViewModel() {
     /**
      * 搜索会员信息列表
      */
-    fun getSearchMemberList(param: String, pageNum: Int = 1, pageSize: Int = 50) {
+    fun getSearchMemberList(param:String, pageNum: Int = 1, pageSize: Int = 50) {
+        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 param = SearchParam(
-                appVersion = GlobalData.appVersion,
-                param = param,
+            val searchParam = SearchParam(
+//                appVersion = GlobalData.appVersion,
+                name = name,
+                phone = phone,
                 pageNum = pageNum,
                 pageSize = pageSize
             )
             isLoading = true
-            val response = repository.searchUser(param)
+            val response = repository.searchUser(searchParam)
             isLoading = false
             if (parseResponse(response)) {
-                response.data?.let {
-                    canLoadMore = it.hasNextPage != false
-                    val newList = it.list ?: emptyList()
+                response.data?.let { list ->
                     if (pageNum == 1) {
-                        _searchMemberList.value = newList
+                        _searchMemberList.value = list
                     } else {
-                        _searchMemberList.value = _searchMemberList.value.plus(newList)
+                        _searchMemberList.value = _searchMemberList.value.plus(list)
                     }
-                    currentPage++
+                    if (list.size >= pageSize) currentPage++
                 }
             }
         }
     }
 
-    fun bindPlate(
-        equipmentBoxCode: String,
-        equipmentCode: String = globalEquipmentCode,
-        memberId: Int,
-        plateNumber: String
-    ) {
+//    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 bindParam = BindParam(
-                appVersion = GlobalData.appVersion,
-                equipmentBoxCode = equipmentBoxCode,
-                equipmentCode = equipmentCode,
-                memberId = memberId,
-                plateNumber = plateNumber
-            )
-            val response = repository.bindEquipment(bindParam)
+            val response = repository.plateUnbind(id)
             if (parseResponse(response)) {
-                val userInfo = response.data
-                _bindStateChange.value = true to ErrorInfo(equipmentUserInfo = userInfo)
+                block(false to ErrorInfo())
             } else {
-                _bindStateChange.value = true to ErrorInfo(response.code, response.msg.toString())
+                block(false to ErrorInfo(response.code, response.msg.toString()))
             }
         }
     }
 
-    fun unbindPlate(
-        equipmentBoxCode: String,
-        equipmentCode: String = globalEquipmentCode
-    ) {
+    fun bindPlate(bindParam: BindParam, block:(Pair<Boolean?, ErrorInfo>)-> Unit) {
         launchWithLoading {
-            val bindParam = BindParam(
-                appVersion = GlobalData.appVersion,
-                equipmentBoxCode = equipmentBoxCode,
-                equipmentCode = equipmentCode
-            )
-            val response = repository.bindEquipment(bindParam)
+            val response = repository.plateBind(bindParam)
             if (parseResponse(response)) {
-                _bindStateChange.value = false to ErrorInfo()
+                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 {
-                _bindStateChange.value = false to ErrorInfo(response.code, response.msg.toString())
+                block(true to ErrorInfo(response.code, response.msg.toString()))
             }
         }
     }
@@ -125,14 +192,11 @@ class SettingViewModel : BaseViewModel() {
         plateNumber: String,
         equipmentCode: String = globalEquipmentCode
     ) {
+        _searchUserInfo.value = null
         launchWithLoading {
-            val bindParam = BindParam(
-                appVersion = GlobalData.appVersion,
-                plateNumber = plateNumber,
-                equipmentCode = equipmentCode
-            )
-            val response = repository.findByPlateNumber(bindParam)
-            if (response.code == 200) {
+//            val bindParam = BindParam(plateNumber = plateNumber)
+            val response = repository.findByPlateNumber(plateNumber)
+            if (response.code == "00000") {
                 _searchUserInfo.value = response.data
             } else {
                 _searchUserInfo.value = EquipmentUserInfo(
@@ -143,4 +207,31 @@ class SettingViewModel : BaseViewModel() {
             }
         }
     }
+
+    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)
+                }
+            }
+        }
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.sw.platecabinet.viewmodel
 
+import androidx.lifecycle.viewModelScope
 import com.arcsoft.face.ErrorInfo
 import com.sw.inbound.utils.SPUtil
 import com.sw.plate.App
@@ -10,17 +11,27 @@ 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.ThreadUtils
+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
 
+/**
+ * 用户viewmodel
+ */
 class UserViewModel : BaseViewModel() {
+
+    companion object {
+        const val PAGE_SIZE = 100
+    }
+
     // 通过人脸获取到的用户信息
     private val _currentUserInfo = MutableStateFlow<EquipmentUserInfo?>(null)
     val currentUserInfo: StateFlow<EquipmentUserInfo?> = _currentUserInfo
@@ -30,58 +41,73 @@ class UserViewModel : BaseViewModel() {
     /**
      * 获取token
      */
-    fun generateToken(deviceId: String = "SWSN:88:12:AC:4E:D9:CC") {
+//    fun generateToken(deviceId: String = "SWSN:88:12:AC:4E:D9:CC") {
+//        launchWithLoading {
+//            val response = repository.generateToken(deviceId)
+//            if (parseResponse(response)) {
+//                // 缓存token
+//                SPUtil.getInstance().put(GlobalKey.KEY_TOKEN, response.data)
+//                // 首次运行获取人脸数据
+//                if (SPUtil.getInstance().get(GlobalKey.KEY_FIRST_RUN, false) != true) {
+//                    getUserFaceCache()
+//                }
+//            }
+//        }
+//    }
+
+    /**
+     * 获取人脸数据
+     */
+    fun getUserFaceCache(pageNo: Int = 1, pageSize: Int = PAGE_SIZE) {
+        var currentPageNo = pageNo
         launchWithLoading {
-            val response = repository.generateToken(deviceId)
+            val response = repository.getUserFaceCache(pageNum = pageNo, pageSize = pageSize)
             if (parseResponse(response)) {
-                // 缓存token
-                SPUtil.getInstance().put(GlobalKey.KEY_TOKEN, response.data)
-                // 首次运行获取人脸数据
-                if (SPUtil.getInstance().get(GlobalKey.KEY_FIRST_RUN, false) != true) {
-                    getUserFaceCache()
+                // 获取成功一次后缓存状态
+                SPUtil.getInstance().put(GlobalKey.KEY_FIRST_RUN, true)
+                val list: List<UserFaceModel> = response.data ?: emptyList()
+                if (pageNo==1&&list.isEmpty()) {
+                    return@launchWithLoading
+                }
+                val faceEntityList = list.map {
+                    FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr))
+                }
+                withContext(Dispatchers.Default) {
+                    faceApi.updateFaceData(pageNo, faceEntityList)
+                    if (list.size >= pageSize) {
+                        faceTimestamp = list.last().faceUpdateTimestamp?:0
+                        currentPageNo++
+                        getUserFaceCache(currentPageNo)
+                        return@withContext
+                    }
+                    if (list.isNotEmpty()) {
+                        faceTimestamp = list.last().faceUpdateTimestamp?:0
+                    }
+                    SpTool.setLastFaceTimestamp(faceTimestamp)
+                    //activeEngine()
                 }
             }
         }
     }
 
-    /**
-     * 获取人脸数据
-     */
-    fun getUserFaceCache(index: Int = 0) {
-        launchWithLoading {
-            val response = repository.getUserFaceCache()
-            if (parseResponse(response)) {
-                // 获取成功一次后缓存状态
-                SPUtil.getInstance().put(GlobalKey.KEY_FIRST_RUN, true)
-                val list: List<UserFaceModel> = response.data ?: emptyList()
-                val faceEntity = list.map {
-                    FaceEntity(it.userId, null, Base64.decode(it.faceFeatureString))
-                }
-                withContext(Dispatchers.Default) {
-                    faceApi.updateFaceData(index, faceEntity)
-                    activeEngine()
-                }
-            }
-        }
-    }
+    private var faceTimestamp = 0L
 
     /**
      * 激活人脸识别引擎
      */
     fun activeEngine() {
         Timber.d("activeEngine")
-        var appId = "Hkz1rBk6PZXbS8KwKr67K2eZtsz8bRoMHLg64bUdgCZj"
-        var sdkKey = "AabXs3sHM8UhhE7oCGf4LVMLrdkGb1nJNksbjjTdVt7k"
-        var activeKey = "085F-118G-Q391-53YL"
+
         faceApi.activeEngine(
             App.getContext(),
-            appId,
-            sdkKey,
-            activeKey,
+            GlobalData.appId,
+            GlobalData.sdkKey,
+            GlobalData.activeKey,
             object : FaceApi.ActiveCallback {
                 override fun onSuccess(activeCode: Int) {
                     Timber.d("activeEngine activeCode = $activeCode")
-                    ThreadUtils.launch {
+//                    ThreadUtils.launch {
+                    viewModelScope.launch(Dispatchers.Main) {
                         when (activeCode) {
                             ErrorInfo.MOK -> {
                                 ToastUtils.showToast("激活引擎成功")
@@ -99,7 +125,7 @@ class UserViewModel : BaseViewModel() {
                 }
 
                 override fun onFail(e: Exception?) {
-                    ThreadUtils.launch {
+                    viewModelScope.launch(Dispatchers.Main) {
                         ToastUtils.showToast("激活引擎异常,${e?.message}")
                     }
                 }
@@ -109,14 +135,8 @@ class UserViewModel : BaseViewModel() {
     /**
      * 校验码登录
      */
-    fun loginWithPwd(equipmentCode: String = globalEquipmentCode, phone: String, password: String) {
+    fun loginWithPwd(loginParam: LoginParam) {
         launchWithLoading {
-            val loginParam = LoginParam(
-                appVersion = GlobalData.appVersion,
-                equipmentCode = equipmentCode,
-                phone = phone,
-                password = password
-            )
             val response = repository.equipmentBoxLogin(loginParam)
             if (parseResponse(response)) {
                 _currentUserInfo.value = response.data
@@ -127,16 +147,14 @@ class UserViewModel : BaseViewModel() {
     /**
      * 通过用户id获取用户信息
      */
-    fun getUserInfoById(equipmentCode: String = globalEquipmentCode, memberId: Int) {
+    fun getUserInfoById(memberId: String?, action:(EquipmentUserInfo?)->Unit={}) {
+        _currentUserInfo.value = null
         launchWithLoading {
-            val loginParam = LoginParam(
-                appVersion = GlobalData.appVersion,
-                equipmentCode = equipmentCode,
-                memberId = memberId
-            )
+            val loginParam = LoginParam(faceId = memberId)
             val response = repository.equipmentBoxLogin(loginParam)
             if (parseResponse(response)) {
                 _currentUserInfo.value = response.data
+                action(response.data)
             }
         }
     }
@@ -148,5 +166,16 @@ class UserViewModel : BaseViewModel() {
         Timber.d("resetUserInfo")
         _currentUserInfo.value = null
     }
+    fun getDeviceConfig(block: (DeviceConfig?) -> Unit) {
+//        Timber.tag(TAG).d("getDeviceConfig")
+        launch {
+            val response = repository.getDeviceConfig()
+            if (parseResponse(response)) {
+                block(response.data)
+            } else {
+                block(null)
+            }
+        }
+    }
 
 }

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#000000" /> <!-- 整体黑色背景 -->
+    <stroke
+        android:width="2dp"
+        android:color="#333333" /> <!-- 边框颜色和宽度 -->
+    <corners android:radius="12dp" /> <!-- 圆角半径 -->
+</shape>

app/src/main/res/drawable/bg_init_button.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="#ff08C6DC" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</ripple>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <item
+        android:width="600dp"
+        android:height="1024dp">
+        <bitmap android:src="@drawable/bg"/>
+    </item>
+    <item
+        android:width="337dp"
+        android:height="322dp"
+        android:gravity="top|center_horizontal"
+        android:top="112dp">
+        <bitmap android:src="@drawable/img_init" android:scaleType="fitCenter"/>
+    </item>
+
+</layer-list>

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

@@ -4,5 +4,5 @@
     <corners android:radius="12dp" />
     <stroke
         android:width="2dp"
-        android:color="#887872" />
+        android:color="#FFCC99" />
 </shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="6dp" />
-    <solid android:color="#F0C8B4" />
+    <solid android:color="#FFCC99" />
 </shape>

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

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="12dp" />
-    <!--    <solid android:color="#F3D2BD"/>-->
-    <gradient
-        android:endColor="#E5B79F"
-        android:startColor="#F9DDC9" />
+    <solid android:color="#FFCC99" />
 </shape>

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

@@ -3,5 +3,5 @@
     <corners android:radius="12dp" />
     <stroke
         android:width="2dp"
-        android:color="#F0C8B4" />
+        android:color="#FFCC99" />
 </shape>

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="337dp"
+        android:layout_height="322dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="112dp"
+        android:src="@drawable/img_init"
+        tools:ignore="ContentDescription"
+        android:visibility="invisible"/>
+
+    <TextView
+        android:id="@+id/btnInit"
+        android:layout_width="225dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="75dp"
+        android:background="@drawable/bg_init_button"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="设备初始化"
+        android:textColor="@color/white"
+        android:textSize="22sp"
+        android:textStyle="bold"
+        android:visibility="invisible"
+        tools:ignore="HardcodedText" />
+
+    <Space
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <ImageView
+        android:id="@+id/ivQrCode"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center_horizontal|bottom"
+        android:layout_marginBottom="37dp"
+        tools:ignore="ContentDescription"
+        tools:src="@mipmap/ic_logo512"
+        android:visibility="invisible"/>
+
+</LinearLayout>

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

@@ -0,0 +1,63 @@
+<?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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg"
+    android:orientation="vertical"
+    tools:context=".activity.InitActivity">
+
+    <include
+        android:id="@+id/includeHeader"
+        layout="@layout/item_title_time" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="0dp"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="142dp"
+            android:src="@drawable/ic_init_text"
+            android:adjustViewBounds="true"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="345dp"
+            android:layout_marginTop="90dp"
+            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" />-->
+
+        <TextView android:id="@+id/takeButton"
+            android:layout_width="wrap_content"
+            android:layout_height="60dp"
+            android:text="点击取盘"
+            android:textColor="#FFCC99"
+            android:textSize="24sp"
+            android:paddingHorizontal="45dp"
+            android:gravity="center"
+            android:background="@drawable/btn_outline"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+</LinearLayout>

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

@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="手机后四位"
-            android:textColor="#F0C8B4"
+            android:textColor="#FFCC99"
             android:textSize="26sp"
             android:textStyle="bold" />
 
@@ -62,7 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="25dp"
             android:text="校验码"
-            android:textColor="#F0C8B4"
+            android:textColor="#FFCC99"
             android:textSize="26sp"
             android:textStyle="bold" />
 
@@ -115,7 +115,7 @@
             android:layout_marginTop="40dp"
             android:padding="8dp"
             android:text="人脸识别"
-            android:textColor="#887872"
+            android:textColor="#FFCC99"
             android:textSize="26sp"
             android:textStyle="bold" />
     </LinearLayout>

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

@@ -4,9 +4,9 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/bg"
     android:fitsSystemWindows="false"
     android:orientation="vertical"
-    android:background="@drawable/bg"
     tools:context=".activity.LoginByFaceActivity">
 
     <include
@@ -19,55 +19,57 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="129dp"
-            android:text="请正视屏幕"
-            android:textColor="#fff0c8b4"
-            android:textSize="36sp" />
-
-
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="129dp"
+            android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:visibility="visible">
 
             <FrameLayout
-                android:layout_width="380dp"
+                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="380dp"
-                    android:visibility="visible"
-                    android:layout_height="wrap_content" />
-
+                    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="380dp" />
+                    android:layout_height="match_parent"
+                    android:visibility="visible" />
             </FrameLayout>
 
             <ImageView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_face" />
+                android:layout_height="match_parent"
+                android:layout_marginTop="0dp"
+                android:background="@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:text="请正视屏幕"
+                android:textStyle="bold"
+                android:textColor="#FFCC99"
+                android:textSize="36sp" />
 
             <LinearLayout
                 android:id="@+id/ll_to_pwd"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="208dp"
-                android:layout_marginTop="500dp"
-                android:background="@drawable/btn_outline_887872"
+                android:layout_marginTop="730dp"
+                android:background="@drawable/btn_outline"
                 android:gravity="center"
                 android:paddingHorizontal="45dp"
                 android:paddingVertical="18dp">
@@ -76,12 +78,21 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="密码登录"
-                    android:textColor="#ff887872"
+                    android:textColor="#FFCC99"
                     android:textSize="24sp" />
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/tv_to_init"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="30"
+                android:padding="12dp"
+                android:gravity="center"
+                android:layout_marginTop="185dp"
+                android:textColor="#FFCC99"
+                android:textSize="36sp" />
+
         </FrameLayout>
-
-
     </LinearLayout>
 </LinearLayout>

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

@@ -0,0 +1,81 @@
+<?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="1024dp"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/dialogContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:layout_marginTop="0dp"
+        android:background="@drawable/bg_dialog"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingTop="30dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_tip_warn_unbind" />
+
+        <TextView
+            android:id="@+id/tv_tip_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            tools:text="即将解除【曹德磊】的餐盘"
+            android:textColor="#ffffffff"
+            android:textSize="28sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="解绑后该用户将无法使用餐盘柜"
+            android:textColor="#ff999999"
+            android:textSize="24sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="30dp"
+            android:background="#ff333333" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="90dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="取消"
+                android:textColor="#ff999999"
+                android:textSize="30sp"
+                android:textStyle="bold" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="#333333" />
+
+            <TextView
+                android:id="@+id/tv_confirm"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="确定解绑"
+                android:textColor="#ffffcc99"
+                android:textSize="30sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,53 @@
+<?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:id="@+id/dialogContainer"
+    android:layout_width="480dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top"
+    android:layout_marginTop="0dp"
+    android:background="@drawable/bg_dialog"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:ignore="HardcodedText">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:src="@drawable/ic_tip_warn_unbind" />
+
+    <TextView
+        android:id="@+id/tv_tip_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="余额不足"
+        android:textColor="#ffffffff"
+        android:textSize="28sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="请通过小程序或到柜台充值后使用"
+        android:textColor="#ff999999"
+        android:textSize="24sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="30dp"
+        android:background="#ff333333" />
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:gravity="center"
+        android:text="知道了"
+        android:textColor="#ffffcc99"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+</LinearLayout>

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

@@ -0,0 +1,54 @@
+<?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:id="@+id/dialogContainer"
+    android:layout_width="480dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top"
+    android:layout_marginTop="0dp"
+    android:background="@drawable/bg_dialog"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:ignore="HardcodedText">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:src="@drawable/ic_tip_warn_unbind" />
+
+    <TextView
+        android:id="@+id/tv_tip_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="温馨提示"
+        android:textColor="#ffffffff"
+        android:textSize="28sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/tvBindContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="请通过小程序或到柜台充值后使用"
+        android:textColor="#ff999999"
+        android:textSize="24sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="30dp"
+        android:background="#ff333333" />
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:gravity="center"
+        android:text="知道了"
+        android:textColor="#ffffcc99"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+</LinearLayout>

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

@@ -7,14 +7,15 @@
     android:gravity="center_horizontal"
     android:orientation="vertical"
     android:paddingHorizontal="60dp"
-    tools:context=".fragment.BindPlateFragment">
+    tools:context=".fragment.BindPlateFragment"
+    tools:background="@color/black">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="60dp"
         android:text="柜体编号"
-        android:textColor="#ff7c6d6a"
+        android:textColor="#999999"
         android:textSize="20sp" />
 
     <TextView
@@ -22,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:textColor="#fff0c8b4"
+        android:textColor="#FFCC99"
         android:textSize="36sp"
         android:textStyle="bold"
         tools:text="1-12" />
@@ -43,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="餐盘码"
-            android:textColor="#fff0c8b4"
+            android:textColor="#FFCC99"
             android:textSize="26sp" />
 
         <Space
@@ -55,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="确认餐盘码是否有误"
-            android:textColor="#ff7c6d6a"
+            android:textColor="#666666"
             android:textSize="20sp" />
     </LinearLayout>
 
@@ -72,11 +73,11 @@
             android:layout_height="match_parent"
             android:background="@color/transparent"
             android:gravity="center"
-            android:maxLines="1"
             android:hint="请录入餐盘码"
             android:inputType="number"
-            android:textColor="#fff0c8b4"
-            android:textColorHint="#ff7c6d6a"
+            android:maxLines="1"
+            android:textColor="#FFCC99"
+            android:textColorHint="#999999"
             android:textSize="26sp"
             android:textStyle="bold"
             tools:text="" />
@@ -92,7 +93,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="会员"
-            android:textColor="#fff0c8b4"
+            android:textColor="#FFCC99"
             android:textSize="26sp" />
 
         <Space
@@ -104,7 +105,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="仅限VIP会员绑定，非VIP暂不支持"
-            android:textColor="#ff7c6d6a"
+            android:textColor="#666666"
             android:textSize="20sp" />
     </LinearLayout>
 
@@ -117,17 +118,25 @@
 
         <EditText
             android:id="@+id/et_user_info"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_weight="1"
             android:background="@color/transparent"
             android:gravity="center"
             android:hint="请输入会员姓名或手机号"
-            android:imeOptions="actionDone"
+            android:imeOptions="actionSearch"
             android:inputType="text"
             android:maxLines="1"
-            android:textColor="#F0C8B4"
-            android:textColorHint="#ff7c6d6a"
+            android:textColor="#FFCC99"
+            android:textColorHint="#999999"
             android:textSize="26sp" />
+
+        <ImageView
+            android:id="@+id/iv_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="24dp"
+            android:src="@drawable/ic_search" />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -150,7 +159,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="绑定开门"
-            android:textColor="#ff11111c"
+            android:textColor="#11111C"
             android:textSize="30sp"
             android:textStyle="bold" />
     </LinearLayout>
@@ -162,6 +171,6 @@
         android:layout_marginTop="46dp"
         android:paddingHorizontal="20dp"
         android:text="返回"
-        android:textColor="#ff887872"
+        android:textColor="#FFCC99"
         android:textSize="26sp" />
 </LinearLayout>

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

@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="48dp"
         android:text="餐盘柜已满"
-        android:textColor="#fff0c8b4"
+        android:textColor="#FFCC99"
         android:textSize="36sp" />
 
     <TextView
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:text="3秒后返回主屏"
-        android:textColor="#ff887872"
+        android:textColor="#FFCC99"
         android:textSize="20sp" />
 
 

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

@@ -51,7 +51,7 @@
                 android:layout_marginHorizontal="20dp"
                 android:maxLines="1"
                 android:ellipsize="end"
-                android:textColor="#ff887872"
+                android:textColor="#FFCC99"
                 android:textSize="24sp" />
 
             <TextView
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="34dp"
                 android:text="3"
-                android:textColor="#fff0c8b4"
+                android:textColor="#FFCC99"
                 android:textSize="36sp" />
         </LinearLayout>
     </FrameLayout>

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

@@ -13,14 +13,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="80dp"
-        android:src="@drawable/ic_unbind_img" />
+        android:rotation="180"
+        android:src="@drawable/ic_bind_img" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="25dp"
         android:text="柜体编号"
-        android:textColor="#ff7c6d6a"
+        android:textColor="#999999"
         android:textSize="20sp" />
 
     <TextView
@@ -30,7 +31,7 @@
         android:layout_marginTop="23dp"
         tools:text="1-12"
         android:textStyle="bold"
-        android:textColor="#fff0c8b4"
+        android:textColor="#FFCC99"
         android:textSize="36sp" />
 
 
@@ -53,7 +54,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="餐盘码"
-                android:textColor="#ff7c6d6a"
+                android:textColor="#999999"
                 android:textSize="24sp" />
 
             <Space
@@ -66,7 +67,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="100888"
-                android:textColor="#fff0c8b4"
+                android:textColor="#FFCC99"
                 android:textSize="24sp"
                 android:textStyle="bold" />
         </LinearLayout>
@@ -88,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="姓名"
-                android:textColor="#ff7c6d6a"
+                android:textColor="#999999"
                 android:textSize="24sp" />
 
             <Space
@@ -101,7 +102,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="曹*磊"
-                android:textColor="#fff0c8b4"
+                android:textColor="#FFCC99"
                 android:textSize="24sp"
                 android:textStyle="bold" />
         </LinearLayout>
@@ -123,7 +124,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="手机号"
-                android:textColor="#ff7c6d6a"
+                android:textColor="#999999"
                 android:textSize="24sp" />
 
             <Space
@@ -136,7 +137,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="138****8000"
-                android:textColor="#fff0c8b4"
+                android:textColor="#FFCC99"
                 android:textSize="24sp"
                 android:textStyle="bold" />
         </LinearLayout>
@@ -157,7 +158,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="最近使用"
-                android:textColor="#ff7c6d6a"
+                android:textColor="#999999"
                 android:textSize="24sp" />
 
             <Space
@@ -170,7 +171,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="14天前使用"
-                android:textColor="#fff0c8b4"
+                android:textColor="#FFCC99"
                 android:textSize="24sp"
                 android:textStyle="bold" />
         </LinearLayout>
@@ -188,7 +189,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="解除绑定"
-            android:textColor="#ff11111c"
+            android:textColor="#11111C"
             android:textSize="30sp"
             android:textStyle="bold" />
     </LinearLayout>
@@ -200,6 +201,6 @@
         android:layout_marginTop="48dp"
         android:paddingHorizontal="20dp"
         android:text="返回"
-        android:textColor="#ff887872"
+        android:textColor="#FFCC99"
         android:textSize="26sp" />
 </LinearLayout>

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

@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:text="02"
-        android:textColor="#fff0c8b4"
+        android:textColor="#FFCC99"
         android:textSize="24sp"
         android:textStyle="bold" />
 
@@ -27,7 +27,7 @@
         android:layout_marginStart="24dp"
         android:layout_weight="1"
         android:text="未绑定"
-        android:textColor="#fff0c8b4"
+        android:textColor="#FFCC99"
         android:textSize="18sp"
         android:textStyle="bold"
         android:visibility="gone" />

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

@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="马*飞(8000)"
-        android:textColor="#fff0c8b4"
+        android:textColor="#FFCC99"
         android:textSize="26sp"
         android:textStyle="bold" />
 
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="138****8000"
-        android:textColor="#ff7c6d6a"
+        android:textColor="#999999"
         android:textSize="20sp"
         android:textStyle="bold" />
 </LinearLayout>

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="40dp"
     android:paddingHorizontal="24dp">
 
     <TextView
@@ -11,11 +11,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:paddingTop="20dp"
-        android:textColor="#F0C8B4"
+        android:textColor="#FFCC99"
         android:textSize="18sp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         tools:text="2025年6月18日 星期三" />
 
     <TextView
@@ -23,11 +22,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:paddingTop="20dp"
-        android:textColor="#F0C8B4"
+        android:textColor="#FFCC99"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tvLeftDate"
+        app:layout_constraintBottom_toBottomOf="@id/tvLeftDate"
         tools:text="14:02:39" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-night/themes.xml

@@ -3,5 +3,6 @@
     <style name="Base.Theme.SmartPlateCabinet" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+        <item name="android:windowBackground">@drawable/bg_splash</item>
     </style>
 </resources>

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

@@ -7,12 +7,12 @@
     <color name="bind_4E535D">#4E535D</color>
     <color name="bind_585868">#585868</color>
     <color name="bind_time_old">#FF9632</color>
-    <color name="bind_F0C8B4">#F0C8B4</color>
-    <color name="unbind_F0C8B4">#F0C8B4</color>
+    <color name="bind_FFCC99">#FFCC99</color>
+    <color name="unbind_FFCC99">#FFCC99</color>
     <color name="unbind_32283C">#32283C</color>
 
     <color name="divColor">#4c91ceff</color>
     <color name="tip_title_success">#ff02f1be</color>
-    <color name="tip_title_fail">#FF9933</color>
-    <color name="tip_sub_title">#887872</color>
+    <color name="tip_title_fail">#FFCC99</color>
+    <color name="tip_sub_title">#FFCC99</color>
 </resources>

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

@@ -4,6 +4,7 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowBackground">@drawable/bg_splash</item>
     </style>
 
     <style name="Theme.SmartPlateCabinet" parent="Base.Theme.SmartPlateCabinet" />
@@ -22,4 +23,14 @@
         <item name="windowActionBar">false</item>
     </style>
 
+    <style name="DialogActivity" parent="Theme.AppCompat.Light.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
 </resources>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+<!--    <domain-config cleartextTrafficPermitted="true">-->
+<!--        <domain includeSubdomains="true">vip.shuziweidao.com</domain>-->
+<!--        <domain includeSubdomains="true">192.168.1.207</domain>-->
+<!--        <domain includeSubdomains="true">device.shuziweidao.com</domain>-->
+<!--    </domain-config>-->
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>

gradle/libs.versions.toml

@@ -23,7 +23,12 @@ timber = "5.0.1"
 gson = "2.13.1"
 hiltAndroid = "2.56.2"
 
+core = "3.4.1"
+androidCore = "3.3.0"
+
 [libraries]
+android-core = { module = "com.google.zxing:android-core", version.ref = "androidCore" }
+core = { module = "com.google.zxing:core", version.ref = "core" }
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }

lib_face/build.gradle.kts

@@ -55,7 +55,7 @@ dependencies {
     implementation("com.licheedev:android-serialport:2.1.5")
 
     val roomVersion = "2.2.5"
-    implementation("androidx.room:room-runtime:$roomVersion")
+    api("androidx.room:room-runtime:$roomVersion")
     annotationProcessor("androidx.room:room-compiler:$roomVersion")
 
     implementation("io.reactivex.rxjava2:rxandroid:2.0.1")

lib_face/proguard-rules.pro

@@ -18,4 +18,5 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+ -keep class androidx.core.app.CoreComponentFactory { *; }

lib_face/src/main/java/com/sw/plate/utils/PrefUtils.java

@@ -44,6 +44,18 @@ public class PrefUtils {
         sp.edit().putInt(key, value).commit();
     }
 
+    public static long getLong(Context ctx, String key, long defaultValue) {
+        SharedPreferences sp = ctx.getSharedPreferences(PREF_NAME,
+                Context.MODE_PRIVATE);
+        return sp.getLong(key, defaultValue);
+    }
+
+    public static void setLong(Context ctx, String key, long value) {
+        SharedPreferences sp = ctx.getSharedPreferences(PREF_NAME,
+                Context.MODE_PRIVATE);
+        sp.edit().putLong(key, value).commit();
+    }
+
     public static float getFloat(Context ctx, String key, float defaultValue) {
         SharedPreferences sp = ctx.getSharedPreferences(PREF_NAME,
                 Context.MODE_PRIVATE);

lib_face/src/main/java/com/sw/plate/utils/ScanGunKeyEventHelper.java

@@ -23,9 +23,9 @@ public class ScanGunKeyEventHelper {
     //    private String mDeviceName = "TMC HIDKeyBoard";
     private String mDeviceName = "Linux 3.4.35 with ak-hsudc Composite Gadget (ACM + HID)";
     private String mDeviceName1 = "USBKey Chip USBKey Module";
+    private long lastTime = 0L;
 
     public ScanGunKeyEventHelper(Context context, OnScanSuccessListener onScanSuccessListener) {
-
         mContext = context;
         mOnScanSuccessListener = onScanSuccessListener;
         mStringBufferResult = new StringBuffer();
@@ -38,6 +38,14 @@ public class ScanGunKeyEventHelper {
      */
     private void performScanSuccess() {
         String barcode = mStringBufferResult.toString();
+        L.d("performScanSuccess barcode = " + barcode);
+        long currentTime = System.currentTimeMillis();
+        if (currentTime - lastTime < 5 * 1000) {
+            L.d("performScanSuccess 操作太频繁");
+            mStringBufferResult.setLength(0);
+            return;
+        }
+        lastTime = currentTime;
         if (mOnScanSuccessListener != null && !TextUtils.isEmpty(barcode))
             mOnScanSuccessListener.onScanSuccess(barcode);
         mStringBufferResult.setLength(0);

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

@@ -1,6 +1,7 @@
 package com.sw.plate.utils.arcface;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.arcsoft.face.FaceEngine;
@@ -32,7 +33,7 @@ public class FaceApi {
     public void updateFaceData(int index, List<FaceEntity> list) {
         Log.d(TAG, "updateFaceData: index = " + index + ", listSize = " + list.size());
         FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
-        if (index == 0) {
+        if (index == 1) {
             faceDao.deleteAll();
             faceDao.resetId();
         }
@@ -79,4 +80,26 @@ public class FaceApi {
 //        List<FacePreviewInfo> facePreviewInfoList = recognizeViewModel.onPreviewFrame(nv21, true);
         return null;
     }
+
+    public void deleteByUserName(String userName) {
+        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        faceDao.deleteFaceById(userName);
+    }
+
+    public Long insert(FaceEntity entity) {
+        if (entity == null) {
+            return 0L;
+        }
+        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        return faceDao.insert(entity);
+    }
+
+    public FaceEntity queryByUserName(String userName) {
+        if (TextUtils.isEmpty(userName)) {
+            return null;
+        }
+        FaceDao faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+        return faceDao.queryByUserName(userName);
+    }
+
 }

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

@@ -88,4 +88,7 @@ public interface FaceDao {
 
     @Query("UPDATE sqlite_sequence SET seq = 0 WHERE name ='face'")
     void resetId();
+
+    @Query("SELECT * FROM face WHERE user_name = :userName limit 1")
+    FaceEntity queryByUserName(String userName);
 }

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

@@ -2,9 +2,11 @@ package com.sw.plate.utils.arcface.facedb.entity;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
+import androidx.room.Ignore;
 import androidx.room.PrimaryKey;
 
 import java.util.Arrays;
@@ -42,7 +44,14 @@ public class FaceEntity implements Parcelable {
      */
     @ColumnInfo(name = "register_time")
     private long registerTime;
+    /**
+     * 用户类型：1-普通会员、2-临时用户、3-内部员工、或者其它待定类型
+     */
+    @ColumnInfo(name = "user_type")
+    private String userType;
 
+    @Ignore
+    private int trackId;//人脸追踪ID
 
     public FaceEntity(String userName, String imagePath, byte[] featureData) {
         this.userName = userName;
@@ -120,6 +129,22 @@ public class FaceEntity implements Parcelable {
         this.registerTime = registerTime;
     }
 
+    public int getTrackId() {
+        return trackId;
+    }
+
+    public void setTrackId(int trackId) {
+        this.trackId = trackId;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
     @Override
     public int describeContents() {
         return 0;
@@ -132,8 +157,11 @@ public class FaceEntity implements Parcelable {
         dest.writeString(userName);
         dest.writeString(imagePath);
         dest.writeByteArray(featureData);
+        dest.writeString(userType);
     }
 
+
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -143,16 +171,17 @@ public class FaceEntity implements Parcelable {
             return false;
         }
         FaceEntity that = (FaceEntity) o;
-        return faceId == that.faceId &&
-                registerTime == that.registerTime &&
-                userName.equals(that.userName) &&
-                imagePath.equals(that.imagePath) &&
-                Arrays.equals(featureData, that.featureData);
+        return this.faceId == that.faceId &&
+                this.registerTime == that.registerTime &&
+                TextUtils.equals(this.userName, that.userName) &&
+                TextUtils.equals(this.imagePath, that.imagePath) &&
+                Arrays.equals(featureData, that.featureData) &&
+                TextUtils.equals(this.userType, that.userType);
     }
 
     @Override
     public int hashCode() {
-        int result = Objects.hash(faceId, registerTime, userName, imagePath);
+        int result = Objects.hash(faceId, registerTime, userName, imagePath, userType);
         result = 31 * result + Arrays.hashCode(featureData);
         return result;
     }

lib_face/src/main/java/com/sw/plate/utils/arcface/faceserver/FaceServer.java

@@ -33,6 +33,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -60,6 +61,10 @@ public class FaceServer {
         faceRegisterInfoList = new ArrayList<>();
     }
 
+    public FaceEngine getFaceEngine() {
+        return faceEngine;
+    }
+
     public static FaceServer getInstance() {
         if (faceServer == null) {
             synchronized (FaceServer.class) {
@@ -341,6 +346,7 @@ public class FaceServer {
      */
     public void registerFaceFeatureInfoFromDb(FaceEntity faceEntity, FaceEngine faceEngine) {
         if (faceEntity != null && faceEngine != null) {
+            Log.i(TAG, "registerFaceFeature:" + faceEntity.getFaceId()+"==="+ Arrays.toString(faceEntity.getFeatureData()));
             FaceFeatureInfo faceFeatureInfo = new FaceFeatureInfo((int) faceEntity.getFaceId(), faceEntity.getFeatureData());
             int res = faceEngine.registerFaceFeature(faceFeatureInfo);
             Log.i(TAG, "registerFaceFeature:" + res);

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

@@ -337,8 +337,10 @@ public class RecognizeViewModel extends ViewModel implements RecognizeCallback {
     }
 
     public void addFace(FaceEntity faceEntity) {
-        if (frEngine != null)
+        if (frEngine != null) {
+            Log.e("performSync", "addFace=" + faceEntity.getRegisterTime());
             FaceServer.getInstance().registerFaceFeatureInfoFromDb(faceEntity, frEngine);
+        }
     }
 
     public void refreshFaceList() {

lib_face/src/main/java/com/sw/plate/utils/comn/SerialApi.java

@@ -34,4 +34,14 @@ public class SerialApi {
         }
         serialPortManager.sendCommand(generateOpenCommand(boxNumber), callback);
     }
+
+    public static void close() {
+        if (serialPort != null) {
+            serialPort.close();
+            serialPort = null;
+        }
+        if (serialPortManager != null) {
+            serialPortManager.close();
+        }
+    }
 }