From 736e4820ddb7429de3c66e3d264e7a32f3628d7d Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Tue, 21 Apr 2026 16:52:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(fragment):=20=E4=BF=AE=E5=A4=8D=20triggerHi?=
 =?UTF-8?q?ghlight=20=E5=9B=A0=E8=AE=BE=E5=A4=87=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=94=A8=20!=3D=20=E5=AF=BC=E8=87=B4=E4=B8=BB=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=A7=A4=E8=AF=AF=E8=A7=A6=E5=8F=91=E8=B0=83=E6=96=99?=
 =?UTF-8?q?=E6=A0=BC=E5=AD=90=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dish/match/ui/fragment/SeasoningConfigFragment.kt       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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