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