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 ca27479..15d3bb4 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -221,6 +221,7 @@ class LoginByFaceActivity : BaseActivity(), private fun isFitData(userFaceInfo: UserFaceInfo?): Boolean { if (userFaceInfo == null) return false val headBmp = userFaceInfo.headBmp + loadLogInfo("collectFace,isFitData:w=${headBmp?.width},height=${headBmp?.height}") if (headBmp == null) return false // if (headBmp.width <= 200 || headBmp.height <= 200) { // loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小-----------") @@ -234,9 +235,12 @@ class LoginByFaceActivity : BaseActivity(), recognizeViewModel.prepareRegister() recognizeViewModel.setOnRegisterFinishedCallback { facePreviewInfo, userFaceInfo -> registerHandler?.setCallback { + loadLogInfo("collectFace,registerHandler?.setCallback") if (!isCollectFace || !isCollecting.get()) { + loadLogInfo("collectFace,isCollectFace=${isCollectFace},isCollecting=${isCollecting.get()}") return@setCallback } + loadLogInfo("collectFace,userFaceInfo==null:${userFaceInfo==null}") if (this.userFaceInfo == null && isFitData(userFaceInfo)) { val headBmp = userFaceInfo.headBmp ?: run { loadLogInfo("collectFace,isFitData:headBmp 为 null,跳过") 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 625f3f0..598abbe 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt @@ -79,6 +79,10 @@ class PlcSettingActivity : BaseActivity() { }) }).show() } + + binding.tvTips.clickWithDebounce { + binding.layoutTips.visibility = android.view.View.GONE + } } // ==================== 连接控制 ==================== @@ -204,18 +208,19 @@ class PlcSettingActivity : BaseActivity() { PlcHelper.getInstance(this).platformUp(object : PlcCallback { override fun onSuccess(result: String) { // 平台上升完成,继续执行返回营业 - PlcHelper.getInstance(this@PlcSettingActivity).backToBusiness(object : PlcCallback { - override fun onSuccess(result: String) { - hideWaitingDialog() - ToastUtils.showToast("平台复位成功") - finish() - } + PlcHelper.getInstance(this@PlcSettingActivity) + .backToBusiness(object : PlcCallback { + override fun onSuccess(result: String) { + hideWaitingDialog() + ToastUtils.showToast("平台复位成功") + finish() + } - override fun onError(message: String) { - hideWaitingDialog() - ToastUtils.showToast("返回营业失败:$message") - } - }) + override fun onError(message: String) { + hideWaitingDialog() + ToastUtils.showToast("返回营业失败:$message") + } + }) } override fun onError(message: String) { diff --git a/app/src/main/res/layout/activity_plc_setting.xml b/app/src/main/res/layout/activity_plc_setting.xml index b84673f..f98afc9 100644 --- a/app/src/main/res/layout/activity_plc_setting.xml +++ b/app/src/main/res/layout/activity_plc_setting.xml @@ -23,7 +23,7 @@ android:src="@mipmap/img_error_tips" tools:ignore="ContentDescription" /> - + android:textSize="32sp" />