diff --git a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt index 6f6d081..8d8b192 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt @@ -256,6 +256,7 @@ abstract class BaseActivity : AppCompatActivity() { mDialogWaiting = CustomLoadingDialog(this, view, R.style.MyDialog) mDialogWaiting!!.show() mDialogWaiting!!.setCancelable(true) + mDialogWaiting!!.setCanceledOnTouchOutside(true) } } diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt index cbb745a..1946dbe 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -799,7 +799,7 @@ class LoginByFaceActivity : BaseActivity(), private fun pauseCamera() { isRecognition = false -// recognizeViewModel.onPreviewFrame(emptyFrame, true) + recognizeViewModel.onPreviewFrame(emptyFrame, true) } // private fun judgeRecognizeState(): Boolean { diff --git a/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt index 4b78118..0478878 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt @@ -32,6 +32,7 @@ class PlcSettingActivity : BaseActivity() { } } + override fun inflateViewBinding(): ActivityPlcSettingBinding { return ActivityPlcSettingBinding.inflate(layoutInflater) } @@ -58,6 +59,7 @@ class PlcSettingActivity : BaseActivity() { userViewModel.getUserFaceCache(pageNo = 1, callback = { state, errMsg -> hideWaitingDialog() if (state) { + recognizeViewModel.refreshFaceList() ToastUtils.showToast("人脸数据已更新") } else { ToastUtils.showToast(errMsg)