From df9212d2dd4aa2ebb9f54a7941fabcfb2ae10c41 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Tue, 31 Mar 2026 10:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=90=E7=9B=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E8=B0=83=E6=95=B4=E8=AE=BE=E7=BD=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=9A=90=E8=97=8F=E6=97=A0=E5=85=B3=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/LoginByFaceActivity.kt           |  31 ++-
 .../activity/PlcSettingActivity.kt            |   1 +
 .../main/res/layout/activity_plc_setting.xml  | 227 +++++++++---------
 3 files changed, 138 insertions(+), 121 deletions(-)

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<ActivityLoginFaceBinding>(),
     override fun initialize() {
         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()
         initArcView()
         openRectInfoDraw = true
@@ -414,17 +424,18 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                 SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
                 plateEnable = false
                 recognizeCountDownUtil.cancelCountDown()
-                PlcHelper.getInstance(this@LoginByFaceActivity).outPlate(object : PlcCallback<String> {
-                    override fun onSuccess(result: String) {
-                        loadLogInfo("collectFace,openPlate: 出盘成功，result=$result")
-                        goInitActivity()
-                    }
+                PlcHelper.getInstance(this@LoginByFaceActivity)
+                    .outPlate(object : PlcCallback<String> {
+                        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<ActivityPlcSettingBinding>() {
                 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">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -143,126 +143,131 @@
                 android:textColor="#FFCC99"
                 android:textSize="22sp" />
 
-            <!-- ===== 故障处理 ===== -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:text="故障处理"
-                android:textColor="#FFCC99"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/btnAlarmReset"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/btn_outline"
-                android:gravity="center"
-                android:text="故障复位"
-                android:textColor="#FFCC99"
-                android:textSize="22sp" />
-
-            <!-- ===== 参数设置 ===== -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:text="参数设置"
-                android:textColor="#FFCC99"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:orientation="horizontal">
+                android:orientation="vertical"
+                android:visibility="gone">
+                <!-- ===== 故障处理 ===== -->
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:text="故障处理"
+                    android:textColor="#FFCC99"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
 
-                <EditText
-                    android:id="@+id/etParamType"
-                    android:layout_width="0dp"
+                <TextView
+                    android:id="@+id/btnAlarmReset"
+                    android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:layout_weight="1"
+                    android:layout_marginTop="10dp"
                     android:background="@drawable/btn_outline"
                     android:gravity="center"
-                    android:hint="参数类型（如 18FD）"
-                    android:inputType="text"
-                    android:paddingHorizontal="12dp"
+                    android:text="故障复位"
                     android:textColor="#FFCC99"
-                    android:textColorHint="#99885566"
-                    android:textSize="18sp" />
+                    android:textSize="22sp" />
+
+                <!-- ===== 参数设置 ===== -->
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:text="参数设置"
+                    android:textColor="#FFCC99"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
+                    <EditText
+                        android:id="@+id/etParamType"
+                        android:layout_width="0dp"
+                        android:layout_height="60dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/btn_outline"
+                        android:gravity="center"
+                        android:hint="参数类型（如 18FD）"
+                        android:inputType="text"
+                        android:paddingHorizontal="12dp"
+                        android:textColor="#FFCC99"
+                        android:textColorHint="#99885566"
+                        android:textSize="18sp" />
+
+                    <View
+                        android:layout_width="20dp"
+                        android:layout_height="1dp" />
+
+                    <EditText
+                        android:id="@+id/etParamValue"
+                        android:layout_width="0dp"
+                        android:layout_height="60dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/btn_outline"
+                        android:gravity="center"
+                        android:hint="参数值（整数）"
+                        android:inputType="number"
+                        android:paddingHorizontal="12dp"
+                        android:textColor="#FFCC99"
+                        android:textColorHint="#99885566"
+                        android:textSize="18sp" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/btnSetParams"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="12dp"
+                    android:background="@drawable/btn_outline"
+                    android:gravity="center"
+                    android:text="设置参数"
+                    android:textColor="#FFCC99"
+                    android:textSize="22sp" />
+
+                <!-- ===== 状态显示 ===== -->
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:text="PLC 状态"
+                    android:textColor="#FFCC99"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/btnRefreshStatus"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/btn_outline"
+                    android:gravity="center"
+                    android:text="刷新状态"
+                    android:textColor="#FFCC99"
+                    android:textSize="22sp" />
+
+                <TextView
+                    android:id="@+id/tvStatusInfo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:background="@drawable/btn_outline"
+                    android:paddingHorizontal="16dp"
+                    android:paddingVertical="14dp"
+                    android:text="暂无状态数据"
+                    android:textColor="#FFCC99"
+                    android:textSize="16sp"
+                    tools:text="空盘：false | 平台下位：false | 平台上位：true | 取盘红外：false | 报警码：0" />
 
                 <View
-                    android:layout_width="20dp"
-                    android:layout_height="1dp" />
-
-                <EditText
-                    android:id="@+id/etParamValue"
-                    android:layout_width="0dp"
-                    android:layout_height="60dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/btn_outline"
-                    android:gravity="center"
-                    android:hint="参数值（整数）"
-                    android:inputType="number"
-                    android:paddingHorizontal="12dp"
-                    android:textColor="#FFCC99"
-                    android:textColorHint="#99885566"
-                    android:textSize="18sp" />
-
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp" />
             </LinearLayout>
-
-            <TextView
-                android:id="@+id/btnSetParams"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_marginTop="12dp"
-                android:background="@drawable/btn_outline"
-                android:gravity="center"
-                android:text="设置参数"
-                android:textColor="#FFCC99"
-                android:textSize="22sp" />
-
-            <!-- ===== 状态显示 ===== -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:text="PLC 状态"
-                android:textColor="#FFCC99"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/btnRefreshStatus"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/btn_outline"
-                android:gravity="center"
-                android:text="刷新状态"
-                android:textColor="#FFCC99"
-                android:textSize="22sp" />
-
-            <TextView
-                android:id="@+id/tvStatusInfo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:background="@drawable/btn_outline"
-                android:paddingHorizontal="16dp"
-                android:paddingVertical="14dp"
-                android:text="暂无状态数据"
-                android:textColor="#FFCC99"
-                android:textSize="16sp"
-                tools:text="空盘：false | 平台下位：false | 平台上位：true | 取盘红外：false | 报警码：0" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="30dp" />
-
         </LinearLayout>
     </ScrollView>