扭橙sdk更新，033称重文字改动

BusinessAirFryer/src/main/assets/config_000.json

@@ -116,20 +116,20 @@
     },
     {
       "type": "DICING",
-      "name": "dicing_011",
+      "name": "dicing",
       "bg": "ic_mode_dicing",
       "icon": "ic_grid_dicing",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
 
     {
       "type": "POTATO_PEELER",
-      "name": "potato_peeler_011",
+      "name": "potato_peeler",
       "bg": "ic_mode_potato_peeler",
       "icon": "ic_grid_potato_peeler",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
 
 

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -759,6 +759,12 @@ object DataFactory {
         R.string.Manual_cooking_32,
         R.string.Download_new_recipes_32
     )
+    private var typeList11 = mutableListOf<EntranceType>(
+        EntranceType.automatic_recipes,
+        EntranceType.automatic_programmes,
+        EntranceType.manual_cooking,
+        EntranceType.download_new_recipes
+    )
 
     private var typeList1 = mutableListOf<EntranceType>(
         EntranceType.automatic_recipes,
@@ -870,7 +876,7 @@ object DataFactory {
         for (i in iconResIds1.indices) {
             dataList.add(
                 EntranceData(
-                    bgResIds011[i], iconResIds1[i], titleStrIds011[i], titleStrIds011[i], typeList1[i]
+                    bgResIds011[i], iconResIds1[i], titleStrIds011[i], titleStrIds011[i], typeList11[i]
                 )
             )
         }

BusinessCommon/src/main/res/layout/home_sort_filter_search_view.xml

@@ -203,9 +203,9 @@
         android:id="@+id/searchLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_88px"
-        android:layout_marginStart="@dimen/convert_270px"
+        android:layout_marginStart="@dimen/convert_260px"
         android:layout_marginTop="@dimen/convert_40px"
-        android:layout_marginEnd="@dimen/convert_270px"
+        android:layout_marginEnd="@dimen/convert_260px"
         android:layout_marginBottom="@dimen/convert_60px"
         android:visibility="gone"
         >
@@ -220,10 +220,10 @@
             android:hint="@string/enter_search"
             android:paddingStart="@dimen/convert_40px"
             android:singleLine="true"
-            android:paddingRight="@dimen/convert_120px"
+            android:paddingRight="@dimen/convert_115px"
             android:textColor="@color/color_1A1A1A"
             android:textColorHint="@color/color_1A1A1A"
-            android:textSize="@dimen/convert_40px"
+            android:textSize="@dimen/convert_36px"
 
             />
 

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

@@ -186,7 +186,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="please_select_age">Veuillez sélectionner un âge</string>
     <string name="cancel_lower">Annulation</string>
     <string name="female">De la femme</string>
-    <string name="tare">Poids</string>
+    <string name="tare">Tarer</string>
     <string name="keep_cooking_in_the_background">Continuer à cuisiner en arrière - plan?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">Réinitialisation</string>

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

@@ -415,7 +415,11 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
          * */
         if (event.devInfo.resetZero.toInt() == 1 && event.devInfo.resetZero.toInt() != isResetZero) {
 
-        var modeName = if (getSN().startsWith("011"))  resources.getString(com.develop.common.R.string.citrus_juicer_011) else resources.getString(com.develop.common.R.string.citrus_juicer)
+        var modeName = if (getSN().startsWith("011"))  {
+            resources.getString(com.develop.common.R.string.citrus_juicer_011)
+        } else {
+            resources.getString(com.develop.common.R.string.citrus_juicer)
+        }
 
             navigateTo(Screens.Cook.COOK_MODES) {
                 val bundle = Bundle()

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

@@ -158,7 +158,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                 if (FoodDataProvider.checkDataExit()) {
 
 
-                                    var modeName = if (sn.startsWith("011"))resources.getString(com.develop.common.R.string.automatic_programmes_011).replace("\n"," ")  else resources.getString(com.develop.common.R.string.adapted_cooking)
+                                    var modeName = if (sn.startsWith("011"))resources.getString(com.develop.common.R.string.manual_cooking_011).replace("\n"," ")  else resources.getString(com.develop.common.R.string.adapted_cooking)
                                     navigateTo(Screens.Cook.COOK_MODES) {
 
                                         if (DevModes.SOUP == CofarSDK.devInfo().devMode) {
@@ -637,13 +637,20 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
          * */
         if (event.devInfo.resetZero.toInt() == 1&&event.devInfo.resetZero.toInt()!=isResetZero) {
 
+            var modeName = if (sn.startsWith("011"))  {
+                resources.getString(com.develop.common.R.string.citrus_juicer_011)
+            } else {
+                resources.getString(com.develop.common.R.string.citrus_juicer)
+            }
+
+
 
             navigateTo(Screens.Cook.COOK_MODES) {
                 val bundle = Bundle()
                 bundle.putString(MODE_TYPE, WorkModes.CITRUS_JUICER)
                 bundle.putString(
                     "mode_name",
-                    resources.getString(com.develop.common.R.string.citrus_juicer)
+                    modeName
                 )
                 with(bundle)
             }

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

@@ -783,12 +783,24 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
          * 当扭橙的值不等于初始化的时候，就需要重新跳转ModesDetails
          * */
         if (event.devInfo.resetZero.toInt() == 1 && event.devInfo.resetZero.toInt() != isResetZero) {
+            //之前忘记判断在当前扭橙程序，不用重新跳转页面
+            if (modeType==WorkModes.CITRUS_JUICER){
+                return
+            }
+
+
+            var modeName = if (sn.startsWith("011"))  {
+                resources.getString(com.develop.common.R.string.citrus_juicer_011)
+            } else {
+                resources.getString(com.develop.common.R.string.citrus_juicer)
+            }
+
             navigateTo(Screens.Cook.COOK_MODES) {
                 val bundle = Bundle()
                 bundle.putString(MODE_TYPE, WorkModes.CITRUS_JUICER)
                 bundle.putString(
                     "mode_name",
-                    resources.getString(com.develop.common.R.string.citrus_juicer)
+                    modeName
                 )
                 with(bundle)
             }
@@ -2077,7 +2089,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
              * CofarSDK.devInfo().resetZero.toInt()==1 代表已经是扭橙汁配件
              * */
             if (modeType == WorkModes.CITRUS_JUICER && CofarSDK.devInfo().resetZero.toInt() != 1) {
-                showMsgDialog(resources.getString(com.develop.common.R.string.dev_not_orange_parts))
+                showMsgDialog(resources.getString(com.develop.common.R.string.dev_dice_and_peel_tips))
                 return
             }
             /**

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

@@ -416,13 +416,20 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
          * */
         if (event.devInfo.resetZero.toInt() == 1 && event.devInfo.resetZero.toInt() != isResetZero) {
 
+            var modeName = if (sn.startsWith("011"))  {
+                resources.getString(com.develop.common.R.string.citrus_juicer_011)
+            } else {
+                resources.getString(com.develop.common.R.string.citrus_juicer)
+            }
+
+
 
             navigateTo(Screens.Cook.COOK_MODES) {
                 val bundle = Bundle()
                 bundle.putString(MODE_TYPE, WorkModes.CITRUS_JUICER)
                 bundle.putString(
                     "mode_name",
-                    resources.getString(com.develop.common.R.string.citrus_juicer)
+                    modeName
                 )
                 with(bundle)
             }

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

@@ -232,6 +232,7 @@ fun getSN(): String {
 //        return "033G20020020123010190001"
 //        return  "014A19050020123010190002"
 //        return "029C21010020123010190001"
+//        return "029C10390020123010190001"
 //        return  "062A10390020123010190001"
 //        return "062A20030020123010190001"
 //        return  "062A20030020123010190003"