063B处理

BusinessAirFryer/src/main/assets/config_063.json

@@ -2,13 +2,21 @@
   "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
   "workModes": [
     {
-      "type": "ADAPTED_COOKING",
+      "type": "ADAPTED_COOKING_HEAT",
       "name": "adapted_cooking",
       "bg": "ic_mode_diy",
       "icon": "ic_grid_adapted_cooking",
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": false
+    },
     {
       "type": "COOK_EGGS",
       "name": "cook_eggs",

BusinessCommon/src/main/java/com/develop/common/food_sdk/TextMcu2DevEventListener.java

@@ -31,7 +31,7 @@ public class TextMcu2DevEventListener {
         try {
             BaseDecoder baseDecoder = new BaseDecoder(event.getData());
 
-
+            Log.e("TAG MCUDEV","event :"+event.getData());
             if (CmdTypes.SHAKE_HANDS.equals(baseDecoder.getProtocol())) {
                 ShakeHandsResp shakeHandsResp = new ShakeHandsResp();
                 CofarSDK.post2Mcu(shakeHandsResp);
@@ -67,7 +67,11 @@ public class TextMcu2DevEventListener {
                 }
                 devInfo.setTemp(CofarSDK.parseTemp(temp));
                 devInfo.setRealTemp(Converter.hexToShort(heartbeatCmd.getTemp()));
-                devInfo.setTargetTemp(CofarSDK.parseTemp(Converter.hexToShort(heartbeatCmd.getTargetTemp())));
+                if (devInfo.getMode().isResetTempSetting()){
+                    devInfo.setTargetTemp(CofarSDK.parseTemp(Converter.hexToShort(heartbeatCmd.getTargetTemp())));
+                }else {
+                    devInfo.setTargetTemp((short) devInfo.getMode().getResetTargetTemp());
+                }
 //                devInfo.setRemainTime(Converter.hexToShort(heartbeatCmd.getRemainTime()));
 //                devInfo.setTargetTime(Converter.hexToShort(heartbeatCmd.getTargetTime()));
                 devInfo.setPotStatus(Converter.hexToByte(heartbeatCmd.getPotStatus()));

BusinessCommon/src/main/java/com/develop/common/food_sdk/ZeroMcu2DevEventListener.java

@@ -1,5 +1,7 @@
 package com.develop.common.food_sdk;
 
+import android.util.Log;
+
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.core.DevInfo;
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.Mcu2DevEvent;
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.listener.Mcu2DevEventListener;
@@ -24,6 +26,7 @@ public class ZeroMcu2DevEventListener extends Mcu2DevEventListener {
     public void onMcu2DevEvent(Mcu2DevEvent event) {
         try {
             BaseDecoder baseDecoder = new BaseDecoder(event.getData());
+            Log.e("TAG mcu",event.getData());
             if ("0001".equals(baseDecoder.getProtocol())) {
                 ShakeHandsResp shakeHandsResp = new ShakeHandsResp();
                 CofarSDK.post2Mcu(shakeHandsResp);

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

@@ -901,8 +901,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         }
 
         Log.d("TAG ModesDetail", "event:" + event.devInfo.toString())
-
-
+        Log.d("TAG ModesDetail", "mode:" + event.devInfo.mode.defaultHeatMode.toString())
+        Log.d("TAG ModesDetail", "resetTargetTemp:" + event.devInfo.mode.resetTargetTemp.toString())
         //由于sdk没有判断E7到E16 需要判断运行和暂停过程中，设备发生故障弹出窗口告知故障
         //sdk 会把 E6-15的回调到 base DevPromptEvent方法里面，这里就不需要在做弹窗
 

app/build.gradle

@@ -20,7 +20,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="000B"
-    brandCode = "011G"
+    brandCode = "063B"
 //    model = "5037"
     model = "1039"
 
@@ -989,16 +989,16 @@ android {
 //            //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-            manifestPlaceholders = [channelName: "brand011GTuya"]
-//            dimension "platform"
-//            applicationId "com.develop.foodcooking"
-            buildConfigField("String", "UpdatePlatform", "\"011\"")
-            resValue("string", "app_theme", "@style/Splash011GTheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"011G\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
+//            manifestPlaceholders = [channelName: "brand011GTuya"]
+////            dimension "platform"
+////            applicationId "com.develop.foodcooking"
+//            buildConfigField("String", "UpdatePlatform", "\"011\"")
+//            resValue("string", "app_theme", "@style/Splash011GTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"011G\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
 
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
@@ -1127,14 +1127,14 @@ android {
 //            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 ////
 
-//            manifestPlaceholders = [channelName: "brand063BTuya"]
-//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"063B\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
-//            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            manifestPlaceholders = [channelName: "brand063BTuya"]
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"063B\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 //
 
 

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

@@ -241,7 +241,7 @@ fun getSN(): String {
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190001"
-        return "011G10390020123010190001"
+//        return "011G10390020123010190001"
 //        return "011F10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
@@ -276,7 +276,7 @@ fun getSN(): String {
 //        return "062A20030020123010190004"
 //        return  "063A10390020123010190015"
 //        return  "063B10390020123010190002"
-//        return  "063B10390020123010190001"
+        return  "063B10390020123010190001"
 //        return  "063B20030020123010190015"
 //        return "063B21050020123010190001"
 //        return "058A10390020123010190001"