From bb32ed84fe535b08cf9cbb04dbd6d30751f45910 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Mon, 13 Apr 2026 09:40:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(device):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=A7=92=E8=89=B2=E5=88=A4=E6=96=AD=E5=92=8C=E4=B8=B2?=
 =?UTF-8?q?=E5=8F=A3=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 Weigher2 的初始化代码从 InitActivity 到 BaseApp
- 将设备角色判断与串口配置逻辑合并到应用启动流程中
- 主设备配置为 /dev/ttyS7，子设备配置为 /dev/ttyS4
- 简化设备角色分配的条件判断逻辑
---
 .../main/java/com/shuwei/dish/match/base/BaseApp.kt    | 10 +++++++---
 .../main/java/com/shuwei/dish/match/ui/InitActivity.kt |  8 --------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt b/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt
index fc602e8..9325e75 100644
--- a/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt
+++ b/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt
@@ -13,6 +13,7 @@ import com.shuwei.dish.match.ui.InitActivity.Companion.TAG
 import com.shuwei.dish.match.utils.AppUtil
 import com.shuwei.dish.match.utils.BootReceiver
 import com.shuwei.dish.match.utils.CrashHandler
+import com.shuwei.dish.match.utils.Weigher2
 
 
 class BaseApp : Application() {
@@ -28,10 +29,13 @@ class BaseApp : Application() {
         GlobalData.deviceId = deviceId
 
         // 根据设备 ID 判断角色：指定 ID 为主设备，其余为子设备
-        GlobalData.deviceRole = if (deviceId == "8fc2ab34-2137-3112-acca-f884ea8736d4") {
-            DeviceRole.MASTER
+        // 主设备是/dev/ttyS7，子设备是/dev/ttyS4
+        if (deviceId == "8fc2ab34-2137-3112-acca-f884ea8736d4") {
+            GlobalData.deviceRole = DeviceRole.MASTER
+            Weigher2.setDevicePort("/dev/ttyS7")
         } else {
-            DeviceRole.SLAVE
+            GlobalData.deviceRole = DeviceRole.SLAVE
+            Weigher2.setDevicePort("/dev/ttyS4")
         }
         Log.d(TAG, "设备角色: ${GlobalData.deviceRole}")
 
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt
index 6c6b888..7c063a7 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt
@@ -58,14 +58,6 @@ class InitActivity : BaseActivity() {
 
         initViewModel()
 
-        // 主设备上/dev/ttyS7，子设备是/dev/ttyS4
-        Weigher2.setDevicePort(
-            if (GlobalData.deviceId == "8fc2ab34-2137-3112-acca-f884ea8736d4") {
-                "/dev/ttyS7"
-            } else {
-                "/dev/ttyS4"
-            }
-        )
         WeightUtil.init()
         WeightUtil.getWeight()
         WeightUtil.startContinuousRead()