fix(fragment): 修复 triggerHighlight 因设备判断用 != 导致主设备秤误触发调料格子高亮

2026-04-21 16:52:23 +08:00
parent 3fc54d5f52
commit 736e4820dd
1 changed files with 3 additions and 3 deletions
@@ -274,10 +274,10 @@ class SeasoningConfigFragment : BaseFragment<FragmentSeasoningConfigBinding>() {
     * @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")