处理转速问题

BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -347,6 +347,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         viewModel.stopTurbo()
         viewModel.cancelAnimator()
         hasShowScreenSaver = false
+
     }
 
     /**
@@ -882,7 +883,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         } else {
             ////devInfo.potStatus 0是有锅  1是没锅
             //处理换锅问题
-            if ((isModelNum == "5037" ||isModelNum == "5067" )&& event.devInfo.potStatus.toInt() == 1 && workMode?.type != "WIGHT") {
+            if ((isModelNum == "5037" || isModelNum == "5067") && event.devInfo.potStatus.toInt() == 1 && workMode?.type != "WIGHT") {
                 // isDevModes 避免重复刷新
                 if (isDevModes && workMode?.devMode != DevModes.SOUP) {
                     isDevModes = false
@@ -906,7 +907,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 }
                 isDevModes = true
 
-            }else if (isModelNum == "5067" && event.devInfo.potStatus.toInt() == 0 && workMode?.type != "WIGHT") {
+            } else if (isModelNum == "5067" && event.devInfo.potStatus.toInt() == 0 && workMode?.type != "WIGHT") {
                 /**
                  * 由于客户无锅状态下是默认汤锅列表，但是在一进来是空炸锅，拿出来（无锅的时候已经换了汤锅模式），
                  * 但重新放空炸锅，onDevModeChange 是不会回调的，固需要用potCoverType 锅盖协议来判断是否需要重新换模式
@@ -1147,6 +1148,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 //其他模式
                 changeCommonStep()
 
+                //运行情况初始化需要设置转速 ，不然以后会导致设置是0速度，设置后台回来以后会是currentMotorGer，在设置时间上面的话，会导致错误
+                if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()){
+                    currentMotorGer = CofarSDK.devInfo().motorGear.toInt()
+                }
 
 
                 viewModel.changeStep(CookSettingType.TEMP_SETTING)
@@ -1212,6 +1217,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         )
 
                         currentMotorGer = defaultMotorGear
+
                         updateMotorGearUI(
                             minMotorGear.toFloat(),
                             maxMotorGear.toFloat(),
@@ -2429,6 +2435,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private fun cancelClick() {
         //取消
         userChanging = false
+        //需要设置转速 ，不然取消以后，会导致设置如果之前是5速度，cancel 以后会是currentMotorGer，时间上面的话，会导致错误
+        currentMotorGer = CofarSDK.devInfo().motorGear.toInt()
         CofarSDK.cancel()
         binding.btnCancel.visibility = View.GONE
         binding.btnConfirm.visibility = View.GONE
@@ -2584,11 +2592,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 //                ThreadUtils.runOnMainThread({turboLock = false},2000);
             }
             ThreadUtils.runOnMainThread {
+
                 var cm = viewModel.modeType;
                 modeType = viewModel.lastModeType
                 viewModel.modeType = viewModel.lastModeType
                 //binding.tvModeName.text = viewModel.getModeTitle(resources)
                 var workMode = ConfigUtils.getMode(modeType)
+
                 if (!isNightTheme()) {
                     if (workMode == null) {
                         Glide.with(this).load(com.develop.common.R.drawable.ic_mode_diy)
@@ -2639,6 +2649,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             CofarSDK.stoptWeight()
             finish()
         }
+
     }
 
 
@@ -2709,14 +2720,23 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         hours: Int, minute: Int, second: Int, time: String, setByUser: Boolean, type: String
     ) {
 
+        Log.e(
+            "TAG rollTimeEvent",
+            "currentMotorGer:$currentMotorGer     hours:$hours  minute:$minute    second:$second    time:$time    setByUser:$setByUser"
+        )
         if (setByUser) {
             var cifTime = second + (minute + hours * 60) * 60
-            if ((CofarSDK.devInfo().motorGear >= 7 || CofarSDK.devInfo().motorGearBuffer >= 7) && cifTime > 600) {
-                userChanging = false
+            var times = time
+            if (currentMotorGer >= 7 && cifTime > 600) {
+//                userChanging = false
+                cifTime = 600
+                times = "10:00"
+                binding.clSetTime.setTargetTime("--${getTimeStr(cifTime.toLong())}--")
+                binding.clSetTime.setTimeInternal(0, 10, 0, true)
             } else {
-                userChanging = true
+//                userChanging = true
             }
-            binding.clCookTime.setConfigValue("--${time}--")
+            binding.clCookTime.setConfigValue("--${times}--")
             CofarSDK.cfgTime(cifTime)
             showConfirmAndCancelBtn()
         }

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -208,9 +208,15 @@ class CookStepActivity : CookStepBaseActivity() {
                 ) {
                     if (setByUser) {
                         viewModel.stepUiData.doingModify = true
-                        val totalTime = second + (minute + hours * 60) * 60
+                        var totalTime = second + (minute + hours * 60) * 60
+                        var times = time
+                        Log.e("TACC rollTimeEvent","currentMotorGer:$currentMotorGer     hours:$hours  minute:$minute    second:$second    time:$time    setByUser:$setByUser")
+                        if (currentMotorGer>=7 && totalTime > 600) {
+                            totalTime = 600
+                            times = "10:00"
+                        }
                         viewModel.displayStep()?.uiData?.targetTime = totalTime
-                        binding.controller.tvCookingTimeTarget.updateText("--${time}--")
+                        binding.controller.tvCookingTimeTarget.updateText("--${times}--")
                         currTime = totalTime
                         CofarSDK.cfgTime(totalTime)
                     }
@@ -1330,7 +1336,7 @@ class CookStepActivity : CookStepBaseActivity() {
         uiData.isTimeChange = true
         Log.d("TAG eeeeeee", "${uiData.targetTime} == ${currTime} === $step")
         //处理时间 转速高于7的实话最高10分钟
-        if ((CofarSDK.devInfo().motorGear >= 7 || CofarSDK.devInfo().motorGearBuffer >= 7)&&currTime>600){
+        if (currentMotorGer>=7&&currTime>600){
             currTime = 600
         }
         uiData.targetTime = currTime

app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

@@ -106,7 +106,7 @@ class FoodCookingApp : BaseApp() {
 
 
 //        收集崩溃问题
-//        CatchException.getInstence().init(this)
+        CatchException.getInstence().init(this)
 
 
         WindowManager.getInstance().init(this, OptionFactory())

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -211,12 +211,12 @@ fun getSN(): String {
 
 
     if (BuildConfig.DEBUG) {
-//        return "002D10390020123010190001"
+        return "002D10390020123010190001"
 //        return "045A21030020123010190001"
 //        return "000A30150020123010190001"
 //     return "000A10390020123010170001"
 //     return "000A10390020123010190001"
-        return "000A50670020123010190005"
+//        return "000A50670020123010190005"
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"