diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt index a9910c6..0a353db 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt @@ -274,10 +274,10 @@ class SeasoningConfigFragment : BaseFragment() { * @param delta 重量变化量(克) */ private fun triggerHighlight(sourceDeviceId: String, address: Int, delta: Double) { - // 根据来源设备决定查哪个列表,而非查本机设备ID - val pos22 = if (sourceDeviceId != ScaleDeviceConfig.DEVICE_ID_18) + // 只有对应设备的秤才查对应列表,避免主设备(DEVICE_ID_2)等其他设备误触发 + val pos22 = if (sourceDeviceId == ScaleDeviceConfig.DEVICE_ID_22) ScaleDeviceConfig.SCALE_ORDER_22.indexOf(address) else -1 - val pos18 = if (sourceDeviceId != ScaleDeviceConfig.DEVICE_ID_22) + val pos18 = if (sourceDeviceId == ScaleDeviceConfig.DEVICE_ID_18) ScaleDeviceConfig.SCALE_ORDER_18.indexOf(address) else -1 Log.d(TAG, "triggerHighlight: sourceDeviceId=$sourceDeviceId address=$address pos22=$pos22 pos18=$pos18")