062 配置

BusinessAirFryer/src/main/assets/config_062.json

@@ -4,83 +4,147 @@
     {
       "type": "ADAPTED_COOKING",
       "name": "adapted_cooking",
-      "bg": "ic_mode_diy",
-      "icon": "ic_grid_adapted_cooking",
+      "bg": "ic_mode_diy_bg_062",
+      "icon": "ic_grid_adapted_cooking_062",
       "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",
+      "bg": "ic_mode_weight_bg_062",
+      "icon": "ic_grid_weight_062",
       "devMode": "SOUP",
       "listShow": true
     },
+
     {
-      "type": "CHOP",
-      "name": "chop",
-      "bg": "ic_mode_chop",
-      "icon": "ic_grid_chop",
+      "type": "STEAM",
+      "name": "steam",
+      "bg": "ic_mode_steam_bg_062",
+      "icon": "ic_grid_steam_062",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "SLOW_COOK",
       "name": "slow_cook",
-      "bg": "ic_mode_slow_cook",
-      "icon": "ic_grid_slow_cook",
+      "bg": "ic_mode_slow_cook_bg_062",
+      "icon": "ic_grid_slow_cook_062",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_dough",
-      "bg": "ic_mode_knead_dough",
-      "icon": "ic_grid_knead_dough",
+      "bg": "ic_mode_knead_dough_bg_062",
+      "icon": "ic_grid_knead_dough_062",
       "devMode": "SOUP",
       "listShow": true
     },
     {
-      "type": "STEAM",
-      "name": "steam",
-      "bg": "ic_mode_steam",
-      "icon": "ic_grid_steam",
+      "type": "ROAST",
+      "name": "brown",
+      "bg": "ic_mode_roast_bg_062",
+      "icon": "ic_grid_brown_062",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "COOK_EGGS",
+      "name": "cook_eggs",
+      "bg": "ic_mode_cook_eggs_bg_062",
+      "icon": "ic_grid_cooking_eggs_062",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "SOVS_VIDE",
+      "name": "sovs_vide",
+      "bg": "ic_mode_sovs_vide_bg_062",
+      "icon": "ic_grid_sovs_vide_062",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "FOOD_PROCESSOR",
       "name": "food_processor",
-      "bg": "ic_mode_food_processor",
-      "icon": "ic_grid_food_processor",
+      "bg": "ic_mode_food_processor_bg_062",
+      "icon": "ic_grid_food_processor_062",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+    {
+      "type": "FERMENT",
+      "name": "ferment",
+      "bg": "ic_mode_ferment_bg_062",
+      "icon": "ic_grid_ferment_062",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "TURBO",
       "name": "turbo",
-      "bg": "ic_mode_turbo",
-      "icon": "ic_grid_turbo",
+      "bg": "ic_mode_turbo_bg_062",
+      "icon": "ic_grid_turbo_062",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+    {
+      "type": "PUREE",
+      "name": "puree",
+      "bg": "ic_mode_puree_bg_062",
+      "icon": "ic_grid_puree_062",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SMOOTHIE",
+      "name": "smoothie",
+      "bg": "ic_mode_smoothie_bg_062",
+      "icon": "ic_grid_smoothie_062",
       "devMode": "SOUP",
       "listShow": true
     },
+
+    {
+      "type": "COOK_RICE",
+      "name": "cook_rice",
+      "bg": "ic_mode_cook_rice_bg_062",
+      "icon": "ic_gird_cook_rice_062",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "MULSIFY",
+      "name": "mulsify",
+      "bg": "ic_mode_mulsify_bg_062",
+      "icon": "ic_grid_mulsify_062",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+    {
+      "type": "BOIL_WATER",
+      "name": "kettle",
+      "bg": "ic_mode_boil_water_bg_062",
+      "icon": "ic_grid_boil_water_062",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+
+
+
+
+
+
+
+
+
     {
       "type": "AF_DIY",
       "name": "af_diy",
@@ -92,10 +156,10 @@
     {
       "type": "AF_AIR_FRYER",
       "name": "af_air_fryer",
-       "bg": "af_air_fryer_bg",
+      "bg": "af_air_fryer_bg",
       "icon": "af_air_fryer",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "WIGHT",
@@ -103,7 +167,7 @@
       "bg": "ic_mode_weight",
       "icon": "ic_grid_weight",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_BAKE",
@@ -111,7 +175,7 @@
       "bg": "af_bake_bg",
       "icon": "af_bake",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_DRUMSTICKS",
@@ -119,7 +183,7 @@
       "bg": "af_drumsticks_bg",
       "icon": "af_drumsticks",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_EGG_TART",
@@ -127,7 +191,7 @@
       "bg": "af_egg_tart_bg",
       "icon": "af_egg_tart",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_PIZZA",
@@ -135,7 +199,7 @@
       "bg": "af_pizza_bg",
       "icon": "af_pizza",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_DEHYDRATE",
@@ -143,7 +207,7 @@
       "bg": "af_dehydrate_bg",
       "icon": "af_dehydrate",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_REHEAT",
@@ -151,7 +215,7 @@
       "bg": "af_reheat_bg",
       "icon": "af_reheat",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_CHICKEN_WING",
@@ -159,7 +223,7 @@
       "bg": "af_chicken_wing_bg",
       "icon": "af_chicken_wing",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_STEAK",
@@ -167,7 +231,7 @@
       "bg": "af_steak_bg",
       "icon": "af_steak",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_SEA_FOOD",
@@ -175,7 +239,7 @@
       "bg": "af_sea_food_bg",
       "icon": "af_sea_food",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_VEGETABLE",
@@ -183,7 +247,7 @@
       "bg": "af_vegetable_bg",
       "icon": "af_vegetable",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "AF_MUTTON_CHOP",
@@ -191,7 +255,7 @@
       "bg": "af_mutton_chop_bg",
       "icon": "af_mutton_chop",
       "devMode": "AIR_FRYER",
-      "listShow": true
+      "listShow": false
     }
   ]
 }

BusinessAirFryer/src/main/assets/lang_config_062.json

@@ -5,7 +5,7 @@
       "value": "TR",
       "icon": "icon_lang_tr",
       "showName": "Turkish",
-      "show": false
+      "show": true
     },
     {
       "name": "Czech(捷克语)",

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -315,6 +315,16 @@
       "uid": "uuid1ed716f65a8fc8c6",
       "ak": "TliIl48lle7GbMB2MCjrvWDknjH4guo9"
     },
+    "011A50370020123010190003": {
+      "pid": "o0qxz32qigce6kpk",
+      "uid": "uuid07f67e5909d62d1c",
+      "ak": "T66eVlTGRodmJetW2AqA36AVyY9KpI5Q"
+    },
+    "011A50370020123010190004": {
+      "pid": "o0qxz32qigce6kpk",
+      "uid": "uuid31e4c322f126133d",
+      "ak": "vsWlb4zFAzr1wzesJFfXqAXS0iKndeGQ"
+    },
     "045A20060020123010190001": {
       "pid": "zqu9xyol98eirdqg",
       "uid": "uuidbd4d1cbba19ea736",

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

@@ -66,7 +66,9 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_011a)
         } else if (isBrand054A()) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_054a)
-        } else if (getSN().startsWith("045")) {
+        } else if (isBrand062()) {
+            binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_062a)
+        }else if (getSN().startsWith("045")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_045a)
         }
         initFragmentList()

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

@@ -779,7 +779,7 @@ object DataFactory {
         for (i in iconResIds1.indices) {
             dataList.add(
                 EntranceData(
-                    bg032DResIds[i], icon032DResIds[i], titleStrIds1[i], title2StrIds1[i], typeList1[i]
+                    bg032DResIds[i], icon032DResIds[i], titleStrIds[i], title2StrIds1[i], typeList[i]
                 )
             )
         }

BusinessCommon/src/main/java/com/develop/common/utils/UpdateUtil.kt

@@ -17,6 +17,7 @@ import com.azhon.appupdate.manager.DownloadManager
 import com.azhon.appupdate.manager.HttpDownloadManager
 import com.azhon.appupdate.util.LogUtil
 import com.develop.base.R
+import com.develop.base.ext.toJson
 import com.develop.base.util.GlobalToast
 import com.develop.base.util.TopResumedAtyHolder
 import com.develop.common.data_repo.net.Api
@@ -48,14 +49,14 @@ import javax.net.ssl.X509TrustManager
 object UpdateUtil {
 
     fun checkApkVersion(showTips:Boolean = true) {
-
+        println("TAG 涂鸦 请求了")
         TopResumedAtyHolder.getCurrentActivity()?.apply {
             scopeNetLife {
-
                 try {
                     val result = Post<DevInfoResult>(Api.DEV_INFO) {
                         body = DeviceInfoBody.genDeviceInfoBody()
                     }.await()
+                    println("TAG 涂鸦1 :"+result.toJson())
                     val ctx = this@apply
                     if (result.apkUpdate) {
                         val commonDialog = CommonDialog()
@@ -121,6 +122,7 @@ object UpdateUtil {
                     }
 
                 } catch (e: java.lang.Exception) {
+                    println("TAG 涂鸦 异常了")
                     e.printStackTrace()
                 }
 

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

@@ -10,6 +10,7 @@
     <color name="color_FFA627">#FFA627</color>
     <color name="color_E03E52">#E03E52</color>
     <color name="color_F4A12E">#F4A12E</color>
+    <color name="color_5887DA">#5887DA</color>
     <color name="color_fff">#fff</color>
     <color name="color_33000000">#33000000</color>
     <color name="color_6B6B6B">#6B6B6B</color>
@@ -155,6 +156,7 @@
     <color name="no_color">#FB900C</color>
     <color name="dialog_recipes_no">#FB900C</color>
     <color name="view_change">#EE8F08</color>
+    <color name="view_change_062">#5887DA</color>
     <color name="text_hit">#B1B2B2</color>
     <color name="direction_color">#ffffff</color>
     <color name="egg_red">#B83546</color>

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

@@ -284,6 +284,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="mulsify">MULSIFY</string>
     <string name="puree">PUREE</string>
     <string name="roast">ROAST</string>
+    <string name="brown">BROWN</string>
+    <string name="kettle">KETTLE</string>
     <string name="smoothie">SMOOTHIE</string>
     <string name="sovs_vide">SOVS VIDE</string>
     <string name="auto_clean">AUTO CLEAN</string>

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

@@ -17,36 +17,54 @@ class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private  var onIteminterface : onItem? = null;
     private  var positions :Int = 0;
     private var notificationPosition :Int = 0;
-    private var isType = false
+    private var isType = 0
     @SuppressLint("UseCompatLoadingForDrawables")
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, @SuppressLint("RecyclerView") position: Int) {
         val data = mDataList[position]
         var text = holder.itemView.findViewById<TextView>(R.id.letter_textview)
         var letter_layout = holder.itemView.findViewById<LinearLayout>(R.id.letter_layout)
         text.text = data
-        if (isType){
+
+        // isType = 1 是黑色风格， 2是蓝色风格，0是默认
+        if (isType ==1){
             letter_layout.background = mContext.resources.getDrawable(com.develop.common.R.color.color_00000000)
         }else{
             letter_layout.background = mContext.resources.getDrawable(com.develop.common.R.color.bg_color)
         }
+
+        var colorTrue = when (isType) {
+            1 -> mContext.resources.getColor(com.develop.common.R.color.color_E03E52)
+            2 -> mContext.resources.getColor(com.develop.common.R.color.color_5887DA)
+            else -> mContext.resources.getColor(com.develop.common.R.color.color_EE8F08)
+        }
+
+        var colorFlase = when (isType) {
+            1 -> mContext.resources.getColor(com.develop.common.R.color.color_fff)
+            2 -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
+            else -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
+        }
+
         if (position==positions){
             text.textSize = mContext.resources.getDimension(com.develop.base.R.dimen.convert_20px)
-            if (isType){
-                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_E03E52))
-            }else{
-                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_EE8F08))
-            }
+            text.setTextColor(colorTrue)
+//            if (isType){
+//                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_E03E52))
+//            }else{
+//                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_EE8F08))
+//            }
 
         }else{
 
             text.textSize = mContext.resources.getDimension(com.develop.base.R.dimen.convert_15px)
-            if (isType){
-                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_fff))
+            text.setTextColor(colorFlase)
 
-            }else{
-
-                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_000000))
-            }
+//            if (isType){
+//                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_fff))
+//
+//            }else{
+//
+//                text.setTextColor(mContext.resources.getColor(com.develop.common.R.color.color_000000))
+//            }
 
         }
         text.gravity=Gravity.CENTER
@@ -59,7 +77,7 @@ class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         }
     }
 
-    fun setData(dataList: List<String>,isType:Boolean,position: Int,onitem: onItem,) {
+    fun setData(dataList: List<String>,isType:Int,position: Int,onitem: onItem,) {
         this.isType = isType
         this.onIteminterface = onitem
         this.positions = position

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

@@ -290,7 +290,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                         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 {
+                    R.id.content_view.onClick {
                         val clickModel = getModel<EntranceData>()
                         title = getString(clickModel.title2StrId)
                         when (clickModel.type) {
@@ -374,7 +374,6 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                         params.height = (ScreenUtil.getScreenSize(this@ModeEntranceActivity)[1] / 2)
                         itemView.layoutParams = params
                         itemView.setEntranceData(getModel())
-
                     }
                     R.id.entrance_item.onClick {
                         val clickModel = getModel<EntranceData>()

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

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

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

@@ -20,16 +20,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
         <ImageView
+            android:id="@+id/iv_icon"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/iv_mode_bg"
+            android:scaleType="centerCrop"
             />
-        <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

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

@@ -28,6 +28,7 @@ import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isBrand054A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setVisible
+import com.develop.base.ext.toJson
 import com.develop.base.ext.updateText
 import com.develop.base.util.GlobalToast
 import com.develop.common.dialog.CancelConfirmDialog
@@ -406,6 +407,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         binding.tvAppVersion.text = "v${AppUtils.getAppVersionName()}"
 
         viewModel.devInfoLiveData.observe(this) {
+
+            println("TAG 涂鸦 onResume :"+ it.toString())
             updateApkUrl = it?.apkUrl ?: ""
             if (it?.apkUpdate == true) {
 //                binding.tvUpdate.visibility = View.VISIBLE

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

@@ -17,6 +17,7 @@ import com.blankj.utilcode.util.LanguageUtils
 import com.develop.base.ext.getSN
 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.resId2Dimension
@@ -68,6 +69,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
         }else if (isBrand054A()) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
+        }else if (isBrand062()) {
+            binding.ivLogo.setGone()
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
         }else if (getSN().startsWith("045")){
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)

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

@@ -11,6 +11,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.isScreenHeight
 import com.develop.base.ext.isScreenWidth
@@ -56,6 +57,8 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
         }else if (isBrand054A()){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
+        }else if (isBrand062()){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
         }else if (getSN().startsWith("045")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)
         }else if (isBrand011A()){

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

@@ -92,8 +92,11 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         }else if (isBrand054A()){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
             binding.ivLogo.setGone()
+        }else if (isBrand062()){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
+            binding.ivLogo.setGone()
         }else if (isBrand011A()){
-            binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_011a)
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
             binding.ivLogo.setGone()
         }else if (getSN().startsWith("045")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)

BusinessSetting/src/main/java/com/develop/setting/ui/viewmodel/AboutViewModel.kt

@@ -2,6 +2,7 @@ package com.develop.setting.ui.viewmodel
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.scopeNetLife
+import com.develop.base.ext.toJson
 import com.develop.base.mvvm.BaseViewModel
 import com.develop.common.data_repo.net.Api
 import com.develop.common.data_repo.net.model.request.DeviceInfoBody

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

@@ -122,12 +122,17 @@
                 android:layout_centerVertical="true"
                 android:visibility="invisible"
                 android:orientation="horizontal">
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/update"
-                    android:textColor="@color/about_update_recipes"
-                    android:textSize="@dimen/convert_16px" />
+                <ImageView
+                    android:layout_width="@dimen/convert_28px"
+                    android:layout_height="@dimen/convert_28px"
+                    android:src="@drawable/iv_about_update"
+                    />
+<!--                <androidx.appcompat.widget.AppCompatTextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:text="@string/update"-->
+<!--                    android:textColor="@color/about_update_recipes"-->
+<!--                    android:textSize="@dimen/convert_16px" />-->
             </LinearLayout>
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -221,12 +226,17 @@
                 android:layout_centerVertical="true"
                 android:visibility="invisible"
                 android:orientation="horizontal">
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/update"
-                    android:textColor="@color/about_update_recipes"
-                    android:textSize="@dimen/convert_16px" />
+                <ImageView
+                    android:layout_width="@dimen/convert_28px"
+                    android:layout_height="@dimen/convert_28px"
+                    android:src="@drawable/iv_about_update"
+                    />
+<!--                <androidx.appcompat.widget.AppCompatTextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:text="@string/update"-->
+<!--                    android:textColor="@color/about_update_recipes"-->
+<!--                    android:textSize="@dimen/convert_16px" />-->
             </LinearLayout>
 
             <androidx.appcompat.widget.AppCompatTextView

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -14,6 +14,7 @@ import com.blankj.utilcode.util.LogUtils
 import com.develop.base.ext.background_drawable
 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.setGone
@@ -126,14 +127,19 @@ class CookStepActivity : CookStepBaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         //做食谱步骤判断
         configJson = ConfigUtils.loadConfig()
         isModelNum = getModelNum()
         if (!isNightTheme()) {
-            binding.viewChangeCrush.setBgColor(R.color.view_change)
-            binding.viewChangeWeight.setBgColor(R.color.view_change)
-            binding.viewRemark.setBgColor(R.color.view_change)
+            if (is062){
+                binding.viewChangeCrush.setBgColor(R.color.view_change_062)
+                binding.viewChangeWeight.setBgColor(R.color.view_change_062)
+                binding.viewRemark.setBgColor(R.color.white)
+            }else{
+                binding.viewChangeCrush.setBgColor(R.color.view_change)
+                binding.viewChangeWeight.setBgColor(R.color.view_change)
+                binding.viewRemark.setBgColor(R.color.view_change)
+            }
             binding.viewNote.setVisible()
             binding.viewChangeWeight.src = R.drawable.ic_detail_tab_1_normal
             binding.viewChangeCrush.src = R.drawable.ic_cooking_weight_normal
@@ -598,8 +604,15 @@ class CookStepActivity : CookStepBaseActivity() {
         whereIndex = -1
         binding.controller.clSetTime.stopAlphaAnim()
         binding.controller.llStepComplete.setGone()
-        binding.controller.jiahao.setVisible()
-        binding.controller.jianhao.setVisible()
+        //062设计图需要隐藏加号减号按钮
+        if (is062){
+            binding.controller.jiahao.setGone()
+            binding.controller.jianhao.setGone()
+        }else{
+            binding.controller.jiahao.setVisible()
+            binding.controller.jianhao.setVisible()
+        }
+
 
     }
 

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepBaseActivity.kt

@@ -17,6 +17,7 @@ import androidx.core.graphics.drawable.DrawableCompat
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.launcher.ARouter
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
@@ -83,7 +84,7 @@ abstract class CookStepBaseActivity :
     private var isCookDetailDialogShow = false
     private var rotateAnimator: ObjectAnimator? = null
     private var rotateAnimDir = -1
-
+    public var is062 = false
     abstract fun clickNextStep()
 
     abstract fun clickPrevStep()
@@ -122,6 +123,7 @@ abstract class CookStepBaseActivity :
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        is062 = isBrand062()
         hasShowScreenSaver = true
         ARouter.getInstance().inject(this)
         binding.controller.apply {
@@ -190,9 +192,13 @@ abstract class CookStepBaseActivity :
             }
         } else {
             binding.viewRemark.src = R.drawable.ic_cooking_remark
-            binding.viewRemark.drawable?.apply {
-                DrawableCompat.setTint(this, resources.getColor(R.color.white))
+            if (is062){
+            }else{
+                binding.viewRemark.drawable?.apply {
+                    DrawableCompat.setTint(this, resources.getColor(R.color.white))
+                }
             }
+
             binding.viewNote.src = R.drawable.ic_cookint_note
         }
         binding.viewNote.setOnClickListener {
@@ -231,6 +237,7 @@ abstract class CookStepBaseActivity :
             binding.controller.clSetTime.stopAlphaAnim()
             changeWaterGearSettingStep()
         }
+
         binding.viewBack.setOnClickListener {
             val run = recipeNumber?.let { it1 -> CofarSDK.devInfo().runningInstId.startsWith(it1) }
             if (runningState != 0 && run == true) {
@@ -370,8 +377,14 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTempSettingPanel() {
-        binding.controller.jianhao.setVisible()
-        binding.controller.jiahao.setVisible()
+        if (is062) {
+            binding.controller.jianhao.setGone()
+            binding.controller.jiahao.setGone()
+        } else {
+            binding.controller.jianhao.setVisible()
+            binding.controller.jiahao.setVisible()
+        }
+
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
@@ -406,8 +419,14 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTimeSettingPanel() {
-        binding.controller.jianhao.setVisible()
-        binding.controller.jiahao.setVisible()
+        if (is062) {
+            binding.controller.jianhao.setGone()
+            binding.controller.jiahao.setGone()
+        } else {
+            binding.controller.jianhao.setVisible()
+            binding.controller.jiahao.setVisible()
+        }
+
         binding.controller.steamFire.visibility = View.GONE;
 //        binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
@@ -428,8 +447,14 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeSpeedSettingStep() {
-        binding.controller.jianhao.setVisible()
-        binding.controller.jiahao.setVisible()
+        if (is062) {
+            binding.controller.jianhao.setGone()
+            binding.controller.jiahao.setGone()
+        } else {
+            binding.controller.jianhao.setVisible()
+            binding.controller.jiahao.setVisible()
+        }
+
         binding.controller.steamFire.visibility = View.GONE;
 //        binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
@@ -451,8 +476,14 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeWaterGearSettingStep() {
-        binding.controller.jianhao.setVisible()
-        binding.controller.jiahao.setVisible()
+        if (is062) {
+            binding.controller.jianhao.setGone()
+            binding.controller.jiahao.setGone()
+        } else {
+            binding.controller.jianhao.setVisible()
+            binding.controller.jiahao.setVisible()
+        }
+
         binding.controller.steamFire.visibility = View.GONE;
 //        binding.controller.steamFireSmall.visibility = View.GONE;
         binding.llWeightView.visibility = View.GONE

app/build.gradle

@@ -13,8 +13,8 @@ ext{
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode="032D"
-    model="1039"
+    brandCode="000A"
+    model="5037"
 
 }
 
@@ -284,21 +284,22 @@ android {
 //            buildConfigField("String", "model", "\"5037\"")
 //            buildConfigField("String", "brandCode", "\"011A\"")
 
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"017A\"")
-            //versionCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"017A\"")
+//            //versionCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
 
 
 //            resValue("string", "app_theme", "@style/SplashTheme")
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            buildConfigField("String", "model", "\"5037\"")
+//            buildConfigField("String", "brandCode", "\"000A\"")
 //            //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/Splash062ATheme")
 //            buildConfigField("String", "UpdatePlatform", "\"062A\"")
@@ -308,6 +309,13 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"030A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
         }
     }
 

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

@@ -189,7 +189,7 @@ fun getBrandNum(): String {
  * @return
  */
 fun getModelNum(): String {
-    if (getSN().length<9){
+    if (getSN().length < 9) {
         return "1039"
     }
     return getSN().substring(4, 8)
@@ -206,21 +206,24 @@ fun getSN(): String {
 //    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
 //     return "000A10390020123010190001"
-//        return "000A50370020123010190005"
+//        return "000A50370020123010190005"/
 //    return "010D10390020123010190001"
 //    return "011A50370020123010190001"
+//        return "000A50370020123010190004"
 //        return "011A50370020123010190001"
 //    return "007D20020020123010190001"
 //    return "036I21060020123010190003"
 //    return  "030A10390020123010190001"
 //    return  "017A20060020123010190001"
-        return  "017A10390020123010190001"
+//        return  "017A10390020123010190001"
 //    return "010D10390020123010190001"
 //    return "000A10390020123010190009"
-//    return  "032D21060020123010190001"
+//        return "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //    return  "030A10390020123010190002"
 //        return "029C21010020123010190001"
+//        return  "062A10390020123010190002"
+        return "000A50370020123010190018"
     } else {
         //通过反射获取sn号
         try {
@@ -241,9 +244,9 @@ fun getSN(): String {
 
 }
 
-fun  getGoneLogin():Boolean{
+fun getGoneLogin(): Boolean {
     var sn = getSN()
-    return sn.startsWith("032D")||sn.startsWith("011A")||sn.startsWith("030A")
+    return sn.startsWith("032D") || sn.startsWith("011A") || sn.startsWith("030A")
 }
 
 fun ImageView.load(data: Any?) {
@@ -256,7 +259,7 @@ fun ImageView.loadGif(data: Int) {
     Glide.with(this.context)
         .asGif().load(data)
         .diskCacheStrategy(DiskCacheStrategy.DATA)
-        .override(240,200)
+        .override(240, 200)
         .into(this)
 
 
@@ -331,6 +334,7 @@ fun setIsBrand054A(is054A: Boolean) {
 fun isBrand054A(): Boolean {
     return MMkvUtils.getBool("is054A", false)
 }
+
 fun setIsBrand062(is054A: Boolean) {
     MMkvUtils.save("is062", is054A)
 }

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/category_tab_solid_normal.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:color="#fff"
-        android:width="@dimen/convert_2px"/>
+    <solid android:color="@color/category_solid" />
 </shape>

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

@@ -2,6 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:topLeftRadius="@dimen/convert_15px"/>
-    <stroke android:color="#fff"
-        android:width="@dimen/convert_2px"/>
+    <solid android:color="@color/category_solid"/>
 </shape>

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

@@ -2,6 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:topRightRadius="@dimen/convert_15px" />
-    <stroke android:color="#fff"
-        android:width="@dimen/convert_2px"/>
+    <solid android:color="@color/category_solid" />
 </shape>

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

@@ -40,12 +40,12 @@
 
 
     <color name="bg_color">#ffffff</color>
-    <color name="common_title">#ffffff</color>
-    <color name="about_app_name">#ffffff</color>
+    <color name="common_title">#1A1A1A</color>
+    <color name="about_app_name">#1A1A1A</color>
     <color name="about_update_stroke">#5887DA</color>
     <color name="about_update_recipes">#5887DA</color>
     <color name="about_function_stroke">#E5E5E5</color>
-    <color name="about_function_title">#ffffff</color>
+    <color name="about_function_title">#1A1A1A</color>
     <color name="about_function_des">#A3A3A2</color>
     <color name="about_line">#E5E5E5</color>
     <color name="about_update">#79C414</color>
@@ -103,9 +103,9 @@
     <color name="category_tab_stroke">#5887DA</color>
     <color name="category_tab_solid">#fff</color>
     <color name="category_tab_selected">#5887DA</color>
-    <color name="category_tab_gap">#1A1A1A</color>
+    <color name="category_tab_gap">#ffffff</color>
     <color name="category_solid">#E5E5E5</color>
-    <color name="home_search_title">#fff</color>
+    <color name="home_search_title">#1A1A1A</color>
     <color name="sort_stroke">#A3A3A2</color>
     <color name="sort_soild">#fff</color>
     <color name="sort_value">#1A1A1A</color>
@@ -149,7 +149,7 @@
     <color name="panel_unselected">#FFFFFF</color>
     <color name="search_tag">#5887DA</color>
     <color name="search_tag_content">#5887DA</color>
-    <color name="category_unselect">#fff</color>
+    <color name="category_unselect">#A3A3A2</color>
     <color name="source_name">#1A1A1A</color>
     <color name="source_line">#E4E4E4</color>
     <color name="source_amount">#5887DA</color>
@@ -165,4 +165,6 @@
     <color name="dialog_recipes_no">#ffffff</color>
     <color name="view_change">#5887DA</color>
     <color name="text_hit">#eeeeee</color>
+    <color name="direction_color">#ffffff</color>
+    <color name="egg_red">#B83546</color>
 </resources>