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 cc159db..b4a1aa7 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -95,6 +95,16 @@ class LoginByFaceActivity : BaseActivity(), override fun initialize() { userViewModel.activeEngine() + PlcHelper.getInstance(this).openSerialPort(object : PlcCallback { + override fun onSuccess(result: String) { + ToastUtils.showToast("打开串口 → 成功: ${result}") + } + + override fun onError(message: String) { + ToastUtils.showToast("打开串口 → 失败: $message") + } + }) + initArcViewModel() initArcView() openRectInfoDraw = true @@ -414,17 +424,18 @@ class LoginByFaceActivity : BaseActivity(), SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0) plateEnable = false recognizeCountDownUtil.cancelCountDown() - PlcHelper.getInstance(this@LoginByFaceActivity).outPlate(object : PlcCallback { - override fun onSuccess(result: String) { - loadLogInfo("collectFace,openPlate: 出盘成功,result=$result") - goInitActivity() - } + PlcHelper.getInstance(this@LoginByFaceActivity) + .outPlate(object : PlcCallback { + override fun onSuccess(result: String) { + loadLogInfo("collectFace,openPlate: 出盘成功,result=$result") + goInitActivity() + } - override fun onError(message: String) { - loadLogInfo("collectFace,openPlate: 出盘失败,message=$message") - goInitActivity() - } - }) + override fun onError(message: String) { + loadLogInfo("collectFace,openPlate: 出盘失败,message=$message") + goInitActivity() + } + }) } override fun onError(message: String) { 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 9790114..02c0337 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/PlcSettingActivity.kt @@ -144,6 +144,7 @@ class PlcSettingActivity : BaseActivity() { override fun onSuccess(result: String) { hideWaitingDialog() ToastUtils.showToast("返回营业成功:$result") + finish() } 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 62817b3..cbd85b6 100644 --- a/app/src/main/res/layout/activity_plc_setting.xml +++ b/app/src/main/res/layout/activity_plc_setting.xml @@ -15,9 +15,9 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" + android:clipToPadding="false" android:paddingHorizontal="50dp" - android:paddingVertical="20dp" - android:clipToPadding="false"> + android:paddingVertical="20dp"> - - - - - - - - + android:orientation="vertical" + android:visibility="gone"> + + - + android:textSize="22sp" /> + + + + + + + + + + + + + + + + + + + + + + - - - + android:layout_width="match_parent" + android:layout_height="30dp" /> - - - - - - - - - - - -