011 涂鸦兼容代码上传

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -1,6 +1,15 @@
 {
   "licences": {
-
+    "011D10390020123010190019": {
+      "pid": "xkt4eqycakmkofec",
+      "uid": "uuid14e8e649b47d3f43",
+      "ak": "oTnUA1bTV7ANNcZxMIhZOctXiNIZYdLA"
+    },
+    "011D10390020123010190020": {
+      "pid": "xkt4eqycakmkofec",
+      "uid": "uuide4756e33e810409d",
+      "ak": "cv1ujfrhDgCHH1rkx2MCxG9bjyvQfWQE"
+    },
     "011A10390020123010190111": {
       "pid": "xkt4eqycakmkofec",
       "uid": "uuid1bb4c5b06b8f612d",

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

@@ -3,6 +3,7 @@ package com.develop.common.utils;
 import android.content.Context;
 import android.util.Log;
 
+import com.develop.base.util.MMkvUtils;
 import com.develop.common.tuya_bean.TuyaQRUrlBean;
 import com.sun.jna.Pointer;
 
@@ -17,7 +18,7 @@ public class TuyaUtilsSo {
     private static volatile TuyaUtilsSo singleton;
     private TuyaApi tuyaApi;
     public  boolean tuyaInitSuccess = false;
-    public  boolean tuyaNetwork = true;
+    public  boolean tuyaNetwork = false;
     public   String mPid = "dquk8axtyy72c1ap";
     public   String mUid = "uuid50e9e0c707553116";
     public   String mAk = "MJhcxmQ6LeZDj1tNu6F5kqK5aQJfpdOb";
@@ -104,6 +105,8 @@ public class TuyaUtilsSo {
                     String result = msg.substring(startIndex).trim();
                     TuyaQRUrlBean bean = GsonUtils.GsonToBean(result,TuyaQRUrlBean.class);
                     shorturl = bean.getShortUrl();
+                    //根据 uuid 存储 url
+                    MMkvUtils.INSTANCE.save(mUid,shorturl);
 
                 }
 

BusinessSetting/src/main/java/com/develop/setting/ui/SettingMainActivity.kt

@@ -210,8 +210,6 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                         }
 
                         SettingType.RESTORE_FACTORY_SETTINGS -> {
-//                            //isTuya&&TuyaUtils.qrcodeUrl
-//                            showTuyaRequestDialog()
                             navigateTo(Screens.Setting.RESTORE)
                         }
 
@@ -228,9 +226,13 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                                 ToastUtils.showShort(getString(com.develop.common.R.string.change_lang_tips))
                             } else {
                                 if (getNetwork()) {
+
+                                    if (TuyaUtilsSo.getInstance().shorturl == ""){
+                                        TuyaUtilsSo.getInstance().shorturl = MMkvUtils.getString(TuyaUtilsSo.getInstance().mUid)
+                                    }
                                     Log.e(
                                         "TAG isTuya",
-                                        "isNetWordLoading :" + isNetWordLoading + " isTuya: " + isTuya + "   TuyaUtils.qrcodeUrl:" + TuyaUtils.qrcodeUrl
+                                        "isNetWordLoading :" + isNetWordLoading + " isTuya: " + isTuya + "   TuyaUtilsSo.getInstance().shorturl:" + TuyaUtilsSo.getInstance().shorturl
                                     )
                                     if (isNetWordLoading) {
                                         Log.e("TAG isTuya", "isNetWordLoadingisNetWordLoading")
@@ -325,7 +327,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
     private fun downTimeVoid() {
         if (isTuya) {
-            if (TuyaUtils.qrcodeUrl != ""||TuyaUtils.init){
+            if (TuyaUtilsSo.getInstance().shorturl != ""||TuyaUtilsSo.getInstance().tuyaInitSuccess){
                 tuyaRequestDialog?.removeSelf()
                 timer?.let { timer ->
                     timer.cancel()
@@ -392,12 +394,24 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     //从wifi功能回来方法
     private fun getDevNetwork(num: Int) {
 
+
+
+
         //无需获取涂鸦功能，估不网络请求涂鸦
         if (getGoneTuYa()) {
             return
         }
+
+
+
+
+
         //处理wifi点击回来
         if (getNetwork()) {
+            //先获取本地配置
+            getAppTuya(true)
+            return
+
             /**
              * 因为有涂鸦功能不需要重新请求，但是会导致涂鸦图标是灰色
              * 估在这做多判断处理

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

@@ -106,9 +106,9 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
 
 //        getAppTuya(true)
 //
-        getDevInfo()
+//        getDevInfo()
 
-//        getTuyaSo()
+        getTuyaSo()
 
     }