提交人：jtm

提交内容：bug fixed

BusinessAirFryer/src/main/assets/lang_config_032.json

@@ -0,0 +1,179 @@
+{
+  "langs": [
+    {
+      "name": "Polish(波兰语)",
+      "value": "PL",
+      "icon": "icon_lang_pl",
+      "showName": "Polski",
+      "show": false
+    },
+    {
+      "name": "Spanish(西班牙语)",
+      "value": "ES",
+      "icon": "icon_lang_es",
+      "showName": "Español",
+      "show": true
+    },
+    {
+      "name": "Portuguese(葡萄牙语)",
+      "value": "PT",
+      "icon": "icon_lang_pt",
+      "showName": "Português",
+      "show": true
+    },
+    {
+      "name": "Italiano(意大利语)",
+      "value": "IT",
+      "icon": "icon_lang_it",
+      "showName": "Italiano",
+      "show": true
+    },
+    {
+      "name": "English(英语)",
+      "value": "EN",
+      "icon": "icon_lang_en",
+      "showName": "English",
+      "show": true
+    },
+    {
+      "name": "German(德语)",
+      "value": "DE",
+      "icon": "icon_lang_de",
+      "showName": "Deutsch",
+      "show": false
+    },
+    {
+      "name": "French(法语)",
+      "value": "FR",
+      "icon": "icon_lang_fr",
+      "showName": "Français",
+      "show": true
+    },
+    {
+      "name": "Dutch(荷兰语)",
+      "value": "NL",
+      "icon": "icon_lang_nl",
+      "showName": "Nederlands",
+      "show": false
+    },
+    {
+      "name": "Greek(希腊语)",
+      "value": "GR",
+      "icon": "icon_lang_gr",
+      "showName": "Ελληνικά",
+      "show": false
+    },
+    {
+      "name": "Russian(俄语)",
+      "value": "RU",
+      "icon": "icon_lang_ru",
+      "showName": "Русский",
+      "show": false
+    },
+    {
+      "name": "Romanian(罗马尼亚语)",
+      "value": "RO",
+      "icon": "icon_lang_ro",
+      "showName": "Română",
+      "show": false
+    },
+    {
+      "name": "Finnish(芬兰语)",
+      "value": "FI",
+      "icon": "icon_lang_fi",
+      "showName": "Suomi",
+      "show": false
+    },
+    {
+      "name": "Norsk(挪威语)",
+      "value": "NO",
+      "icon": "icon_lang_no",
+      "showName": "Norsk",
+      "show": false
+    },
+    {
+      "name": "Swedish(瑞典语)",
+      "value": "SE",
+      "icon": "icon_lang_se",
+      "showName": "Svenska",
+      "show": false
+    },
+    {
+      "name": "Danish(丹麦语)",
+      "value": "DK",
+      "icon": "icon_lang_dk",
+      "showName": "Dansk",
+      "show": false
+    },
+    {
+      "name": "Czech(捷克语)",
+      "value": "CZ",
+      "icon": "icon_lang_cz",
+      "showName": "Čeština",
+      "show": false
+    },
+    {
+      "name": "Estonki(爱沙尼亚语)",
+      "value": "EE",
+      "icon": "icon_lang_ee",
+      "showName": "Eesti keel",
+      "show": false
+    },
+    {
+      "name": "Slovak(斯洛伐克语)",
+      "value": "SK",
+      "icon": "icon_lang_sk",
+      "showName": "Slovenčina",
+      "show": false
+    },
+    {
+      "name": "Ukrainian(乌克兰语)",
+      "value": "UK",
+      "icon": "icon_lang_uk",
+      "showName": "Українська",
+      "show": false
+    },
+    {
+      "name": "Arabic(阿拉伯语)",
+      "value": "AR",
+      "icon": "icon_lang_ar",
+      "showName": "العربية",
+      "show": false
+    },
+    {
+      "name": "Lithuanian(立陶宛语)",
+      "value": "LT",
+      "icon": "icon_lang_lt",
+      "showName": "Lietuvių kalba",
+      "show": false
+    },
+    {
+      "name": "Farsi(波斯语)",
+      "value": "IR",
+      "icon": "icon_lang_ir",
+      "showName": "فارسی",
+      "show": false
+    },
+    {
+      "name": "Kazakh(哈萨克语)",
+      "value": "KZ",
+      "icon": "icon_lang_kz",
+      "showName": "Қазақша",
+      "show": false
+    },
+    {
+      "name": "Chinese(中文)",
+      "value": "ZH",
+      "icon": "icon_lang_zh",
+      "showName": "中文",
+      "show": false
+    },
+    {
+      "name": "Japanese(日语)",
+      "value": "JA",
+      "icon": "icon_lang_ja",
+      "showName": "日本語",
+      "show": false
+    }
+  ]
+}

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -200,15 +200,15 @@
       "uid": "uuid1ed716f65a8fc8c6",
       "ak": "TliIl48lle7GbMB2MCjrvWDknjH4guo9"
     },
-    "045A50370020123010190001": {
-      "pid": "lozjriuxwhwpaz4k",
-      "uid": "uuid68716791437c5329",
-      "ak": "qcz27dPBLo82sgvbZpmwuVmZxheKrtzk"
+    "045A20060020123010190001": {
+      "pid": "zqu9xyol98eirdqg",
+      "uid": "uuidbd4d1cbba19ea736",
+      "ak": "S1Tv2LOeANACGugcWdNlszKO6EqgeTMl"
     },
-    "045A50370020123010190002": {
-      "pid": "lozjriuxwhwpaz4k",
-      "uid": "uuiddd1bf831a6aecfae",
-      "ak": "ko3JgbIIFmiNHyD7sPPq4jYyeycrbB6t"
+    "045A20060020123010190002": {
+      "pid": "zqu9xyol98eirdqg",
+      "uid": "uuid11883ce74bcb3c8e",
+      "ak": "jME9tDGXIF3F1Y0E6m9AAAiNeegNJJGO"
     },
     "029C21010020123010190001": {
       "pid": "vowpjhiaj5tyv2rd",
@@ -219,6 +219,16 @@
       "pid": "vowpjhiaj5tyv2rd",
       "uid": "uuid5c221a4957ad2f69",
       "ak": "ysx7mZoKndu12lNAqABH8AP31yW3Iv8v"
+    },
+    "032D21060020123010190001": {
+      "pid": "ua4cifaz2yysnhvx",
+      "uid": "uuida2fe2befab0fd953",
+      "ak": "AtiUKJP1EqEWBzH5xfHKjJ8HnP2kyD0X"
+    },
+    "032D21060020123010190002": {
+      "pid": "ua4cifaz2yysnhvx",
+      "uid": "uuid51d88782ae882cd7",
+      "ak": "vLcW2HLzZUssv6m2TXnCBsYeCFeTHSud"
     }
   }
 }

app/build.gradle

@@ -12,7 +12,7 @@ ext{
 
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="010D"
+    brandCode="045A"
     model="1039"
 
 }

libBase/src/main/java/com/develop/base/mvvm/FullScreenTransparentDialog.kt

@@ -33,10 +33,7 @@ abstract class FullScreenTransparentDialog : DialogFragment() {
             )
         }
         dialog?.setOnKeyListener { dialogInterface, i, keyEvent ->
-            if (keyEvent.action == KeyEvent.ACTION_UP) {
-                EventBus.getDefault().post(CloseDialogEvent())
-                false
-            } else keyEvent.action == KeyEvent.ACTION_DOWN
+            i == KeyEvent.KEYCODE_BACK
         }
     }