增加配置接口；调试人脸识别；验证手机号密码登录和人脸登录功能；

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

@@ -200,10 +200,10 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     private fun disableSystemUICompletely() {
         Timber.d("disableSystemUICompletely")
         // 禁用系统手势（Android 10+）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.insetsController?.systemBarsBehavior =
-                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-        }
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+//            window.insetsController?.systemBarsBehavior =
+//                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+//        }
 
 
         // 全屏+隐藏导航栏（所有版本通用）
@@ -330,10 +330,12 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
      */
     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
         }

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

@@ -1,20 +1,22 @@
 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>() {
 
-//    private val deviceViewModel by viewModels<DeviceViewModel>()
-
     override fun inflateViewBinding(): ActivityDeviceInitBinding {
         return ActivityDeviceInitBinding.inflate(layoutInflater)
     }
@@ -24,9 +26,6 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
     }
 
     override fun initialize() {
-        var deviceId = AppUtil.getUDID(this)
-        deviceId = "be154831-3466-3ba2-a2ea-57652c919fed"
-        GlobalData.deviceId = deviceId
 //        val isSuccess = deviceViewModel.checkEquipmentInfo()
 //        if (isSuccess) {
 //            goLoginActivity()
@@ -41,11 +40,29 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
 //        binding.btnInit.setOnClickListener {
 //            deviceViewModel.getDeviceToken()
 //        }
-        binding.btnInit.gone()
-        binding.ivQrCode.invisible()
-        binding.root.postDelayed({
-            goLoginActivity()
-        }, 1000)
+//        binding.btnInit.gone()
+//        binding.ivQrCode.invisible()
+//        binding.root.postDelayed({
+//            goLoginActivity()
+//        }, 1000)
+        showWaitingDialog("加载中……")
+        viewModel.getDeviceConfig { deviceConfig ->
+            runOnUiThread {
+                if (deviceConfig == null) {
+                    hideWaitingDialog()
+                    ToastUtils.showToast("获取设备配置数据失败")
+                    return@runOnUiThread
+                }
+                GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
+                GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
+                GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
+                binding.root.postDelayed({
+                    hideWaitingDialog()
+                    goLoginActivity()
+                }, 500)
+            }
+        }
+//        goLoginActivity()
     }
 
     override fun registerDataChange() {

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

@@ -81,7 +81,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         openRectInfoDraw = true
         recognizeViewModel.setDrawRectInfoTextValue(true)
         //viewModel.generateToken()
-        viewModel.activeEngine()
+//        viewModel.activeEngine()
         viewModel.getUserFaceCache()
 
         binding.llToPwd.setOnClickListener {
@@ -173,7 +173,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
         recognizeViewModel.recognizeUserId.observe(this, Observer { userId: String? ->
             Timber.i("recognizeUserId observe userId = $userId")
-            viewModel.getUserInfoById(memberId = userId?.toIntOrNull())
+            viewModel.getUserInfoById(memberId = userId)
         })
 
         recognizeViewModel.drawRectInfoText.observe(this, Observer { info ->

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

@@ -53,9 +53,9 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
         super.handleLoginSuccess(equipmentUserInfo, isAdmin)
 //        val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble()
 //        val balanceIsNotEnough = cardBalance <= 0.toDouble()
-//        if (balanceIsNotEnough) {
-//            return
-//        }
+        if (equipmentUserInfo.isIntercept) {
+            return
+        }
         LoginByFaceActivity.goInitActivity()
         finish()
     }