011 涂鸦步骤

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -6,6 +6,16 @@
       "uid": "uuid1bb4c5b06b8f612d",
       "ak": "xxcENweozy7c16PcMXN1oQWxQVHgRMIb"
     },
+    "011A10390020123010190155": {
+      "pid": "xkt4eqycakmkofec",
+      "uid": "uuid3bb98fa475dfce31",
+      "ak": "PFeHWnNdpEeCBV2o1SGkPl13PWnqF5uz"
+    },
+    "011A10390020123010190188": {
+      "pid": "xkt4eqycakmkofec",
+      "uid": "uuid189ba5f027d5e0eb",
+      "ak": "pTfelgD9SJDQd7A4nFcRV1IanxCARMi3"
+    },
 
     "010D10390020123010100032": {
       "pid": "dquk8axtyy72c1ap",

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

@@ -3,9 +3,10 @@ package com.develop.common.tuya_bean;
 import java.util.List;
 
 public class RecipesBean {
-    private List<?> allergens;
+
+    private List<AllergensBean> allergens;
     private String author;
-    private List<?> cookStepInfoVOList;
+    private List<CookStepInfoVOListBean> cookStepInfoVOList;
     private Integer cookTime;
     private Integer cookType;
     private String desc;
@@ -41,14 +42,15 @@ public class RecipesBean {
     private String stepVideo;
     private String stepVideoCover;
     private String taste;
+    private String tasteDesc;
     private Integer useFoodLib;
     private String xyxk;
 
-    public List<?> getAllergens() {
+    public List<AllergensBean> getAllergens() {
         return allergens;
     }
 
-    public void setAllergens(List<?> allergens) {
+    public void setAllergens(List<AllergensBean> allergens) {
         this.allergens = allergens;
     }
 
@@ -60,11 +62,11 @@ public class RecipesBean {
         this.author = author;
     }
 
-    public List<?> getCookStepInfoVOList() {
+    public List<CookStepInfoVOListBean> getCookStepInfoVOList() {
         return cookStepInfoVOList;
     }
 
-    public void setCookStepInfoVOList(List<?> cookStepInfoVOList) {
+    public void setCookStepInfoVOList(List<CookStepInfoVOListBean> cookStepInfoVOList) {
         this.cookStepInfoVOList = cookStepInfoVOList;
     }
 
@@ -348,6 +350,14 @@ public class RecipesBean {
         this.taste = taste;
     }
 
+    public String getTasteDesc() {
+        return tasteDesc;
+    }
+
+    public void setTasteDesc(String tasteDesc) {
+        this.tasteDesc = tasteDesc;
+    }
+
     public Integer getUseFoodLib() {
         return useFoodLib;
     }
@@ -364,6 +374,207 @@ public class RecipesBean {
         this.xyxk = xyxk;
     }
 
+    public static class AllergensBean {
+        private Integer id;
+        private String name;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
+    public static class CookStepInfoVOListBean {
+        private List<CookArgsBean> cookArgs;
+        private String finishCtrl;
+        private Long gmtCreate;
+        private Long gmtModified;
+        private Integer id;
+        private Integer isCookArgs;
+        private List<LangInfosBean> langInfos;
+        private Integer menuId;
+        private Integer step;
+        private String stepImg;
+
+        public List<CookArgsBean> getCookArgs() {
+            return cookArgs;
+        }
+
+        public void setCookArgs(List<CookArgsBean> cookArgs) {
+            this.cookArgs = cookArgs;
+        }
+
+        public String getFinishCtrl() {
+            return finishCtrl;
+        }
+
+        public void setFinishCtrl(String finishCtrl) {
+            this.finishCtrl = finishCtrl;
+        }
+
+        public Long getGmtCreate() {
+            return gmtCreate;
+        }
+
+        public void setGmtCreate(Long gmtCreate) {
+            this.gmtCreate = gmtCreate;
+        }
+
+        public Long getGmtModified() {
+            return gmtModified;
+        }
+
+        public void setGmtModified(Long gmtModified) {
+            this.gmtModified = gmtModified;
+        }
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+        public Integer getIsCookArgs() {
+            return isCookArgs;
+        }
+
+        public void setIsCookArgs(Integer isCookArgs) {
+            this.isCookArgs = isCookArgs;
+        }
+
+        public List<LangInfosBean> getLangInfos() {
+            return langInfos;
+        }
+
+        public void setLangInfos(List<LangInfosBean> langInfos) {
+            this.langInfos = langInfos;
+        }
+
+        public Integer getMenuId() {
+            return menuId;
+        }
+
+        public void setMenuId(Integer menuId) {
+            this.menuId = menuId;
+        }
+
+        public Integer getStep() {
+            return step;
+        }
+
+        public void setStep(Integer step) {
+            this.step = step;
+        }
+
+        public String getStepImg() {
+            return stepImg;
+        }
+
+        public void setStepImg(String stepImg) {
+            this.stepImg = stepImg;
+        }
+
+        public static class CookArgsBean {
+            private String dpCode;
+            private String dpValue;
+            private Boolean isTypeValue;
+            private String productId;
+
+            public String getDpCode() {
+                return dpCode;
+            }
+
+            public void setDpCode(String dpCode) {
+                this.dpCode = dpCode;
+            }
+
+            public String getDpValue() {
+                return dpValue;
+            }
+
+            public void setDpValue(String dpValue) {
+                this.dpValue = dpValue;
+            }
+
+            public Boolean getIsTypeValue() {
+                return isTypeValue;
+            }
+
+            public void setIsTypeValue(Boolean isTypeValue) {
+                this.isTypeValue = isTypeValue;
+            }
+
+            public String getProductId() {
+                return productId;
+            }
+
+            public void setProductId(String productId) {
+                this.productId = productId;
+            }
+        }
+
+        public static class LangInfosBean {
+            private String desc;
+            private String lang;
+            private String stepImg;
+            private String stepVideo;
+            private String stepVideoCover;
+
+            public String getDesc() {
+                return desc;
+            }
+
+            public void setDesc(String desc) {
+                this.desc = desc;
+            }
+
+            public String getLang() {
+                return lang;
+            }
+
+            public void setLang(String lang) {
+                this.lang = lang;
+            }
+
+            public String getStepImg() {
+                return stepImg;
+            }
+
+            public void setStepImg(String stepImg) {
+                this.stepImg = stepImg;
+            }
+
+            public String getStepVideo() {
+                return stepVideo;
+            }
+
+            public void setStepVideo(String stepVideo) {
+                this.stepVideo = stepVideo;
+            }
+
+            public String getStepVideoCover() {
+                return stepVideoCover;
+            }
+
+            public void setStepVideoCover(String stepVideoCover) {
+                this.stepVideoCover = stepVideoCover;
+            }
+        }
+    }
+
     public static class FoodInfoVOListBean {
         private List<FoodLangInfoVOListBean> foodLangInfoVOList;
         private List<FoodNutritionVOListBean> foodNutritionVOList;

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

@@ -6,6 +6,9 @@ import android.util.Log;
 import com.sun.jna.Pointer;
 
 public class TuyaUtilsSo {
+    /**
+     * 由于Gradle版本问题，建议jna版本用5.14.0
+     * */
 
     /**volatile防止指令重排*/
     private static volatile TuyaUtilsSo singleton;

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

@@ -400,7 +400,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         binding.ivLogo.setOnClickListener {
 
 //            pageSize++
-            getCook("3898712")
+            getCook("3844312")
 
             weightAlignCount++
             if (weightAlignCount >= 7) {

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

@@ -78,6 +78,8 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     @Autowired(name = "recipesEdition")
     var recipesEdition: String? = "1.0"
 
+
+
     private var hideDetail = false
     private val hideViews = mutableListOf<View>()
     private val allTabViews = mutableListOf<View>()

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

@@ -17,6 +17,7 @@ import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.data_repo.db.entity.DevAccessory
 import com.develop.common.data_repo.db.entity.DevRecipe
 import com.develop.common.data_repo.db.entity.DevRecipeCategory
+import com.develop.common.data_repo.db.entity.DevRecipeCookingStep
 import com.develop.common.data_repo.db.entity.DevRecipeFood
 import com.develop.common.data_repo.db.entity.DevRecipeNutrition
 import com.develop.common.data_repo.db.entity.DevRecipePortionSize
@@ -113,7 +114,7 @@ class CookDetailViewModel : BaseViewModel() {
                         val includeAccessory = mutableListOf<DevAccessory>()
                         var devRecipeFoodList = mutableListOf<DevRecipeFood>()
                         var devRecipeNutritionList = mutableListOf<DevRecipeNutrition>()
-
+                        var devRecipeCookingStep = mutableListOf<DevRecipeCookingStep>()
                         val includePortionSize = mutableListOf<DevRecipePortionSize>()
                         //不add进去，那边会报错，直接随便新增一个
                         includePortionSize.add(
@@ -163,6 +164,25 @@ class CookDetailViewModel : BaseViewModel() {
                             }
 
                         }
+                        //步骤
+                        t.cookStepInfoVOList?.forEach {
+                            //判断有没有  有cookArgs是模式 ，没有就是描述
+                            var code = it.menuId + it.id
+                            if (it.cookArgs.isEmpty()){
+
+                            }
+
+//                            var dev = DevRecipeCookingStep()
+
+
+                        }
+
+
+
+
+
+
+
                         val detailInfo = CookDetailInfo(
                             devRecipe,
                             includeAccessory,

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

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