Browse Source

010慢炖更新

zhangshenjie 8 months ago
parent
commit
30ad442ccc

+ 13 - 4
BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -780,7 +780,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             return
         }
 
-        Log.d("TAG DevStateEvent", "event:" + event.devInfo.toString())
+//        Log.d("TAG DevStateEvent", "event:" + event.devInfo.toString())
         //由于sdk没有判断E7到E16 需要判断运行和暂停过程中,设备发生故障弹出窗口告知故障
         if ((isClickType == DevStatus.RUNNING.toInt() || isClickType == DevStatus.PAUSE.toInt()
                     || isClickType == DevStatus.STOP.toInt()) && viewModel.modeType != ModesType.WIGHT.name
@@ -1107,7 +1107,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
                     baseMode.apply {
                         currentTemp = targetTemp.toInt()
-                        Log.d("TAG currentTemp", "currentTemp:" + currentTemp)
                         updateTempUI(
                             minTemp.toFloat(),
                             maxTemp.toFloat(),
@@ -1943,9 +1942,19 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
         this.isMotorGearChange = isMotorGearChange
         binding.apply {
+            speedRingView.setCanTouch(isMotorGearChange)
+            //处理慢炖0挡速的时候,要显示设置当
+            /**
+             * 010D 033F
+             * 处理慢炖开5停25逻辑,因为SDK 停的时候 设置挡速为0,客户那边说不能显示0挡速估在这UI处理
+             *
+             * */
+            if ((sn.startsWith("010")||sn.startsWith("033"))&&(modeType == WorkModes.SLOW_COOKING||modeType == WorkModes.SLOW_COOK) && currentMotorGer==0){
+                    return@apply
+            }
+
             clCookSpeed.updateChangeValue(currentMotorGer.toString())
             speedRingView.setRange(minMotorGear, maxMotorGear)
-            speedRingView.setCanTouch(isMotorGearChange)
             speedRingText.text = currentMotorGer.toString()
 
             if (!userChanging || focusUpdate) {
@@ -1980,7 +1989,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         this.isWaterGearChange = isWaterGearChange
 
         binding.apply {
-            clCookSpeed.updateChangeValue(currentMotorGer.toString())
+            clCookSpeed.updateChangeValue(if (currentMotorGer!=0)currentMotorGer.toString()else this@ModesDetailActivity.currentMotorGer.toString())
             waterRingView.setRange(minWaterGear, maxWaterGear)
             waterRingView.setCanTouch(isWaterGearChange)
             waterSprayShow.updateGear(currentMotorGer)

BIN
libThirdPart/libs/cofar-cooking-device-sdk-0.0.1-SNAPSHOT.jar