Browse Source

涂鸦调试bug,称重数据和涂鸦下发关闭页面需要停止程序

zhangshenjie 2 months ago
parent
commit
0fe808b184

+ 16 - 1
BusinessAirFryer/src/main/assets/config_011.json

@@ -123,7 +123,22 @@
       "devMode": "SOUP",
       "listShow": true
     },
-
+    {
+      "type": "BROWN",
+      "name": "brown",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "ROAST",
+      "name": "roast",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
     {
       "type": "SLOW_COOK",
       "name": "slow_cook",

+ 3 - 0
BusinessCommon/src/main/java/com/develop/common/utils/CommonTuyaSoUtils.kt

@@ -123,6 +123,9 @@ object CommonTuyaSoUtils {
 
     fun navigateFinish(){
         if (AppActivityManager.getInstance().topActivity.localClassName.contains("ModesDetailActivity")){
+            if (CofarSDK.devInfo().runningStatus != DevStatus.STOP){
+                CofarSDK.stop(false)
+            }
             AppActivityManager.getInstance().topActivity.finish()
         }
 

+ 1 - 1
BusinessCommon/src/main/java/com/develop/common/utils/TuyaUtilsSo.java

@@ -551,7 +551,7 @@ public class TuyaUtilsSo {
                 ));
 
                 if (isWeight) {
-                    dpEvents.add(new DPEvent(TuyaSoDp.WEIGHT_NUMBER, (byte) DPEvent.Type.PROP_VALUE, info.getWeight(), 0))
+                    dpEvents.add(new DPEvent(TuyaSoDp.WEIGHT_NUMBER, (byte) DPEvent.Type.PROP_VALUE, info.getWeight(), 0));
                 }