完善吐盘逻辑,调整设置界面,隐藏无关设置
This commit is contained in:
@@ -95,6 +95,16 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
override fun initialize() {
|
override fun initialize() {
|
||||||
userViewModel.activeEngine()
|
userViewModel.activeEngine()
|
||||||
|
|
||||||
|
PlcHelper.getInstance(this).openSerialPort(object : PlcCallback<String> {
|
||||||
|
override fun onSuccess(result: String) {
|
||||||
|
ToastUtils.showToast("打开串口 → 成功: ${result}")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onError(message: String) {
|
||||||
|
ToastUtils.showToast("打开串口 → 失败: $message")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
initArcViewModel()
|
initArcViewModel()
|
||||||
initArcView()
|
initArcView()
|
||||||
openRectInfoDraw = true
|
openRectInfoDraw = true
|
||||||
@@ -414,7 +424,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
|
SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
|
||||||
plateEnable = false
|
plateEnable = false
|
||||||
recognizeCountDownUtil.cancelCountDown()
|
recognizeCountDownUtil.cancelCountDown()
|
||||||
PlcHelper.getInstance(this@LoginByFaceActivity).outPlate(object : PlcCallback<String> {
|
PlcHelper.getInstance(this@LoginByFaceActivity)
|
||||||
|
.outPlate(object : PlcCallback<String> {
|
||||||
override fun onSuccess(result: String) {
|
override fun onSuccess(result: String) {
|
||||||
loadLogInfo("collectFace,openPlate: 出盘成功,result=$result")
|
loadLogInfo("collectFace,openPlate: 出盘成功,result=$result")
|
||||||
goInitActivity()
|
goInitActivity()
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
|
|||||||
override fun onSuccess(result: String) {
|
override fun onSuccess(result: String) {
|
||||||
hideWaitingDialog()
|
hideWaitingDialog()
|
||||||
ToastUtils.showToast("返回营业成功:$result")
|
ToastUtils.showToast("返回营业成功:$result")
|
||||||
|
finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onError(message: String) {
|
override fun onError(message: String) {
|
||||||
|
|||||||
@@ -15,9 +15,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
android:clipToPadding="false"
|
||||||
android:paddingHorizontal="50dp"
|
android:paddingHorizontal="50dp"
|
||||||
android:paddingVertical="20dp"
|
android:paddingVertical="20dp">
|
||||||
android:clipToPadding="false">
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -143,6 +143,11 @@
|
|||||||
android:textColor="#FFCC99"
|
android:textColor="#FFCC99"
|
||||||
android:textSize="22sp" />
|
android:textSize="22sp" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:visibility="gone">
|
||||||
<!-- ===== 故障处理 ===== -->
|
<!-- ===== 故障处理 ===== -->
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@@ -262,7 +267,7 @@
|
|||||||
<View
|
<View
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="30dp" />
|
android:layout_height="30dp" />
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user