011 涂鸦优化

BusinessCommon/src/main/java/com/develop/common/tuya_bean/RecipesBean.java

@@ -670,6 +670,8 @@ public class RecipesBean {
             private Integer menuId;
             private String secAmount;
             private String secUnit;
+            private String secUnitCode;
+            private String secUnitDesc;
             private Integer status;
             private Integer tagId;
             private String tagName;
@@ -763,6 +765,22 @@ public class RecipesBean {
                 this.secUnit = secUnit;
             }
 
+            public String getSecUnitCode() {
+                return secUnitCode;
+            }
+
+            public void setSecUnitCode(String secUnitCode) {
+                this.secUnitCode = secUnitCode;
+            }
+
+            public String getSecUnitDesc() {
+                return secUnitDesc;
+            }
+
+            public void setSecUnitDesc(String secUnitDesc) {
+                this.secUnitDesc = secUnitDesc;
+            }
+
             public Integer getStatus() {
                 return status;
             }

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

@@ -400,7 +400,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         binding.ivLogo.setOnClickListener {
 
 //            pageSize++
-            getCook("3844312")
+//            getCook("4115812")
 
             weightAlignCount++
             if (weightAlignCount >= 7) {
@@ -484,7 +484,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.tvAppVersion.setOnClickListener {
 
-            getCook("3899112")
+//            getCook("3899112")
 
 
             adbCount++
@@ -499,6 +499,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         }
 
         binding.tvFirmware.setOnClickListener {
+//            getappLog()
+
             tpCount++
             if (tpCount >= 7) {
                 tpCount = 0
@@ -516,7 +518,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
 
         binding.devSn.setOnClickListener {
-            getCook("3858012")
+//            getCook("1878112")
 
 
             testCount++
@@ -603,8 +605,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         var titleMap = HashMap<String, Any>()
         var map = HashMap<String, Any>()
         map["lang"] = "PL"
-        map["categoryIds"] = ""
-        map["name"] = "Arancello"
+//        map["categoryIds"] = ""
+        map["name"] = "A"
         map["orderType"] = 1
         map["pageNo"] = 0
         map["pageSize"] = 40
@@ -613,15 +615,16 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         android.util.Log.e("TAG TUYA", "json:" + json)
 
-        appGlobalScope.launch(Dispatchers.IO) {
-            var httpResponse =
-                TuyaUtils.ioTSDKManager.httpRequest("tuya.device.menu.lang.list", "1.0", json)
-            var str = httpResponse.result
-            withContext(Dispatchers.Main) {
-                Log.d("TAG", "json：$str")
-            }
+        CommonUtils.getTuyaBean<RecipesListBean>("tuya.device.menu.lang.list", "1.0",
+            json, RecipesListBean::class.java, object : CommonUtils.TuyaHttp<RecipesListBean> {
+                override fun bean(t: RecipesListBean) {
 
-        }
+                }
+
+                override fun fail() {
+                }
+
+            })
 
     }
 

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

@@ -412,14 +412,31 @@ class CookDetailViewModel : BaseViewModel() {
         var i = 1
        if (t.foodInfoVOList!=null){
            t.foodInfoVOList.forEach {
+               var amout = 0.0
+               var unit = ""
+               if (it.menuFoodRelationVO.amount=="0"){
+                    amout = it.menuFoodRelationVO.secAmount.toDouble()
+                   if (it.menuFoodRelationVO.secUnitDesc==null){
+                       unit = "g"
+                   }else{
+                       unit = it.menuFoodRelationVO.secUnitDesc
+                   }
+               }else{
+                   amout = it.menuFoodRelationVO.amount.toDouble()
+                   unit = "g"
+               }
+
+
+
+
                devRecipeFoodList.add(
                    DevRecipeFood(
                        it.id.toString(),
                        it.menuFoodRelationVO.foodId.toString(),
-                       it.menuFoodRelationVO.amount.toDouble(),
+                       amout,
                        it.menuFoodRelationVO.menuId.toString(),
                        lang,
-                       "g",
+                       unit,
                        it.name,
                        "",
                        it.gmtModified,