完善了功能

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

@@ -12,7 +12,6 @@ import android.view.ViewTreeObserver
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.Observer
-import androidx.lifecycle.lifecycleScope
 import com.arcsoft.face.ErrorInfo
 import com.sw.plate.utils.ToastUtils
 import com.sw.plate.utils.arcface.ConfigUtil
@@ -31,9 +30,7 @@ import com.sw.platecabinet.R
 import com.sw.platecabinet.databinding.ActivityLoginFaceBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.utils.PermissionHelper
-import com.sw.platecabinet.viewmodel.UserViewModel
-import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.launch
+import com.sw.platecabinet.utils.ThreadUtils
 import timber.log.Timber
 
 /**
@@ -41,7 +38,6 @@ import timber.log.Timber
  */
 class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     ViewTreeObserver.OnGlobalLayoutListener {
-    private val viewModel by viewModels<UserViewModel>()
     private val recognizeViewModel by viewModels<RecognizeViewModel>()
 
     private val CAMERA_PERMISSION_REQUEST_CODE = 100
@@ -60,7 +56,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     }
 
     override fun initialize() {
-        viewModel.activeEngine()
+        ThreadUtils.launch {
+            viewModel.activeEngine()
+        }
+
         initArcViewModel()
         initArcView()
         openRectInfoDraw = true
@@ -72,20 +71,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         }
     }
 
-    override fun registerDataChange() {
-        super.registerDataChange()
-        lifecycleScope.launch {
-            viewModel.currentUserInfo.drop(1).collect {
-                Timber.d("currentUserInfo it = $it")
-                if (it != null) {
-                    ToastUtils.showToast("登录成功")
-                    MainActivity.start(context, pageType = PageType.PLATE_CABINET_FULL)
-                    finish()
-                }
-            }
-        }
-    }
-
     private fun checkCameraPermission() {
         Timber.i("checkCameraPermission")
         val permissionHelper =
@@ -355,12 +340,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         checkCameraPermission()
     }
 
-
-    //    @Override
-//    protected void onResume() {
-//        super.onResume();
-//        resumeCamera();
-//    }
     private fun resumeCamera() {
         isRecognition = true
         if (rgbCameraHelper != null && rgbCameraHelper!!.isStopped) {
@@ -368,6 +347,12 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        resumeCamera()
+        viewModel.resetUserInfo()
+    }
+
     protected override fun onPause() {
         pauseCamera()
         super.onPause()