011 涂鸦兼容代码上传

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

@@ -157,7 +157,7 @@ object CommonUtils {
 //                return@launch
 //            }
 
-            Log.e("tuya","url :"+url +"   json:"+json)
+            Log.e("tuya", "url :" + url + "   json:" + json)
 //            var httpResponse = TuyaUtils.ioTSDKManager.httpRequest(url, apiVersion, json)
 //            var str = ""
 //            if (httpResponse.errorCode == 0) {
@@ -166,39 +166,47 @@ object CommonUtils {
 //                tuyaHttp.fail()
 //            }
 
-            var str  =  TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
-            if ("" == str || str ==null){
+            var str = TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
+            if ("" == str || str == null) {
                 ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
                 tuyaHttp.fail()
+                return@launch
             }
-            withContext(Dispatchers.Main){
-                tuyaHttp.bean(GsonUtils.GsonToBean(str,t))
+            withContext(Dispatchers.Main) {
+                tuyaHttp.bean(GsonUtils.GsonToBean(str, t))
             }
 
         }
 
     }
 
-    fun  getTuyaLike(
+    fun getTuyaLike(
         url: String,
         apiVersion: String,
         json: String,
         tuyaHttp: TuyaBooleanHttp
     ) {
         appGlobalScope.launch(Dispatchers.IO) {
-            if (!TuyaUtilsSo.getInstance().tuyaInitSuccess || !TuyaUtilsSo.getInstance().tuyaNetwork){
+//            if (!TuyaUtilsSo.getInstance().tuyaInitSuccess || !TuyaUtilsSo.getInstance().tuyaNetwork){
+//                ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
+//                tuyaHttp.fail()
+//                return@launch
+//            }
+            var str = false
+
+            var json = TuyaUtilsSo.getInstance().getPointerLike(url, apiVersion, json)
+
+            if (json == null) {
                 ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
                 tuyaHttp.fail()
                 return@launch
+            } else {
+                str = true
             }
-            var str = false
 
-            var json  =  TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
-            str = !("" == json || json ==null)
 
 
-
-            withContext(Dispatchers.Main){
+            withContext(Dispatchers.Main) {
                 tuyaHttp.bean(str)
 
             }
@@ -223,11 +231,12 @@ object CommonUtils {
 //            }
 
 
-            Log.e("tuya","url :"+url +"   json:"+json)
-            var str  =  TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
-            if ("" == str || str ==null){
+            Log.e("tuya", "url :" + url + "   json:" + json)
+            var str = TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
+            if ("" == str || str == null) {
                 ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
                 tuyaHttpList.fail()
+                return@launch
             }
             withContext(Dispatchers.Main) {
                 tuyaHttpList.bean(GsonUtils.jsonToList(str, t))
@@ -245,6 +254,7 @@ object CommonUtils {
         fun bean(t: T)
         fun fail()
     }
+
     interface TuyaBooleanHttp {
         fun bean(t: Boolean)
         fun fail()

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

@@ -129,6 +129,23 @@ public class TuyaUtilsSo {
         return  json;
     }
 
+    public String getPointerLike (String apiName,String apiVersion,String postDate){
+        Pointer pointer = TuyaApi.INSTANCE.http_common_post_simple(
+                apiName, apiVersion, postDate, ""
+        );
+        String json = "";
+        if (pointer ==null){
+            json = null;
+        }else {
+            json = pointer.getString(0);
+        }
+
+        //释放资源
+        getTuyaApi().free_memory(pointer);
+
+        return  json;
+    }
+
     interface  httpCommonPostCallBack{
         void  httpCommon(String json);
 

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -573,6 +573,8 @@ class CookStepActivity : CookStepBaseActivity() {
                             modeName = this@CookStepActivity.binding.tvTitleStep.text.toString(),
                             detailJson = cookStepDetail ?: "",
                             sizelJson = portionSizelJson ?: "",
+                            tuyaStepJson =  viewModel.tuyaStepJson,
+                            tuyaRecipeJson =  viewModel.tuyaRecipeJson
 
                         )
                         FloatWindowManager.showStepFlowWindow(cookStepEvent)
@@ -608,8 +610,8 @@ class CookStepActivity : CookStepBaseActivity() {
                         modeName = this@CookStepActivity.binding.tvTitleStep.text.toString(),
                         detailJson = cookStepDetail ?: "",
                         sizelJson = portionSizelJson ?: "",
-                        tuyaStepJson =  tuyaStep?:"",
-                        tuyaRecipeJson = tuyaRecipe?:""
+                        tuyaStepJson =  viewModel.tuyaStepJson,
+                        tuyaRecipeJson =  viewModel.tuyaRecipeJson
 
                     )
                     FloatWindowManager.showStepFlowWindow(cookStepEvent)
@@ -1970,6 +1972,8 @@ class CookStepActivity : CookStepBaseActivity() {
                             modeName = this@CookStepActivity.binding.tvTitleStep.text.toString(),
                             detailJson = cookStepDetail ?: "",
                             sizelJson = portionSizelJson ?: "",
+                            tuyaStepJson =  viewModel.tuyaStepJson,
+                            tuyaRecipeJson =  viewModel.tuyaRecipeJson
                         )
                         FloatWindowManager.showStepFlowWindow(cookStepEvent)
                         getRecipe(number)

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -135,6 +135,9 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
     private fun initData() {
+        viewModel.onfialLiveData.observe(this){
+            recipesloadingDialog.removeSelf()
+        }
         viewModel.getRecipeLiveData().observe(this) {
             if (baseSn.startsWith("011")){
                 recipesloadingDialog.removeSelf()
@@ -394,6 +397,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         allTabViews.add(binding.ivTab1)
         allTabViews.add(binding.ivTab2)
         if (sn.startsWith("011")){
+//            var params =  ConstraintLayout.LayoutParams(binding.ivTab1.width,binding.ivTab1.height)
+//            params.topMargin = resources.dimenRes(com.develop.common.R.dimen.convert_100px)
+//            params.marginStart = resources.dimenRes(com.develop.common.R.dimen.convert_120px)
+//            binding.ivTab1.layoutParams = params
+
             binding.ivTab3.setGone()
         }else{
             allTabViews.add(binding.ivTab3)

BusinessStep/src/main/java/com/develop/step/viewmodel/CookDetailViewModel.kt

@@ -50,6 +50,8 @@ class CookDetailViewModel : BaseViewModel() {
     var deleteLikeLiveData = MutableLiveData<Boolean>()
     var stepLiveDataString = MutableLiveData<String>()
 
+    var onfialLiveData = MutableLiveData<String>()
+
     var recipeNumber: String? = null
     private var mRecipeUrl: String? = null
     var tuyaRecipe = ""
@@ -101,8 +103,11 @@ class CookDetailViewModel : BaseViewModel() {
                     }
 
                     override fun fail() {
+                        onfialLiveData.postValue("")
+
                     }
 
+
                 })
 
         } else {
@@ -405,41 +410,44 @@ class CookDetailViewModel : BaseViewModel() {
             )
         )
         var i = 1
-        t.foodInfoVOList.forEach {
-            devRecipeFoodList.add(
-                DevRecipeFood(
-                    it.id.toString(),
-                    it.menuFoodRelationVO.foodId.toString(),
-                    it.menuFoodRelationVO.amount.toDouble(),
-                    it.menuFoodRelationVO.menuId.toString(),
-                    lang,
-                    "g",
-                    it.name,
-                    "",
-                    it.gmtModified,
-                    it.gmtCreate
-                )
-            )
+       if (t.foodInfoVOList!=null){
+           t.foodInfoVOList.forEach {
+               devRecipeFoodList.add(
+                   DevRecipeFood(
+                       it.id.toString(),
+                       it.menuFoodRelationVO.foodId.toString(),
+                       it.menuFoodRelationVO.amount.toDouble(),
+                       it.menuFoodRelationVO.menuId.toString(),
+                       lang,
+                       "g",
+                       it.name,
+                       "",
+                       it.gmtModified,
+                       it.gmtCreate
+                   )
+               )
+
+               it.foodNutritionVOList.forEach { food ->
+
+                   devRecipeNutritionList.add(
+                       DevRecipeNutrition(
+                           food.id.toString(),
+                           number,
+                           i.toString(),
+                           food.value.toDouble(),
+                           "g",
+                           "",
+                           lang,
+                           it.gmtModified,
+                           it.gmtCreate
+                       )
+                   )
+                   i++
+               }
+
+           }
+       }
 
-            it.foodNutritionVOList.forEach { food ->
-
-                devRecipeNutritionList.add(
-                    DevRecipeNutrition(
-                        food.id.toString(),
-                        number,
-                        i.toString(),
-                        food.value.toDouble(),
-                        "g",
-                        "",
-                        lang,
-                        it.gmtModified,
-                        it.gmtCreate
-                    )
-                )
-                i++
-            }
-
-        }
 
         return CookDetailInfo(
             devRecipe,
@@ -465,6 +473,7 @@ class CookDetailViewModel : BaseViewModel() {
                 }
 
                 override fun fail() {
+                    onfialLiveData.postValue("")
                 }
 
             })
@@ -483,6 +492,7 @@ class CookDetailViewModel : BaseViewModel() {
                 }
 
                 override fun fail() {
+                    onfialLiveData.postValue("")
                 }
 
             })

BusinessStep/src/main/res/layout/activity_cook_detail.xml

@@ -301,6 +301,7 @@
         android:layout_height="@dimen/convert_100px"
         android:background="@drawable/bg_detail_tab_selector"
         android:elevation="@dimen/convert_8px"
+
         android:padding="@dimen/convert_20px"
         android:layout_marginTop="@dimen/convert_100px"
         android:src="@drawable/ic_detail_tab3"

app/build.gradle

@@ -21,7 +21,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="054A"
-    brandCode = "011A"
+    brandCode = "011D"
 //    model = "5037"
     model = "1039"