Merge remote-tracking branch 'refs/remotes/origin/main_新版_lvmeng_1222' into main_新版_lvmeng_1229

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

@@ -80,7 +80,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         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)
@@ -170,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?.toIntOrNull())
         })
 
         recognizeViewModel.drawRectInfoText.observe(this, Observer { info ->