处理电磁阀显示问题，011分类不跑马灯问题，添加厨师机程序到config

BusinessAirFryer/src/main/assets/config.json

@@ -375,6 +375,85 @@
       "icon": "ic_grid_weight",
       "devMode": "AIR_FRYER",
       "listShow": true
+    },  {
+      "type": "SM_DIY",
+      "name": "sm_diy",
+      "bg": "ic_special_diy_mode_bg",
+      "icon": "ic_special_diy_mode",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_KNEAD",
+      "name": "sm_knead",
+      "bg": "ic_sm_knead_bg",
+      "icon": "ic_sm_knead",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_WHISK",
+      "name": "sm_whisk",
+      "bg": "ic_sm_whisk_bg",
+      "icon": "ic_sm_whisk",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_BEATER",
+      "name": "sm_beater",
+      "bg": "ic_sm_beater_bg",
+      "icon": "ic_sm_beater",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_SHREDDER",
+      "name": "sm_shredder",
+      "bg": "ic_sm_shredder_bg",
+      "icon": "ic_sm_shredder",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_MEAT_GRUBDER",
+      "name": "sm_meat_grubder",
+      "bg": "ic_sm_meat_grubder_bg",
+      "icon": "ic_sm_meat_grubder",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_BLENDER",
+      "name": "sm_blender",
+      "bg": "ic_sm_blender_bg",
+      "icon": "ic_sm_blender",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_PASTA_MAKER",
+      "name": "sm_pasta_maker",
+      "bg": "ic_sm_pasta_maker_bg",
+      "icon": "ic_sm_pasta_maker",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_TURBO",
+      "name": "turbo",
+      "bg": "ic_sm_turbo_bg",
+      "icon": "ic_sm_turbo",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_WIGHT",
+      "name": "wight",
+      "bg": "ic_sm_wight_bg",
+      "icon": "ic_sm_wight",
+      "devMode": "STAND_MIXER",
+      "listShow": false
     }
 
   ]

BusinessMain/src/main/res/layout/item_filter_and_sort_view.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/item_layout"
     android:background="@color/sort_filter_bg"
-    android:layout_width="match_parent"
+    android:layout_width="@dimen/convert_380px"
     android:layout_height="@dimen/convert_90px">
 
     <ImageView
@@ -11,18 +11,22 @@
         android:layout_height="@dimen/convert_21px"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:background="@drawable/ic_check" />
+        android:background="@drawable/ic_check"
+
+        />
 
     <com.develop.common.widget.MarqueeTextView
         android:id="@+id/tv_name"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/convert_29px"
         android:textColor="@color/sort_filter_name"
         android:layout_toStartOf="@id/iv_check"
-        android:gravity="center_vertical"
+        android:text="asd"
         android:textSize="@dimen/convert_30px"
+        android:layout_marginRight="@dimen/convert_16px"
         android:ellipsize="marquee"
         android:marqueeRepeatLimit="marquee_forever"
         android:singleLine="true"

BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -245,14 +245,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             }
         }
 
-        //2023.12.11 000A客户需要隐藏电磁阀
-        if (sn.startsWith("063")) {
-            binding.tvCount.setVisible()
-            binding.ivPotCover.setVisible()
-        } else {
-            binding.tvCount.setGone()
-            binding.ivPotCover.setGone()
-        }
+
 
 
 //        if (!getSN().startsWith("000")) {
@@ -333,6 +326,14 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             CofarSDK.startWeight()
         }
 
+        //2023.12.11 000A客户需要隐藏电磁阀
+        if (sn.startsWith("063")&&viewModel.modeType != ModesType.WIGHT.name) {
+            binding.tvCount.setVisible()
+            binding.ivPotCover.setVisible()
+        } else {
+            binding.tvCount.setGone()
+            binding.ivPotCover.setGone()
+        }
 
         //初始化模式数据
         initModeData(lastModeType)
@@ -937,7 +938,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             //之前是000 需要做电磁阀，现在单独判断063
             //sn.startsWith("000")
             if (sn.startsWith("063")) {
-                if (!CofarSDK.devInfo().isWeightStatus && currDevInfo.mode.mode != "TURBO") {
+                //之前的判断是判断是否称重，和点动，现在把点动去掉
+                //!CofarSDK.devInfo().isWeightStatus && currDevInfo.mode.mode != "TURBO"
+                if (!CofarSDK.devInfo().isWeightStatus ) {
                     //电磁阀在非称重/切碎下显示开锁和上锁
                     if (currDevInfo.potCloverEleStatus.toInt() == 0 && potCloverEleStatus != 0) {
                         potCloverEleStatus = 0
@@ -1503,6 +1506,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             if (viewModel.modeType == ModesType.TURBO.name) {
                 binding.llTurboView.visibility = View.VISIBLE
             }
+
+
         } else if (viewModel.modeType == ModesType.CITRUS_JUICER.name
             || viewModel.modeType == ModesType.DICING.name
             || viewModel.modeType == ModesType.POTATO_PEELER.name
@@ -2512,8 +2517,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
      * 点击turbo操作
      */
     private fun turboClick() {
-        binding.ivPotCover.setGone()
-        binding.tvCount.setGone()
         CofarSDK.stop(false)
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
@@ -2571,14 +2574,14 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         Glide.with(this).load(com.develop.common.R.drawable.ic_mode_diy)
                             .into(binding.ivBanner)
                     } else {
-                        Glide.with(this).load(
-                            resources.getIdentifier(
-                                workMode.bg,
-                                "drawable",
-                                this.packageName
-                            )
-                        )
-                            .into(binding.ivBanner)
+//                        Glide.with(this).load(
+//                            resources.getIdentifier(
+//                                workMode.bg,
+//                                "drawable",
+//                                this.packageName
+//                            )
+//                        )
+//                            .into(binding.ivBanner)
                     }
                 }
                 binding.tvModeName.text =

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

@@ -100,6 +100,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
 
     private var isLoadingDialog = false //判断是否显示了loading,主要用在在线食谱
 
+    private var isOnResume = true //避免在线食谱重复请求
     override fun createViewModel(): CookDetailViewModel {
         return getViewModel(CookDetailViewModel::class.java)
     }
@@ -127,6 +128,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             if (cookSource == "remote" &&isLoadingDialog){
                 dismissloadingDialog()
                 startCookStep()
+                isLoadingDialog = false
             }
         }
         viewModel.getErrorCodeLiveData().observe(this) {
@@ -737,11 +739,19 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         isResetZero = CofarSDK.devInfo().resetZero.toInt()
         super.onResume()
         viewModel.getStarCount(recipeNumber ?: "")
-        viewModel.queryRecipe(
-            recipeNumber ?: "",
-            cookSource == "remote",
-            recipesEdition ?: "1.0"
-        )
+        if (isOnResume){
+            viewModel.queryRecipe(
+                recipeNumber ?: "",
+                cookSource == "remote",
+                recipesEdition ?: "1.0"
+            )
+            //避免在线食谱重复请求故在这做多一个处理
+            if (cookSource == "remote"){
+                isOnResume = false
+            }
+
+        }
+
     }
 
     private fun showAmountSelectDialog() {