增加人脸采集功能；

识别人脸成功后打开有餐盘的第一个柜子；扫码打开已绑定的柜子，无则打开第一个空柜子并放入餐盘；设置页面问题优化；
2026-01-14 19:00:20 +08:00
parent 11a0a41e3c
commit aadba7efd5
24 changed files with 1327 additions and 908 deletions
@@ -25,6 +25,7 @@ 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.MyApp
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.dialog.BalanceNotEnoughDialog
@@ -33,6 +34,7 @@ import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.UserFaceModel
 import com.sw.platecabinet.utils.IntervalExecutor
 import com.sw.platecabinet.utils.PermissionHelper
+import com.sw.platecabinet.utils.PlateUtils
 import com.sw.platecabinet.utils.SpTool
 import com.sw.platecabinet.view.CustomLoadingDialog
 import com.sw.platecabinet.viewmodel.SettingViewModel
@@ -106,7 +108,34 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     * 处理扫描枪数据
     */
    protected open fun handleScanKeyInfo(scanInfo: String) {
-        settingViewModel.findByPlateNumber(plateNumber = scanInfo)
+//        settingViewModel.findByPlateNumber(plateNumber = scanInfo)
+        var plateNumber = scanInfo
+        if (scanInfo.length > 6) {
+            plateNumber = scanInfo.take(6)
+        }
+//        ToastUtils.showToast(plateNumber)
+        var item = MyApp.plateList?.firstOrNull { it.plateNumber == plateNumber }
+        if (item == null) {
+            //柜子未关联该餐盘，直接找空位置放入盘子
+            item = MyApp.plateList?.firstOrNull { it.plateNumber.isNullOrBlank() }
+            if (item ==null) {
+                //柜子已满
+                MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
+                return
+            }
+            //找到位置，放入餐盘，清除已有id和时间
+            item.plateNumber = plateNumber
+            item.faceId = null
+            item.updateTime = null
+            PlateUtils.open(this, item.equipmentBoxCode)
+            return
+        }
+        //放入餐盘，清除已有id和时间
+        item.plateNumber = plateNumber
+        item.faceId = null
+        item.updateTime = null
+        PlateUtils.open(this, item.equipmentBoxCode)
+        SpTool.savePlateData(MyApp.plateList!!)
    }

    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
@@ -279,7 +308,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
        lifecycleScope.launch {
            viewModel.currentUserInfo.collect {
                if (it == null) return@collect
-                it.showBalanceNotEnoughDialog = true
+//                it.showBalanceNotEnoughDialog = true
                handleLoginSuccess(it, false)
            }
        }
@@ -329,57 +358,57 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     * @param isAdmin  true 管理员 执行绑盘此操作   false 用户，提示错误
     */
    open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
-        Timber.d("handleLoginSuccess isAdmin = $isAdmin")
-        equipmentUserInfo.isIntercept = false
-        val cardBalance = equipmentUserInfo.cardBalance ?: 0.toDouble()
-        val balanceIsNotEnough = cardBalance <= 0.toDouble()
-        if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) {
-            //提示余额不足弹窗
-            equipmentUserInfo.isIntercept = true
-            BalanceNotEnoughDialog(this).show()
-            return
-        }
-        viewModel.resetUserInfo()
-//        if (equipmentUserInfo.isOtherEquipment()) {
-//            MainActivity.start(
-//                context,
-//                pageType = PageType.PLATE_TIP,
-//                equipmentUserInfo = equipmentUserInfo,
-//                isAdmin
-//            )
+//        Timber.d("handleLoginSuccess isAdmin = $isAdmin")
+//        equipmentUserInfo.isIntercept = false
+//        val cardBalance = equipmentUserInfo.cardBalance ?: 0.toDouble()
+//        val balanceIsNotEnough = cardBalance <= 0.toDouble()
+//        if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) {
+//            //提示余额不足弹窗
+//            equipmentUserInfo.isIntercept = true
+//            BalanceNotEnoughDialog(this).show()
 //            return
 //        }
-        if (equipmentUserInfo.equipmentBoxCode?.isNotEmpty() == true) {
-            SerialApi.openPlate(
-                equipmentUserInfo.equipmentBoxCode!!.toInt(),
-                object : SerialPortManager.SendCallback {
-                    override fun onSuccess() {
-                        MainActivity.start(
-                            context,
-                            pageType = PageType.PLATE_TIP,
-                            isAdmin = isAdmin
-                        )
-                    }
-
-                    override fun onFail(e: Exception?) {
-                        ToastUtils.showToast("柜门打开失败")
-                    }
-                })
-        } else {
-            if (isAdmin) {
-                settingViewModel.getEquipmentList {
-                    loadEquipmentList(it)
-                }
-            } else {
-                Timber.d("无餐盘信息")
-                MainActivity.start(
-                    context,
-                    pageType = PageType.PLATE_TIP,
-                    equipmentUserInfo = equipmentUserInfo,
-                    isAdmin = isAdmin
-                )
-            }
-        }
+//        viewModel.resetUserInfo()
+////        if (equipmentUserInfo.isOtherEquipment()) {
+////            MainActivity.start(
+////                context,
+////                pageType = PageType.PLATE_TIP,
+////                equipmentUserInfo = equipmentUserInfo,
+////                isAdmin
+////            )
+////            return
+////        }
+//        if (equipmentUserInfo.equipmentBoxCode?.isNotEmpty() == true) {
+//            SerialApi.openPlate(
+//                equipmentUserInfo.equipmentBoxCode!!.toInt(),
+//                object : SerialPortManager.SendCallback {
+//                    override fun onSuccess() {
+//                        MainActivity.start(
+//                            context,
+//                            pageType = PageType.PLATE_TIP,
+//                            isAdmin = isAdmin
+//                        )
+//                    }
+//
+//                    override fun onFail(e: Exception?) {
+//                        ToastUtils.showToast("柜门打开失败")
+//                    }
+//                })
+//        } else {
+//            if (isAdmin) {
+//                settingViewModel.getEquipmentList {
+//                    loadEquipmentList(it)
+//                }
+//            } else {
+//                Timber.d("无餐盘信息")
+//                MainActivity.start(
+//                    context,
+//                    pageType = PageType.PLATE_TIP,
+//                    equipmentUserInfo = equipmentUserInfo,
+//                    isAdmin = isAdmin
+//                )
+//            }
+//        }
    }

    override fun onDestroy() {
@@ -407,7 +436,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
    private var faceTimestamp = 0L

    private fun getFaceIncrementList() {
-        val timestamp = SpTool.getLastFaceTimestamp()
+        val timestamp = SpTool.lastFaceTimestamp
        if (timestamp == 0L) {
            return
        }
@@ -422,15 +451,15 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
                }
                updateFaceData(list)
                if (list.size >= settingViewModel.PAGE_SIZE) {
-                    faceTimestamp = list.last().faceUpdateTimestamp?:0
+                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
                    taskPageNo++
                    getFaceIncrementList()
                    return@runOnUiThread
                }
                if (list.isNotEmpty()) {
-                    faceTimestamp = list.last().faceUpdateTimestamp?:0
+                    faceTimestamp = list.last().faceUpdateTimestamp ?: 0
                }
-                SpTool.setLastFaceTimestamp(faceTimestamp)
+                SpTool.lastFaceTimestamp = faceTimestamp
            }
        }
    }
@@ -6,10 +6,13 @@ 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.MyApp
 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.model.response.EquipmentUserInfo
+import com.sw.platecabinet.utils.SpTool
 import com.sw.platecabinet.viewmodel.SettingViewModel

 /**
@@ -45,6 +48,7 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
 //        binding.root.postDelayed({
 //            goLoginActivity()
 //        }, 1000)
+        initPlateList()
        showWaitingDialog("加载中……")
        viewModel.getDeviceConfig { deviceConfig ->
            runOnUiThread {
@@ -88,4 +92,23 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {

    }

+    private fun initPlateList() {
+//        SpTool.putString(SpTool.PLATE_BOX_DATA, "")
+        var list = SpTool.getPlateData()
+        if (list.isNullOrEmpty()) {
+            list = mutableListOf()
+            repeat(22) { index ->
+                list.add(
+                    EquipmentUserInfo(
+                        equipmentBoxCode = "${index + 1}",
+//                        faceId = null,
+//                        plateNumber = if (index == 4) "011075" else null,
+//                        updateTime = null
+                    )
+                )
+            }
+        }
+        MyApp.plateList = list
+    }
+
 }
@@ -7,13 +7,21 @@ import android.hardware.Camera
 import android.os.Build
 import android.os.CountDownTimer
 import android.util.DisplayMetrics
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import com.arcsoft.face.ErrorInfo
+import com.google.gson.Gson
+import com.sw.inbound.utils.DateTimeUtils
+import com.sw.inbound.utils.GsonUtils
+import com.sw.plate.App
+import com.sw.plate.utils.Base64
 import com.sw.plate.utils.ToastUtils
 import com.sw.plate.utils.arcface.ConfigUtil
 import com.sw.plate.utils.arcface.ErrorCodeUtil
@@ -24,17 +32,31 @@ import com.sw.plate.utils.arcface.PreviewConfig
 import com.sw.plate.utils.arcface.camera.CameraListener
 import com.sw.plate.utils.arcface.camera.DualCameraHelper
 import com.sw.plate.utils.arcface.face.constants.LivenessType
+import com.sw.plate.utils.arcface.face.model.CompareResult
 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.FaceDatabase
 import com.sw.plate.utils.arcface.facedb.entity.FaceEntity
+import com.sw.plate.utils.arcface.model.UserFaceInfo
 import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
+import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel.REGISTER_STATUS_READY
+import com.sw.platecabinet.MyApp
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ActivityLoginFaceBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.ext.gone
+import com.sw.platecabinet.ext.invisible
+import com.sw.platecabinet.ext.visible
+import com.sw.platecabinet.model.request.BindParam
 import com.sw.platecabinet.model.response.EquipmentUserInfo
-import com.sw.platecabinet.network.task.TaskManager
+import com.sw.platecabinet.utils.IntervalExecutor
 import com.sw.platecabinet.utils.PermissionHelper
+import com.sw.platecabinet.utils.PlateUtils
+import com.sw.platecabinet.utils.SpTool
+import com.sw.platecabinet.utils.countDownByFlow
+import com.sw.platecabinet.viewmodel.SettingViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.runBlocking
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -64,6 +86,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
    }

    companion object {
+        private const val TAG = "LoginByFaceActivity"
        private var instance: LoginByFaceActivity? = null

        fun goInitActivity() {
@@ -82,17 +105,26 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        recognizeViewModel.setDrawRectInfoTextValue(true)
        //viewModel.generateToken()
 //        viewModel.activeEngine()
-        viewModel.getUserFaceCache()

-        binding.llToPwd.setOnClickListener {
-            val intent = Intent(this, LoginByPwdActivity::class.java)
-            startActivity(intent)
-        }
+        // TODO: 暂时注释人脸接口数据，测试本地采集
+//        viewModel.getUserFaceCache()
+//        Thread {
+//            val faceDao = FaceDatabase.getInstance(App.getContext()).faceDao();
+//            faceDao.deleteAll()
+//            faceDao.resetId()
+//        }.start()

-        // TODO: 测试请求
-        TaskManager.startTask()
+
+//        binding.llToPwd.setOnClickListener {
+//            val intent = Intent(this, LoginByPwdActivity::class.java)
+//            startActivity(intent)
+//        }
+
+//        TaskManager.startTask()

        EventBus.getDefault().register(this)
+
+        binding.btnCollectFace.setOnClickListener { collectFace() }
    }

    private fun checkCameraPermission() {
@@ -131,7 +163,11 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
    private fun initArcViewModel() {

        recognizeViewModel.setLiveType(livenessType)
-
+        recognizeViewModel.prepareRegister()
+        recognizeViewModel.setOnRegisterFinishedCallback { facePreviewInfo, userFaceInfo ->
+            this.userFaceInfo = userFaceInfo
+            Log.d(TAG, "initArcViewModel: userFaceInfo == null : ${userFaceInfo == null}")
+        }
        recognizeViewModel.ftInitCode.observe(this, Observer { ftInitCode: Int? ->
            if (ftInitCode != ErrorInfo.MOK) {
                val error: String? = getString(
@@ -171,9 +207,19 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
            Timber.i("recognizeNotice observe notice = $notice")
        })

-        recognizeViewModel.recognizeUserId.observe(this, Observer { userId: String? ->
-            Timber.i("recognizeUserId observe userId = $userId")
-            viewModel.getUserInfoById(memberId = userId)
+        recognizeViewModel.recognizeUserId.observe(this, Observer { result: CompareResult? ->
+            Timber.i("recognizeUserId observe userId = ${result?.faceEntity?.userName}")
+            currentUserId = result?.faceEntity?.userName
+//            viewModel.getUserInfoById(memberId = userId)
+            //ToastUtils.showToast(userId)
+//            if (!currentUserId.isNullOrBlank()) {
+////                ToastUtils.showToast("您已采集过人脸信息")
+//                return@Observer
+//            }
+            if (currentPlateInfo?.faceId == currentUserId) {
+                return@Observer
+            }
+            openPlate(currentUserId)
        })

        recognizeViewModel.drawRectInfoText.observe(this, Observer { info ->
@@ -181,6 +227,69 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        })
    }

+//    private val settingViewModel by viewModels<SettingViewModel>()
+
+    /**
+     * 查询餐盘数据
+     */
+    private fun getPlateData(block: (List<EquipmentUserInfo>) -> Unit) {
+        MyApp.plateList?.let {
+            block(it)
+        }
+//        settingViewModel.getEquipmentList { items ->
+//            block(items)
+//        }
+    }
+
+    private var currentPlateInfo: EquipmentUserInfo? = null
+
+    /**
+     * 打开餐盘柜
+     */
+    private fun openPlate(userId: String?) {
+        getPlateData { items ->
+            Log.d(TAG, "openPlate: ${Gson().toJson(items)}")
+            var item = items.firstOrNull { it.faceId == userId }
+            if (item != null) {
+                //餐盘已取
+                ToastUtils.showToast("您已拿过餐盘！")
+                return@getPlateData
+            }
+            // 未查询到当前用户
+            item = items.firstOrNull { it.plateNumber.isNullOrEmpty().not() }
+            if (item == null) {
+                //暂无餐盘
+                ToastUtils.showToast("暂无餐盘，请联系管理人员！")
+                return@getPlateData
+            }
+            // TODO: 待定如何在设置页面显示plateNumber，可以增加字段处理
+            item.faceId = userId
+            item.updateTime = DateTimeUtils.getDateTimeString()
+            //打开柜子
+            PlateUtils.open(this, item.equipmentBoxCode)
+
+            currentPlateInfo = item
+            MyApp.plateList = items
+            SpTool.savePlateData(items)
+        }
+    }
+
+//    /**
+//     * 绑定餐盘
+//     */
+//    private fun bindPlate(item: EquipmentUserInfo) {
+//        val bindParam = BindParam(
+//            equipmentId = item.equipmentId,
+//            equipmentCode = item.equipmentCode,
+//            equipmentBoxCode = item.equipmentBoxCode,
+//            faceId = item.faceId,
+//            plateNumber = item.plateNumber
+//        )
+//        settingViewModel.bindPlate(bindParam) { pair ->
+//            Log.d(TAG, "openPlate: state:${pair.first},msg:${pair.second.code},${pair.second.msg}")
+//        }
+//    }
+
    private fun initArcView() {
        //在布局结束后才做初始化操作
        binding.dualCameraTexturePreviewRgb.getViewTreeObserver().addOnGlobalLayoutListener(this)
@@ -198,6 +307,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        recognizeViewModel.destroy()

        EventBus.getDefault().unregister(this)
+        countDownJob?.cancel()
+
        super.onDestroy()
    }

@@ -320,6 +431,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                if (facePreviewInfoList != null && rgbFaceRectTransformer != null) {
                    drawPreviewInfo(facePreviewInfoList)
                }
+                if (facePreviewInfoList.isNullOrEmpty()) {
+                    currentPlateInfo = null
+                    currentUserId = null
+                }
                recognizeViewModel.clearLeftFace(facePreviewInfoList)
            }

@@ -444,5 +559,100 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
        startActivity(intent)
    }

+    private fun collectFace() {
+        //toast("currentUserId=$currentUserId")
+        if (currentUserId != null) {
+            ToastUtils.showToast("您已采集过人脸信息")
+            return
+        }
+        currentUserId = null
+        userFaceInfo = null
+        recognizeViewModel.updateRegisterStatus(REGISTER_STATUS_READY)
+        //showWaitingDialog("人脸信息中……")
+
+//        binding.tvFaceTip.gone()
+        binding.btnCollectFace.invisible()
+        binding.layoutState.visible()
+        binding.pbCollectLoading.visible()
+        binding.tvCollectState.text = "采集中......"
+        getFaceData { faceData ->
+            Log.d("LoginByFaceActivity", "faceData: $faceData")
+            runOnUiThread {
+                //hideWaitingDialog()
+                //toast("人脸信息已采集")
+                binding.pbCollectLoading.gone()
+                //binding.tvCollectState.text = "采集完成"
+                userFaceInfo = null
+                countDown()
+            }
+//            sendFaceData(faceData)
+            saveFaceInfo(faceData)
+        }
+    }
+
+    private fun getFaceData(block: (String) -> Unit) {
+        runBlocking {
+            job = executor.startIntervalTask(5) {
+//                if (currentUserId != null && currentUserId!!.isNotBlank()) {
+//                    toast("您已采集过人脸信息")
+//                    return@startIntervalTask
+//                }
+                if (userFaceInfo == null) {
+                    return@startIntervalTask
+                }
+                val faceData = Base64.encode(userFaceInfo!!.faceFeature!!.featureData)
+                block(faceData)
+                job?.cancel()
+            }
+        }
+
+    }
+
+    private var userFaceInfo: UserFaceInfo? = null
+    private var countDownJob: Job? = null
+    private var job: Job? = null
+    val executor = IntervalExecutor()
+    private var currentUserId: String? = null
+    private fun countDown() {
+        countDownJob = countDownByFlow(
+            total = 3,
+            scope = lifecycleScope,
+            onStart = {
+                binding.tvCollectState.text = "采集完成（3s）"
+            },
+            onTick = { seconds ->
+                binding.tvCollectState.text = "采集完成（${seconds}s）"
+            },
+            onFinish = {
+                //binding.tvCollectState.text = "采集完成"
+                currentUserId = null
+                binding.layoutState.invisible()
+//                binding.tvFaceTip.visible()
+                binding.btnCollectFace.visible()
+            }
+        )
+    }
+
+    private fun saveFaceInfo(faceData: String) {
+        Thread {
+            try {
+                val tempId = "${System.currentTimeMillis()}"
+                val faceEntity = FaceEntity(
+                    tempId,
+                    null,
+                    Base64.decode(faceData)
+                ).also {
+                    it.userType = "2"
+                }
+                FaceDatabase.getInstance(this).faceDao().insert(faceEntity)
+                recognizeViewModel.refreshFaceList();
+                runOnUiThread {
+                    ToastUtils.showToast("你的人脸信息已采集")
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }.start()
+    }

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

 import android.content.Context
 import android.content.Intent
+import com.sw.platecabinet.MyApp
 import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ActivityMainBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
-import com.sw.platecabinet.fragment.BindPlateFragment
 import com.sw.platecabinet.fragment.PlateCabinetFullFragment
 import com.sw.platecabinet.fragment.PlateOpenFragment
 import com.sw.platecabinet.fragment.SettingListFragment
-import com.sw.platecabinet.fragment.UnBindPlateFragment
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.FragmentHelper

@@ -58,12 +57,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
        fragmentHelper = FragmentHelper(supportFragmentManager, R.id.fragment_container)
        val page = when (pageType) {
            PageType.SETTING_LIST -> SettingListFragment()
-            PageType.BIND_PLATE -> BindPlateFragment.newInstance(equipmentUserInfo)
+//            PageType.BIND_PLATE -> BindPlateFragment.newInstance(equipmentUserInfo)
            PageType.PLATE_TIP -> PlateOpenFragment.newInstance(equipmentUserInfo, isAdmin)
-            PageType.UNBIND_PLATE -> UnBindPlateFragment.newInstance(equipmentUserInfo)
+//            PageType.UNBIND_PLATE -> UnBindPlateFragment.newInstance(equipmentUserInfo)
            PageType.PLATE_CABINET_FULL -> PlateCabinetFullFragment()
+            else -> null
+        }
+        page?.let {
+            fragmentHelper.addFragment(it)
        }
-        fragmentHelper.addFragment(page)
    }

    override fun onLeftDoubleClick() {
@@ -1,57 +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) // 确保退出也无动画
-    }
-}
+//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) // 确保退出也无动画
+//    }
+//}