Browse Source

食谱步骤,SDK更新

zhangshenjie 8 months ago
parent
commit
28d458b435

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

@@ -1946,7 +1946,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             if (modeType == WorkModes.KNEAD
                 || modeType == WorkModes.KNEAD_TOUGH
                 ||modeType == WorkModes.SLOW_COOKING
-                || modeType == WorkModes.SLOW_COOK){
+                || modeType == WorkModes.SLOW_COOK
+                ||modeType == WorkModes.ROAST
+                || modeType == WorkModes.BROWN){
                 if (CofarSDK.devInfo().isSpeedType&&mRunningState == DevStatus.RUNNING.toInt()){
                     viewModel.playRotateAnimator(
                         CofarSDK.devInfo().motorDirection.toInt(),
@@ -2266,9 +2268,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 CofarSDK.devInfo().runningRecipeId = null
                 var startConfig = HashMap<String, Any>()
                 startConfig.put("stopTips", showStopTips)
-                //处理揉面0温度 会自动STOP问题
+                //处理揉面/间接性搅拌 0温度 会自动STOP问题 试过1度也会自动暂停,估设置2度
                 CofarSDK.startWithConfig(viewModel.modeType, startConfig)
-                if ((modeType == "KNEAD" || modeType == "KNEAD_TOUGH")&&currentTemp==0){
+                if ((modeType == "KNEAD" || modeType == "KNEAD_TOUGH"|| modeType == "BROWN" || modeType == "ROAST")&&currentTemp==0){
                     //
                     /**
                      * 之前试过设置1度的时候,mcu没接收,估设置5度
@@ -2379,7 +2381,14 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
        Handler().postDelayed({
             CofarSDK.resume()
         }, 200)
-
+        if ((modeType == "KNEAD" || modeType == "KNEAD_TOUGH"|| modeType == "BROWN" || modeType == "ROAST")&&currentTemp==0){
+            //
+            /**
+             * 之前试过设置1度的时候,mcu没接收,估设置5度
+             * 设置2度 但是目标温度是0度,但是没有自动暂停
+             * */
+            CofarSDK.cfgHeatNativeNoParse(2, HeatModes.PU_TONG)
+        }
 
     }
 

+ 14 - 2
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -825,6 +825,15 @@ class CookStepActivity : CookStepBaseActivity() {
             CofarSDK.pause()
         } else if (tag == BUTTON_TAG_RESUME) {
             CofarSDK.resume()
+            //处理resume 揉面/间接性搅拌设置0温度 会自动STOP问题 试过1度也会自动暂停,估设置2度
+            if ((modeType == "KNEAD" || modeType == "KNEAD_TOUGH"|| modeType == "BROWN" || modeType == "ROAST")&&currentTemp==0){
+                /**
+                 * 之前试过设置1度的时候,mcu没接收,估设置5度
+                 * 设置2度 但是目标温度是0度,但是没有自动暂停
+                 * */
+                CofarSDK.cfgHeatNativeNoParse(2, HeatModes.PU_TONG)
+            }
+
         } else if (tag == BUTTON_TAG_CONFIRM) {
             //处理010 033 后台后回来的显示转速问题
            CofarSDK.confirm()
@@ -1096,7 +1105,8 @@ class CookStepActivity : CookStepBaseActivity() {
             }
         )
         CofarSDK.cfgMotorGear(uiData.currentSpeed.toByte())
-        if ((modeType == "KNEAD" || modeType == "KNEAD_TOUGH")&&uiData.targetTemp==0){
+        //处理揉面/间接性搅拌 0温度 会自动STOP问题 试过1度也会自动暂停,估设置2度
+        if ((modeType == "KNEAD" || modeType == "KNEAD_TOUGH"|| modeType == "BROWN" || modeType == "ROAST")&&uiData.targetTemp==0){
             CofarSDK.cfgHeatNativeNoParse(2, HeatModes.PU_TONG)
         }else{
             CofarSDK.cfgHeat(uiData.targetTemp.toShort(), HeatModes.PU_TONG)
@@ -1544,7 +1554,9 @@ class CookStepActivity : CookStepBaseActivity() {
         if (uiData.mode == WorkModes.KNEAD
             || uiData.mode == WorkModes.KNEAD_TOUGH
             ||uiData.mode == WorkModes.SLOW_COOKING
-            || uiData.mode == WorkModes.SLOW_COOK){
+            || uiData.mode == WorkModes.SLOW_COOK
+            ||modeType == WorkModes.ROAST
+            || modeType == WorkModes.BROWN){
             if (viewModel.isCurrentOnCookingStep() && uiData.runningStatus == DevStatus.RUNNING.toInt() && CofarSDK.devInfo().isSpeedType) {
                 playRotateAnimator(CofarSDK.devInfo().motorDirection.toInt())
             } else {

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

@@ -212,7 +212,7 @@ fun getSN(): String {
 //     return "000A10390020123010170001"
 //     return "000A10390020123010190001"
 //        return "000A50670020123010190005"
-//        return "010D10390020123010190001"
+        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190001"
@@ -220,7 +220,7 @@ fun getSN(): String {
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
 //        return "011A50370020123010190006"
-        return "011E50370020123010190001"
+//        return "011E50370020123010190001"
 //    return "007D20020020123010190001"
 //        return "036I21060020123010190007"
 //        return "030A10390020123010190004"

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