优化

BusinessAirFryer/src/main/assets/config.json

@@ -5,63 +5,72 @@
       "name": "adapted_cooking",
       "bg": "ic_mode_chop",
       "icon": "ic_grid_adapted_cooking",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "WIGHT",
       "name": "wight",
       "bg": "ic_mode_weight",
       "icon": "ic_grid_weight",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "BOIL_WATER",
       "name": "boil_water",
       "bg": "ic_mode_boil_water",
       "icon": "ic_grid_boil_water",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "CHOP",
       "name": "chop",
       "bg": "ic_mode_chop",
       "icon": "ic_grid_chop",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "SLOW_COOK",
       "name": "slow_cook",
       "bg": "ic_mode_slow_cook",
       "icon": "ic_grid_slow_cook",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_dough",
       "bg": "ic_mode_knead_dough",
       "icon": "ic_grid_knead_dough",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "STEAM",
       "name": "steam",
       "bg": "ic_mode_steam",
       "icon": "ic_grid_steam",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "FOOD_PROCESSOR",
       "name": "food_processor",
       "bg": "ic_mode_food_processor",
       "icon": "ic_grid_food_processor",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "TURBO",
       "name": "turbo",
       "bg": "ic_mode_turbo",
       "icon": "ic_grid_turbo",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
 
     {
@@ -69,7 +78,8 @@
       "name": "cook_eggs",
       "bg": "cm_icon_cook_eggs",
       "icon": "cm_icon_cook_eggs",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
 
     {
@@ -77,48 +87,55 @@
       "name": "cook_rice",
       "bg": "cm_icon_cook_rice",
       "icon": "cm_icon_cook_rice",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "MULSIFY",
       "name": "mulsify",
       "bg": "cm_icon_mulsify",
       "icon": "cm_icon_mulsify",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     }, {
       "type": "PUREE",
       "name": "puree",
       "bg": "cm_icon_puree",
       "icon": "cm_icon_puree",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "ROAST",
       "name": "roast",
       "bg": "cm_icon_roast",
       "icon": "cm_icon_roast",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "SMOOTHIE",
       "name": "smoothie",
       "bg": "cm_icon_smoothie",
       "icon": "cm_icon_smoothie",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "SOVS_VIDE",
       "name": "sovs_vide",
       "bg": "cm_icon_sovs_vide",
       "icon": "cm_icon_sovs_vide",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "AUTO_CLEAN",
       "name": "auto_clean",
       "bg": "cm_icon_auto_clean",
       "icon": "cm_icon_auto_clean",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
 
     {
@@ -126,70 +143,80 @@
       "name": "air_fryer",
        "bg": "air_fryer",
       "icon": "air_fryer",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "MEAT",
       "name": "meat",
       "bg": "meat",
       "icon": "meat",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "FISH",
       "name": "fish",
       "bg": "fish_steak",
       "icon": "fish_steak",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "BAKC",
       "name": "bakc",
       "bg": "bakc",
       "icon": "bakc",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "DRUMSTICKS",
       "name": "drumsticks",
       "bg": "drumsticks",
       "icon": "drumsticks",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "CHICKEN_WING",
       "name": "chicken_wing",
       "bg": "chicken_wing",
       "icon": "chicken_wing",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "VEGETABLE",
       "name": "vegetable",
       "bg": "vegetable",
       "icon": "vegetable",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "SHRIMP",
       "name": "shrimp",
       "bg": "shrimp",
       "icon": "shrimp",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "PIZZA",
       "name": "pizza",
       "bg": "pizza",
       "icon": "pizza",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "DEHYDRATE",
       "name": "dehydrate",
       "bg": "dehydrate",
       "icon": "dehydrate",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     }
   ]
 }

BusinessAirFryer/src/main/assets/config_010.json

@@ -1,74 +1,92 @@
 {
   "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": false
+    },
     {
       "type": "STEAM",
       "name": "steam",
       "bg": "ic_mode_steam",
       "icon": "ic_grid_steam",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_dough",
       "bg": "ic_mode_knead_dough",
       "icon": "ic_grid_knead_dough",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "SLOW_COOK",
       "name": "slow_cook",
       "bg": "ic_mode_slow_cook",
       "icon": "ic_grid_slow_cook",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "FERMENT",
       "name": "ferment",
       "bg": "ic_mode_chop",
       "icon": "ic_grid_ferment",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "MULSIFY",
       "name": "mulsify",
       "bg": "cm_icon_mulsify",
       "icon": "cm_icon_mulsify",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "FOOD_PROCESSOR",
       "name": "food_processor",
       "bg": "ic_mode_food_processor",
       "icon": "ic_grid_food_processor",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "CHOP",
       "name": "chop",
       "bg": "ic_mode_chop",
       "icon": "ic_grid_chop",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "WIGHT",
       "name": "wight",
       "bg": "ic_mode_weight",
       "icon": "ic_grid_weight",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "AUTO_CLEAN",
       "name": "auto_clean",
       "bg": "cm_icon_auto_clean",
       "icon": "cm_icon_auto_clean",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "TURBO",
       "name": "turbo",
       "bg": "ic_mode_turbo",
       "icon": "ic_grid_turbo",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     }
   ]
 }

BusinessAirFryer/src/main/assets/config_030.json

@@ -5,133 +5,152 @@
       "name": "adapted_cooking",
       "bg": "ic_mode_chop",
       "icon": "ic_grid_adapted_cooking",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "WIGHT",
       "name": "wight",
       "bg": "ic_mode_weight",
       "icon": "ic_grid_weight",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "BOIL_WATER",
       "name": "boil_water",
       "bg": "ic_mode_boil_water",
       "icon": "ic_grid_boil_water",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "CHOP",
       "name": "chop",
       "bg": "ic_mode_chop",
       "icon": "ic_grid_chop",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "SLOW_COOK",
       "name": "slow_cook",
       "bg": "ic_mode_slow_cook",
       "icon": "ic_grid_slow_cook",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_dough",
       "bg": "ic_mode_knead_dough",
       "icon": "ic_grid_knead_dough",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "STEAM",
       "name": "steam",
       "bg": "ic_mode_steam",
       "icon": "ic_grid_steam",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "FOOD_PROCESSOR",
       "name": "food_processor",
       "bg": "ic_mode_food_processor",
       "icon": "ic_grid_food_processor",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "TURBO",
       "name": "turbo",
       "bg": "ic_mode_turbo",
       "icon": "ic_grid_turbo",
-      "devMode": "SOUP"
+      "devMode": "SOUP",
+      "listShow": true
     },
     {
       "type": "AIR_FRYER",
       "name": "air_fryer",
        "bg": "air_fryer",
       "icon": "air_fryer",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "MEAT",
       "name": "meat",
       "bg": "meat",
       "icon": "meat",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "FISH",
       "name": "fish",
       "bg": "fish_steak",
       "icon": "fish_steak",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "BAKC",
       "name": "bakc",
       "bg": "bakc",
       "icon": "bakc",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "DRUMSTICKS",
       "name": "drumsticks",
       "bg": "drumsticks",
       "icon": "drumsticks",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "CHICKEN_WING",
       "name": "chicken_wing",
       "bg": "chicken_wing",
       "icon": "chicken_wing",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "VEGETABLE",
       "name": "vegetable",
       "bg": "vegetable",
       "icon": "vegetable",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "SHRIMP",
       "name": "shrimp",
       "bg": "shrimp",
       "icon": "shrimp",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "PIZZA",
       "name": "pizza",
       "bg": "pizza",
       "icon": "pizza",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     },
     {
       "type": "DEHYDRATE",
       "name": "dehydrate",
       "bg": "dehydrate",
       "icon": "dehydrate",
-      "devMode": "AIR_FRYER"
+      "devMode": "AIR_FRYER",
+      "listShow": true
     }
   ]
 }

BusinessCommon/src/main/java/com/develop/common/bean/WorkMode.kt

@@ -1,3 +1,3 @@
 package com.develop.common.bean
 
-data class WorkMode(val name: String?, val type: String, val icon: String?,val bg: String?,val devMode:String?)
+data class WorkMode(val name: String?, val type: String, val icon: String?,val bg: String?,val devMode:String?,val listShow:Boolean?)

BusinessCommon/src/main/java/com/develop/common/router/Screens.kt

@@ -22,6 +22,7 @@ object Screens {
         const val SOUND = "$SCHEMA/sound"
         const val ABOUT = "$SCHEMA/about"
         const val RESTORE = "$SCHEMA/restore"
+        const val HELP = "$SCHEMA/help"
     }
 
     object Main {

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

@@ -42,6 +42,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="scales">Balance</string>
     <string name="boil_water">BOIL WATER</string>
     <string name="chop">Hacher</string>
+    <string name="ferment">Emulsionner</string>
+
     <string name="slow_cook">Mijoter</string>
     <string name="knead_dough">Pétrir</string>
     <string name="steam">Vapeur</string>
@@ -245,10 +247,10 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="error_pot_clover_tips">The current cooking mode is not consistent with the type of pot cover. Do you want to switch to the corresponding cooking mode?</string>
     <string name="cook_eggs">COOK EGGS</string>
     <string name="cook_rice">COOK RICE</string>
-    <string name="mulsify">MULSIFY</string>
+    <string name="mulsify">Emulsionner</string>
     <string name="puree">PUREE</string>
     <string name="roast">ROAST</string>
     <string name="smoothie">SMOOTHIE</string>
     <string name="sovs_vide">SOVS VIDE</string>
-    <string name="auto_clean">AUTO CLEAN</string>
+    <string name="auto_clean">Nettoyage</string>
 </resources>

BusinessMain/src/main/java/com/develop/main/ui/ModesFragment.kt

@@ -81,7 +81,7 @@ class ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>() {
     private fun initView() {
 
         val configJson = ConfigUtils.loadConfig()
-        var modes = configJson?.workModes?.filter { it.devMode == CofarSDK.devInfo().devMode }
+        var modes = configJson?.workModes?.filter { it.devMode == CofarSDK.devInfo().devMode && it.listShow == true }
 
 
         binding.galleryRecycle.apply {

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

@@ -1,9 +1,14 @@
 package com.develop.setting.ui
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.common.router.Screens
 import com.develop.setting.R
 
+@Route(path = Screens.Setting.POLICY)
 class HelpDocsActivity : AppCompatActivity() {
 
 
@@ -11,5 +16,16 @@ class HelpDocsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_help_docs)
+        val webView = findViewById<WebView>(R.id.webview)
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                // 在WebView中加载链接
+                view.loadUrl(url)
+                return true
+            }
+        }
+        webView.loadUrl("https://www.baidu.com");
+
     }
 }

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

@@ -98,7 +98,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                             navigateTo(Screens.Setting.RESTORE)
                         }
                         SettingType.STORAGE -> {
-                            openFileManager()
+                            navigateTo(Screens.Setting.HELP)
                         }
                     }
                 }

BusinessSetting/src/main/res/layout/activity_help_docs.xml

@@ -5,5 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.HelpDocsActivity">
-
+    <WebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1461,7 +1461,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             if (CofarSDK.devInfo().runningInstId == viewModel.modeType) backRequestDialog.show(
                 supportFragmentManager, "backRequestDialog"
             )
-            else finish()
+            else {
+                finish()
+            }
         } else {
             finish()
         }

libThirdPart/build.gradle

@@ -92,7 +92,6 @@ dependencies {
     // 需要替换字体库时引入
     api 'com.github.CoderAlee.PaintedSkin:typeface-plugin:3.5.2.1'
 
-    implementation 'org.nanohttpd:nanohttpd-android:2.3.1'
 
 
 }