062换肤文件

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.isBrand062
 import com.develop.base.ext.isNightTheme
 import kotlin.math.*
 
@@ -16,8 +17,9 @@ class RingControlView @JvmOverloads constructor(
 ) : View(context, attrs, defStyleAttr) {
     private val fillPath = Path()
     private val stubPath = Path()
-    private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG)
-    private val extraPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG) //圆点
+    private val extraPaint = Paint(Paint.ANTI_ALIAS_FLAG) //圆弧
+    private val is062 = isBrand062()
     private val ringStrokeWidth = TypedValue.applyDimension(
         TypedValue.COMPLEX_UNIT_DIP, 7f, context.resources.displayMetrics
     )
@@ -59,22 +61,27 @@ class RingControlView @JvmOverloads constructor(
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         val nightTheme = isNightTheme()
-        if (nightTheme){
+        if (nightTheme) {
             extraPaint.color = 0x00000000
         } else {
             extraPaint.color = 0x60ffffff
         }
+
         val radius = width / 2f - ringStrokeWidth - ringPadding
         canvas.drawCircle(width / 2f, height / 2f, radius, extraPaint)
         ringPaint.color = 0xffffffff.toInt()
         canvas.drawPath(stubPath, ringPaint)
-        if (isNightTheme()){
+        if (isNightTheme()) {
             ringPaint.color = 0xffE03E52.toInt()
         } else {
-            ringPaint.color = 0xffE60012.toInt()
+            if (is062){
+                ringPaint.color = 0xffDAE343.toInt()
+            }else{
+                ringPaint.color = 0xffE60012.toInt()
+            }
         }
         canvas.drawPath(fillPath, ringPaint)
-        extraPaint.color = if (nightTheme) 0xffDF3F54.toInt() else 0xffFFA627.toInt()
+        extraPaint.color = if (nightTheme) 0xffDF3F54.toInt() else if (is062) 0xff5887DA.toInt() else 0xffFFA627.toInt()
 
         // -150 ~ 150
         val angle = 300.0 * progress - 150.0

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

@@ -12,6 +12,7 @@ import android.view.View
 import android.widget.Scroller
 import com.develop.base.ext.dimenRes
 import com.develop.base.R
+import com.develop.base.ext.isBrand062
 
 
 class WeightView @JvmOverloads constructor(
@@ -32,7 +33,7 @@ class WeightView @JvmOverloads constructor(
     private var rotateOffset = 0f
     private val scroller = Scroller(context)
     private val gapCount = 20
-
+    private val is062 = isBrand062()
     init {
         paint.strokeWidth = outlineStrokeWidth
         textPaint.textSize = TypedValue.applyDimension(
@@ -61,7 +62,7 @@ class WeightView @JvmOverloads constructor(
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
-        paint.color = 0xffe60012.toInt() // 三角形指示器
+        paint.color = if (is062) 0xffDAE343.toInt() else 0xffe60012.toInt() // 三角形指示器
         canvas.drawPath(path, paint)
 
         paint.style = Paint.Style.STROKE

BusinessCommon/src/main/res/color/color_blue_cook_tab_tint.xml

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

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

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

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

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

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

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

BusinessCommon/src/main/res/drawable/mode_start_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/mode_stop_bg.xml

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

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

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:layout_marginTop="@dimen/convert_14px"
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_marginTop="@dimen/convert_14px"
     android:id="@+id/cl_cook_temp"
     android:layout_width="@dimen/convert_280px"
     android:layout_height="@dimen/convert_140px"

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

@@ -20,7 +20,7 @@
             android:layout_marginTop="@dimen/convert_69px"
             android:includeFontPadding="false"
             android:text="@string/error"
-            android:textColor="#E60012"
+            android:textColor="@color/download_err_title"
             android:textSize="@dimen/convert_36px" />
 
         <View

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

@@ -52,7 +52,7 @@
                 android:id="@+id/iv_cancel"
                 android:layout_width="@dimen/convert_201px"
                 android:layout_height="@dimen/convert_60px"
-                android:background="@drawable/bg_icon_cancel"
+                android:background="@drawable/dialog_ok_bg"
                 android:textSize="@dimen/convert_30px"
                 android:textColor="@color/white"
                 android:text="@string/ok"

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

@@ -140,7 +140,7 @@
             android:layout_height="@dimen/convert_60px"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@+id/download_layout"
-            android:background="@drawable/shape_100px6fb1fb_corners">
+            android:background="@drawable/recipes_corners_bg">
 
             <ImageView
                 android:layout_width="@dimen/convert_46px"

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

@@ -113,6 +113,7 @@
     <color name="mode_guide_title">#F4A12E</color>
     <color name="online_recipes">#fff</color>
     <color name="download">#fff</color>
+    <color name="download_err_title">#E60012</color>
     <color name="home_banner_line">#fff</color>
     <color name="mode_card_title">#fff</color>
     <color name="cook_detail_bg">#80000000</color>

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

@@ -216,6 +216,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         isModelNum = getModelNum()
 
         if (!isNightTheme()) {
+
             binding.ivBack.drawable?.apply {
                 DrawableCompat.setTint(
                     this,

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

@@ -116,24 +116,28 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             updateDownloadButton(it)
         }
         viewModel.portionSizeLiveData.observe(this) {
-            if (it!=null){
+            if (it != null) {
                 portionSizelJson = Json.encodeToString(it)
                 val jarsCount =
-                    (it.portionSize ?: 1).toString() + " " + getString(com.develop.common.R.string.jar)
+                    (it.portionSize
+                        ?: 1).toString() + " " + getString(com.develop.common.R.string.jar)
                 binding.tvJarCount.text = jarsCount
             }
         }
     }
 
     private fun initView() {
-        if (getSN().startsWith("017A")){
+        if (getSN().startsWith("017A")) {
             binding.tvJarCount.visibility = View.VISIBLE
         } else {
             binding.tvJarCount.visibility = View.INVISIBLE
         }
-        if (isNightTheme()){
-            val tintList =
+        //如果是黑色或者062的时候
+        if (isNightTheme() || isBrand062()) {
+
+            val tintList = if (isNightTheme())
                 resources.getColorStateList(com.develop.common.R.color.color_night_cook_tab_tint)
+            else resources.getColorStateList(com.develop.common.R.color.color_blue_cook_tab_tint)
             binding.ivTab1.drawable?.apply {
                 DrawableCompat.setTintList(this, tintList)
             }
@@ -146,10 +150,18 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.ivTab4.drawable?.apply {
                 DrawableCompat.setTintList(this, tintList)
             }
-            binding.ivTab1.setPadding((com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt())
-            binding.ivTab2.setPadding((com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt())
-            binding.ivTab3.setPadding((com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt())
-            binding.ivTab4.setPadding((com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt())
+            binding.ivTab1.setPadding(
+                (com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt()
+            )
+            binding.ivTab2.setPadding(
+                (com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt()
+            )
+            binding.ivTab3.setPadding(
+                (com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt()
+            )
+            binding.ivTab4.setPadding(
+                (com.develop.common.R.dimen.convert_8px).resId2Dimension().toInt()
+            )
         }
 
 
@@ -164,7 +176,9 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
             if (isNightTheme()) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
-            } else {
+            } else if (isBrand062()){
+                binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
+            }else {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
             }
             binding.viewIcon.setGone()
@@ -394,19 +408,20 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         FoodDataProvider.getUserDatabase().runInTransaction {
             val result = FoodDataProvider.getUserDatabase().userInfoDao()
                 .queryUserTag(CURRENT_USER_ID, detail.recipe.number ?: "")
-            val like = FoodDataProvider.getUserDatabase().userInfoDao().queryFavoriteRecipes(CURRENT_USER_ID,detail.recipe.number ?: "")
+            val like = FoodDataProvider.getUserDatabase().userInfoDao()
+                .queryFavoriteRecipes(CURRENT_USER_ID, detail.recipe.number ?: "")
 
             runOnUiThread {
-                if (like.isNotEmpty()){
+                if (like.isNotEmpty()) {
                     binding.viewLike.src = com.develop.common.R.drawable.ic_like
                 } else {
                     binding.viewLike.src = com.develop.common.R.drawable.ic_unlike
                 }
-                val count1 = result?.starCount?:0
-                val count2 = detail.recipe.score?.toInt()?:0
-                if (count1!=0){
+                val count1 = result?.starCount ?: 0
+                val count2 = detail.recipe.score?.toInt() ?: 0
+                if (count1 != 0) {
                     binding.startLayout.setStarCount(count1)
-                } else if (count2!=0){
+                } else if (count2 != 0) {
                     binding.startLayout.setStarCount(count2)
                 }
             }
@@ -497,6 +512,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         }
         dialog.showDialog(supportFragmentManager, "RecipeDeleteConfirmDialog")
     }
+
     @Subscribe
     fun refreshLikeRecipes(event: RefreshLikeDataEvent) {
         if (event.isLike) {

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

@@ -342,7 +342,7 @@
             android:layout_width="@dimen/convert_550px"
             android:layout_height="@dimen/convert_98px"
             android:layout_marginBottom="@dimen/convert_50px"
-            android:background="@drawable/language_conner"
+            android:background="@drawable/mode_start_bg"
             android:gravity="center"
             android:text="@string/start"
             android:textColor="#ffffff"
@@ -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/language_conner"
+            android:background="@drawable/mode_start_bg"
             android:gravity="center"
             android:text="@string/resume"
             android:textColor="@color/white"
@@ -384,7 +384,7 @@
             android:layout_width="@dimen/convert_550px"
             android:layout_height="@dimen/convert_98px"
             android:layout_marginBottom="@dimen/convert_50px"
-            android:background="@drawable/language_conner"
+            android:background="@drawable/mode_start_bg"
             android:gravity="center"
             android:text="@string/pause"
             android:textColor="@color/white"
@@ -398,7 +398,7 @@
             android:layout_width="@dimen/convert_550px"
             android:layout_height="@dimen/convert_98px"
             android:layout_marginBottom="@dimen/convert_50px"
-            android:background="@drawable/bg_white_stoke"
+            android:background="@drawable/mode_stop_bg"
             android:gravity="center"
             android:text="@string/stop"
             android:textColor="@color/white"
@@ -412,7 +412,7 @@
             android:layout_width="@dimen/convert_550px"
             android:layout_height="@dimen/convert_98px"
             android:layout_marginBottom="@dimen/convert_50px"
-            android:background="@drawable/language_conner"
+            android:background="@drawable/mode_start_bg"
             android:gravity="center"
             android:text="@string/confirm"
             android:textColor="#ffffff"
@@ -426,7 +426,7 @@
             android:layout_width="@dimen/convert_550px"
             android:layout_height="@dimen/convert_98px"
             android:layout_marginBottom="@dimen/convert_50px"
-            android:background="@drawable/bg_white_stoke"
+            android:background="@drawable/mode_stop_bg"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/white"

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

@@ -18,6 +18,7 @@ import com.develop.base.ext.getBrandNum
 import com.develop.base.ext.setIsBrand011A
 import com.develop.base.ext.setIsBrand036I
 import com.develop.base.ext.setIsBrand054A
+import com.develop.base.ext.setIsBrand062
 import com.develop.base.ext.setNightTheme
 import com.develop.base.util.MMkvUtils
 import com.develop.common.bean.TuyaEvent
@@ -92,6 +93,7 @@ class FoodCookingApp : BaseApp() {
         setIsBrand036I(BuildConfig.UpdatePlatform.equals("036I"))
         setIsBrand011A(BuildConfig.UpdatePlatform.equals("011A"))
         setIsBrand054A(BuildConfig.UpdatePlatform.equals("054A"))
+        setIsBrand062(BuildConfig.UpdatePlatform.equals("062"))
         //切换主题，theme=0 night= false 是0000的主题，而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
         ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else 0)
         setNightTheme(isNight)

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

@@ -329,4 +329,11 @@ fun setIsBrand054A(is054A: Boolean) {
 
 fun isBrand054A(): Boolean {
     return MMkvUtils.getBool("is054A", false)
+}
+fun setIsBrand062(is054A: Boolean) {
+    MMkvUtils.save("is062", is054A)
+}
+
+fun isBrand062(): Boolean {
+    return MMkvUtils.getBool("is062", false)
 }

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/convert_100px"/>
-    <solid android:color="@color/color_EE8F08"/>
+        <solid android:color="@color/color_5887DA"/>
 
 </shape>

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

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

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

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

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

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

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

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

skin-blue/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="#e60012"/>
+    <solid android:color="#DAE343"/>
     <corners android:radius="@dimen/convert_80px"/>
 
 </shape>

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

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

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

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

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

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

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

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

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

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

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

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="@color/hide_bg"/>
+    <solid android:color="#5887DA"/>
 </shape>

skin-blue/src/main/res/drawable/mode_start_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="#99DAE343"/>
+</shape>

skin-blue/src/main/res/drawable/mode_stop_bg.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_60px"/>
+    <solid android:color="#99FC5B67"/>
+
+</shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#E03E52"/>
+    <solid android:color="#EE907B"/>
 </shape>

skin-blue/src/main/res/drawable/recipes_corners_bg.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_100px"/>
+    <solid android:color="#5887DA" />
+
+</shape>

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

@@ -18,7 +18,7 @@
     <color name="color_E5E5E5">#E5E5E5</color>
     <color name="color_CCFFFFFF">#CCFFFFFF</color>
     <color name="color_80FFFFFF">#80ffffff</color>
-    <color name="color_E60012">#E60012</color>
+    <color name="color_E60012">#ffffff</color>
     <color name="color_80000000">#80000000</color>
     <color name="color_20000000">#20000000</color>
     <color name="color_B1B2B2">#B1B2B2</color>
@@ -42,8 +42,8 @@
     <color name="bg_color">#1A1A1A</color>
     <color name="common_title">#ffffff</color>
     <color name="about_app_name">#ffffff</color>
-    <color name="about_update_stroke">#ffffff</color>
-    <color name="about_update_recipes">#ffffff</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_des">#A3A3A2</color>
@@ -95,14 +95,14 @@
     <color name="home_title">#1A1A1A</color>
 
     <color name="home_menu_bg">#fff</color>
-    <color name="home_menu">#E03E52</color>
+    <color name="home_menu">#5887DA</color>
     <color name="home_menu_title">#1A1A1A</color>
-    <color name="home_user_name">#1A1A1A</color>
+    <color name="home_user_name">#5887DA</color>
 
-    <color name="modes_bottom_view">#E03E52</color>
-    <color name="category_tab_stroke">#E03E52</color>
+    <color name="modes_bottom_view">#5887DA</color>
+    <color name="category_tab_stroke">#5887DA</color>
     <color name="category_tab_solid">#fff</color>
-    <color name="category_tab_selected">#E03E52</color>
+    <color name="category_tab_selected">#5887DA</color>
     <color name="category_tab_gap">#1A1A1A</color>
     <color name="category_solid">#E5E5E5</color>
     <color name="home_search_title">#fff</color>
@@ -121,17 +121,18 @@
     <color name="mode_guide_title">#E03E52</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="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">#fff</color>
-    <color name="restore_des">#fff</color>
-    <color name="restore_no">#fff</color>
-    <color name="restore_yes">#E03E52</color>
-    <color name="restore_no_str">#fff</color>
+    <color name="evaluate_level">#DAE343</color>
+    <color name="restore_des">#FC5B67</color>
+    <color name="restore_no">#799FE1</color>
+    <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="send_email_stroke">#E03E52</color>
@@ -141,26 +142,26 @@
     <color name="temp_ring">#fff</color>
     <color name="speed_ring">#fff</color>
     <color name="temp_ring_cooking">#fff</color>
-    <color name="cook_item_selected_solid">#E03E52</color>
-    <color name="cook_item_unselected_solid">#FFFFFF</color>
+    <color name="cook_item_selected_solid">#5887DA</color>
+    <color name="cook_item_unselected_solid">#99D3D3D3</color>
     <color name="panel_enabled">#A3A3A2</color>
-    <color name="panel_selected">#E03E52</color>
+    <color name="panel_selected">#FFFFFF</color>
     <color name="panel_unselected">#FFFFFF</color>
-    <color name="search_tag">#fff</color>
-    <color name="search_tag_content">#fff</color>
+    <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_line">#E4E4E4</color>
-    <color name="source_amount">#fff</color>
-    <color name="step_title">#fff</color>
+    <color name="source_amount">#5887DA</color>
+    <color name="step_title">#5887DA</color>
     <color name="step_detail">#fff</color>
-    <color name="tool_name">#fff</color>
+    <color name="tool_name">#5887DA</color>
     <color name="more_circle">#E03E52</color>
     <color name="cook_tab_unselected">#000</color>
     <color name="step_status_bar">#1A1A1A</color>
     <color name="more_bg">#E03E52</color>
     <color name="hide_bg">#fff</color>
-    <color name="no_color">#1A1A1A</color>
-    <color name="view_change">#fff</color>
+    <color name="no_color">#5887DA</color>
+    <color name="view_change">#5887DA</color>
     <color name="text_hit">#eeeeee</color>
 </resources>