032D 主页面图片，062图片更换

BusinessAirFryer/src/main/assets/config_062.json

@@ -0,0 +1,197 @@
+{
+  "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
+  "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "COOK_EGGS",
+      "name": "cook_eggs",
+      "bg": "cm_icon_cook_eggs_bg",
+      "icon": "cm_icon_cook_eggs",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "BOIL_WATER",
+      "name": "boil_water",
+      "bg": "ic_mode_boil_water",
+      "icon": "ic_grid_boil_water",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "CHOP",
+      "name": "chop",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_chop",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SLOW_COOK",
+      "name": "slow_cook",
+      "bg": "ic_mode_slow_cook",
+      "icon": "ic_grid_slow_cook",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "KNEAD_TOUGH",
+      "name": "knead_dough",
+      "bg": "ic_mode_knead_dough",
+      "icon": "ic_grid_knead_dough",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "STEAM",
+      "name": "steam",
+      "bg": "ic_mode_steam",
+      "icon": "ic_grid_steam",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "FOOD_PROCESSOR",
+      "name": "food_processor",
+      "bg": "ic_mode_food_processor",
+      "icon": "ic_grid_food_processor",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "TURBO",
+      "name": "turbo",
+      "bg": "ic_mode_turbo",
+      "icon": "ic_grid_turbo",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "AF_DIY",
+      "name": "af_diy",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_AIR_FRYER",
+      "name": "af_air_fryer",
+       "bg": "af_air_fryer_bg",
+      "icon": "af_air_fryer",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_BAKE",
+      "name": "af_bake",
+      "bg": "af_bake_bg",
+      "icon": "af_bake",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DRUMSTICKS",
+      "name": "af_drumsticks",
+      "bg": "af_drumsticks_bg",
+      "icon": "af_drumsticks",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_EGG_TART",
+      "name": "af_egg_tart",
+      "bg": "af_egg_tart_bg",
+      "icon": "af_egg_tart",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_PIZZA",
+      "name": "af_pizza",
+      "bg": "af_pizza_bg",
+      "icon": "af_pizza",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DEHYDRATE",
+      "name": "af_dehydrate",
+      "bg": "af_dehydrate_bg",
+      "icon": "af_dehydrate",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_REHEAT",
+      "name": "af_reheat",
+      "bg": "af_reheat_bg",
+      "icon": "af_reheat",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_CHICKEN_WING",
+      "name": "af_chicken_wing",
+      "bg": "af_chicken_wing_bg",
+      "icon": "af_chicken_wing",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_STEAK",
+      "name": "af_steak",
+      "bg": "af_steak_bg",
+      "icon": "af_steak",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_SEA_FOOD",
+      "name": "af_sea_food",
+      "bg": "af_sea_food_bg",
+      "icon": "af_sea_food",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_VEGETABLE",
+      "name": "af_vegetable",
+      "bg": "af_vegetable_bg",
+      "icon": "af_vegetable",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_MUTTON_CHOP",
+      "name": "af_mutton_chop",
+      "bg": "af_mutton_chop_bg",
+      "icon": "af_mutton_chop",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    }
+  ]
+}

BusinessAuth/src/main/java/com/develop/auth/ui/MemberAuthActivity.kt

@@ -15,6 +15,7 @@ import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isBrand054A
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setVisible
@@ -59,13 +60,13 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
         if (isBrand036I()) {
             //binding.ivLogo.setVisible()
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
-        } else if (getSN().startsWith("002D")){
+        } else if (getSN().startsWith("002D")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_002d)
-        }else if (isBrand011A()){
+        } else if (isBrand011A()) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_011a)
-        }else if (isBrand054A()){
+        } else if (isBrand054A()) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_054a)
-        }else if (getSN().startsWith("045")){
+        } else if (getSN().startsWith("045")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_045a)
         }
         initFragmentList()
@@ -74,7 +75,11 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
             if (enterFromHome) {
                 finish()
             } else {
-                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                if (isBrand062()) {
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                } else {
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                }
                 finish()
             }
         }

BusinessAuth/src/main/java/com/develop/auth/ui/MemberLaunchFragment.kt

@@ -10,12 +10,13 @@ import com.develop.auth.R
 import com.develop.auth.databinding.FragmentMemberLaunchBinding
 import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.navigateTo
 import com.develop.base.mvvm.BaseBVMFragment
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBVMFragment
 
-class MemberLaunchFragment: CommonBVMFragment<FragmentMemberLaunchBinding, MemberViewModel>() {
+class MemberLaunchFragment : CommonBVMFragment<FragmentMemberLaunchBinding, MemberViewModel>() {
 
     override fun createViewBinding(
         inflater: LayoutInflater,
@@ -30,7 +31,7 @@ class MemberLaunchFragment: CommonBVMFragment<FragmentMemberLaunchBinding, Membe
         val description = getString(com.develop.common.R.string.not_a_member_yet, memberText)
         val memberIndex = description.indexOf(memberText)
         val spannable = description
-        if(memberIndex != -1){
+        if (memberIndex != -1) {
             val spannable = SpannableString(description)
             spannable.setSpan(
                 ForegroundColorSpan(Color.RED),
@@ -44,10 +45,14 @@ class MemberLaunchFragment: CommonBVMFragment<FragmentMemberLaunchBinding, Membe
             viewModel.fragmentChangeLiveData.postValue(FragmentTag.MEMBER_LOGIN)
         }
         binding.tvSkipForNow.setOnClickListener {
-            if (viewModel.enterFromHome){
+            if (viewModel.enterFromHome) {
                 hostActivity.finish()
             } else {
-                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                if (isBrand062()) {
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                } else {
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                }
                 hostActivity.finish()
             }
         }

BusinessAuth/src/main/java/com/develop/auth/ui/MemberLoginFragment.kt

@@ -15,6 +15,7 @@ import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
 import com.develop.base.ext.getGoneLogin
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.mvvm.BaseBVMFragment
@@ -81,7 +82,11 @@ class MemberLoginFragment : CommonBVMFragment<FragmentMemberLoginBinding, Member
 
             }
             if (it.success) {
-                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                if (isBrand062()){
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                }else{
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                }
                 hostActivity.finish()
             }
         }

BusinessAuth/src/main/java/com/develop/auth/ui/MemberProfileFragment.kt

@@ -9,6 +9,7 @@ import androidx.lifecycle.MutableLiveData
 import com.develop.auth.R
 import com.develop.auth.databinding.FragmentMemberProfileBinding
 import com.develop.auth.viewmodel.MemberViewModel
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
@@ -35,7 +36,6 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
 
     private var selectAge = -1
     private var selectGender = 0
-
     override fun createViewBinding(
         inflater: LayoutInflater, container: ViewGroup?
     ): FragmentMemberProfileBinding {
@@ -121,7 +121,12 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
 
 
             } else {
-                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+
+                if (isBrand062()){
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                }else{
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                }
             }
         }
         if (viewModel.enterFromHome) {
@@ -177,7 +182,11 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                     showToast(this)
                 }
                 if (it.success) {
-                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                    if (isBrand062()){
+                        navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                    }else{
+                        navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                    }
                     hostActivity.finish()
                 }
             }

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

@@ -586,7 +586,12 @@ object DataFactory {
         R.drawable.entrance_045a_bg_3,
         R.drawable.entrance_045a_bg_4
     )
-
+    private var bg032DResIds = arrayListOf<Int>(
+        R.drawable.entrance_032d_bg_1,
+        R.drawable.entrance_032d_bg_2,
+        R.drawable.entrance_032d_bg_3,
+        R.drawable.entrance_032d_bg_4
+    )
     private var iconResIds = arrayListOf<Int>(
         R.drawable.entrance_icon_1,
         R.drawable.entrance_icon_2,
@@ -600,6 +605,13 @@ object DataFactory {
         R.drawable.entrance_icon_3_002d,
         R.drawable.entrance_icon_4_002d
     )
+
+    private var icon032DResIds = arrayListOf<Int>(
+        R.drawable.entrance_icon_1_032d,
+        R.drawable.entrance_icon_2_032d,
+        R.drawable.entrance_icon_3_032d,
+        R.drawable.entrance_icon_4_032d
+    )
     private var titleStrIds = mutableListOf<Int>(
         R.string.automatic_recipes,
         R.string.automatic_programmes,
@@ -761,6 +773,18 @@ object DataFactory {
         }
         return dataList
     }
+
+    fun get032DEntranceData(): MutableList<EntranceData> {
+        val dataList = mutableListOf<EntranceData>()
+        for (i in iconResIds1.indices) {
+            dataList.add(
+                EntranceData(
+                    bg032DResIds[i], icon032DResIds[i], titleStrIds1[i], title2StrIds1[i], typeList1[i]
+                )
+            )
+        }
+        return dataList
+    }
 }
 
 fun getTime(hour: Int, minute: Int): String {

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.develop.base.ext.getSN
 import com.develop.base.ext.load
 import com.develop.base.ext.updateText
 import com.develop.common.R
@@ -11,7 +12,6 @@ import com.develop.common.databinding.ItemEntranceViewBinding
 
 class EntranceItemView : ConstraintLayout {
     private val binding: ItemEntranceViewBinding
-
     constructor(context: Context) : super(context) {}
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {}
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(

BusinessCommon/src/main/res/drawable/mode_resume_bg.xml

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

BusinessCommon/src/main/res/drawable/shape_10px000000_corners.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_10px"/>
+    <solid android:color="@color/color_000000" />
+
+</shape>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/recipes_layout"
+    android:layout_width="match_parent"
+    android:layout_marginStart="@dimen/convert_10px"
+    android:layout_marginEnd="@dimen/convert_10px"
+    android:layout_height="@dimen/convert_330px"
+    android:layout_marginBottom="@dimen/convert_24px"
+    app:cardCornerRadius="@dimen/convert_10px"
+    app:cardElevation="@dimen/convert_2px">
+
+    <com.develop.common.widget.FoodContentView
+        android:id="@+id/food_content_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.cardview.widget.CardView>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tool="http://schemas.android.com/tools"
     android:id="@+id/content_layout"

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

@@ -11,6 +11,7 @@
         android:layout_height="match_parent" />
 
     <RelativeLayout
+        android:id="@+id/content_bg"
         android:layout_width="@dimen/convert_360px"
         android:layout_height="@dimen/convert_260px"
         android:background="@drawable/shape_10px33ffffff_corners"

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

@@ -246,9 +246,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
     <string name="repeat">REPEAT</string>
-    <string name="automatic_recipes">Automatic\nrecipes</string>
+    <string name="automatic_recipes">Automatic\nRecipes</string>
     <string name="automatic_programmes">Automatic\nProgrammes</string>
-    <string name="manual_cooking">Manual\ncooking</string>
+    <string name="manual_cooking">Manual\nCooking</string>
     <string name="download_new_recipes">Download\nnew recipes</string>
     <string name="home">HOME</string>
     <string name="back">BACK</string>

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

@@ -1,313 +1,298 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="not_a_member_yet">Ainda não é membro?</string>
+    <string name="not_a_member_yet">Ainda não é um% 1s?</string>
     <string name="member">membro</string>
-    <string name="select_language">Selecione o idioma</string>
+    <string name="select_language">Seleccionar o Idioma</string>
     <string name="next">PRÓXIMO</string>
     <string name="english">Inglês</string>
-    <string name="chinese">简体中文</string>
-    <string name="france">Français</string>
-    <string name="japan">日本語</string>
-    <string name="skip"><![CDATA[SKIP >>]]></string>
-    <string name="recipes">RECIPES</string>
-    <string name="mode">MODE</string>
-    <string name="sunday">Sunday</string>
-    <string name="monday">Monday</string>
-    <string name="tuesday">Tuesday</string>
-    <string name="wednesday">Wednesday</string>
-    <string name="thursday">Thursday</string>
-    <string name="friday">Friday</string>
-    <string name="saturday">Saturday</string>
-    <string name="resume">RESUME</string>
-    <string name="privacy_policy">Privacy policy</string>
-    <string name="privacy_policy_content">1.How do we collect and use your personal information
-Nanfang plus client is an online information platform developed and operated by Guangdong Nanfang newspaper mobile media Co.,Ltd.(hereinafter referred to as"we").In theprocess of using the southern plus client service,we will collect the information you actively provide when using the service or arising from using the service in the following ways to provide you with services,optimize our services and ensure the security of your account.</string>
-    <string name="i_agree">I Agree</string>
-    <string name="i_have_read_the_privacy_policy">I have read the privacy policy</string>
-    <string name="second">Second</string>
+    <string name="chinese">Chinês simplificado</string>
+    <string name="france">Francês</string>
+    <string name="japan">Japonês</string>
+    <string name="skip"> <![CDATA[SKIP >>]]> </string>
+    <string name="recipes">RECEITAS</string>
+    <string name="mode">MODO</string>
+    <string name="sunday">Domingo</string>
+    <string name="monday">Segunda-feira</string>
+    <string name="tuesday">Terça-feira</string>
+    <string name="wednesday">Quarta-feira</string>
+    <string name="thursday">Quinta-feira</string>
+    <string name="friday">Sexta-feira</string>
+    <string name="saturday">Sábado</string>
+    <string name="resume">RESUMO</string>
+    <string name="privacy_policy">Política de privacidade</string>
+    <string name="privacy_policy_content">1Como coletamos e usamos suas informações pessoais
+Nanfang mais cliente é uma plataforma de informação on-line desenvolvida e operada por Guangdong Nanfang jornal móvel media Co., Ltd. (doravante referido como "nós"). No processo de usar o serviço ao cliente southern plus, coletaremos as informações que você fornece ativamente ao usar o serviço ou decorrentes do uso do serviço das seguintes maneiras para fornecer serviços, otimizar nossos serviços e garantir a segurança de sua conta.</string>
+    <string name="i_agree">Concordo</string>
+    <string name="i_have_read_the_privacy_policy">Li a política de privacidade</string>
+    <string name="second">Segundo</string>
     <string name="wifi">WIFI</string>
     <string name="off_line">OFF-LINE</string>
-    <string name="ok">OK</string>
+    <string name="ok">OKEY</string>
     <string name="on_line">ON-LINE</string>
-    <string name="pwd_can_not_be_empty">pwd can not be empty!</string>
-    <string name="skin_for_now">Skin for now</string>
+    <string name="pwd_can_not_be_empty">O pwd não pode estar vazio!</string>
+    <string name="skin_for_now">Pele por enquanto</string>
     <string name="login">Login</string>
-    <string name="online_recipes">Online Recipes</string>
-    <string name="cook_history">Cooking history</string>
-    <string name="favourite_recipes">Favourite recipes</string>
-    <string name="settings">Settings</string>
-    <string name="grid_view">Grid view</string>
-    <string name="list_view">List view</string>
-    <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="ferment">FERMENT</string>
-    <string name="slow_cook">SLOW COOK</string>
-    <string name="knead_dough">KNEAD DOUGH</string>
-    <string name="steam">STEAM</string>
-    <string name="food_processor">FOOD PROCESSOR</string>
+    <string name="online_recipes">Receitas Online</string>
+    <string name="cook_history">História da cozinha</string>
+    <string name="favourite_recipes">Receitas favoritas</string>
+    <string name="settings">Configuração</string>
+    <string name="grid_view">Vista da grelha</string>
+    <string name="list_view">Vista de lista</string>
+    <string name="adapted_cooking">COZINHA ADAPTADA</string>
+    <string name="scales">ESCALAS</string>
+    <string name="boil_water">ÁGUA CAIXA</string>
+    <string name="chop">CORTAR</string>
+    <string name="ferment">FERMENTOS</string>
+    <string name="slow_cook">COZINHAR LENTA</string>
+    <string name="knead_dough">DOUGH DE COELHO</string>
+    <string name="steam">VAPOR</string>
+    <string name="food_processor">PROCESSADOR ALIMENTAR</string>
     <string name="turbo">TURBO</string>
-    <string name="language">LANGUAGE</string>
-    <string name="sound">SOUND</string>
-    <string name="brightness">BRIGHTNESS</string>
-    <string name="user_account">USER ACCOUNT</string>
-    <string name="storage">STORAGE</string>
-    <string name="reset">RESTORE FACTORY SETTINGS</string>
-    <string name="about">ABOUT</string>
-    <string name="weight">WEIGHT</string>
-    <string name="local_recipes">Local recipes</string>
-    <string name="download">Download</string>
-    <string name="downloading">Downloading</string>
-    <string name="enter_search">Enter search</string>
-    <string name="search">Search</string>
-    <string name="most_popular">Most popular</string>
-    <string name="newest">Newest</string>
-    <string name="the_most_commonly_searched">The most commonly searched</string>
-    <string name="notice">Notice</string>
-    <string name="all">ALL</string>
-    <string name="Recipes">Recipes</string>
-    <string name="ingredients">Ingredients</string>
-    <string name="Brightness">Brightness</string>
-    <string name="screen_lock_time">Screen lock time</string>
+    <string name="language">LÍNGUA</string>
+    <string name="sound">SOM</string>
+    <string name="brightness">BRILHANTE</string>
+    <string name="user_account">CONTA DE UTILIZADOR</string>
+    <string name="storage">ARMAZENAMENTO</string>
+    <string name="reset">CONJUNTO DA FÁBRICA DE RESTORAÇÃO</string>
+    <string name="about">SOBRE</string>
+    <string name="weight">PESO</string>
+    <string name="local_recipes">Receitas locais</string>
+    <string name="download">Transferir</string>
+    <string name="downloading">A transferir</string>
+    <string name="enter_search">Indique a pesquisa</string>
+    <string name="search">Procurar</string>
+    <string name="most_popular">Mais populares</string>
+    <string name="newest">Mais recente</string>
+    <string name="the_most_commonly_searched">O mais procurado</string>
+    <string name="notice">Aviso</string>
+    <string name="all">TODAS</string>
+    <string name="Recipes">Receitas</string>
+    <string name="ingredients">Ingredientes</string>
+    <string name="Brightness">Brilho</string>
+    <string name="screen_lock_time">Tempo de bloqueio do ecrã</string>
     <string name="time_3min">3Min</string>
     <string name="time_5min">5Min</string>
     <string name="time_10min">10Min</string>
     <string name="time_30min">30Min</string>
-    <string name="Sound">Sound</string>
-    <string name="text_to_speech">Text to speech</string>
-    <string name="Language">Language</string>
-    <string name="Continue">CONTINUE</string>
-    <string name="start_cooking">START COOKING</string>
-    <string name="off">OFF</string>
-    <string name="on">ON</string>
-    <string name="update_the_recipes">Update the recipes</string>
+    <string name="Sound">Som</string>
+    <string name="text_to_speech">Texto para fala</string>
+    <string name="Language">Língua</string>
+    <string name="Continue">CONTINUAR</string>
+    <string name="start_cooking">COMEÇA COZINHAR</string>
+    <string name="off">FECHADA</string>
+    <string name="on">ABRIR</string>
+    <string name="update_the_recipes">Actualizar as receitas</string>
     <string name="apk">APK</string>
     <string name="mcu">MCU</string>
     <string name="tp">FW</string>
     <string name="serial_number">SN</string>
-    <string name="standby_time">MODEL</string>
-    <string name="update">Update</string>
-    <string name="About">About</string>
-    <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
-    <string name="yes">YES</string>
-    <string name="restore_factory_settings">Restore factory settings</string>
-    <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
-    <string name="network_wifi_status_saved">Saved</string>
+    <string name="standby_time">MODELO</string>
+    <string name="update">Actualizar</string>
+    <string name="About">Sobre</string>
+    <string name="are_you_sure_to_restore_factory_settings">Tem a certeza de restaurar as configurações de fábrica?</string>
+    <string name="yes">SIM</string>
+    <string name="restore_factory_settings">Restaurar as configurações de fábrica</string>
+    <string name="network_wifi_status_connected_no_internet">Ligado, mas incapaz de aceder à Internet</string>
+    <string name="network_wifi_status_saved">Gravado</string>
     <string name="network_wifi_status_idle" />
-    <string name="network_wifi_status_disabled">"Stopped"</string>
-    <string name="network_wifi_status_network_failure">"IP address configuration failure"</string>
-    <string name="network_wifi_status_wifi_failure">"WLAN connection failure"</string>
-    <string name="network_wifi_status_password_failure">"There is a problem with authentication"</string>
-    <string name="network_wifi_status_scanning">Scanning...</string>
-    <string name="network_wifi_status_connecting">Connecting…</string>
-    <string name="network_wifi_status_authenticating">Authentication in progress…</string>
-    <string name="network_wifi_status_obtaining_ip_address">obtaining IP address…</string>
-    <string name="network_wifi_status_connected">Connected</string>
-    <string name="network_wifi_status_suspended">Suspended</string>
-    <string name="network_wifi_status_disconnecting">Disconnecting…</string>
-    <string name="network_wifi_status_disconnected">Disconnected</string>
-    <string name="network_wifi_status_failed">Failed</string>
-    <string name="network_wifi_status_blocked">Blocked</string>
-    <string name="network_wifi_status_verifying_poor_link">Temporarily shut down (bad network condition)</string>
-    <string name="start">START</string>
+    <string name="network_wifi_status_disabled">"Parado"</string>
+    <string name="network_wifi_status_network_failure">"Falha na configuração do endereço IP"</string>
+    <string name="network_wifi_status_wifi_failure">"Falha na ligação WLAN"</string>
+    <string name="network_wifi_status_password_failure">"Existe um problema com a autenticação"</string>
+    <string name="network_wifi_status_scanning">Digitalização...</string>
+    <string name="network_wifi_status_connecting">Ligar…</string>
+    <string name="network_wifi_status_authenticating">Autenticação em curso…</string>
+    <string name="network_wifi_status_obtaining_ip_address">obter o endereço IP…</string>
+    <string name="network_wifi_status_connected">Ligado</string>
+    <string name="network_wifi_status_suspended">Suspenso</string>
+    <string name="network_wifi_status_disconnecting">Desconectar…</string>
+    <string name="network_wifi_status_disconnected">Desligado</string>
+    <string name="network_wifi_status_failed">Falhou</string>
+    <string name="network_wifi_status_blocked">Bloqueado</string>
+    <string name="network_wifi_status_verifying_poor_link">Desligar temporariamente (mau estado de rede)</string>
+    <string name="start">COMEÇAR</string>
     <string name="pause">PAUSE</string>
-    <string name="cancel">CANCEL</string>
-    <string name="confirm">CONFIRM</string>
-    <string name="stop">STOP</string>
-    <string name="turn_right">TURN\nRIGHT</string>
-    <string name="turn_left">TURN\nLEFT</string>
-    <string name="temperature">TEMPERATURE</string>
-    <string name="time">TIME</string>
-    <string name="speed">SPEED</string>
-    <string name="direction">DIRECTION</string>
-    <string name="bad">Bad</string>
-    <string name="imperfect">Imperfect</string>
-    <string name="ordinary">Ordinary</string>
-    <string name="good">Good</string>
-    <string name="perfect">Perfect</string>
-    <string name="are_you_sure_to_delete">Are you sure to delete?</string>
-    <string name="no">NO</string>
-    <string name="unset_param_tips">Set operating parameters ( Temp, Time  and Speed ).</string>
-    <string name="pmpt_confirm">Confirm</string>
-    <string name="pmpt_cancel">Cancel</string>
-    <string name="pmpt_msg">Tips</string>
-    <string name="dev_end_of_run_tips">Finish!</string>
-    <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure to continue?</string>
-    <string name="hight_temp_turbo_tips">The current temperature exceeds 60, turbo function cannot be operated</string>
-    <string name="update_msg">System updating, please wait～</string>
-    <string name="update_title">Is it the latest version？</string>
-    <string name="finish_download">Downloaded</string>
-    <string name="download_fail">Download failure</string>
-    <string name="start_download">Start to download</string>
-    <string name="weight_overload_tips">Weighing overload</string>
-    <string name="forgot_password">Forgotten password</string>
-    <string name="enter_email_id">Enter Email ID</string>
-    <string name="enter_password">Enter Password</string>
-    <string name="register">Register</string>
-    <string name="launch_detail">Join us today and enjoy the ultimate cooking expenence</string>
-    <string name="login_sign_up">Login / Sign up</string>
-    <string name="skip_for_now">Skip for now</string>
-    <string name="reset_password">Reset Password</string>
-    <string name="enter_captcha">Enter Captcha</string>
-    <string name="send_email">Send Email</string>
-    <string name="send_no_email">Please fill in your  email</string>
-    <string name="enter_password_again">Enter Password Again</string>
-    <string name="enter_the_captcha_obtained_from_the_mail">Enter the Captcha obtained from the mail</string>
-    <string name="nickname">Nickname</string>
-    <string name="enter_nickname">Enter Nickname</string>
-    <string name="Gender">Gender</string>
-    <string name="male">Male</string>
-    <string name="age">Age</string>
-    <string name="save">Save</string>
-    <string name="cancellation_of_account">Cancellation of account</string>
-    <string name="sign_up_it_s_free">Sign up, it\'s FREE</string>
-    <string name="pwd_requirement">Composed of letters and numbers,with no less than 8 digits.</string>
-    <string name="please_select_age">Please select age</string>
-    <string name="cancel_lower">Cancel</string>
-    <string name="female">Female</string>
-    <string name="tare">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>
-    <string name="finish">Finish!</string>
-    <string name="error">Error</string>
-    <string name="download_failed">Download failed</string>
-    <string name="warning">Warning!</string>
-    <string name="lid_unlock">Lid unlock</string>
-    <string name="share_with_more_people">Share with more people</string>
-    <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="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>
-    <string name="per_serving">Per serving</string>
-    <string name="preparation">Preparation:</string>
+    <string name="cancel">CANCELAR</string>
+    <string name="confirm">CONFIRMA</string>
+    <string name="stop">PARAR</string>
+    <string name="turn_right">Vire à direita</string>
+    <string name="turn_left">Vire à esquerda</string>
+    <string name="temperature">TEMPERATURA</string>
+    <string name="time">HORA</string>
+    <string name="speed">VELOCIDADE</string>
+    <string name="direction">DIRECÇÃO</string>
+    <string name="bad">Mau</string>
+    <string name="imperfect">Imperfeito</string>
+    <string name="ordinary">Ordinário</string>
+    <string name="good">Bom</string>
+    <string name="perfect">Perfeito</string>
+    <string name="are_you_sure_to_delete">Tem a certeza de apagar?</string>
+    <string name="no">NÃO</string>
+    <string name="unset_param_tips">Definir parâmetros operacionais ( Temp, Tempo e Velocidade ).</string>
+    <string name="pmpt_confirm">Confirmar</string>
+    <string name="pmpt_cancel">Cancelar</string>
+    <string name="pmpt_msg">Dicas</string>
+    <string name="dev_end_of_run_tips">Terminar!</string>
+    <string name="hight_temp_warning_tips">A temperatura atual excede 60, e a velocidade do motor excede a terceira engrenagem. De certeza que vai continuar?</string>
+    <string name="hight_temp_turbo_tips">A temperatura atual excede 60, a função turbo não pode ser operada</string>
+    <string name="update_msg">Atualização do sistema, por favor aguarde～</string>
+    <string name="update_title">É a versão mais recente?</string>
+    <string name="finish_download">Baixado</string>
+    <string name="download_fail">Falha na transferência</string>
+    <string name="start_download">Iniciar a transferência</string>
+    <string name="weight_overload_tips">Sobrecarga de pesagem</string>
+    <string name="forgot_password">Esqueceu- se da senha</string>
+    <string name="enter_email_id">Indique o ID do E- mail</string>
+    <string name="enter_password">Indique a Senha</string>
+    <string name="register">Registar</string>
+    <string name="launch_detail">Junte-se a nós hoje e desfrute das melhores despesas culinárias</string>
+    <string name="login_sign_up">Login / Registar</string>
+    <string name="skip_for_now">Saltar por agora</string>
+    <string name="reset_password">Repor a Senha</string>
+    <string name="enter_captcha">Entrar no Captcha</string>
+    <string name="send_email">Enviar e- mail</string>
+    <string name="enter_password_again">Indique a Senha de novo</string>
+    <string name="enter_the_captcha_obtained_from_the_mail">Indique o Captcha obtido a partir do correio</string>
+    <string name="nickname">Apelido</string>
+    <string name="enter_nickname">Indique a alcunha</string>
+    <string name="Gender">Sexo</string>
+    <string name="male">Homem</string>
+    <string name="age">Idade</string>
+    <string name="save">Gravar</string>
+    <string name="cancellation_of_account">Cancelamento da conta</string>
+    <string name="sign_up_it_s_free">Cadastre-se, é GRÁTIS</string>
+    <string name="pwd_requirement">Composto por letras e números, com não menos de 8 dígitos.</string>
+    <string name="please_select_age">Seleccione por favor a idade</string>
+    <string name="cancel_lower">Cancelar</string>
+    <string name="female">Feminino</string>
+    <string name="tare">TARA</string>
+    <string name="keep_cooking_in_the_background">Continuas a cozinhar ao fundo?</string>
+    <string name="reset_button">REPOR</string>
+    <string name="finish">Acabar!</string>
+    <string name="error">Erro</string>
+    <string name="download_failed">Falha no download</string>
+    <string name="warning">Aviso!</string>
+    <string name="lid_unlock">Desbloqueio da tampa</string>
+    <string name="share_with_more_people">Compartilhe com mais pessoas</string>
+    <string name="scan_qr_code_with_camera">Digitalize o código QR com a câmera</string>
+    <string name="enter_what_you_want_to_say">Digite o que você quer dizer</string>
+    <string name="note_title">TÍTULO DA NOTA</string>
+    <string name="type_your_notes_here">Digite suas anotações aqui</string>
+    <string name="make_1_jar">FAZ 1 JAR</string>
+    <string name="make_n_jars">FABRICA FRASCOS %1s</string>
+    <string name="per_serving">Por Dose</string>
+    <string name="preparation">Preparação:</string>
     <string name="hours">h</string>
     <string name="min">min</string>
-    <string name="ready_in">Ready in:</string>
-    <string name="jar">JAR</string>
-    <string name="serving_sizes">Serving sizes</string>
-    <string name="score">Score</string>
-    <string name="share">Share</string>
-    <string name="delete">Delete</string>
-    <string name="recipe_update_tips">A total of {{num}} recipes have been found. Do you want to download them?</string>
-    <string name="no_recipe_update_tips">No new recipe data package \n Currently the latest version</string>
-    <string name="recipe_update_process_tips">({{progress}})Recipe data downloading…</string>
-    <string name="recipe_update_finish">Recipe data update completed</string>
-    <string name="update_recipe_title">Recipe update</string>
-    <string name="restore_confirm_tips">Are you sure to restore to the factory settings?</string>
-    <string name="change_lang_tips">The program is running, please close the program to perform this operation again!</string>
-    <string name="exit_weight_align">Exit calibration</string>
-    <string name="weight_aligning">Calibrating..</string>
-    <string name="weight_one_kg_tips">Please put on weight 1 KGS</string>
-    <string name="weight_two_kg_tips">Please put on weight 2 KGS</string>
-    <string name="weight_align_success">Calibrate successfully!</string>
-    <string name="change_lang_tips2">After switch the language, recipe languages will change at the same time and restart. Are you sure to switch the language? </string>
-    <string name="pot_clover_not_clost_tips">The lid is unlocked. Please lock the lid first and start.</string>
-    <string name="screen_saver_title">Do you want to enter the breath screen?</string>
-    <string name="sex">Sex</string>
-    <string name="wight">WEIGHT</string>
-    <string name="running_block_tips">Please stop the running program and start new programs.</string>
-    <string name="unset_target_time">Time has not been set.</string>
-    <string name="recipe_complete">RECIPE COMPLETED</string>
-    <string name="engjoy_your_meal">ENJOY YOUR MEAL!</string>
-    <string name="gan_sao_yi_chan">Attention\n· High temperature\n· No contents in bowl when heating\n· Add ingredients, liquids</string>
+    <string name="ready_in">Pronto em:</string>
+    <string name="jar">JARRO</string>
+    <string name="serving_sizes">Tamanhos das porções</string>
+    <string name="score">Pontuação</string>
+    <string name="share">Compartilhar</string>
+    <string name="delete">Excluir</string>
+    <string name="recipe_update_tips">Um total de {{num}} receitas foram encontradas.  Deseja baixá-los?</string>
+    <string name="no_recipe_update_tips">Nenhum novo pacote de dados de receita \n Atualmente a versão mais recente</string>
+    <string name="recipe_update_process_tips">({{progresso}})  Download de dados de receitas...</string>
+    <string name="recipe_update_finish">Atualização de dados da receita concluída</string>
+    <string name="update_recipe_title">Atualização de receita</string>
+    <string name="restore_confirm_tips">Tem certeza de restaurar as configurações de fábrica?</string>
+    <string name="change_lang_tips">O programa está em execução, feche o programa para executar esta operação novamente!</string>
+    <string name="exit_weight_align">Calibração de saída</string>
+    <string name="weight_aligning">Calibrar..</string>
+    <string name="weight_one_kg_tips">Por favor, coloque em peso 1 KGS</string>
+    <string name="weight_two_kg_tips">Por favor, coloque em peso 2 KGS</string>
+    <string name="weight_align_success">Calibre com sucesso!</string>
+    <string name="change_lang_tips2">Depois de mudar o idioma, os idiomas da receita serão alterados ao mesmo tempo e reiniciados.  Tem certeza de mudar o idioma?</string>
+    <string name="pot_clover_not_clost_tips">A tampa está destravada.  Por favor, bloqueie a tampa primeiro e comece.</string>
+    <string name="screen_saver_title">Quer entrar na tela de respiração?</string>
+    <string name="sex">Sexo</string>
+    <string name="wight">PESO</string>
+    <string name="running_block_tips">Por favor, pare o programa em execução e inicie novos programas.</string>
+    <string name="unset_target_time">O tempo ainda não foi definido.</string>
+    <string name="recipe_complete">RECEITA CONCLUÍDA</string>
+    <string name="engjoy_your_meal">APROVEITE A SUA REFEIÇÃO!</string>
+    <string name="gan_sao_yi_chan">Atenção\n·  Alta temperatura\n·  Nenhum conteúdo na tigela ao aquecer\n·  Adicionar ingredientes, líquidos</string>
 
-    <string name="zhuan_su_fan_kui_yi_chan">Warning\n· Bowl lid not fully engaged\n· Motor overload, allow machine to cool down, Restart with less bowl contents.</string>
-    <string name="dian_zi_cheng_tong_xin_yi_chan">Attention\n· Weight was not measured, scale error\n· Scale faulty </string>
-    <string name="ntc_yi_chan"> Attention: NTC is not working properly, please contact technical service.</string>
-    <string name="mei_fang_guo_yi_chan">Attention\n· Mixing bowl not engaged, reposition bowl</string>
+    <string name="zhuan_su_fan_kui_yi_chan">Aviso\n·  Tampa da tigela não totalmente engatada\n·  Sobrecarga do motor, permitir que a máquina esfrie, reiniciar com menos conteúdo de tigela.</string>
+    <string name="dian_zi_cheng_tong_xin_yi_chan">Atenção\n·  Não foi aferido peso, erro de balança\n·  Escala defeituosa</string>
+    <string name="ntc_yi_chan"> Atenção: NTC não está funcionando corretamente, entre em contato com o serviço técnico.</string>
+    <string name="mei_fang_guo_yi_chan">Atenção\n·  Tigela de mistura não engatada, tigela de reposição</string>
 
-    <string name="empty_notice">Empty Notice</string>
-    <string name="press_the_button">Press the button</string>
-    <string name="please_fill_in">Please fill in</string>
-    <string name="Password_is_not_the_same">Password is not the same</string>
-    <string name="enter">ENTER</string>
-    <string name="repeat">REPEAT</string>
-    <string name="automatic_recipes">Automatic\nrecipes</string>
-    <string name="automatic_programmes">Automatic\nProgrammes</string>
-    <string name="manual_cooking">Manual\ncooking</string>
-    <string name="download_new_recipes">Download\nnew recipes</string>
-    <string name="home">HOME</string>
+    <string name="empty_notice">Aviso vazio</string>
+    <string name="press_the_button">Pressione o botão</string>
+    <string name="please_fill_in">Por favor, preencha</string>
+    <string name="Password_is_not_the_same">A senha não é a mesma</string>
+    <string name="enter">ENTRAR</string>
+    <string name="repeat">REPETIR</string>
+    <string name="automatic_recipes">Automático\nreceitas</string>
+    <string name="automatic_programmes">Automático\nProgramas</string>
+    <string name="manual_cooking">Manual\nCozinhar</string>
+    <string name="download_new_recipes">Baixar\nnovas receitas</string>
+    <string name="home">Página inicial</string>
     <string name="back">BACK</string>
-    <string name="historical_search">Historical search</string>
+    <string name="historical_search">Pesquisa histórica</string>
 
-    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
-    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
-    <string name="Manual_cooking">MANUAL COOKING</string>
-    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
-    <string name="account_or_pwd_error">Incorrect account number or password</string>
-    <string name="login_faild">Incorrect account number or password</string>
+    <string name="Automatic_recipes">RECEITAS AUTOMÁTICAS</string>
+    <string name="Automatic_programmes">PROGRAMAS AUTOMÁTICOS</string>
+    <string name="Manual_cooking">COZINHA MANUAL</string>
+    <string name="Download_new_recipes">BAIXAR NOVOS RECIPTOS</string>
+    <string name="account_or_pwd_error">Número da conta ou senha incorretas</string>
+    <string name="login_faild">Número da conta ou senha incorretas</string>
 
 
-    <!-- 空炸模式 -->
+    <!-- Modo de explosão de ar-->
     <string name="air_fryer">AIR FRYER</string>
-    <string name="meat">MEAT</string>
-    <string name="fish">FISH</string>
+    <string name="meat">CARNE</string>
+    <string name="fish">PEIXES</string>
     <string name="bakc">BAKC</string>
-    <string name="drumsticks">DRUMSTICKS</string>
-    <string name="chicken_wing">CHICKEN WING</string>
-    <string name="vegetable">VEGETABLE</string>
-    <string name="shrimp">SHRIMP</string>
+    <string name="drumsticks">BAQUETAS</string>
+    <string name="chicken_wing">ASA DE FRANGO</string>
+    <string name="vegetable">PRODUTOS</string>
+    <string name="shrimp">CAMARÃO</string>
     <string name="pizza">PIZZA</string>
-    <string name="dehydrate">DEHYDRATE</string>
-    <string name="confirm_change_dev_mode">Confirm change dev mode ?</string>
-    <string name="water_spary">WATER SPARY</string>
-    <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="dehydrate">DEHIDRATO</string>
+    <string name="confirm_change_dev_mode">Confirmar mudar o modo de desenvolvimento?</string>
+    <string name="water_spary">ESPAÇO DE ÁGUA</string>
+    <string name="error_pot_clover_tips">O modo de cozimento atual não é consistente com o tipo de tampa da panela. Deseja mudar para o modo de cozedura correspondente?</string>
 
 
 
-    <string name="cook_eggs">COOK EGGS</string>
-    <string name="cook_rice">COOK RICE</string>
-    <string name="mulsify">MULSIFY</string>
-    <string name="puree">PUREE</string>
+    <string name="cook_eggs">OVOS DE COZINHA</string>
+    <string name="cook_rice">ARZ DE COZINHA</string>
+    <string name="mulsify">Emulsão</string>
+    <string name="puree">PURÉ</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="network_error">network error</string>
-    <string name="apk_version_latest">The app version is already up to date.</string>
-    <string name="installing">Installing...</string>
-    <string name="help">Help</string>
-    <string name="evaluate_successfully">Evaluate successfully</string>
-    <string name="reset_to_default_settings">Reset to default settings</string>
+    <string name="sovs_vide">VÍDEO SOVS</string>
+    <string name="auto_clean">AUTO LIMPO</string>
+    <string name="network_error">erro de rede</string>
+    <string name="apk_version_latest">A versão do aplicativo já está atualizada.</string>
+    <string name="installing">Instalar...</string>
+    <string name="help">Ajuda</string>
+    <string name="evaluate_successfully">Avalie com sucesso</string>
+    <string name="reset_to_default_settings">Redefinir para as configurações padrão</string>
     <string name="home_auth"><![CDATA[HOME >>]]></string>
-    <string name="rating">rating</string>
-    <string name="loading">Loading</string>
+    <string name="rating">classificação</string>
+    <string name="loading">Carregamento</string>
     <string name="Min20">20Min</string>
-    <string name="enjoy_your_meal">ENJOY YOUR MEAL</string>
-    <string name="enjoy_your_meal_desc">enjoy your meal</string>
-    <string name="save_success">Save success</string>
-    <string name="reset_password_success">Reset password success!</string>
-    <string name="email_send">Email send</string>
-    <string name="email_not_send">Email not send</string>
-    <string name="the_email_has_been_already_registered">The email has been already registered</string>
-    <string name="please_fill_in_your_email">Please fill in your email</string>
-    <string name="please_fill_in_the_captcha">Please fill in the captcha</string>
-    <string name="please_fill_in_the_password">Please fill in the password</string>
-    <string name="password_uncorrect">Password uncorrect</string>
-    <string name="password">Password</string>
-    <string name="dev_error">Attention: The device is abnormal, please check the device</string>
-    <string name="login_expire_tips">Failed to login, please try again</string>
-    <string name="add_to_favourite">Add to favourite</string>
-    <string name="step_pot_error">Please switch the corresponding pot and start again</string>
-    <string name="verify_code_uncorrect">Verify code uncorrect</string>
-    <string name="success">Success</string>
-    <string name="no_net_error">Please connect to Wifi</string>
-    <string name="no_login">Veuillez saisir les champs ci-dessus pour vous connecter</string>
-    <string name="wrong_captcha">Wrong captcha</string>
-
-    <string name="e7_errCode">Motor heat dissipation abnormal</string>
-    <string name="e8_errCode">Plug in air fryer attachment</string>
-    <string name="e9_errCode">Air fryer NTC abnormal</string>
-    <string name="e10_errCode">Put air fryer lid into place</string>
-    <string name="e11_errCode">Put air fryer bowl into place</string>
-    <string name="e12_errCode">Air fryer attachment overheat protection. Pls use it after cool down.</string>
-    <string name="e13_errCode">Air fryer water pump abnormal</string>
-    <string name="e14_errCode">Unplug air fryer attachment when in robot cooker mode</string>
-    <string name="e15_errCode">TFT screen dissipation abnormal</string>
-    <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
+    <string name="enjoy_your_meal">APROVEITE A SUA REFEIÇÃO</string>
+    <string name="enjoy_your_meal_desc">Desfrute da sua refeição</string>
+    <string name="save_success">Salve o sucesso</string>
+    <string name="reset_password_success">Repor a senha de sucesso!</string>
+    <string name="email_send">Enviar e- mail</string>
+    <string name="email_not_send">E- mail não enviado</string>
+    <string name="the_email_has_been_already_registered">O e-mail já foi registado</string>
+    <string name="please_fill_in_your_email">Por favor, preencha o seu e-mail</string>
+    <string name="please_fill_in_the_captcha">Por favor preencha o captcha</string>
+    <string name="please_fill_in_the_password">Por favor, preencha a senha</string>
+    <string name="password_uncorrect">Senha não corrigida</string>
+    <string name="password">Senha</string>
+    <string name="dev_error">Atenção: O dispositivo é anormal, verifique por favor o dispositivo</string>
+    <string name="login_expire_tips">Não foi possível aceder, tente novamente</string>
+    <string name="add_to_favourite">Adicionar ao favorito</string>
+    <string name="verify_code_uncorrect">Verificar o código não correcto</string>
+    <string name="success">Sucesso</string>
+    <string name="no_net_error">Por favor, ligue-se ao Wifi</string>
+    <string name="no_login">Por favor, insira os campos acima para fazer login</string>
+    <string name="wrong_captcha">Captcha errada</string>
 </resources>

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

@@ -232,9 +232,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
     <string name="repeat">REPEAT</string>
-    <string name="automatic_recipes">Automatic\nrecipes</string>
+    <string name="automatic_recipes">Automatic\nRecipes</string>
     <string name="automatic_programmes">Automatic\nProgrammes</string>
-    <string name="manual_cooking">Manual\ncooking</string>
+    <string name="manual_cooking">Manual\nCooking</string>
     <string name="download_new_recipes">Download\nnew recipes</string>
     <string name="home">HOME</string>
     <string name="back">BACK</string>

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

@@ -110,4 +110,12 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
     </style>
+
+    <style name="Splash062ATheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- 这里的trans自己写一个#00000000即可-->
+        <item name="android:windowBackground">@color/color_fff</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
 </resources>

BusinessMain/src/main/AndroidManifest.xml

@@ -7,7 +7,10 @@
     <application>
         <activity
             android:name=".ui.ModeEntrance2Activity"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
+            />
         <activity
             android:name=".ui.ModeEntranceActivity"
             android:launchMode="singleTask"

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

@@ -13,6 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.getGoneLogin
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isFrLanguage
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
@@ -150,7 +151,12 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
 
                 override fun onHomeOrBackClick(homeOrBack: HomeOrBack) {
                     if (homeOrBack == HomeOrBack.Home) {
-                        navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                        if (isBrand062()){
+                            navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                        }else{
+                            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+
+                        }
                         finish()
                     } else {
                         EventBus.getDefault().post(HomeBackClickEvent(true))

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

@@ -279,7 +279,91 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                     }
                 }
             }.models = DataFactory.get002DEntranceData()
-        } else {
+        }else if (getSN().startsWith("032D")){
+            binding.entranceRecycle.apply {
+                grid(2)
+                setup {
+                    addType<EntranceData>(R.layout.item_entrance_032d)
+                    onBind {
+                        val model = getModel<EntranceData>()
+                        findView<ImageView>(com.develop.common.R.id.iv_bg).src = model.bgResId
+                        findView<AppCompatTextView>(com.develop.common.R.id.tv_title).setText(model.titleStrId)
+                        findView<ImageView>(com.develop.common.R.id.ic_icon).src = model.iconResId
+                    }
+                    R.id.entrance_item.onClick {
+                        val clickModel = getModel<EntranceData>()
+                        title = getString(clickModel.title2StrId)
+                        when (clickModel.type) {
+                            EntranceType.automatic_recipes -> {
+                                if (FoodDataProvider.checkDataExit()) {
+                                    val bundle = Bundle()
+                                    bundle.putInt(MODE_ENTRANCE, Recipes)
+                                    bundle.putInt(RECIPES_TYPE, LocalFood)
+                                    bundle.putString(HOME_TITLE, title)
+                                    navigateTo(Screens.Main.HOME) {
+                                        with(bundle)
+                                    }
+                                } else {
+                                    showLoading()
+                                }
+                            }
+
+                            EntranceType.automatic_programmes -> {
+                                if (FoodDataProvider.checkDataExit()) {
+                                    val bundle = Bundle()
+                                    bundle.putInt(MODE_ENTRANCE, Mode)
+                                    bundle.putString(HOME_TITLE, title)
+                                    navigateTo(Screens.Main.HOME) {
+                                        with(bundle)
+                                    }
+                                } else {
+                                    showLoading()
+                                }
+
+                            }
+
+                            EntranceType.manual_cooking -> {
+                                if (FoodDataProvider.checkDataExit()) {
+
+                                    navigateTo(Screens.Cook.COOK_MODES) {
+                                        if (CofarSDK.devInfo().devMode == DevModes.SOUP) {
+                                            val bundle = Bundle()
+                                            bundle.putString(MODE_TYPE, WorkModes.ADAPTED_COOKING)
+                                            bundle.putString(
+                                                "mode_name",
+                                                resources.getString(com.develop.common.R.string.adapted_cooking)
+                                            )
+                                            with(bundle)
+                                        } else {
+                                            val bundle = Bundle()
+                                            bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
+                                            with(bundle)
+                                        }
+                                    }
+                                } else {
+                                    showLoading()
+                                }
+                            }
+
+                            EntranceType.download_new_recipes -> {
+                                if (FoodDataProvider.checkDataExit()) {
+                                    val bundle = Bundle()
+                                    bundle.putInt(MODE_ENTRANCE, Recipes)
+                                    bundle.putInt(RECIPES_TYPE, NetFood)
+                                    bundle.putString(HOME_TITLE, title)
+                                    navigateTo(Screens.Main.HOME) {
+                                        with(bundle)
+                                    }
+                                } else {
+                                    showLoading()
+                                }
+
+                            }
+                        }
+                    }
+                }
+            }.models = DataFactory.get032DEntranceData()
+        }else {
             binding.entranceRecycle.apply {
                 grid(2)
                 setup {
@@ -369,6 +453,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                 else if (isBrand011A()) DataFactory.get011A5037EntranceData()
                 else if (isBrand054A()) DataFactory.get054AEntranceData()
                 else if (getSN().startsWith("045")) DataFactory.get045AEntranceData()
+                else if (getSN().startsWith("032")) DataFactory.get032DEntranceData()
                 else DataFactory.getEntranceData()
         }
 

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

@@ -15,6 +15,7 @@ import com.develop.base.ext.background_drawable
 import com.develop.base.ext.getBrandNum
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.common.bean.WorkMode
 import com.develop.base.ext.load
@@ -158,7 +159,50 @@ class  ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>()
                             with(bundle)
                         }
                     }
-                } else {
+                } else if (isBrand062()) {
+                    addType<WorkMode>(R.layout.item_mode_blue_view)
+                    onBind {
+                        val model = getModel<WorkMode>()
+                        findView<ImageView>(R.id.iv_icon).background_drawable =
+                            resources.getIdentifier(
+                                model.icon,
+                                "drawable",
+                                "com.develop.foodcooking"
+                            )
+                        model.name?.let { it1 ->
+                            findView<AppCompatTextView>(R.id.tv_mode_name).updateText(
+                                resources.getString(
+                                    resources.getIdentifier(
+                                        it1,
+                                        "string",
+                                        "com.develop.foodcooking"
+                                    )
+                                )
+                            )
+                        }
+                    }
+                    R.id.iv_icon.onClick {
+
+
+                        val devInfo = CofarSDK.devInfo();
+
+                        if (devInfo.status != DevStatus.STOP.toInt() && devInfo.runningInstId != modes?.get(
+                                absoluteAdapterPosition
+                            )?.type
+                        ) {
+                            runningWeightTips()
+                            return@onClick
+                        }
+
+                        navigateTo(Screens.Cook.COOK_MODES) {
+
+
+                            val bundle = Bundle()
+                            bundle.putString(MODE_TYPE, modes?.get(absoluteAdapterPosition)?.type)
+                            with(bundle)
+                        }
+                    }
+                }else {
                     addType<WorkMode>(R.layout.item_mode_card_view)
                     onBind {
                         val model = getModel<WorkMode>()

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

@@ -20,6 +20,7 @@ import com.bumptech.glide.Glide
 import com.develop.base.ext.background_color
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.globalApp
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
@@ -189,7 +190,9 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                 addType<HomeHeader>(com.develop.common.R.layout.item_home_header)
                 if (isNightTheme()) {
                     addType<FoodContentModel>(com.develop.common.R.layout.food_content_night_provider)
-                } else {
+                } else if (isBrand062()){
+                    addType<FoodContentModel>(com.develop.common.R.layout.food_content_blue_provider)
+                }else {
                     addType<FoodContentModel>(com.develop.common.R.layout.food_content_provider)
                 }
                 onBind {
@@ -316,7 +319,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
                         }
 
-                        com.develop.common.R.layout.food_content_night_provider, com.develop.common.R.layout.food_content_provider -> {
+                        com.develop.common.R.layout.food_content_night_provider, com.develop.common.R.layout.food_content_provider, com.develop.common.R.layout.food_content_blue_provider -> {
                             findView<FoodContentView>(com.develop.common.R.id.food_content_view).setFoodContent(
                                 getModel()
                             )

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

@@ -21,7 +21,7 @@
                 android:id="@+id/mode_content_one"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="2">
+                android:layout_weight="1.8">
 
                 <ImageView
                     android:id="@+id/iv_one_bg"
@@ -40,7 +40,6 @@
                     android:gravity="center"
                     android:textColor="@color/white"
                     android:textSize="@dimen/convert_46px"
-                    android:textStyle="bold"
                     android:text="@string/automatic_programmes"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -50,7 +49,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/convert_30px"
+                android:layout_marginLeft="@dimen/convert_15px"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
@@ -58,13 +57,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:layout_marginBottom="@dimen/convert_20px"
+                    android:layout_marginBottom="@dimen/convert_10px"
                     android:orientation="horizontal">
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:layout_marginRight="@dimen/convert_15px"
+                        android:layout_marginRight="@dimen/convert_7px"
                         >
                         <ImageView
                             android:id="@+id/iv_two_bg"
@@ -83,7 +82,6 @@
                             android:gravity="center"
                             android:textColor="@color/white"
                             android:textSize="@dimen/convert_46px"
-                            android:textStyle="bold"
                             android:text="@string/automatic_recipes"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -93,7 +91,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:layout_marginLeft="@dimen/convert_15px"
+                        android:layout_marginLeft="@dimen/convert_7px"
                         >
                         <ImageView
                             android:id="@+id/iv_three_bg"
@@ -111,7 +109,6 @@
                             android:gravity="center"
                             android:textColor="@color/white"
                             android:textSize="@dimen/convert_46px"
-                            android:textStyle="bold"
                             android:text="@string/manual_cooking"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -122,7 +119,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="2.5">
+                    android:layout_weight="2.3">
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -138,14 +135,11 @@
                             android:id="@+id/tv_four_title"
                             android:layout_width="@dimen/convert_450px"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/convert_52px"
-                            android:layout_marginEnd="@dimen/convert_52px"
-                            android:layout_marginBottom="@dimen/convert_75px"
                             android:gravity="center"
                             android:textColor="@color/white"
                             android:textSize="@dimen/convert_46px"
-                            android:textStyle="bold"
                             android:text="@string/download_new_recipes"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent" />
@@ -156,10 +150,10 @@
 
         <ImageView
             android:id="@+id/iv_tab"
-            android:layout_width="@dimen/convert_120px"
-            android:layout_height="@dimen/convert_120px"
-            android:layout_marginStart="@dimen/convert_35px"
-            android:layout_marginTop="@dimen/convert_35px"
+            android:layout_width="@dimen/convert_80px"
+            android:layout_height="@dimen/convert_80px"
+            android:layout_marginStart="@dimen/convert_50px"
+            android:layout_marginTop="@dimen/convert_50px"
             android:src="@drawable/iv_062_tab" />
     </FrameLayout>
 

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

@@ -0,0 +1,43 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content_view"
+    android:layout_width="@dimen/convert_640px"
+    android:layout_height="@dimen/convert_400px"
+    tools:ignore="MissingDefaultResource">
+
+    <ImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:id="@+id/content_bg"
+        android:layout_width="@dimen/convert_240px"
+        android:layout_height="@dimen/convert_260px"
+        android:background="@drawable/shape_10px000000_corners"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/ic_icon"
+            android:layout_width="@dimen/convert_100px"
+            android:layout_height="@dimen/convert_100px"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_32px" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/ic_icon"
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
+            android:layout_marginTop="@dimen/convert_14px"
+            android:textColor="@color/white"
+            android:textSize="@dimen/convert_30px"
+            />
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    tools:ignore="MissingDefaultResource"
+    >
+
+
+    <FrameLayout
+        android:id="@+id/card_view"
+        android:layout_width="@dimen/convert_400px"
+        android:layout_height="@dimen/convert_400px"
+        android:layout_marginTop="@dimen/convert_60px"
+        app:cardCornerRadius="@dimen/convert_24px"
+        app:cardElevation="@dimen/convert_10px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/iv_mode_bg"
+            />
+        <ImageView
+            android:id="@+id/iv_icon"
+            android:layout_width="@dimen/convert_230px"
+            android:layout_height="@dimen/convert_230px"
+            android:layout_gravity="center"
+            android:scaleType="centerCrop" />
+    </FrameLayout>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_mode_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_43px"
+        android:includeFontPadding="false"
+        android:textColor="@color/mode_card_title"
+        android:textSize="@dimen/convert_40px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/card_view" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -20,6 +20,7 @@ import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isBrand054A
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.setGone
@@ -180,12 +181,21 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         binding.tvSkin.setOnClickListener {
             if (NetworkUtils.isConnected()) {
                 if (getGoneLogin()){
-                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                    if (isBrand062()){
+                        navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                    }else{
+                        navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                    }
                 }else{
                     navigateTo(Screens.Auth.MEMBER)
                 }
             } else {
-                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                if (isBrand062()){
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+                }else{
+                    navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                }
+
             }
             EventBus.getDefault().post(FinishAtyEvent())
             finish()

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

@@ -19,6 +19,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.bumptech.glide.Glide
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.runOnMainThread
@@ -118,6 +119,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private var isDevModes = true
     private var isModelNum = ""
     private var devMode = ""
+    private var is062 = false
 
     private val deviceStateDialog by lazy {
         CancelConfirmDialog()
@@ -211,16 +213,16 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         super.onCreate(savedInstanceState)
         hasShowScreenSaver = true
         configLock = true
-
+        is062 = isBrand062()
         devMode = CofarSDK.devInfo().devMode
         isModelNum = getModelNum()
 
         if (!isNightTheme()) {
-
+            var color = if (is062) com.develop.common.R.color.white else com.develop.common.R.color.view_change
             binding.ivBack.drawable?.apply {
                 DrawableCompat.setTint(
                     this,
-                    resources.getColor(com.develop.common.R.color.view_change)
+                    resources.getColor(color)
                 )
             }
         }
@@ -1288,8 +1290,14 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     /**切换到温度*/
     private fun changeTempSettingStep() {
-        binding.jianhao.setVisible()
-        binding.jiahao.setVisible()
+        if (is062){
+            binding.jianhao.setGone()
+            binding.jiahao.setGone()
+        }else{
+            binding.jianhao.setVisible()
+            binding.jiahao.setVisible()
+        }
+
         binding.steamFire.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
@@ -1319,8 +1327,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到时间*/
     private fun changeTimeSettingStep() {
         binding.steamFire.visibility = View.GONE
-        binding.jianhao.setVisible()
-        binding.jiahao.setVisible()
+        if (is062){
+            binding.jianhao.setGone()
+            binding.jiahao.setGone()
+        }else{
+            binding.jianhao.setVisible()
+            binding.jiahao.setVisible()
+        }
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -1341,8 +1354,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
         binding.steamFire.visibility = View.GONE
-        binding.jianhao.setVisible()
-        binding.jiahao.setVisible()
+        if (is062){
+            binding.jianhao.setGone()
+            binding.jiahao.setGone()
+        }else{
+            binding.jianhao.setVisible()
+            binding.jiahao.setVisible()
+        }
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -1385,8 +1403,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
         binding.steamFire.visibility = View.GONE
-        binding.jianhao.setVisible()
-        binding.jiahao.setVisible()
+        if (is062){
+            binding.jianhao.setGone()
+            binding.jiahao.setGone()
+        }else{
+            binding.jianhao.setVisible()
+            binding.jiahao.setVisible()
+        }
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE

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

@@ -370,7 +370,7 @@
             android:layout_width="@dimen/convert_550px"
             android:layout_height="@dimen/convert_98px"
             android:layout_marginBottom="@dimen/convert_50px"
-            android:background="@drawable/mode_start_bg"
+            android:background="@drawable/mode_resume_bg"
             android:gravity="center"
             android:text="@string/resume"
             android:textColor="@color/white"

app/build.gradle

@@ -13,7 +13,7 @@ ext{
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode="000A"
+    brandCode="032D"
     model="1039"
 
 }
@@ -215,6 +215,18 @@ android {
             resValue("string", "app_theme", "@style/Splash054ATheme")
         }
 
+        brand062A {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            resValue("string", "app_theme", "@style/Splash062ATheme")
+            buildConfigField("String", "UpdatePlatform", "\"062A\"")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"062A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
+        }
+
     }
 
     signingConfigs {
@@ -275,10 +287,10 @@ android {
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/SplashTheme")
             buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"030A\"")
+            buildConfigField("String", "brandCode", "\"032D\"")
             //versionCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-//            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "appCode", "\"2.01\"")
 
 
 //            resValue("string", "app_theme", "@style/SplashTheme")
@@ -287,6 +299,15 @@ android {
 //            //versionCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+
+//            resValue("string", "app_theme", "@style/Splash062ATheme")
+//            buildConfigField("String", "UpdatePlatform", "\"062A\"")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"062A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
+
         }
     }
 

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

@@ -84,18 +84,24 @@ class FoodCookingApp : BaseApp() {
         //处理崩溃问题
 //        CrashHandler.getInstance().init(this);
         //FoodDataProvider.initFoodDataBase()
+        ResourceUtils.copyFileFromAssets(
+            ASSETS_BLUE_SKIN_PACK,
+            SKIN_PACK_PATH + BLUE_SKIN_PACK_NAME
+        )
         ResourceUtils.copyFileFromAssets(
             ASSETS_NIGHT_SKIN_PACK,
             SKIN_PACK_PATH + NIGHT_SKIN_PACK_NAME
         )
         WindowManager.getInstance().init(this, OptionFactory())
         val isNight = BuildConfig.UpdatePlatform.equals("night")
+        val is062 = BuildConfig.UpdatePlatform.equals("062A")
         setIsBrand036I(BuildConfig.UpdatePlatform.equals("036I"))
         setIsBrand011A(BuildConfig.UpdatePlatform.equals("011A"))
         setIsBrand054A(BuildConfig.UpdatePlatform.equals("054A"))
-        setIsBrand062(BuildConfig.UpdatePlatform.equals("062"))
+        setIsBrand062(is062)
+
         //切换主题，theme=0 night= false 是0000的主题，而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
-        ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else 0)
+        ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else if (is062) 2  else 0)
         setNightTheme(isNight)
         CofarSDK.init(getBrandNum())
         SerialPortUtils.init()
@@ -330,6 +336,7 @@ class OptionFactory : IOptionFactory {
     override fun requireOption(theme: Int): IThemeSkinOption? {
         return when (theme) {
             1 -> NightOption()
+            2 -> BlueOption()
             else -> null
         }
     }
@@ -344,9 +351,20 @@ class NightOption : IThemeSkinOption {
     }
 }
 
+class BlueOption : IThemeSkinOption {
+    override fun getStandardSkinPackPath(): LinkedHashSet<String> {
+        val pathSet = LinkedHashSet<String>()
+        pathSet.add(SKIN_PACK_PATH + BLUE_SKIN_PACK_NAME)
+        return pathSet
+    }
+}
+
 const val NIGHT_SKIN_PACK_NAME = "night.skin"
 const val ASSETS_NIGHT_SKIN_PACK = "skins/night.skin"
 
+const val BLUE_SKIN_PACK_NAME = "blue.skin"
+const val ASSETS_BLUE_SKIN_PACK = "skins/blue.skin"
+
 /**
  * 应用存储空间根路径
  */

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

@@ -7,6 +7,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.WindowManager
 import androidx.lifecycle.scopeNetLife
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setScreenHeight
 import com.develop.base.ext.setScreenWidth
@@ -37,7 +38,13 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
         super.onCreate(savedInstanceState)
         getScreen()
         if (MMkvUtils.getBool(FIRST_IN)) {
-            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+            if (isBrand062()){
+                navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
+
+            }else{
+                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+
+            }
         } else {
             //设置语言
             var list = DataFactory.createLanguageDataV2(resources)

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

@@ -203,7 +203,7 @@ fun getSN(): String {
     var serial: String
     if (BuildConfig.DEBUG) {
 //        return "045A21030020123010190001"
-    return "000A30150020123010190001"
+//    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
 //     return "000A10390020123010190001"
 //        return "000A50370020123010190005"
@@ -216,7 +216,7 @@ fun getSN(): String {
 //    return  "017A20060020123010190001"
 //    return "010D10390020123010190001"
 //    return "000A10390020123010190009"
-//    return  "032D21060020123010190001"
+    return  "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //    return  "030A10390020123010190002"
 //        return "029C21010020123010190001"

settings.gradle

@@ -36,4 +36,4 @@ include ':BusinessStep'
 include ':BusinessAirFryer'
 include ':skin-support'
 include ':LocalTools'
-include ':skin-blue'
+//include ':skin-blue'

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

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

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="@dimen/convert_40px"/>
-    <stroke android:width="@dimen/convert_3px"
-        android:color="#707070"/>
+    <corners android:radius="@dimen/convert_40px" />
+    <solid android:color="#5887DA"/>
 
 
 </shape>

skin-blue/src/main/res/drawable/mode_resume_bg.xml

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

skin-blue/src/main/res/drawable/mode_start_bg.xml

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

skin-blue/src/main/res/drawable/mode_stop_bg.xml

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

skin-blue/src/main/res/values/colors.xml

@@ -39,7 +39,7 @@
 
 
 
-    <color name="bg_color">#1A1A1A</color>
+    <color name="bg_color">#ffffff</color>
     <color name="common_title">#ffffff</color>
     <color name="about_app_name">#ffffff</color>
     <color name="about_update_stroke">#5887DA</color>
@@ -62,7 +62,7 @@
     <color name="policy_agree">#fff</color>
     <color name="policy_agree_tip">#FC5B67</color>
 
-    <color name="setting_title">#fff</color>
+    <color name="setting_title">#1A1A1A</color>
 
     <color name="sound_content">#1A1A1A</color>
     <color name="thumb_unselect">#E5E5E5</color>
@@ -96,7 +96,7 @@
 
     <color name="home_menu_bg">#fff</color>
     <color name="home_menu">#5887DA</color>
-    <color name="home_menu_title">#1A1A1A</color>
+    <color name="home_menu_title">#ffffff</color>
     <color name="home_user_name">#5887DA</color>
 
     <color name="modes_bottom_view">#5887DA</color>
@@ -106,14 +106,14 @@
     <color name="category_tab_gap">#1A1A1A</color>
     <color name="category_solid">#E5E5E5</color>
     <color name="home_search_title">#fff</color>
-    <color name="sort_stroke">#fff</color>
-    <color name="sort_soild">#000</color>
-    <color name="sort_value">#fff</color>
+    <color name="sort_stroke">#A3A3A2</color>
+    <color name="sort_soild">#fff</color>
+    <color name="sort_value">#1A1A1A</color>
     <color name="search_stroke">#5887DA</color>
     <color name="search_soild">#fff</color>
     <color name="search_value">#5887DA</color>
-
-    <color name="home_category_title">#fff</color>
+    <color name="color_E03E52">#5887DA</color>
+    <color name="home_category_title">#1A1A1A</color>
     <color name="sort_filter_name">#1A1A1A</color>
     <color name="sort_filter_selected_name">#5887DA</color>
     <color name="sort_filter_line">#E5E5E5</color>
@@ -134,7 +134,7 @@
     <color name="restore_yes">#5887DA</color>
     <color name="restore_no_str">#799FE1</color>
     <color name="restore_yes_str">#fff</color>
-    <color name="food_name">#fff</color>
+    <color name="food_name">#1A1A1A</color>
     <color name="send_email_stroke">#E03E52</color>
     <color name="send_email_solid">#fff</color>
     <color name="wifi_selected">#E03E52</color>
@@ -150,11 +150,11 @@
     <color name="search_tag">#5887DA</color>
     <color name="search_tag_content">#5887DA</color>
     <color name="category_unselect">#fff</color>
-    <color name="source_name">#fff</color>
+    <color name="source_name">#1A1A1A</color>
     <color name="source_line">#E4E4E4</color>
     <color name="source_amount">#5887DA</color>
     <color name="step_title">#5887DA</color>
-    <color name="step_detail">#fff</color>
+    <color name="step_detail">#1A1A1A</color>
     <color name="tool_name">#5887DA</color>
     <color name="more_circle">#E03E52</color>
     <color name="cook_tab_unselected">#000</color>