提交人：江天明

提交内容：bug fixed

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

@@ -41,7 +41,7 @@ import java.util.*
 
 @Route(path = Screens.Cook.COOK_MODES)
 class ModesDetailActivity : BaseActivity<ActivityModeDetailBinding>() {
-    private var modeType = ModesType.CHOP.name
+    private var modeType = ModesType.FERMENT.name
     override fun createViewBinding(inflater: LayoutInflater): ActivityModeDetailBinding {
         return ActivityModeDetailBinding.inflate(layoutInflater)
     }
@@ -49,7 +49,7 @@ class ModesDetailActivity : BaseActivity<ActivityModeDetailBinding>() {
     private val viewModel by viewModels<CookModesViewModel>()
     private var userChanging = false //当前是否用户在操作
     private var currDevInfo = DevInfo()
-    private var lastModeType = ModesType.CHOP.name
+    private var lastModeType = ModesType.FERMENT.name
     private var modeChange = false
     private var turboTimer: Timer? = null
     private var mSettingInstId = ""
@@ -85,7 +85,7 @@ class ModesDetailActivity : BaseActivity<ActivityModeDetailBinding>() {
         configLock = true
         super.onCreate(savedInstanceState)
         hasShowScreenSaver = true
-        modeType = intent.extras?.getString(MODE_TYPE, ModesType.CHOP.name) ?: ""
+        modeType = intent.extras?.getString(MODE_TYPE, ModesType.FERMENT.name) ?: ""
         lastModeType = modeType
         //初始化模式数据
         initModeData(modeType)

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

@@ -23,9 +23,14 @@ class CookModesViewModel(application: Application) : AndroidViewModel(applicatio
 
     fun getBanner(modeType: String): Int {
         return when (modeType) {
+            ModesType.FERMENT.name -> {
+                R.drawable.ic_mode_chop
+            }
+
             ModesType.CHOP.name -> {
                 R.drawable.ic_mode_chop
             }
+
             ModesType.STEAM.name -> {
                 R.drawable.ic_mode_steam
             }
@@ -61,6 +66,9 @@ class CookModesViewModel(application: Application) : AndroidViewModel(applicatio
             ModesType.CHOP.name -> {
                 resources.getString(R.string.chop)
             }
+            ModesType.FERMENT.name -> {
+                resources.getString(R.string.ferment)
+            }
             ModesType.STEAM.name -> {
                 resources.getString(R.string.steam)
             }

libBase/build.gradle

@@ -40,6 +40,8 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    aaptOptions.cruncherEnabled = false
+    aaptOptions.useNewCruncher = false
     viewBinding {
         enabled = true
     }

libBase/src/main/java/com/develop/food/base/data/DataFactory.kt

@@ -21,8 +21,7 @@ import com.develop.food.base.utils.MmkvUtils
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import java.lang.reflect.Type
-import java.util.*
-import kotlin.Comparator
+import java.util.Collections
 
 object DataFactory {
 
@@ -182,7 +181,7 @@ object DataFactory {
             resource.getString(R.string.adapted_cooking),
             resource.getString(R.string.wight),
             resource.getString(R.string.boil_water),
-            resource.getString(R.string.chop),
+            resource.getString(R.string.ferment),
             resource.getString(R.string.slow_cook),
             resource.getString(R.string.knead_dough),
             resource.getString(R.string.steam),
@@ -193,7 +192,7 @@ object DataFactory {
             ModesType.ADAPTED_COOKING,
             ModesType.WIGHT,
             ModesType.BOIL_WATER,
-            ModesType.CHOP,
+            ModesType.FERMENT,
             ModesType.SLOW_COOK,
             ModesType.KNEAD_TOUGH,
             ModesType.STEAM,
@@ -415,6 +414,7 @@ enum class ModesType {
     WIGHT,
     BOIL_WATER,
     CHOP,
+    FERMENT,
     SLOW_COOK,
     KNEAD_TOUGH,
     STEAM,

libBase/src/main/res/values-en/strings.xml

@@ -42,7 +42,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="adapted_cooking">ADAPTED COOKING</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">BOIL WATER</string>
-    <string name="chop">FERMENT</string>
+    <string name="chop">CHOP</string>
+    <string name="ferment">FERMENT</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>

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

@@ -40,7 +40,8 @@
     <string name="adapted_cooking">ADAPTED COOKING</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">KETTLE</string>
-    <string name="chop">FERMENT</string>
+    <string name="chop">CHOP</string>
+    <string name="ferment">FERMENT</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>

libBase/src/main/res/values-ja/strings.xml

@@ -40,7 +40,8 @@
     <string name="adapted_cooking">ADAPTED COOKING</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">KETTLE</string>
-    <string name="chop">FERMENT</string>
+    <string name="chop">CHOP</string>
+    <string name="ferment">FERMENT</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>

libBase/src/main/res/values-ru/strings.xml

@@ -40,7 +40,8 @@
     <string name="adapted_cooking">АДАПТИРОВАННОЕ ПРИГОТОВЛЕНИЕ</string>
     <string name="scales">СКАЛЫ</string>
     <string name="boil_water">КИПЯТИТЬ ВОДУ</string>
-    <string name="chop">отбивная</string>
+    <string name="chop">CHOP</string>
+    <string name="ferment">отбивная</string>
     <string name="slow_cook">МЕДЛЕННАЯ ГОТОВКА</string>
     <string name="knead_dough">ЗАМЕСИТЬ ТЕСТО</string>
     <string name="steam">STEAM</string>

libBase/src/main/res/values-zh-rCN/strings.xml

@@ -41,6 +41,7 @@
     <string name="scales">SCALES</string>
     <string name="boil_water">BOIL WATER</string>
     <string name="chop">CHOP</string>
+    <string name="ferment">FERMENT</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>

libBase/src/main/res/values/strings.xml

@@ -43,7 +43,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="adapted_cooking">ADAPTED COOKING</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">BOIL WATER</string>
-    <string name="chop">chop</string>
+    <string name="chop">CHOP</string>
+    <string name="ferment">FERMENT</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>