011D 涂鸦云 重连机制调整

BusinessCommon/src/main/java/com/develop/common/utils/CommonUtils.kt

@@ -192,17 +192,30 @@ object CommonUtils {
 //            }
 
             var str = TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
+
+
             if ("" == str || str == null) {
-                //重连3次，如果3次过后 还没有数据就显示失败
-                if (num > 3) {
+                if (TuyaUtilsSo.getInstance().tuyaNetwork){
+                    ToastUtils.showShort(globalApp().getString(R.string.not_http_tuya_content))
+                }else{
                     ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
-                    tuyaHttp.fail()
-                    return@launch
-                } else {
-                    var nums = num + 1
-                    getTuyaBean(url, apiVersion, json, t, tuyaHttp, nums)
                 }
 
+//                ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
+                tuyaHttp.fail()
+                return@launch
+
+
+                //重连3次，如果3次过后 还没有数据就显示失败
+//                if (num > 3) {
+//                    ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
+//                    tuyaHttp.fail()
+//                    return@launch
+//                } else {
+//                    var nums = num + 1
+//                    getTuyaBean(url, apiVersion, json, t, tuyaHttp, nums)
+//                }
+
             }
             withContext(Dispatchers.Main) {
                 tuyaHttp.bean(GsonUtils.GsonToBean(str, t))
@@ -266,15 +279,24 @@ object CommonUtils {
             Log.e("tuya", "url :" + url + "   json:" + json)
             var str = TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
             if ("" == str || str == null) {
-                //重连3次，如果3次过后 还没有数据就显示失败
-                if (num > 3) {
+                if (TuyaUtilsSo.getInstance().tuyaNetwork){
+                    ToastUtils.showShort(globalApp().getString(R.string.not_http_tuya_content))
+                }else{
                     ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
-                    tuyaHttpList.fail()
-                    return@launch
-                } else {
-                    var nums = num + 1
-                    getTuyaList(url, apiVersion, json, t, tuyaHttpList, nums)
                 }
+                tuyaHttpList.fail()
+                return@launch
+
+
+                //重连3次，如果3次过后 还没有数据就显示失败
+//                if (num > 3) {
+//                    ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
+//                    tuyaHttpList.fail()
+//                    return@launch
+//                } else {
+//                    var nums = num + 1
+//                    getTuyaList(url, apiVersion, json, t, tuyaHttpList, nums)
+//                }
 
             }
             withContext(Dispatchers.Main) {

BusinessCommon/src/main/res/values-pl/strings.xml

@@ -407,5 +407,6 @@
     <string name="add_like_fail">Dodanie kolekcji receptur nie powiodło się</string>
     <string name="delete_like_fail">Nie udało się usunąć kolekcji receptur</string>
     <string name="connect_tuya">Proszę podłączyć urządzenie TUYA</string>
+    <string name="not_http_tuya_content">Nie udało się pobrać danych TUYA.</string>
     <string name="not_recipes_steps">Obecnie nie ma dostępnych kroków przepisu</string>
 </resources>

BusinessCommon/src/main/res/values/strings.xml

@@ -492,5 +492,6 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="add_like_fail">Adding recipe collection failed</string>
     <string name="delete_like_fail">Failed to delete recipe collection</string>
     <string name="connect_tuya">Please connect TUYA device</string>
+    <string name="not_http_tuya_content">Failed to retrieve TUYA data.</string>
     <string name="not_recipes_steps">There are currently no recipe steps available</string>
 </resources>