011F 换肤新增图片

BusinessAirFryer/src/main/assets/config.json

@@ -148,6 +148,14 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "FERMENT",
+      "name": "ferment",
+      "bg": "ic_mode_ferment",
+      "icon": "ic_grid_ferment",
+      "devMode": "SOUP",
+      "listShow": true
+    },
     {
       "type": "AUTO_CLEAN",
       "name": "auto_clean",

BusinessAirFryer/src/main/assets/config_011F.json

@@ -12,88 +12,88 @@
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_011",
-      "bg": "ic_a_knead_dough_bg_011",
-      "icon": "ic_a_knead_dough_011",
+      "bg": "ic_a_knead_dough_bg_011_f",
+      "icon": "ic_a_knead_dough_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "STEAM",
       "name": "steam_011",
-      "bg": "ic_a_steam_bg_011",
-      "icon": "ic_a_steam_011",
+      "bg": "ic_a_steam_bg_011_f",
+      "icon": "ic_a_steam_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "BOIL_WATER",
       "name": "boil_water_011",
-      "bg": "ic_a_boil_water_bg_011",
-      "icon": "ic_a_boil_water_011",
+      "bg": "ic_a_boil_water_bg_011_f",
+      "icon": "ic_a_boil_water_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "SOVS_VIDE",
       "name": "sovs_vide_011",
-      "bg": "ic_a_sovs_vide_bg_011",
-      "icon": "ic_a_sovs_vide_011",
+      "bg": "ic_a_sovs_vide_bg_011_f",
+      "icon": "ic_a_sovs_vide_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "COOK_RICE",
       "name": "cook_rice_011",
-      "bg": "ic_a_cook_rice_bg_011",
-      "icon": "ic_a_cook_rice_011",
+      "bg": "ic_a_cook_rice_bg_011_f",
+      "icon": "ic_a_cook_rice_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "FOOD_PROCESSOR",
       "name": "food_processor_011",
-      "bg": "ic_a_food_processor_bg_011",
-      "icon": "ic_a_food_processor_011",
+      "bg": "ic_a_food_processor_bg_011_f",
+      "icon": "ic_a_food_processor_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "CHOP",
       "name": "chop_011",
-      "bg": "ic_a_chop_bg_011",
-      "icon": "ic_a_chop_011",
+      "bg": "ic_a_chop_bg_011_f",
+      "icon": "ic_a_chop_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "TURBO",
       "name": "turbo_011",
-      "bg": "ic_a_turbo_bg_011",
-      "icon": "ic_a_turbo_011",
+      "bg": "ic_a_turbo_bg_011_f",
+      "icon": "ic_a_turbo_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "SMOOTHIE",
       "name": "smoothie_011",
-      "bg": "ic_a_smoothie_bg_011",
-      "icon": "ic_a_smoothie_011",
+      "bg": "ic_a_smoothie_bg_011_f",
+      "icon": "ic_a_smoothie_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "AUTO_CLEAN",
       "name": "auto_clean_011",
-      "bg": "ic_a_auto_clean_bg_011",
-      "icon": "ic_a_auto_clean_011",
+      "bg": "ic_a_auto_clean_bg_011_f",
+      "icon": "ic_a_auto_clean_011_f",
       "devMode": "SOUP",
       "listShow": true
     },
     {
       "type": "WIGHT",
       "name": "wight_011",
-      "bg": "ic_a_weight_bg_011",
-      "icon": "ic_a_weight_011",
+      "bg": "ic_a_weight_bg_011_f",
+      "icon": "ic_a_weight_011_f",
       "devMode": "SOUP",
       "listShow": true
     },

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

@@ -730,6 +730,14 @@ val dataSn = getSN()
         R.drawable.entrance_011a_5037_bg_4
     )
 
+    private var bg011FAResIds = arrayListOf<Int>(
+        R.drawable.entrance_011f_bg_1,
+        R.drawable.entrance_011f_bg_2,
+        R.drawable.entrance_011f_bg_3,
+        R.drawable.entrance_011f_bg_4
+    )
+
+
     private var bg054AResIds = arrayListOf<Int>(
         R.drawable.entrance_054a_bg_1,
         R.drawable.entrance_054a_bg_2,
@@ -1103,6 +1111,23 @@ val dataSn = getSN()
         }
         return dataList
     }
+    fun get011FEntranceData(): MutableList<EntranceData> {
+        val dataList = mutableListOf<EntranceData>()
+        for (i in iconResIds1.indices) {
+            dataList.add(
+                EntranceData(
+                    bg011FAResIds[i],
+                    icon032DResIds[i],
+                    titleStrIds32[i],
+                    titleStrIds32[i],
+                    typeList[i]
+                )
+            )
+        }
+        return dataList
+    }
+
+
     fun get053AEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds1.indices) {

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

@@ -35,6 +35,9 @@ class HomeFilterSortSearchView : RelativeLayout {
         val root = View.inflate(context, R.layout.home_sort_filter_search_view, this)
         binding = HomeSortFilterSearchViewBinding.bind(root)
         if (sn.startsWith("011")){
+            if (sn.startsWith("011F")){
+                binding.homeSortLayout.background = resources.getDrawable(R.color.color_00000000)
+            }
             binding.downloadLayout.visibility = View.INVISIBLE
             binding.onlineLayout.visibility = View.INVISIBLE
         }else{

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

@@ -47,8 +47,15 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
         binding.ivTab.setOnClickListener(this)
         binding.ivWifi.setOnClickListener(this)
         if (sn.startsWith("011")){
-            binding.homeTopLayout.background = resources.getDrawable(R.color.black)
-            binding.modeLayout.background = resources.getDrawable(R.color.black)
+            if (sn.startsWith("011F")){
+                //011F 背景需要透明
+                binding.homeTopLayout.background = resources.getDrawable(R.color.color_00000000)
+                binding.modeLayout.background = resources.getDrawable(R.color.color_00000000)
+            }else{
+                binding.homeTopLayout.background = resources.getDrawable(R.color.black)
+                binding.modeLayout.background = resources.getDrawable(R.color.black)
+            }
+
             binding.ivWifi.src = R.drawable.icon_wifi_act_signal_level_011
             binding.ivFunction.background_drawable = R.drawable.ic_home_011
             binding.ivTab.src = R.drawable.ic_tab_011

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

@@ -8,6 +8,7 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.MotionEvent
 import android.view.View
+import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
@@ -22,6 +23,7 @@ class RingControlView @JvmOverloads constructor(
     private val extraPaint = Paint(Paint.ANTI_ALIAS_FLAG) //圆弧
     private val is062 = isBrand062()
     private val is011 = isBrand011A()
+    private val sn = getSN()
     private val ringStrokeWidth = TypedValue.applyDimension(
         TypedValue.COMPLEX_UNIT_DIP, 7f, context.resources.displayMetrics
     )
@@ -78,12 +80,15 @@ class RingControlView @JvmOverloads constructor(
         } else {
             if (is062){
                 ringPaint.color = 0xffDAE343.toInt()
+            }else if (sn.startsWith("011F")){
+                ringPaint.color = 0xff211D6D.toInt()
             }else{
                 ringPaint.color = 0xffE60012.toInt()
             }
         }
         canvas.drawPath(fillPath, ringPaint)
-        extraPaint.color = if (nightTheme) if (is011) 0xffD51317.toInt() else 0xffDF3F54.toInt() else if (is062) 0xffDAE343.toInt() else 0xffFFA627.toInt()
+        extraPaint.color = if (nightTheme) if (is011) 0xffD51317.toInt() else 0xffDF3F54.toInt()
+        else if (is062) 0xffDAE343.toInt()else if (sn.startsWith("011F")) 0xff60F262.toInt() else 0xffFFA627.toInt()
 
         // -150 ~ 150
         val angle = 300.0 * progress - 150.0

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:id="@+id/home_sort_layout"
     android:background="@color/bg_color"
     android:paddingStart="@dimen/convert_24px"
     android:paddingEnd="@dimen/convert_24px">

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

@@ -164,6 +164,7 @@
     <color name="view_change">#EE8F08</color>
     <color name="view_change_062">#5887DA</color>
     <color name="view_change_011">#C10A27 </color>
+    <color name="view_change_011_f">#211D6D</color>
     <color name="text_hit">#B1B2B2</color>
     <color name="direction_color">#ffffff</color>
     <color name="egg_red">#B83546</color>

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

@@ -104,6 +104,14 @@
         <item name="android:windowFullscreen">true</item>
     </style>
 
+    <style name="Splash011FTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- 这里的trans自己写一个#00000000即可-->
+        <item name="android:windowBackground">@drawable/ic_screensaver_011f_app</item>
+        <!--        <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>
     <style name="Splash011ETheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
         <item name="android:windowBackground">@drawable/ic_screensaver_011e_app</item>

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

@@ -155,8 +155,14 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
     }
 
     private fun initCallbackAndListener() {
-        if (getSN().startsWith("011")){
-            binding.homeImage.load(com.develop.common.R.drawable.home_bg_011)
+        if (baseSn.startsWith("011")){
+            if (baseSn.startsWith("011F")){
+                binding.homeImage.load(com.develop.common.R.drawable.home_bg_011_f)
+
+            }else{
+                binding.homeImage.load(com.develop.common.R.drawable.home_bg_011)
+
+            }
         }else{
             binding.homeImage.setGone()
         }

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

@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup.LayoutParams
 import android.view.ViewGroup.VIEW_LOG_TAG
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.lifecycle.MutableLiveData
@@ -823,7 +824,98 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                     }
                 }
             }.models = DataFactory.get049EntranceData()
-        } else {
+        } else if (sn.startsWith("011F")){
+            binding.entranceRecycle.apply {
+            grid(2)
+            setup {
+                addType<EntranceData>(R.layout.item_entrance_011f)
+                onBind {
+                    val model = getModel<EntranceData>()
+                    findView<ImageView>(R.id.iv_bg_011f).src = model.bgResId
+                }
+                R.id.iv_bg_011f.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()) {
+
+
+                                var modeName =
+                                    if (sn.startsWith("011")) resources.getString(com.develop.common.R.string.manual_cooking_011)
+                                        .replace(
+                                            "\n",
+                                            " "
+                                        ) else resources.getString(com.develop.common.R.string.adapted_cooking)
+                                navigateTo(Screens.Cook.COOK_MODES) {
+
+                                    if (DevModes.SOUP == CofarSDK.devInfo().devMode) {
+                                        val bundle = Bundle()
+                                        bundle.putString(MODE_TYPE, WorkModes.ADAPTED_COOKING)
+                                        bundle.putString(
+                                            "mode_name",
+                                            modeName
+                                        )
+                                        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.get011FEntranceData()
+
+        }else {
             binding.entranceRecycle.apply {
                 grid(2)
                 setup {

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

@@ -98,7 +98,7 @@ class  ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>()
 
     override fun onPostCreateView() {
         super.onPostCreateView()
-        if (isNightTheme()) {
+        if (isNightTheme()|| getSN().startsWith("011F")) {
             binding.bottomView.setGone()
         } else {
             binding.bottomView.setVisible()

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

@@ -195,9 +195,16 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         letterStringList.addAll(TimeUtil.forLetterList())
 
         binding.rv.apply {
+
             itemAnimator?.changeDuration = 0
             (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-            background_color = com.develop.common.R.color.bg_color
+            if (sn.startsWith("011F")){
+                background_color = com.develop.common.R.color.color_00000000
+
+            }else{
+                background_color = com.develop.common.R.color.bg_color
+
+            }
             setHasFixedSize(true)
             isNestedScrollingEnabled = false
             val gridLayoutManager = GridLayoutManager(requireContext(), 4)
@@ -387,6 +394,9 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         }
 
         binding.page.apply {
+            if (sn.startsWith("011F")){
+                this.background = null
+            }
             setDisableContentWhenRefresh(true)
             setDisableContentWhenLoading(true)
             setEnableRefresh(false)

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.develop.common.widget.EntranceItemView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/convert_640px"
+    android:layout_height="@dimen/convert_400px"
     android:id="@+id/entrance_item"
-    android:layout_height="@dimen/convert_400px" />
+    />

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

@@ -0,0 +1,17 @@
+<LinearLayout 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"
+    android:orientation="vertical"
+    >
+
+    <ImageView
+        android:id="@+id/iv_bg_011f"
+        android:layout_width="@dimen/convert_640px"
+        android:layout_height="@dimen/convert_400px" />
+
+
+</LinearLayout>

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

@@ -234,6 +234,9 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         val ivUpdateParam = binding.icUpdate.layoutParams as LinearLayout.LayoutParams
         binding.ivClose.setVisible()
         binding.ivClose.setImageResource(com.develop.common.R.drawable.ic_close)
+        if (baseSn.startsWith("011F")){
+            binding.aboutLayout.background = resources.getDrawable(com.develop.common.R.drawable.home_bg_011_f)
+        }
         //muc 过长展示需要成mcu
         if (binding.tvAboutMcu.text.length > 10) {
             binding.tvAboutMcu.text = "MCU"

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

@@ -44,6 +44,9 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         val dataList011D = mutableListOf(
             com.develop.common.R.drawable.ic_screensaver_011d
         )
+        val dataList011F = mutableListOf(
+            com.develop.common.R.drawable.ic_screensaver_011f_app
+        )
         val dataList011E = mutableListOf(
             com.develop.common.R.drawable.ic_screensaver_011e
         )
@@ -60,7 +63,8 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
 
         val bannerAdapter = ScreenBannerAdapter(
             if (sn.startsWith("011A")) dataList011A
-            else if (sn.startsWith("011D")||sn.startsWith("011F")) dataList011D
+            else if (sn.startsWith("011D")) dataList011D
+            else if (sn.startsWith("011F")) dataList011F
             else if (sn.startsWith("011E")) dataList011E
             else if (sn.startsWith("054")) dataList054
             else if (sn.startsWith("045")) dataList045

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/setting_layout"
     android:layout_width="match_parent"
     android:background="@color/bg_color"
     android:layout_height="match_parent">

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

@@ -259,7 +259,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         isModelNum = getModelNum()
         if (!isNightTheme()) {
             var color =
-                if (is062) com.develop.common.R.color.white else if (is011) com.develop.common.R.color.view_change_011 else com.develop.common.R.color.view_change
+                if (is062) com.develop.common.R.color.white
+                else if (is011) com.develop.common.R.color.view_change_011
+                else if (sn.startsWith("011F")) com.develop.common.R.color.view_change_011_f
+                else com.develop.common.R.color.view_change
             binding.ivBack.drawable?.apply {
                 DrawableCompat.setTint(
                     this,
@@ -322,13 +325,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         this.packageName
                     )
                 )
-//                Glide.with(this).load(
-//                    resources.getIdentifier(
-//                        workMode?.bg,
-//                        "drawable",
-//                        this.packageName
-//                    )
-//                ).into(binding.ivBanner)
             }
         } else {
             if (sn.startsWith("054A") || sn.startsWith("053A") || sn.startsWith("000B")) {

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

@@ -196,6 +196,11 @@ class CookStepActivity : CookStepBaseActivity() {
                 binding.viewChangeWeight.setBgColor(R.color.view_change_011)
                 binding.viewRemark.setBgColor(R.color.white)
                 binding.viewWeightClose.setBgColor(R.color.view_change_011)
+            }else if (baseSn.startsWith("011F")){
+                binding.viewChangeCrush.setBgColor(R.color.view_change_011_f)
+                binding.viewChangeWeight.setBgColor(R.color.view_change_011_f)
+                binding.viewRemark.setBgColor(R.color.view_change_011_f)
+                binding.viewWeightClose1.setBgColor(R.color.view_change_011_f)
             } else {
                 binding.viewChangeCrush.setBgColor(R.color.view_change)
                 binding.viewChangeWeight.setBgColor(R.color.view_change)

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

@@ -668,12 +668,12 @@ abstract class CookStepBaseActivity :
                 else -> {}
             }
         }
-        if (isNightTheme()) {
+        if (isNightTheme()||baseSn.startsWith("011F")) {
             binding.controller.tvSpeedText.setTextColor(Color.WHITE)
             binding.controller.tvRingTempText.setTextColor(Color.WHITE)
         } else {
-            binding.controller.tvSpeedText.setTextColor(Color.parseColor("#E03E52"))
-            binding.controller.tvRingTempText.setTextColor(Color.parseColor("#E03E52"))
+                binding.controller.tvSpeedText.setTextColor(Color.parseColor("#E03E52"))
+                binding.controller.tvRingTempText.setTextColor(Color.parseColor("#E03E52"))
         }
     }
 

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

@@ -265,7 +265,8 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
             if (isNightTheme()) {
                 if (baseSn.startsWith("011")||baseSn.startsWith("054")) {
-                    binding.viewProgress.setButtonColor(Color.parseColor("#D51317"))
+                        binding.viewProgress.setButtonColor(Color.parseColor("#D51317"))
+
                 } else {
                     binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
                 }
@@ -273,7 +274,9 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
             } else if (is011) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#C10A27"))
-            } else {
+            } else if (baseSn.startsWith("011F")){
+                binding.viewProgress.setButtonColor(Color.parseColor("#211D6D"))
+            }else {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
             }
             binding.viewIcon.setGone()
@@ -801,12 +804,14 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
                 binding.viewProgress.setProgress(1f)
                 if (isNightTheme()) {
-                    if (getSN().startsWith("011")) {
+                    if (sn.startsWith("011")) {
                         binding.viewProgress.setButtonColor(Color.parseColor("#D51317"))
                     } else {
                         binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
                     }
-                } else {
+                } else if (sn.startsWith("011F")){
+                    binding.viewProgress.setButtonColor(Color.parseColor("#211D6D"))
+                }else {
                     binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
                 }
                 binding.viewIcon.setGone()

app/build.gradle

@@ -20,7 +20,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="000B"
-    brandCode = "083B"
+    brandCode = "011F"
 //    model = "5037"
     model = "1039"
 
@@ -210,7 +210,7 @@ android {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"011\"")
-            resValue("string", "app_theme", "@style/Splash011DTheme")
+            resValue("string", "app_theme", "@style/Splash011FTheme")
             buildConfigField("String", "model", "\"1039\"")
             buildConfigField("String", "brandCode", "\"011F\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
@@ -871,13 +871,13 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-//            manifestPlaceholders = [channelName: "brand011FTuya"]
-//            buildConfigField("String", "UpdatePlatform", "\"011\"")
-//            resValue("string", "app_theme", "@style/Splash011DTheme")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"011F\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
+            manifestPlaceholders = [channelName: "brand011FTuya"]
+            buildConfigField("String", "UpdatePlatform", "\"011F\"")
+            resValue("string", "app_theme", "@style/Splash011DTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"011F\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 
 
 //            manifestPlaceholders = [channelName: "brand011DTuya"]
@@ -1093,14 +1093,14 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
-            manifestPlaceholders = [channelName: "brand083ATuya"]
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"083A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
+//            manifestPlaceholders = [channelName: "brand083ATuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"083A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
 
         }

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

@@ -122,6 +122,7 @@ class FoodCookingApp : BaseApp() {
             val isNight = UpdatePlatform.equals("night")
             val is062 = UpdatePlatform.equals("062A")
             val is011 = UpdatePlatform.equals("011")
+            val is011f =  UpdatePlatform.equals("011F")
             setIsBrand036I(UpdatePlatform.equals("036I"))
             setIsBrand011A(is011)
             setIsBrand062(is062)
@@ -147,10 +148,19 @@ class FoodCookingApp : BaseApp() {
                 )
             }
 
+            if (is011f){
+                ResourceUtils.copyFileFromAssets(
+                    ASSETS_DARK_BLUE_SKIN_PACK,
+                    SKIN_PACK_PATH + DARK_BLUE_SKIN_PACK_NAME
+                )
+            }
+
+
+
 
             //切换主题，theme=0 night= false 是0000的主题，而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
             ThemeSkinService.getInstance()
-                .switchThemeSkin(if (isNight) 1 else if (is062) 2 else if (is011) 3 else 0)
+                .switchThemeSkin(if (isNight) 1 else if (is062) 2 else if (is011) 3 else if (is011f) 4 else 0)
 
             //由于之前011黑色风格 故在这做 011兼容, 这个判断，不能在设置皮肤前面
             if (isNight || is011) {
@@ -443,6 +453,7 @@ class OptionFactory : IOptionFactory {
             1 -> NightOption()
             2 -> BlueOption()
             3 -> ZeroOneOneOption()
+            4 -> DarkBlueOption()
             else -> null
         }
     }
@@ -473,6 +484,13 @@ class ZeroOneOneOption : IThemeSkinOption {
     }
 }
 
+class DarkBlueOption : IThemeSkinOption {
+    override fun getStandardSkinPackPath(): LinkedHashSet<String> {
+        val pathSet = LinkedHashSet<String>()
+        pathSet.add(SKIN_PACK_PATH + DARK_BLUE_SKIN_PACK_NAME)
+        return pathSet
+    }
+}
 
 const val NIGHT_SKIN_PACK_NAME = "night.skin"
 const val ASSETS_NIGHT_SKIN_PACK = "skins/night.skin"
@@ -483,6 +501,9 @@ const val ASSETS_BLUE_SKIN_PACK = "skins/blue.skin"
 const val ZERO_ONE_ONE_SKIN_PACK_NAME = "zeroOneOne.skin"
 const val ASSETS_ZERO_ONE_ONE_SKIN_PACK = "skins/zeroOneOne.skin"
 
+const val DARK_BLUE_SKIN_PACK_NAME = "dark_blue.skin"
+const val ASSETS_DARK_BLUE_SKIN_PACK = "skins/dark_blue.skin"
+
 
 /**
  * 应用存储空间根路径

gradle.properties

@@ -20,6 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=false
 android.enableJetifier=true
 android.jetifier.blacklist=bcprov-jdk15on-1.70.jar

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

@@ -232,14 +232,14 @@ fun getSN(): String {
 
 //        return "000B10390020123010190001"
 //        return "025A10390020123010190001"
-        return "083A10390020123010190001"
+//        return "083A10390020123010190001"
 //        return "054A50370020123010190001"
 //        return "054A10390020123010190001"
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190001"
-//        return "011F10390020123010190001"
+        return "011F10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"

skin-DarkBlue/release/output-metadata.json

@@ -1,18 +0,0 @@
-{
-  "version": 2,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.develop.skin_blue",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0",
-      "outputFile": "blue.skin"
-    }
-  ]
-}

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

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

skin-DarkBlue/src/main/res/drawable/bg_tare_button.xml

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

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_40px" />
-    <solid android:color="#5887DA"/>
+    <solid android:color="#211D6D"/>
 
 
 </shape>

skin-DarkBlue/src/main/res/drawable/mode_resume_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="#CC5887DA"/>
+    <solid android:color="#211D6D"/>
 </shape>

skin-DarkBlue/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="#CCDAE343"/>
+    <solid android:color="#211D6D"/>
 </shape>

skin-DarkBlue/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="#CCFC5B67"/>
+    <solid android:color="#60F262"/>
 
 </shape>

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

@@ -7,14 +7,14 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="color_FFA627">#E03E52</color>
+    <color name="color_FFA627">#211D6D</color>
 
-    <color name="color_F4A12E">#E03E52</color>
+    <color name="color_F4A12E">#211D6D</color>
     <color name="color_fff">#fff</color>
     <color name="color_33000000">#33000000</color>
     <color name="color_6B6B6B">#6B6B6B</color>
     <color name="color_33F4A12E">#33F4A12E</color>
-    <color name="color_CCF4A12E">#E03E52</color>
+    <color name="color_CCF4A12E">#211D6D</color>
     <color name="color_E5E5E5">#E5E5E5</color>
     <color name="color_CCFFFFFF">#CCFFFFFF</color>
     <color name="color_80FFFFFF">#80ffffff</color>
@@ -42,8 +42,8 @@
     <color name="bg_color">#ffffff</color>
     <color name="common_title">#1A1A1A</color>
     <color name="about_app_name">#1A1A1A</color>
-    <color name="about_update_stroke">#92cf40</color>
-    <color name="about_update_recipes">#92cf40</color>
+    <color name="about_update_stroke">#60F262</color>
+    <color name="about_update_recipes">#60F262</color>
     <color name="about_function_stroke">#E5E5E5</color>
     <color name="about_function_title">#1A1A1A</color>
     <color name="about_function_des">#A3A3A2</color>
@@ -66,9 +66,9 @@
 
     <color name="sound_content">#1A1A1A</color>
     <color name="thumb_unselect">#E5E5E5</color>
-    <color name="thumb_select">#E03E52</color>
+    <color name="thumb_select">#211D6D</color>
 
-    <color name="wifi_tip">#</color>
+    <color name="wifi_tip">#211D6D</color>
     <color name="wifi_left_stroke">#E5E5E5</color>
     <color name="wifi_pwd_input">#6B6B6B</color>
     <color name="wifi_right_conner">#211D6D</color>
@@ -79,18 +79,18 @@
     <color name="auth_rest_pwd">#1A1A1A</color>
     <color name="forgot_input_stroke">#A3A3A2</color>
     <color name="forget_tip">#E60012</color>
-    <color name="forgot_conner">#E03E52</color>
+    <color name="forgot_conner">#211D6D</color>
     <color name="login">#211D6D</color>
     <color name="launch_content">#1A1A1A</color>
     <color name="skin_for_now">#211D6D</color>
     <color name="login_title">#1A1A1A</color>
-    <color name="forget_pwd">#FC5B67</color>
+    <color name="forget_pwd">#211D6D</color>
     <color name="register">#211D6D </color>
     <color name="profile_title">#1A1A1A</color>
-    <color name="register_tip">#FC5B67</color>
+    <color name="register_tip">#211D6D</color>
 
     <color name="home_tab">#211D6D</color>
-    <color name="home_function_name">#fff</color>
+    <color name="home_function_name">#211D6D</color>
     <color name="login_state">#211D6D</color>
     <color name="home_title">#1A1A1A</color>
 
@@ -118,26 +118,26 @@
     <color name="sort_filter_selected_name">#211D6D</color>
     <color name="sort_filter_line">#E5E5E5</color>
     <color name="sort_filter_bg">#fff</color>
-    <color name="mode_guide_title">#E03E52</color>
+    <color name="mode_guide_title">#211D6D</color>
     <color name="online_recipes">#fff</color>
     <color name="download">#fff</color>
     <color name="download_err_title">#F87B85</color>
     <color name="home_banner_line">#fff</color>
-    <color name="mode_card_title">#fff</color>
+    <color name="mode_card_title">#211D6D</color>
     <color name="cook_detail_bg">#80000000</color>
     <color name="cook_detail_info">#ffffff</color>
     <color name="detail_function_title">#1a1a1a</color>
     <color name="evaluate_title">#1A1A1A</color>
     <color name="evaluate_level">#DAE343</color>
-    <color name="restore_des">#FC5B67</color>
+    <color name="restore_des">#211D6D</color>
     <color name="restore_no">#799FE1</color>
     <color name="restore_yes">#211D6D</color>
     <color name="restore_no_str">#799FE1</color>
     <color name="restore_yes_str">#fff</color>
     <color name="food_name">#1A1A1A</color>
-    <color name="send_email_stroke">#E03E52</color>
+    <color name="send_email_stroke">#211D6D</color>
     <color name="send_email_solid">#fff</color>
-    <color name="wifi_selected">#E03E52</color>
+    <color name="wifi_selected">#211D6D</color>
 
     <color name="temp_ring">#fff</color>
     <color name="speed_ring">#fff</color>
@@ -156,10 +156,10 @@
     <color name="step_title">#211D6D</color>
     <color name="step_detail">#1A1A1A</color>
     <color name="tool_name">#211D6D</color>
-    <color name="more_circle">#E03E52</color>
+    <color name="more_circle">#211D6D</color>
     <color name="cook_tab_unselected">#000</color>
     <color name="step_status_bar">#211D6D</color>
-    <color name="more_bg">#E03E52</color>
+    <color name="more_bg">#211D6D</color>
     <color name="hide_bg">#fff</color>
     <color name="no_color">#211D6D</color>
     <color name="dialog_recipes_no">#ffffff</color>