Browse Source

处理时间下标超出问题,和食谱煮水问题

zhangshenjie 5 months ago
parent
commit
d6371d16dc

+ 9 - 0
BusinessAirFryer/src/main/assets/config.json

@@ -25,6 +25,15 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "KETTLE",
+      "name": "boil_water",
+      "bg": "ic_mode_boil_water",
+      "icon": "ic_grid_boil_water",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
     {
       "type": "CHOP",
       "name": "chop",

+ 3 - 0
BusinessCommon/src/main/java/com/develop/common/widget/TimePickerView.kt

@@ -298,6 +298,9 @@ class TimePickerView : ConstraintLayout {
             return
         }
 
+        if (firstTimePos>=157){
+            firstTimePos = 157
+        }
         val minMinutes = (minTime / 60 % 60)
         val minHours = (minTime / 3600)
         val minSeconds = minTime % 60

+ 22 - 8
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -435,7 +435,7 @@ class CookStepActivity : CookStepBaseActivity() {
                 } else if (it.isDescription()) {
                     CofarSDK.stoptWeight()
                     changeDescription()
-                } else if (it.isWarning()) {
+                }  else if (it.isWarning()) {
                     CofarSDK.stoptWeight()
                     changeWarning()
                 } else {
@@ -519,7 +519,10 @@ class CookStepActivity : CookStepBaseActivity() {
                 } else {
                     binding.ivCookBg.setGone()
                 }
-
+                //处理煮水不能修改时间
+                if (it.isWater()){
+                    it.uiData.isTimeChange = false
+                }
                 updateUiSetting(it)
                 playStepAudio(it.source.audioFilePath)
                 tryConsumePendingCookStep(it)
@@ -1315,9 +1318,9 @@ class CookStepActivity : CookStepBaseActivity() {
             }
         } else if (tabType == CookSettingType.TIME_SETTING) {
             cookStep?.uiData?.let {
-//                if (!it.isTimeChange) {
-//                    return
-//                }
+                if (!it.isTimeChange&& (it.mode == WorkModes.KETTLE||it.mode == WorkModes.BOIL_WATER)) {
+                    return
+                }
                 dealWithTimeByOperation(it, increase)
             }
         } else if (tabType == CookSettingType.DIRECTION_SETTING) {
@@ -1386,15 +1389,26 @@ class CookStepActivity : CookStepBaseActivity() {
                 ":${sec}"
             }
         }
-        uiData.isTimeChange = true
+//        uiData.isTimeChange = true
         Log.d("TAG eeeeeee", "${uiData.targetTime} == ${currTime} === $step")
         //处理时间 转速高于7的实话最高10分钟
         if (currentMotorGer>=7&&currTime>600){
             currTime = 600
         }
+        //处理时间,煮水bug,时间会一直超过98小时,故在这做98小时限制,其他模式会有时间限制
+        if (currTime>=352800){
+            currTime = 352800;
+        }
         uiData.targetTime = currTime
-        LogUtils.d("调节时间:${currTime}")
-        binding.controller.clSetTime.isTimeCanChange(true)
+
+        Log.d("TAG eeeeeee", "调节时间:${currTime}")
+
+//        LogUtils.d("调节时间:${currTime}")
+        if (uiData.mode ==WorkModes.KETTLE || uiData.mode ==WorkModes.BOIL_WATER){
+            binding.controller.clSetTime.isTimeCanChange(false)
+        }else{
+            binding.controller.clSetTime.isTimeCanChange(true)
+        }
         // 回调到上面那个地方来设置时间
         TimeUtil.getTimes(currTime, timeArray)
         CofarSDK.cfgTime(currTime)

+ 5 - 1
BusinessStep/src/main/java/com/develop/step/ui/cook_step/model/CookStepStatus.kt

@@ -22,8 +22,12 @@ class CookStepStatus(
     fun isDescription():Boolean {
         return  workMode == "DESCRIPTION" || workMode =="AF_DESCRIPTION"  || workMode =="SM_DESCRIPTION"
     }
+    fun isWater():Boolean {
+        return  workMode == "KETTLE" || workMode =="BOIL_WATER"
+    }
     fun  isWarning():Boolean{
-        return  workMode == "WARNING" || workMode == "AF_WARNING" || workMode =="AF_DESCRIPTION"
+//        return  workMode == "WARNING" || workMode == "AF_WARNING" || workMode =="AF_DESCRIPTION"
+        return  workMode == "WARNING" || workMode == "AF_WARNING"
     }
 
     fun  isFinalStep() :Boolean{

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