涂鸦so 调试

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -15,6 +15,12 @@
       "uid": "uuide4756e33e810409d",
       "ak": "cv1ujfrhDgCHH1rkx2MCxG9bjyvQfWQE"
     },
+    "011D10390020123010190021": {
+      "pid": "xkt4eqycakmkofec",
+      "uid": "uuidfd3160911dacd1f4",
+      "ak": "MwlibMlczBaYhtz67ihr3OkSpAU3aPzf"
+    },
+
     "011A10390020123010190111": {
       "pid": "xkt4eqycakmkofec",
       "uid": "uuid1bb4c5b06b8f612d",

BusinessCommon/src/main/java/com/develop/common/utils/TuyaUtilsSo.java

@@ -220,6 +220,16 @@ public class TuyaUtilsSo {
 
                     break;
 
+                case TuyaSoDp.CURRENT_RECIPE_NUMBER:
+                    //当前食谱编号
+                    CommonTuyaSoUtils.INSTANCE.navigateToRemoteRecipe(strValue);
+                    break;
+                case TuyaSoDp.CURRENT_RECIPE_STEP:
+                    //当前食谱编号
+//                    CommonTuyaSoUtils.INSTANCE.navigateToRemoteRecipe(strValue);
+                    break;
+
+
             }
         }
     };
@@ -237,7 +247,7 @@ public class TuyaUtilsSo {
          * 5 搅碎(Chop) ， 6 奶昔(Smoothie)，7 称重(Weight) ,8 切丁(Dive)， 9 去皮(Peeling) ，10 烧水(Boil_water)，11 切丝切片 (Food_processor)
          * 12 自动清洁(Auto_clean) ,13 预加热 (Preheating) , 14 间接性搅拌 (Intermittent_Stir) 15 警告 (Warning)
          * */
-
+//        sendDevReady(1);
         String type = "";
         switch (enumValue) {
             case 0:
@@ -326,8 +336,9 @@ public class TuyaUtilsSo {
             if (message.equals("tuya_init success...")) {
                 tuyaInitSuccess = true;
             }
-            //配网成功，可以访问涂鸦
-            if (message.equals("SOC TUYA-Cloud Status:3")) {
+            //配网成功，可以访问涂鸦   network status:2    SOC TUYA-Cloud Status:3
+            //在之前 判断SOC TUYA-Cloud Status:3 的时候，会导致dp上报失败，估换 network status:2
+            if (message.equals("network status:2")) {
                 tuyaNetwork = true;
             }
             if (message.contains("qrCodeUrl")) {
@@ -497,6 +508,14 @@ public class TuyaUtilsSo {
 //        ioTSDKManager.sendDP(dpEvents);
     }
 
+
+    public void sendDevReady(int value){
+        // TuyaSoDp.DEV_READY         110
+
+         getTuyaApi().send_dp_value(110, value);
+
+    }
+
     public void uploadDataONOFF() {
         if (!tuyaNetwork) {
             return;
@@ -716,8 +735,6 @@ public class TuyaUtilsSo {
                 return;
             }
         }
-
-
        int code =  getTuyaApi().send_dp_value(dpid, value);
        //上报成功，避免同一个值重复上报，估在这加map做缓存
        if (code ==0){

BusinessMain/src/main/java/com/develop/main/ui/HomeActivity.kt

@@ -235,7 +235,6 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
 
         binding.settingLayout.setOnClickListener {
 
-            TuyaUtilsSo.getInstance().setDpStart()
 
             navigateTo(Screens.Setting.MAIN_SETTING)
             binding.contentView.closeDrawers()
@@ -257,7 +256,6 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
 
         binding.historyLayout.setOnClickListener {
 
-            TuyaUtilsSo.getInstance().setDpWeight()
 
 
             val bundle = Bundle()
@@ -270,7 +268,6 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }
 
         binding.policyLayout.setOnClickListener {
-            TuyaUtilsSo.getInstance().setDpApp()
 
 
             val bundle = Bundle()
@@ -282,7 +279,6 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }
 
         binding.helpLayout.setOnClickListener {
-            TuyaUtilsSo.getInstance().setDpTemp()
 
 
             navigateTo(Screens.Setting.HELP)

BusinessMain/src/main/java/com/develop/main/ui/RecipesFragment.kt

@@ -1038,7 +1038,17 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             } else {
                 isRefresh = true
                 binding.page.resetNoMoreData()
-                viewModel.queryLocalRecipes(viewModel.categoryCode)
+                if (sn.startsWith("011")){
+                    if (viewModel.categoryCode == globalApp().getString(com.develop.common.R.string.all)) {
+                        viewModel.queryLocalRecipes("")
+                    } else {
+                        //选择语言以后，按关闭页面会走这里
+                        viewModel.queryLocalRecipes(viewModel.categoryCode)
+                    }
+                }else{
+                    viewModel.queryLocalRecipes(viewModel.categoryCode)
+
+                }
             }
         }
     }

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

@@ -381,8 +381,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         ThreadUtils.runOnMainThread({ configLock = false }, 500)
         ctx = this
 
+
+        //用于涂鸦指令上报
         TuyaUtilsSo.getInstance().mapClean()
         TuyaUtilsSo.getInstance().uploadData()
+//        TuyaUtilsSo.getInstance().sendDevReady(2) // 1表示已就绪
 
     }
 
@@ -392,6 +395,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         viewModel.stopTurbo()
         viewModel.cancelAnimator()
         hasShowScreenSaver = false
+//        TuyaUtilsSo.getInstance().sendDevReady(1) // 1表示设备不就绪
+
 
     }
 

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

@@ -225,7 +225,9 @@ fun getSN(): String {
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190002"
 //        return "011A10390020123010190002"
-        return  "011D10390020123010190003"
+        return  "011D10390020123010190021";
+
+//        return  "011D10390020123010190003"
 //        return  "011A10390020123010190188"
 //        return "011A10390020123010190099"
 //        return "011A10390020123010190009"