011兼容翻译

BusinessCommon/src/main/java/com/develop/common/widget/HomeFilterSortSearchView.kt

@@ -54,6 +54,10 @@ class HomeFilterSortSearchView : RelativeLayout {
         binding.filterCardView.setOnClickListener {
             onFunctionCallback?.onFilterClick(binding.filterCardView)
         }
+        if (getSN().startsWith("011")){
+            binding.tvSortName.text = resources.getString(R.string.all_name)
+        }
+
         binding.sortCardView.setOnClickListener {
             onFunctionCallback?.onSortClick(binding.sortCardView)
         }

BusinessCommon/src/main/java/com/develop/common/widget/RingControlView.kt

@@ -74,7 +74,7 @@ class RingControlView @JvmOverloads constructor(
         ringPaint.color = 0xffffffff.toInt()
         canvas.drawPath(stubPath, ringPaint)
         if (isNightTheme()) {
-            ringPaint.color = 0xffE03E52.toInt()
+            ringPaint.color = if (is011) 0xffD51317.toInt()  else   0xffE03E52.toInt()
         } else {
             if (is062){
                 ringPaint.color = 0xffDAE343.toInt()
@@ -83,7 +83,7 @@ class RingControlView @JvmOverloads constructor(
             }
         }
         canvas.drawPath(fillPath, ringPaint)
-        extraPaint.color = if (nightTheme) 0xffDF3F54.toInt() else if (is062) 0xffDAE343.toInt()else if (is011) 0xffC10A27.toInt() else 0xffFFA627.toInt()
+        extraPaint.color = if (nightTheme) if (is011) 0xffD51317.toInt() else 0xffDF3F54.toInt() else if (is062) 0xffDAE343.toInt() else 0xffFFA627.toInt()
 
         // -150 ~ 150
         val angle = 300.0 * progress - 150.0

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

@@ -66,20 +66,7 @@ Nanfang plus client is an online information platform developed and operated by
 
 
 
-    <string name="knead_011">Knead</string>
-    <string name="steam_011">Steam</string>
-    <string name="boil_water_011">Boil</string>
-    <string name="sovs_vide_011">Sous-vide</string>
-    <string name="cook_rice_011">Rice cooking</string>
-    <string name="food_processor_011">Food processor</string>
-    <string name="chop_011">Chop</string>
-    <string name="turbo_011">Turbo</string>
-    <string name="smoothie_011">Smoothie</string>
-    <string name="auto_clean_011">Autowash</string>
-    <string name="wight_011">Scales</string>
-    <string name="dicing_011">Dicing</string>
-    <string name="citrus_juicer_011">Citrus juicer</string>
-    <string name="potato_peeler_011">Potato peeler</string>
+
 
 
     <string name="language">LANGUAGE</string>
@@ -105,9 +92,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="enter_search">Enter search</string>
     <string name="search">Search</string>
     <string name="all_name">Alphabetical (A-Z)</string>
-    <string name="most_popular_011">Favourites</string>
     <string name="most_popular">Most popular</string>
-    <string name="newest_011">The latest</string>
+
+
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>
@@ -227,7 +214,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="cancel_lower">Cancel</string>
     <string name="female">Female</string>
     <string name="tare">TARE</string>
-    <string name="tare_011">Tare</string>
+
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">RESET</string>
@@ -240,7 +227,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
     <string name="enter_what_you_want_to_say">Enter what you want to say</string>
     <string name="note_title">NOTE TITLE</string>
-    <string name="note_title_011">My notes</string>
+
     <string name="type_your_notes_here">Type your notes here</string>
     <string name="make_1_jar">MAKES 1 JAR</string>
     <string name="make_n_jars">MAKES %1s JARS</string>
@@ -252,9 +239,6 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="food_hour">hour</string>
     <string name="food_minutes">minutes</string>
 
-    <string name="hours_011">h</string>
-    <string name="min_011">min</string>
-    <string name="sec_011">sec</string>
 
     <string name="ready_in">Ready in:</string>
     <string name="jar">JAR</string>
@@ -337,10 +321,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Manual_cooking_32">MANUAL\nMODE</string>
     <string name="Download_new_recipes_32">DOWNLOAD RECIPES</string>
 
-    <string name="automatic_recipes_011">Recipes</string>
-    <string name="automatic_programmes_011">Automatic\nprograms</string>
-    <string name="manual_cooking_011">Manual\ncooking</string>
-    <string name="download_new_recipes_011">Download</string>
+
 
     <!-- 空炸模式 -->
     <string name="air_fryer">AIR FRYER</string>
@@ -406,4 +387,43 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="empty_notice_011">No notifications</string>
     <string name="press_the_button_011">Press and hold the button</string>
     <string name="direction_011">Rotation</string>
+
+
+    <string name="automatic_recipes_011">Recipes</string>
+    <string name="automatic_programmes_011">Automatic\nprograms</string>
+    <string name="manual_cooking_011">Manual\ncooking</string>
+    <string name="download_new_recipes_011">Download</string>
+
+    <string name="knead_011">Knead</string>
+    <string name="steam_011">Steam</string>
+    <string name="boil_water_011">Boil</string>
+    <string name="sovs_vide_011">Sous-vide</string>
+    <string name="cook_rice_011">Rice cooking</string>
+    <string name="food_processor_011">Food processor</string>
+    <string name="chop_011">Chop</string>
+    <string name="turbo_011">Turbo</string>
+    <string name="smoothie_011">Smoothie</string>
+    <string name="auto_clean_011">Autowash</string>
+    <string name="wight_011">Scales</string>
+    <string name="dicing_011">Dicing</string>
+    <string name="citrus_juicer_011">Citrus juicer</string>
+    <string name="potato_peeler_011">Potato peeler</string>
+
+
+
+
+    <string name="hours_011">h</string>
+    <string name="min_011">min</string>
+    <string name="sec_011">sec</string>
+
+    <string name="note_title_011">My notes</string>
+    <string name="tare_011">Tare</string>
+    <string name="newest_011">The latest</string>
+    <string name="most_popular_011">Favourites</string>
+
+    <string name="turn_right_011">Right</string>
+    <string name="turn_left_011">Left</string>
+    <string name="preparation_011">Preparation:</string>
+    <string name="ready_in_011">Cooking time:</string>
+
 </resources>

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

@@ -63,9 +63,9 @@
     <string name="enter_search">Wprowadź dane wyszukiwania</string>
     <string name="search">Wyszukiwanie</string>
     <string name="all_name">Alfabetycznie (A-Z)</string>
-    <string name="most_popular_011">Ulubione</string>
+
     <string name="most_popular">Najpopularniejsze</string>
-    <string name="newest_011">Najnowsze</string>
+
     <string name="newest">Najnowsze</string>
     <string name="the_most_commonly_searched">Najczęściej wyszukiwane</string>
     <string name="notice">Uwaga</string>
@@ -179,7 +179,8 @@
     <string name="cancel_lower">Anuluj</string>
     <string name="female">Kobieta</string>
     <string name="tare">TAROWANIE</string>
-    <string name="tare_011">Zeruj</string>
+
+
     <string name="keep_cooking_in_the_background">Gotować w tle?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">RESET</string>
@@ -192,7 +193,6 @@
     <string name="scan_qr_code_with_camera">Skanowanie kodu QR za pomocą kamery</string>
     <string name="enter_what_you_want_to_say">Wprowadź treść</string>
     <string name="note_title">TYTUŁ UWAGI</string>
-    <string name="note_title_011">Moje notatki</string>
     <string name="type_your_notes_here">Wprowadź swoje uwagi</string>
     <string name="make_1_jar">1 SŁOIK</string>
     <string name="make_n_jars">Liczba słoików: %1s</string>
@@ -204,9 +204,7 @@
     <string name="hours">h</string>
     <string name="min">min.</string>
 
-    <string name="hours_011">godz.</string>
-    <string name="min_011">min.</string>
-    <string name="sec_011">sek.</string>
+
 
 
     <string name="ready_in">Czas przygotowania:</string>
@@ -265,27 +263,6 @@
     <string name="login_faild">Nieprawidłowy numer konta lub hasło</string>
 
 
-    <string name="automatic_recipes_011">Przepisy</string>
-    <string name="automatic_programmes_011">Automatyczne\nprogramy</string>
-    <string name="manual_cooking_011">Ustawienia\nwlasne</string>
-    <string name="download_new_recipes_011">Aktualizacja</string>
-
-
-
-    <string name="knead_011">Ugniatanie</string>
-    <string name="steam_011">Na parze</string>
-    <string name="boil_water_011">Gotowanie</string>
-    <string name="sovs_vide_011">Sous-vide</string>
-    <string name="cook_rice_011">Gotowanie ryżu</string>
-    <string name="food_processor_011">Szatkowanie</string>
-    <string name="chop_011">Siekanie</string>
-    <string name="turbo_011">Turbo</string>
-    <string name="smoothie_011">Smoothie</string>
-    <string name="auto_clean_011">Mycie wstępne</string>
-    <string name="wight_011">Waga</string>
-    <string name="dicing_011">Krojenie w kostkę</string>
-    <string name="citrus_juicer_011">Wyciskanie cytrusów</string>
-    <string name="potato_peeler_011">Obieranie ziemniaków</string>
 
 
 
@@ -362,6 +339,30 @@
 
 
     <!-- 011兼容翻译 -->
+    <string name="automatic_recipes_011">Przepisy</string>
+    <string name="automatic_programmes_011">Automatyczne\nprogramy</string>
+    <string name="manual_cooking_011">Ustawienia\nwlasne</string>
+    <string name="download_new_recipes_011">Aktualizacja</string>
+
+
+
+    <string name="knead_011">Ugniatanie</string>
+    <string name="steam_011">Na parze</string>
+    <string name="boil_water_011">Gotowanie</string>
+    <string name="sovs_vide_011">Sous-vide</string>
+    <string name="cook_rice_011">Gotowanie ryżu</string>
+    <string name="food_processor_011">Szatkowanie</string>
+    <string name="chop_011">Siekanie</string>
+    <string name="turbo_011">Turbo</string>
+    <string name="smoothie_011">Smoothie</string>
+    <string name="auto_clean_011">Mycie wstępne</string>
+    <string name="wight_011">Waga</string>
+    <string name="dicing_011">Krojenie w kostkę</string>
+    <string name="citrus_juicer_011">Wyciskanie cytrusów</string>
+    <string name="potato_peeler_011">Obieranie ziemniaków</string>
+
+
+
     <string name="brightness_011">Czas blokady ekranu</string>
     <string name="reset_011">Przywróć ustawienia fabryczne</string>
     <string name="mei_fang_guo_yi_chan_011">Uwaga\n· Nie wykryto dzbanka</string>
@@ -370,4 +371,17 @@
     <string name="empty_notice_011">Brak powiadomień</string>
     <string name="press_the_button_011">Naciśnij i przytrzymaj przycisk</string>
     <string name="direction_011">Obroty</string>
+    <string name="hours_011">godz.</string>
+    <string name="min_011">min.</string>
+    <string name="sec_011">sek.</string>
+    <string name="most_popular_011">Ulubione</string>
+    <string name="newest_011">Najnowsze</string>
+    <string name="tare_011">Zeruj</string>
+    <string name="note_title_011">Moje notatki</string>
+
+    <string name="turn_left_011">W lewo</string>
+    <string name="turn_right_011">W prawo</string>
+    <string name="preparation_011">Przygotowanie:</string>
+    <string name="ready_in_011">Czas gotowania:</string>
+
 </resources>

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

@@ -62,9 +62,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="enter_search">Enter search</string>
     <string name="search">Search</string>
     <string name="all_name">За алфавітом (A-Z)</string>
-    <string name="most_popular_011">Вибране</string>
     <string name="most_popular">Most popular</string>
-    <string name="newest_011">Oстанній</string>
+
+
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>
@@ -181,7 +181,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="cancel_lower">Cancel</string>
     <string name="female">Female</string>
     <string name="tare">TARE</string>
-    <string name="tare_011">Таруванья</string>
+
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
     <string name="delete_old_recipes">Ви дійсно бажаєте видалити старі рецепти?</string>
     <string name="reset_button">RESET</string>
@@ -194,7 +194,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
     <string name="enter_what_you_want_to_say">Enter what you want to say</string>
     <string name="note_title">NOTE TITLE</string>
-    <string name="note_title_011">Мої нотатки</string>
+
     <string name="type_your_notes_here">Type your notes here</string>
     <string name="make_1_jar">MAKES 1 JAR</string>
     <string name="make_n_jars">MAKES %1s JARS</string>
@@ -203,9 +203,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="hours">h</string>
     <string name="min">min</string>
 
-    <string name="hours_011">год.</string>
-    <string name="min_011">хв.</string>
-    <string name="sec_011">с.</string>
+
 
     <string name="ready_in">Ready in:</string>
     <string name="jar">JAR</string>
@@ -283,25 +281,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="login_faild">Incorrect account number or password</string>
 
 
-    <string name="automatic_recipes_011">РЕЦЕПТИ</string>
-    <string name="automatic_programmes_011">АВТОMATИЧHI\nПPOГPAMИ</string>
-    <string name="manual_cooking_011">BЛACHI\nHAЛAШTУBAHHЯ</string>
-    <string name="download_new_recipes_011">OHOBЛEHHЯ\nPEЦEПTIB</string>
 
-    <string name="knead_011">Замішування тіста</string>
-    <string name="steam_011">Приготування на пару</string>
-    <string name="boil_water_011">Кулінарія</string>
-    <string name="sovs_vide_011">Sous Vide</string>
-    <string name="cook_rice_011">Приготування рису</string>
-    <string name="food_processor_011">Подрібнення</string>
-    <string name="chop_011">рубання</string>
-    <string name="turbo_011">Turbo</string>
-    <string name="smoothie_011">Smoothie</string>
-    <string name="auto_clean_011">Попереднє прання</string>
-    <string name="wight_011">Ваги</string>
-    <string name="dicing_011">Нарізка кубиками</string>
-    <string name="citrus_juicer_011">Витискання соку з цитрусових</string>
-    <string name="potato_peeler_011">Чищення картоплі</string>
 
 
 
@@ -368,4 +348,40 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="empty_notice_011">Без сповіщень</string>
     <string name="press_the_button_011">Натисніть і утримуйте кнопку</string>
     <string name="direction_011">Оборот</string>
+
+
+    <string name="automatic_recipes_011">РЕЦЕПТИ</string>
+    <string name="automatic_programmes_011">АВТОMATИЧHI\nПPOГPAMИ</string>
+    <string name="manual_cooking_011">BЛACHI\nHAЛAШTУBAHHЯ</string>
+    <string name="download_new_recipes_011">OHOBЛEHHЯ\nPEЦEПTIB</string>
+
+    <string name="knead_011">Замішування тіста</string>
+    <string name="steam_011">Приготування на пару</string>
+    <string name="boil_water_011">Кулінарія</string>
+    <string name="sovs_vide_011">Sous Vide</string>
+    <string name="cook_rice_011">Приготування рису</string>
+    <string name="food_processor_011">Подрібнення</string>
+    <string name="chop_011">рубання</string>
+    <string name="turbo_011">Turbo</string>
+    <string name="smoothie_011">Smoothie</string>
+    <string name="auto_clean_011">Попереднє прання</string>
+    <string name="wight_011">Ваги</string>
+    <string name="dicing_011">Нарізка кубиками</string>
+    <string name="citrus_juicer_011">Витискання соку з цитрусових</string>
+    <string name="potato_peeler_011">Чищення картоплі</string>
+
+
+    <string name="hours_011">год.</string>
+    <string name="min_011">хв.</string>
+    <string name="sec_011">с.</string>
+
+    <string name="note_title_011">Мої нотатки</string>
+    <string name="tare_011">Таруванья</string>
+    <string name="newest_011">Oстанній</string>
+    <string name="most_popular_011">Вибране</string>
+
+    <string name="turn_left_011">Ліворуч</string>
+    <string name="turn_right_011">Гаразд</string>
+    <string name="preparation_011">Підготовка:</string>
+    <string name="ready_in_011">Час готування:</string>
 </resources>

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

@@ -81,9 +81,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="enter_search">Enter search</string>
     <string name="search">Search</string>
     <string name="all_name">Alphabetical (A-Z)</string>
-    <string name="most_popular_011">Favourites</string>
     <string name="most_popular">Most popular</string>
-    <string name="newest_011">The latest</string>
+
+
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>
@@ -202,7 +202,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="cancel_lower">Cancel</string>
     <string name="female">Female</string>
     <string name="tare">TARE</string>
-    <string name="tare_011">Tare</string>
+
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">RESET</string>
@@ -215,7 +215,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
     <string name="enter_what_you_want_to_say">Enter what you want to say</string>
     <string name="note_title">NOTE TITLE</string>
-    <string name="note_title_011">My notes</string>
+
     <string name="type_your_notes_here">Type your notes here</string>
     <string name="make_1_jar">MAKES 1 JAR</string>
     <string name="make_n_jars">MAKES %1s JARS</string>
@@ -228,9 +228,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="hours">h</string>
     <string name="min">min</string>
 
-    <string name="hours_011">h</string>
-    <string name="min_011">min</string>
-    <string name="sec_011">sec</string>
+
 
     <string name="food_hour">hour</string>
     <string name="food_minutes">minutes</string>
@@ -298,10 +296,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Manual_cooking_32">MANUAL\nMODE</string>
     <string name="Download_new_recipes_32">DOWNLOAD RECIPES</string>
 
-    <string name="automatic_recipes_011">Recipes</string>
-    <string name="automatic_programmes_011">Automatic\nprograms</string>
-    <string name="manual_cooking_011">Manual\ncooking</string>
-    <string name="download_new_recipes_011">Download</string>
+
 
     <!-- 空炸模式 -->
     <string name="air_fryer">AIR FRYER</string>
@@ -343,6 +338,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="sm_pasta_maker">PASTA MAKER</string>
 
 
+
     <string name="steam_010">STEAM</string>
     <string name="knead_dough_010">KNEAD DOUGH</string>
     <string name="slow_cook_010">SLOW COOK</string>
@@ -355,23 +351,6 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="turbo_010">TURBO</string>
 
 
-    <string name="knead_011">Knead</string>
-    <string name="steam_011">Steam</string>
-    <string name="boil_water_011">Boil</string>
-    <string name="sovs_vide_011">Sous-vide</string>
-    <string name="cook_rice_011">Rice cooking</string>
-    <string name="food_processor_011">Food processor</string>
-    <string name="chop_011">Chop</string>
-    <string name="turbo_011">Turbo</string>
-    <string name="smoothie_011">Smoothie</string>
-    <string name="auto_clean_011">Autowash</string>
-    <string name="wight_011">Scales</string>
-    <string name="dicing_011">Dicing</string>
-    <string name="citrus_juicer_011">Citrus juicer</string>
-    <string name="potato_peeler_011">Potato peeler</string>
-
-
-
 
 
     <string name="cook_eggs">COOK EGGS</string>
@@ -456,4 +435,42 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="empty_notice_011">No notifications</string>
     <string name="press_the_button_011">Press and hold the button</string>
     <string name="direction_011">Rotation</string>
+
+
+
+    <string name="automatic_recipes_011">Recipes</string>
+    <string name="automatic_programmes_011">Automatic\nprograms</string>
+    <string name="manual_cooking_011">Manual\ncooking</string>
+    <string name="download_new_recipes_011">Download</string>
+
+    <string name="hours_011">h</string>
+    <string name="min_011">min</string>
+    <string name="sec_011">sec</string>
+
+    <string name="note_title_011">My notes</string>
+    <string name="tare_011">Tare</string>
+    <string name="newest_011">The latest</string>
+    <string name="most_popular_011">Favourites</string>
+
+
+    <string name="knead_011">Knead</string>
+    <string name="steam_011">Steam</string>
+    <string name="boil_water_011">Boil</string>
+    <string name="sovs_vide_011">Sous-vide</string>
+    <string name="cook_rice_011">Rice cooking</string>
+    <string name="food_processor_011">Food processor</string>
+    <string name="chop_011">Chop</string>
+    <string name="turbo_011">Turbo</string>
+    <string name="smoothie_011">Smoothie</string>
+    <string name="auto_clean_011">Autowash</string>
+    <string name="wight_011">Scales</string>
+    <string name="dicing_011">Dicing</string>
+    <string name="citrus_juicer_011">Citrus juicer</string>
+    <string name="potato_peeler_011">Potato peeler</string>
+
+
+    <string name="turn_right_011">Right</string>
+    <string name="turn_left_011">Left</string>
+    <string name="preparation_011">Preparation:</string>
+    <string name="ready_in_011">Cooking time:</string>
 </resources>

BusinessMain/src/main/java/com/develop/main/adapter/LetterTextAdapter.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import com.develop.base.ext.isBrand011A
 import com.develop.main.R
 class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var mDataList = mutableListOf<String>()
@@ -42,7 +43,7 @@ class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         var colorFlase = when (isType) {
             1 -> mContext.resources.getColor(com.develop.common.R.color.color_fff)
             2 -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
-            3 -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
+            3 -> mContext.resources.getColor(com.develop.common.R.color.color_fff)
             else -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
         }
 
@@ -79,8 +80,12 @@ class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         }
     }
 
-    fun setData(dataList: List<String>,isType:Int,position: Int,onitem: onItem,) {
-        this.isType = isType
+    fun setData(dataList: List<String>,isType:Int,position: Int,onitem: onItem) {
+        if (isType==1&& isBrand011A()){
+            this.isType = 3
+        }else{
+            this.isType = isType
+        }
         this.onIteminterface = onitem
         this.positions = position
         mDataList.clear()

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

@@ -264,7 +264,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                                     var letterTextAdapter = LetterTextAdapter()
                                     letterTextAdapter.setData(
                                         letterStringList,
-                                        if (isNightTheme()) 1 else if (isBrand062()) 2 else if (isBrand011A()) 3  else 0,
+                                        if (isNightTheme()) 1 else if (isBrand062()) 2  else 0,
                                         letterPosition,
                                         object : LetterTextAdapter.onItem {
                                             override fun onClickStr(str: String, pos: Int) {

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

@@ -290,6 +290,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.model.text = if (isBrand036I()) {
             "2106"
+        }else if (sn.startsWith("011")){
+            getModelString()
         } else {
             getSN().substring(4, 8)
         }
@@ -463,6 +465,10 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 binding.tvUpdate.visibility = View.INVISIBLE
             }
             binding.updateApk.visibility = View.VISIBLE
+            if (sn.startsWith("011")){
+                binding.updateApk.background = null
+            }
+
             binding.updateFirmware.visibility = View.VISIBLE
         }
 
@@ -591,6 +597,18 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         }
     }
 
+    fun  getModelString() :String{
+        return if (sn.startsWith("011A")){
+            "MRK-48"
+        }else if (sn.startsWith("011D")){
+            "MRK-48P"
+        }else if (sn.startsWith("011E")){
+            "MRK-58"
+        }else{
+            "MRK-48"
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         viewModel.getDevInfo()
@@ -601,4 +619,6 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         commonDialog.removeSelf()
         cancelConfirmDialog.removeSelf()
     }
+
+
 }

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

@@ -121,7 +121,7 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
         url =
             if (width==1280&&height==720){
                 if (isNight){
-                    if (sn.startsWith("011")&&language!= EN){
+                    if (sn.startsWith("011")){
                         "file:///android_asset/help/${language}/privacy_011.html"
                     }else{
                         "file:///android_asset/help/${language}/privacy_night-a.html"
@@ -133,7 +133,7 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
 
             }else{
                 if (isNight){
-                    if (sn.startsWith("011")&&language!= EN){
+                    if (sn.startsWith("011")){
                         "file:///android_asset/help/${language}/privacy_011.html"
                     }else{
                         "file:///android_asset/help/${language}/privacy_night.html"

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

@@ -157,7 +157,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         }
 
 
-        if (is062||baseSn.startsWith("011")) {
+        if (is062) {
             binding.tvEasy.visibility = View.VISIBLE
         }
 
@@ -167,8 +167,10 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.viewMore.visibility = View.INVISIBLE
         }
         if (sn.startsWith("011")){
+            binding.startLayout.visibility = View.INVISIBLE
             binding.viewMore.visibility = View.INVISIBLE
             binding.viewHide.visibility = View.INVISIBLE
+            binding.tvEasy.visibility = View.VISIBLE
         }
         if (sn.startsWith("017A") || sn.startsWith("062A")) {
             binding.tvJarCount.visibility = View.VISIBLE
@@ -226,7 +228,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         if (cookSource == "local") {
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
             if (isNightTheme()) {
-                binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
+                if (getSN().startsWith("011")){
+                    binding.viewProgress.setButtonColor(Color.parseColor("#D51317"))
+                }else{
+                    binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
+                }
             } else if (is062) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
             } else if (is011) {
@@ -502,7 +508,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         binding.tvFoodName.text = detail.recipe.name
         binding.tvFoodName.movementMethod = ScrollingMovementMethod.getInstance()
         val timeDescBuilder = StringBuilder()
-        timeDescBuilder.append(getString(com.develop.common.R.string.preparation))
+        timeDescBuilder.append(if (sn.startsWith("011")) getString(com.develop.common.R.string.preparation_011)else getString(com.develop.common.R.string.preparation))
         timeDescBuilder.append(" ")
         if (detail.recipe.prepareHours.isPositive()) {
             timeDescBuilder.append(detail.recipe.prepareHours)
@@ -515,7 +521,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
 
         }
         timeDescBuilder.append("\n")
-        timeDescBuilder.append(getString(com.develop.common.R.string.ready_in))
+        timeDescBuilder.append(if (sn.startsWith("011")) getString(com.develop.common.R.string.ready_in_011)  else getString(com.develop.common.R.string.ready_in))
         timeDescBuilder.append(" ")
         if (detail.recipe.makeHours.isPositive()) {
             timeDescBuilder.append(detail.recipe.makeHours)
@@ -619,7 +625,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
                 binding.viewProgress.setProgress(1f)
                 if (isNightTheme()) {
-                    binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
+                    if (getSN().startsWith("011")){
+                        binding.viewProgress.setButtonColor(Color.parseColor("#D51317"))
+                    }else{
+                        binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
+                    }
                 } else {
                     binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
                 }

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

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
 import androidx.lifecycle.MutableLiveData
+import com.develop.base.ext.getSN
 import com.develop.base.mvvm.BaseViewModel
 import com.develop.common.data_repo.db.ModesType
 import com.develop.step.CookSettingType
@@ -23,6 +24,7 @@ class ModesViewMode : BaseViewModel() {
     private var turboTimer: Timer? = null
     var modeType = ModesType.CHOP.name
     var lastModeType = ModesType.CHOP.name
+    private  var snMode = getSN()
 
 
     fun changeStep(step: CookSettingType) {
@@ -124,8 +126,14 @@ class ModesViewMode : BaseViewModel() {
 
 
     fun getDirectionStr(isLeft: Boolean, resources: Resources): String {
-        return if (isLeft) resources.getString(R.string.turn_left)
-        else resources.getString(R.string.turn_right)
+        if (snMode.startsWith("011")){
+            return if (isLeft) resources.getString(R.string.turn_left_011)
+            else resources.getString(R.string.turn_right_011)
+        }else{
+            return if (isLeft) resources.getString(R.string.turn_left)
+            else resources.getString(R.string.turn_right)
+        }
+
     }
 
     fun playRotateAnimator(direction: Int, viewIcon: ImageView) {

BusinessStep/src/main/res/layout/activity_cook_detail.xml

@@ -88,6 +88,8 @@
         android:textStyle="bold"
         android:scrollbars="vertical"
         android:maxLines="3"
+        android:scrollbarThumbVertical="@color/color_A3A3A2"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/iv_top_banner"
         app:layout_constraintTop_toBottomOf="@+id/start_layout"

app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

@@ -104,7 +104,7 @@ class FoodCookingApp : BaseApp() {
         var UpdatePlatform = BuildConfig.UpdatePlatform
         val isNight = UpdatePlatform.equals("night")
         val is062 = UpdatePlatform.equals("062A")
-        val is011 = UpdatePlatform.equals("011A")
+        val is011 = UpdatePlatform.equals("011")
         setIsBrand036I(UpdatePlatform.equals("036I"))
         setIsBrand054A(UpdatePlatform.equals("054A"))
         setIsBrand011A(is011)
@@ -135,7 +135,11 @@ class FoodCookingApp : BaseApp() {
         //切换主题，theme=0 night= false 是0000的主题，而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
         ThemeSkinService.getInstance()
             .switchThemeSkin(if (isNight) 1 else if (is062) 2 else if (is011) 3 else 0)
-        setNightTheme(isNight)
+
+        //由于之前011黑色风格 故在这做 011兼容, 这个判断，不能在设置皮肤前面
+        if (isNight || is011){
+            setNightTheme(true)
+        }
         CofarSDK.init(getBrandNum())
         SerialPortUtils.init()
         CofarSDK.register(this)

skin-zeroOneOne/src/main/res/color/color_amount_text.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="#ffffff" android:state_selected="true"/>
-    <item android:color="#5887DA" android:state_selected="false"/>
+    <item android:color="#D51317" android:state_selected="false"/>
 </selector>

skin-zeroOneOne/src/main/res/color/detail_star_tint2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_selected="true" android:color="#DAE343"/>
+    <item android:state_selected="true" android:color="#E60012"/>
     <item android:state_selected="false" android:color="#b3b4b4"/>
 
 </selector>

skin-zeroOneOne/src/main/res/drawable/bg_amount_item.xml

@@ -3,14 +3,14 @@
 
     <item android:state_selected="false">
         <shape>
-            <stroke android:color="#E03E52" android:width="1dp"/>
+            <stroke android:color="#D51317" android:width="1dp"/>
             <solid android:color="#ffffff"/>
             <corners android:radius="@dimen/convert_45px"/>
         </shape>
     </item>
     <item android:state_selected="true">
         <shape>
-            <solid android:color="#E03E52"/>
+            <solid android:color="#D51317"/>
             <corners android:radius="@dimen/convert_45px"/>
         </shape>
     </item>

skin-zeroOneOne/src/main/res/drawable/bg_close_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="#E03E52"/>
+    <solid android:color="#D51317"/>
     <corners android:radius="@dimen/convert_60px"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/bg_cook_item_selected.xml

@@ -2,14 +2,18 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape>
-            <solid android:color="@color/cook_item_selected_solid"/>
+            <stroke android:color="@color/cook_item_selected_solid"
+                android:width="@dimen/convert_1px"/>
+            <solid android:color="#00000000"/>
             <corners android:radius="@dimen/convert_15px"/>
         </shape>
     </item>
     <item android:state_selected="false">
         <shape>
-            <solid android:color="@color/cook_item_unselected_solid"/>
+            <stroke android:color="@color/cook_item_unselected_solid"
+                android:width="@dimen/convert_1px"/>
             <corners android:radius="@dimen/convert_15px"/>
+            <solid android:color="#00000000"/>
         </shape>
     </item>
 </selector>

skin-zeroOneOne/src/main/res/drawable/bg_cook_step_ok.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_60px"/>
-    <solid android:color="#E03E52"/>
+    <solid android:color="#D51317"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/bg_detail_tab_selector.xml

@@ -7,7 +7,7 @@
     </item>
     <item android:state_selected="true">
         <shape android:shape="oval">
-            <solid android:color="@color/language_conner"/>
+            <solid android:color="#D51317"/>
         </shape>
     </item>
 </selector>

skin-zeroOneOne/src/main/res/drawable/bg_evaluate_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="#E03E52"/>
+    <solid android:color="#D51317"/>
     <corners android:radius="@dimen/convert_80px"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/bg_icon_cancel.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="#E03E52"/>
+    <solid android:color="#D51317"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/bg_orange_button.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_60px"/>
-    <solid android:color="#E03E52"/>
+    <solid android:color="#D51317"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/cook_direction_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/cook_direction_selected"/>
+    <item android:state_selected="false" android:drawable="@drawable/cook_direction_unselected"/>
+
+</selector>

skin-zeroOneOne/src/main/res/drawable/cook_speed_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/cook_speed_selected"/>
+    <item android:state_selected="false" android:drawable="@drawable/cook_speed_unselected"/>
+
+</selector>

skin-zeroOneOne/src/main/res/drawable/cook_temp_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/cook_temp_selected"/>
+    <item android:state_selected="false" android:drawable="@drawable/cook_temp_unselected"/>
+
+</selector>

skin-zeroOneOne/src/main/res/drawable/cook_time_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/cook_time_selected"/>
+    <item android:state_selected="false" android:drawable="@drawable/cook_time_unselected"/>
+
+</selector>

skin-zeroOneOne/src/main/res/drawable/cook_water_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/ic_water_spary_selected"/>
+    <item android:state_selected="false" android:drawable="@drawable/ic_water_spary_unselected"/>
+
+</selector>

skin-zeroOneOne/src/main/res/drawable/dialog_ok_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
 
-    <solid android:color="#5887DA"/>
-    <corners android:radius="@dimen/convert_80px"/>
+    <solid android:color="#D51317"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/recipes_corners_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="@dimen/convert_100px"/>
-    <solid android:color="#5887DA" />
+    <corners android:radius="@dimen/convert_60px"/>
+    <solid android:color="#D51317"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/dialog_recipes_cancel.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_100px"/>
-    <stroke android:color="@color/color_EE8F08"
+    <stroke android:color="#000"
         android:width="@dimen/convert_2px"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/dialog_recipes_download.xml

@@ -2,7 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_60px"/>
-    <solid android:color="#ccC10A27"/>
-
+    <solid android:color="#D51317"/>
 
 </shape>

skin-zeroOneOne/src/main/res/drawable/eye_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_open_eye" android:state_checked="true"/>
+
+    <item android:drawable="@drawable/ic_close_eye"/>
+
+</selector>

skin-zeroOneOne/src/main/res/drawable/f4a12e_circle.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/convert_860px" />
+    <solid android:color="@color/color_F4A12E" />
+
+</shape>

skin-zeroOneOne/src/main/res/drawable/home_menu_corners.xml

@@ -2,6 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_40px"/>
-    <solid android:color="@color/home_menu" />
+    <stroke android:width="@dimen/convert_3px"
+        android:color="#707070"/>
+
 
 </shape>