011 涂鸦兼容代码上传

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -1,5 +1,10 @@
 {
   "licences": {
+    "011D10390020123010190003": {
+      "pid": "xkt4eqycakmkofec",
+      "uid": "uuid5556223d6a565563",
+      "ak": "2nFvnySNZfQD2yvS7kXHe7O4JGf6WSdL"
+    },
     "011D10390020123010190019": {
       "pid": "xkt4eqycakmkofec",
       "uid": "uuid14e8e649b47d3f43",

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

@@ -226,9 +226,8 @@ 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)
+                                    if (TuyaUtilsSo.getInstance().shorturl == ""  ){
+                                        TuyaUtilsSo.getInstance().shorturl = MMkvUtils.getString(TuyaUtilsSo.getInstance().mUid)?:""
                                     }
                                     Log.e(
                                         "TAG isTuya",
@@ -408,14 +407,15 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
         //处理wifi点击回来
         if (getNetwork()) {
-            //先获取本地配置
-            getAppTuya(true)
-            return
-
             /**
              * 因为有涂鸦功能不需要重新请求，但是会导致涂鸦图标是灰色
              * 估在这做多判断处理
              * */
+
+
+            //先获取本地配置
+            getAppTuya(true)
+            return
             if (isTuya) {
                 dataList.forEach { settingModel ->
                     if (settingModel.type == SettingType.TUYA) {
@@ -512,6 +512,17 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 //            TuyaUtils.mUid = tuyaConfig.get("uid")
 //            TuyaUtils.initSDK(this, "1.0.0")
             isTuya = true
+
+            if (isTuya) {
+                dataList.forEach { settingModel ->
+                    if (settingModel.type == SettingType.TUYA) {
+                        settingModel.resId = com.develop.common.R.drawable.ic_setting_tuya
+                    }
+                }
+                binding.mainSettingRecycler.bindingAdapter.notifyDataSetChanged()
+            }
+
+
             //涂鸦存值判断有涂鸦功能
             MMkvUtils.save(ISTUYA, true)
         } else {

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

@@ -69,7 +69,6 @@ class TuyaActivity : CommonBindingActivity<ActivityTuyaBinding>() {
             if(TuyaUtilsSo.getInstance().shorturl != "" && !TuyaUtilsSo.getInstance().tuyaNetwork){
                 //init关乎是否有其他手机连接
                 //有设备连接需要显示cancelBtn按钮
-
                 performBackgroundTaskAndUpdateUI(TuyaUtilsSo.getInstance().shorturl)
 
 //                ThreadUtils.runOnMainThread {

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

@@ -225,7 +225,8 @@ fun getSN(): String {
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190002"
 //        return "011A10390020123010190002"
-        return  "011A10390020123010190188"
+        return  "011D10390020123010190003"
+//        return  "011A10390020123010190188"
 //        return "011A10390020123010190099"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"