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()