解决冲突

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

@@ -11,6 +11,7 @@ import com.develop.auth.R
 import com.develop.auth.databinding.ActivityMemberAuthBinding
 import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
+import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.util.MMkvUtils
 import com.develop.common.router.Screens
@@ -45,6 +46,11 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         ARouter.getInstance().inject(this)
+        if (isNightTheme()){
+            binding.tvSkip.setBackgroundResource(0)
+        } else {
+            binding.tvSkip.setBackgroundResource(com.develop.common.R.drawable.bg_skip_text)
+        }
         initFragmentList()
         viewModel.enterFromHome = enterFromHome
         binding.tvSkip.setOnClickListener {

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

@@ -102,7 +102,7 @@ class MemberLoginFragment : CommonBVMFragment<FragmentMemberLoginBinding, Member
     }
 
     companion object {
-        var dp60 = (com.develop.base.R.dimen.convert_60px).resId2Dimension()
+        var dp60 = (com.develop.common.R.dimen.convert_60px).resId2Dimension()
     }
 
 }

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

@@ -11,6 +11,7 @@ import com.develop.auth.viewmodel.MemberViewModel
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.setVisible
+import com.develop.base.ext.text_color
 import com.develop.base.mvvm.BaseBVMFragment
 import com.develop.base.util.MMkvUtils
 import com.develop.base.util.ThreadUtils
@@ -42,11 +43,11 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
             AgeSelectDialog(hostActivity) { index, change ->
                 selectAge = index + 20
                 binding.tvChooseAge.text = selectAge.toString()
-                binding.tvChooseAge.setTextColor(Color.BLACK)
-            }.show()
+                binding.tvChooseAge.text_color = com.develop.common.R.color.common_title
+            }.showDialog(childFragmentManager, "AgeSelectDialog")
         }
         binding.ivMember.setOnClickListener {
-            UserIconSelectDialog(viewModel).show(childFragmentManager, "UserIcon")
+            UserIconSelectDialog(viewModel).showDialog(childFragmentManager, "UserIcon")
         }
         binding.tvChooseSex.setOnClickListener {
             GenderSelectDialog {
@@ -56,8 +57,8 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                 } else {
                     binding.tvChooseSex.text = "Female"
                 }
-                binding.tvChooseSex.setTextColor(Color.BLACK)
-            }.show(parentFragmentManager, "gender")
+                binding.tvChooseSex.text_color = com.develop.common.R.color.common_title
+            }.showDialog(parentFragmentManager, "gender")
         }
         binding.tvSave.setOnClickListener {
             saveProfile(
@@ -93,14 +94,14 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                     viewModel.chooseAvatar.value = userAvatar?.toInt()
                     if (selectGender == 2) {
                         binding.tvChooseSex.text = "Male"
-                        binding.tvChooseSex.setTextColor(Color.BLACK)
+                        binding.tvChooseSex.text_color = com.develop.common.R.color.common_title
                     } else if (selectGender == 1) {
                         binding.tvChooseSex.text = "Female"
-                        binding.tvChooseSex.setTextColor(Color.BLACK)
+                        binding.tvChooseSex.text_color = com.develop.common.R.color.common_title
                     }
                     if (selectAge > 0) {
                         binding.tvChooseAge.text = selectAge.toString()
-                        binding.tvChooseAge.setTextColor(Color.BLACK)
+                        binding.tvChooseAge.text_color = com.develop.common.R.color.common_title
                     }
                 }
             }

BusinessAuth/src/main/res/layout/activity_member_auth.xml

@@ -39,6 +39,6 @@
         android:gravity="center"
         android:textSize="@dimen/convert_40px"
         android:paddingVertical="@dimen/convert_22px"
-        android:textColor="#1A1A1A"/>
+        android:textColor="@color/auth_home"/>
 
 </FrameLayout>

BusinessAuth/src/main/res/layout/fragment_member_forgot.xml

@@ -17,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/reset_password"
-            android:textColor="#1A1A1A"
+            android:textColor="@color/auth_rest_pwd"
             android:textSize="@dimen/convert_36px"
             android:layout_marginTop="@dimen/convert_104px"
             android:layout_marginStart="@dimen/convert_80px"/>
@@ -30,7 +30,7 @@
             android:singleLine="true"
             android:textSize="@dimen/convert_30px"
             android:inputType="textEmailAddress"
-            android:background="@drawable/bg_edit_input"
+            android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
             android:layout_marginHorizontal="@dimen/convert_40px"
@@ -50,7 +50,7 @@
                 android:hint="@string/enter_captcha"
                 android:textSize="@dimen/convert_30px"
                 android:singleLine="true"
-                android:background="@drawable/bg_edit_input_left"
+                android:background="@drawable/forgot_input_left_stroke"
                 android:paddingHorizontal="@dimen/convert_66px"
                 app:layout_constraintEnd_toStartOf="@+id/tv_send_email"
                 app:layout_constraintStart_toStartOf="parent"
@@ -74,7 +74,7 @@
             android:id="@+id/tv_hints"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#E60012"
+            android:textColor="@color/forget_tip"
             android:textSize="@dimen/convert_26px"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
@@ -88,7 +88,7 @@
             android:textSize="@dimen/convert_30px"
             android:inputType="textPassword"
             android:singleLine="true"
-            android:background="@drawable/bg_edit_input"
+            android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
             android:paddingHorizontal="@dimen/convert_40px"
@@ -103,7 +103,7 @@
             android:text="@string/reset_password"
             android:gravity="center"
             android:layout_gravity="center_horizontal"
-            android:background="@drawable/bg_orange_button"
+            android:background="@drawable/language_conner"
             android:layout_marginTop="@dimen/convert_28px"
             android:layout_marginHorizontal="@dimen/convert_40px"/>
 
@@ -111,7 +111,7 @@
             android:id="@+id/tv_login"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="#FFA627"
+            android:textColor="@color/login"
             android:textSize="@dimen/convert_30px"
             android:text="@string/login"
             android:gravity="center"

BusinessAuth/src/main/res/layout/fragment_member_launch.xml

@@ -3,14 +3,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#fff">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#1A1A1A"
+        android:textColor="@color/launch_content"
         android:textSize="@dimen/convert_36px"
         android:text="Not a member yet?"
         android:layout_marginStart="@dimen/convert_70px"
@@ -24,7 +23,7 @@
         android:id="@+id/tv_subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColor="#1A1A1A"
+        android:textColor="@color/launch_content"
         android:textSize="@dimen/convert_30px"
         android:text="@string/launch_detail"
         android:lineSpacingExtra="8dp"
@@ -39,11 +38,11 @@
         android:id="@+id/tv_login_or_signup"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_98px"
-        android:textColor="#fff"
+        android:textColor="@color/language_next"
         android:textSize="@dimen/convert_36px"
         android:text="@string/login_sign_up"
         android:gravity="center"
-        android:background="@drawable/bg_orange_button"
+        android:background="@drawable/language_conner"
         android:layout_marginHorizontal="@dimen/convert_40px"
         app:layout_constraintBottom_toTopOf="@+id/tv_skip_for_now"
         app:layout_constraintStart_toStartOf="parent"
@@ -53,7 +52,7 @@
         android:id="@+id/tv_skip_for_now"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#FFA627"
+        android:textColor="@color/skin_for_now"
         android:textSize="@dimen/convert_30px"
         android:text="@string/skip_for_now"
         android:gravity="center"

BusinessAuth/src/main/res/layout/fragment_member_login.xml

@@ -18,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/login"
-            android:textColor="#1A1A1A"
+            android:textColor="@color/login_title"
             android:textSize="@dimen/convert_36px"
             android:layout_marginTop="@dimen/convert_133px"
             android:layout_marginStart="@dimen/convert_68px"
@@ -29,7 +29,7 @@
             android:id="@+id/tv_forget"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#E60012"
+            android:textColor="@color/forget_pwd"
             android:textSize="@dimen/convert_26px"
             android:text="@string/forgot_password"
             android:layout_marginEnd="@dimen/convert_42px"
@@ -45,7 +45,7 @@
             android:hint="@string/enter_email_id"
             android:textSize="@dimen/convert_30px"
             android:singleLine="true"
-            android:background="@drawable/bg_edit_input"
+            android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
             android:paddingHorizontal="@dimen/convert_40px"
@@ -61,7 +61,7 @@
             android:textSize="@dimen/convert_30px"
             android:singleLine="true"
             android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:background="@drawable/bg_edit_input"
+            android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
             android:paddingHorizontal="@dimen/convert_40px"
@@ -72,12 +72,12 @@
             android:id="@+id/tv_login"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_98px"
-            android:textColor="#fff"
+            android:textColor="@color/language_next"
             android:textSize="@dimen/convert_36px"
             android:text="@string/login"
             android:gravity="center"
             android:layout_gravity="center_horizontal"
-            android:background="@drawable/bg_orange_button"
+            android:background="@drawable/language_conner"
             android:layout_marginHorizontal="@dimen/convert_40px"
             app:layout_constraintBottom_toTopOf="@+id/tv_register"/>
 
@@ -85,7 +85,7 @@
             android:id="@+id/tv_register"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="#FFA627"
+            android:textColor="@color/register"
             android:textSize="@dimen/convert_30px"
             android:text="@string/register"
             android:gravity="center"

BusinessAuth/src/main/res/layout/fragment_member_profile.xml

@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:background="#fff">
+    android:background="@color/bg_color">
 
     <ImageView
         android:id="@+id/iv_member"
@@ -30,7 +30,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/nickname"
-        android:textColor="#1A1A1A"
+        android:textColor="@color/common_title"
         android:textSize="@dimen/convert_36px"
         android:layout_marginTop="@dimen/convert_213px"
         android:layout_marginStart="@dimen/convert_80px"
@@ -43,7 +43,9 @@
         android:layout_height="@dimen/convert_88px"
         android:hint="@string/enter_nickname"
         android:textSize="@dimen/convert_30px"
-        android:background="@drawable/bg_edit_input"
+        android:textColorHint="#B1B2B2"
+        android:textColor="@color/common_title"
+        android:background="@drawable/forgot_input_stroke"
         android:layout_marginTop="@dimen/convert_12px"
         android:layout_gravity="center_horizontal"
         android:paddingHorizontal="@dimen/convert_40px"
@@ -56,7 +58,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/sex"
-        android:textColor="#1A1A1A"
+        android:textColor="@color/common_title"
         android:textSize="@dimen/convert_36px"
         android:layout_marginTop="@dimen/convert_25px"
         android:layout_marginStart="@dimen/convert_80px"
@@ -69,8 +71,8 @@
         android:layout_height="@dimen/convert_88px"
         android:textSize="@dimen/convert_30px"
         android:text="@string/male"
-        android:textColor="#B1B2B2"
-        android:background="@drawable/bg_edit_input"
+        android:textColor="@color/common_title"
+        android:background="@drawable/forgot_input_stroke"
         android:layout_marginTop="@dimen/convert_12px"
         android:gravity="center_vertical"
         android:layout_gravity="center_horizontal"
@@ -87,8 +89,8 @@
         android:layout_height="@dimen/convert_88px"
         android:textSize="@dimen/convert_30px"
         android:text="20"
-        android:textColor="#B1B2B2"
-        android:background="@drawable/bg_edit_input"
+        android:textColor="@color/common_title"
+        android:background="@drawable/forgot_input_stroke"
         android:gravity="center_vertical"
         android:layout_gravity="center_horizontal"
         android:paddingHorizontal="@dimen/convert_66px"
@@ -102,7 +104,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/age"
-        android:textColor="#1a1a1a"
+        android:textColor="@color/common_title"
         android:textSize="@dimen/convert_36px"
         android:layout_marginStart="@dimen/convert_40px"
         app:layout_constraintTop_toTopOf="@+id/tv_sex"
@@ -112,12 +114,12 @@
         android:id="@+id/tv_save"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_98px"
-        android:textColor="#fff"
+        android:textColor="@color/language_next"
         android:textSize="@dimen/convert_36px"
         android:text="@string/save"
         android:gravity="center"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/bg_orange_button"
+        android:background="@drawable/language_conner"
         android:layout_marginTop="@dimen/convert_40px"
         android:layout_marginHorizontal="@dimen/convert_40px"
         app:layout_constraintTop_toBottomOf="@+id/tv_choose_sex"/>
@@ -126,7 +128,7 @@
         android:id="@+id/tv_skip_for_now"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="#FFA627"
+        android:textColor="@color/skin_for_now"
         android:textSize="@dimen/convert_30px"
         android:text="@string/skip_for_now"
         android:gravity="center"

BusinessAuth/src/main/res/layout/fragment_member_register.xml

@@ -2,8 +2,7 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#fff">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -17,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/sign_up_it_s_free"
-            android:textColor="#6B6B6B"
+            android:textColor="@color/profile_title"
             android:textSize="@dimen/convert_30px"
             android:layout_marginTop="@dimen/convert_104px"
             android:layout_marginStart="@dimen/convert_80px"/>
@@ -29,7 +28,7 @@
             android:hint="@string/enter_email_id"
             android:textSize="@dimen/convert_30px"
             android:singleLine="true"
-            android:background="@drawable/bg_edit_input"
+            android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
             android:layout_marginHorizontal="@dimen/convert_40px"
@@ -44,7 +43,7 @@
             android:singleLine="true"
             android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
             android:inputType="textPassword"
-            android:background="@drawable/bg_edit_input"
+            android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
             android:layout_marginHorizontal="@dimen/convert_40px"
@@ -59,7 +58,7 @@
             android:textSize="@dimen/convert_30px"
             android:singleLine="true"
             android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:background="@drawable/bg_edit_input"
+            android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"
             android:layout_marginHorizontal="@dimen/convert_40px"
@@ -68,7 +67,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="#E60012"
+            android:textColor="@color/register_tip"
             android:textSize="@dimen/convert_22px"
             android:text="@string/pwd_requirement"
             android:layout_marginTop="@dimen/convert_12px"
@@ -81,20 +80,20 @@
         android:id="@+id/tv_register"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_98px"
-        android:textColor="#fff"
+        android:textColor="@color/language_next"
         android:textSize="@dimen/convert_36px"
         android:text="@string/register"
         android:gravity="center"
         android:layout_marginHorizontal="@dimen/convert_40px"
         android:layout_gravity="center_horizontal|bottom"
-        android:background="@drawable/bg_orange_button"
+        android:background="@drawable/language_conner"
         android:layout_marginBottom="@dimen/convert_130px"/>
 
     <TextView
         android:id="@+id/tv_login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="#FFA627"
+        android:textColor="@color/login"
         android:textSize="@dimen/convert_30px"
         android:text="@string/login"
         android:gravity="center"

BusinessCommon/src/main/java/com/develop/common/dialog/AgeSelectDialog.kt

@@ -3,8 +3,14 @@ package com.develop.common.dialog
 import android.app.Dialog
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.view.Window
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil.setContentView
+import com.develop.base.mvvm.FullScreenTransparentDialog
 import com.develop.common.R
 import com.develop.common.databinding.DialogDataPickerBinding
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -12,15 +18,21 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 class AgeSelectDialog(
     private val activity: AppCompatActivity,
     private val onConfirm: (index: Int, change: Boolean) -> Unit
-): Dialog(activity, R.style.TransparentDialog) {
+): FullScreenTransparentDialog() {
 
     private val binding = DialogDataPickerBinding.inflate(activity.layoutInflater)
     private val initIndex = 0
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return binding.root
+    }
     init {
-        requestWindowFeature(Window.FEATURE_NO_TITLE)
-        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         val listData = createAgeListData()
-        setContentView(binding.root)
+
         binding.root.setOnClickListener {
             dismiss()
         }

BusinessCommon/src/main/java/com/develop/common/dialog/ShareQRCodeDialog.kt

@@ -5,9 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
+import com.develop.base.ext.background_drawable
 import com.develop.base.ext.setGone
+import com.develop.base.ext.src
 import com.develop.base.mvvm.FullScreenTransparentDialog
 import com.develop.base.util.ThreadUtils
+import com.develop.common.R
 import com.develop.common.databinding.DialogShareQrCodeBinding
 import com.develop.common.utils.QRCodeUtils
 
@@ -32,6 +35,10 @@ class ShareQRCodeDialog : FullScreenTransparentDialog() {
         binding.ivCancel.setOnClickListener {
             removeSelf()
         }
+        binding.ivCancel.apply {
+            src = R.drawable.ic_cancel
+            background_drawable = R.drawable.bg_icon_cancel
+        }
         return binding.root
     }
 

BusinessCommon/src/main/java/com/develop/common/food_sdk/FloatWindowManager.kt

@@ -101,8 +101,8 @@ object FloatWindowManager {
             .setSidePattern(SidePattern.RESULT_SIDE)
             .setImmersionStatusBar(true)
             .setLocation(
-                getScreenWidth() - com.develop.base.R.dimen.convert_420px.resId2Dimension().toInt(),
-                getScreenHeight() - com.develop.base.R.dimen.convert_206px.resId2Dimension().toInt()
+                getScreenWidth() - R.dimen.convert_420px.resId2Dimension().toInt(),
+                getScreenHeight() - com.develop.common.R.dimen.convert_206px.resId2Dimension().toInt()
 
             )
             .show()

BusinessCommon/src/main/java/com/develop/common/food_sdk/ProtocolListener.kt

@@ -44,6 +44,7 @@ class ProtocolListener(private val serialPort: SerialPort) : Runnable {
                                     )
 
                                 }
+//                                Log.i("mcu2dev:", baseDecoder.escapeBytesStr())
                                 CofarSDK.post2Dev(baseDecoder.baseBody)
                                 bytes.clear()
                             } catch (e: Exception) {

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

@@ -4,6 +4,10 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.RelativeLayout
+import com.develop.base.ext.background_drawable
+import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setGone
+import com.develop.base.ext.text_color
 import com.develop.common.R
 import com.develop.common.data_repo.db.CategoryType
 import com.develop.common.databinding.CategotyTabViewBinding
@@ -26,40 +30,45 @@ class CategoryTabViewLayout : RelativeLayout {
     init {
         val root = View.inflate(context, R.layout.categoty_tab_view, this)
         binding = CategotyTabViewBinding.bind(root)
+        if (isNightTheme()){
+            binding.lineGap1.setGone()
+            binding.lineGap2.setGone()
+            binding.bottomGap.visibility = INVISIBLE
+        }
         binding.tvAll.setOnClickListener {
             binding.lineGap1.visibility = View.GONE
             binding.lineGap2.visibility = View.VISIBLE
             onCategoryTabSelectedListener?.onCurrentSelected(CategoryType.All)
-            binding.tvAll.setBackgroundResource(R.drawable.shape_15pxf4a12e_top_left_conners)
-            binding.tvRecipes.setBackgroundResource(R.drawable.shape_e5e5e5_solid)
-            binding.tvAll.setTextColor(context.resources.getColor(R.color.color_F4A12E))
-            binding.tvRecipes.setTextColor(context.resources.getColor(R.color.color_6B6B6B))
-            binding.tvIngredients.setTextColor(context.resources.getColor(R.color.color_6B6B6B))
-            binding.tvIngredients.setBackgroundResource(R.drawable.shape_15pxe5e5e5_top_right_conners)
+            binding.tvAll.background_drawable = R.drawable.category_tab_top_left_conners_selected
+            binding.tvRecipes.background_drawable = R.drawable.category_tab_solid_normal
+            binding.tvAll.text_color = R.color.category_tab_selected
+            binding.tvRecipes.text_color = R.color.category_unselect
+            binding.tvIngredients.text_color = R.color.category_unselect
+            binding.tvIngredients.background_drawable = R.drawable.category_tab_top_right_conners_normal
         }
 
         binding.tvRecipes.setOnClickListener {
             binding.lineGap1.visibility = View.GONE
             binding.lineGap2.visibility = View.GONE
-            binding.tvAll.setTextColor(context.resources.getColor(R.color.color_6B6B6B))
-            binding.tvRecipes.setTextColor(context.resources.getColor(R.color.color_F4A12E))
-            binding.tvIngredients.setTextColor(context.resources.getColor(R.color.color_6B6B6B))
+            binding.tvAll.text_color = R.color.category_unselect
+            binding.tvRecipes.text_color = R.color.category_tab_selected
+            binding.tvIngredients.text_color = R.color.category_unselect
             onCategoryTabSelectedListener?.onCurrentSelected(CategoryType.Recipes)
-            binding.tvAll.setBackgroundResource(R.drawable.shape_15pxe5e5e5_top_left_conners)
-            binding.tvRecipes.setBackgroundResource(R.drawable.shape_f4a12e_conners)
-            binding.tvIngredients.setBackgroundResource(R.drawable.shape_15pxe5e5e5_top_right_conners)
+            binding.tvAll.background_drawable = R.drawable.category_tab_top_left_conners_normal
+            binding.tvRecipes.background_drawable = R.drawable.category_tab_solid_selected
+            binding.tvIngredients.background_drawable = R.drawable.category_tab_top_right_conners_normal
         }
 
         binding.tvIngredients.setOnClickListener {
             binding.lineGap1.visibility = View.VISIBLE
             binding.lineGap2.visibility = View.GONE
-            binding.tvAll.setTextColor(context.resources.getColor(R.color.color_6B6B6B))
-            binding.tvRecipes.setTextColor(context.resources.getColor(R.color.color_6B6B6B))
-            binding.tvIngredients.setTextColor(context.resources.getColor(R.color.color_F4A12E))
+            binding.tvAll.text_color = R.color.category_unselect
+            binding.tvRecipes.text_color = R.color.category_unselect
+            binding.tvIngredients.text_color = R.color.category_tab_selected
             onCategoryTabSelectedListener?.onCurrentSelected(CategoryType.Ingredients)
-            binding.tvAll.setBackgroundResource(R.drawable.shape_15pxe5e5e5_top_left_conners)
-            binding.tvRecipes.setBackgroundResource(R.drawable.shape_e5e5e5_solid)
-            binding.tvIngredients.setBackgroundResource(R.drawable.shape_15pxf4a12e_top_right_conners)
+            binding.tvAll.background_drawable = R.drawable.category_tab_top_left_conners_normal
+            binding.tvRecipes.background_drawable = R.drawable.category_tab_solid_normal
+            binding.tvIngredients.background_drawable = R.drawable.category_tab_top_right_conners_selected
         }
     }
 

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

@@ -81,6 +81,6 @@ class CommonSearchLayout : LinearLayout {
     }
 
     companion object {
-        var dp24 = (com.develop.base.R.dimen.convert_24px).resId2Dimension().toInt()
+        var dp24 = (com.develop.common.R.dimen.convert_24px).resId2Dimension().toInt()
     }
 }

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

@@ -4,7 +4,11 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.develop.base.ext.background_color
+import com.develop.base.ext.background_drawable
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.skinTextColor
+import com.develop.base.ext.text_color
 import com.develop.common.R
 import com.develop.common.databinding.CookCardViewBinding
 
@@ -54,15 +58,19 @@ class CookCardView : ConstraintLayout {
             1 -> {
                 setCardType(CardType.TEMPERATURE, cardSelected)
             }
+
             2 -> {
                 setCardType(CardType.COOK_TIME, cardSelected)
             }
+
             3 -> {
                 setCardType(CardType.SPEED, cardSelected)
             }
+
             4 -> {
                 setCardType(CardType.DIRECTION, cardSelected)
             }
+
             5 -> {
                 setCardType(CardType.WATER_SPARY, cardSelected)
             }
@@ -84,10 +92,10 @@ class CookCardView : ConstraintLayout {
     fun updateChangeValue(changeValue: String) {
         if (currentType == CardType.DIRECTION) {
             binding.tvChangeValue.paint.textSize =
-                com.develop.base.R.dimen.convert_32px.resId2Dimension()
+                com.develop.common.R.dimen.convert_32px.resId2Dimension()
         } else {
             binding.tvChangeValue.paint.textSize =
-                com.develop.base.R.dimen.convert_40px.resId2Dimension()
+                com.develop.common.R.dimen.convert_40px.resId2Dimension()
         }
         binding.tvChangeValue.text = changeValue
     }
@@ -98,23 +106,27 @@ class CookCardView : ConstraintLayout {
         upSelectedView(cardSelected)
         when (cardType) {
             CardType.TEMPERATURE -> {
-                binding.viewIcon.setBackgroundResource(R.drawable.cook_temp_selector)
+                binding.viewIcon.background_drawable = R.drawable.cook_temp_selector
                 binding.tvTitle.text = context.getString(R.string.temperature)
             }
+
             CardType.COOK_TIME -> {
-                binding.viewIcon.setBackgroundResource(R.drawable.cook_time_selector)
+                binding.viewIcon. background_drawable = R.drawable.cook_time_selector
                 binding.tvTitle.text = context.getString(R.string.time)
             }
+
             CardType.SPEED -> {
-                binding.viewIcon.setBackgroundResource(R.drawable.cook_speed_selector)
+                binding.viewIcon.background_drawable = R.drawable.cook_speed_selector
                 binding.tvTitle.text = context.getString(R.string.speed)
             }
+
             CardType.DIRECTION -> {
-                binding.viewIcon.setBackgroundResource(R.drawable.cook_direction_selector)
+                binding.viewIcon.background_drawable = R.drawable.cook_direction_selector
                 binding.tvTitle.text = context.getString(R.string.direction)
             }
+
             CardType.WATER_SPARY -> {
-                binding.viewIcon.setBackgroundResource(R.drawable.cook_water_selector)
+                binding.viewIcon.background_drawable =  R.drawable.cook_water_selector
                 binding.tvTitle.text = context.getString(R.string.water_spary)
                 binding.waterSprayShow.visibility = VISIBLE
             }
@@ -124,16 +136,16 @@ class CookCardView : ConstraintLayout {
     fun upSelectedView(selected: Boolean) {
         if (selected) {
             binding.viewBackground.isSelected = true
-            binding.tvChangeValue.isSelected = true
-            binding.tvTitle.isSelected = true
+            binding.tvTitle.text_color = R.color.panel_selected
             binding.viewIcon.isSelected = true
-            binding.tvConfigValue.isSelected = true
+            binding.tvConfigValue.text_color = R.color.panel_selected
+            binding.tvChangeValue.text_color = R.color.panel_selected
         } else {
             binding.viewBackground.isSelected = false
-            binding.tvChangeValue.isSelected = false
-            binding.tvTitle.isSelected = false
+            binding.tvTitle.text_color = R.color.panel_unselected
             binding.viewIcon.isSelected = false
-            binding.tvConfigValue.isSelected = false
+            binding.tvConfigValue.text_color = R.color.panel_unselected
+            binding.tvChangeValue.text_color = R.color.panel_unselected
         }
         binding.waterSprayShow.updateSelectedStatus(selected)
 

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

@@ -15,6 +15,7 @@ import com.bumptech.glide.request.target.Target
 import com.develop.base.ext.load
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.src
 import com.develop.base.ext.updateText
 import com.develop.base.util.TopResumedAtyHolder
 import com.develop.common.R
@@ -99,7 +100,7 @@ class FoodContentView : RelativeLayout {
             }
         }
         binding.apply {
-            if("" != cover) ivCover.load(cover)
+            if ("" != cover) ivCover.load(cover)
             tvFoodName.updateText(content.foodName)
             scope(Dispatchers.IO) {
                 val result = FoodDataProvider.getUserDatabase().userInfoDao()
@@ -121,12 +122,12 @@ class FoodContentView : RelativeLayout {
                 ivNet.visibility = View.GONE
             }
             if (hasDownload) {
-                ivLike.load(R.drawable.ic_delete)
+                ivLike.src = R.drawable.ic_delete
             } else {
                 if (isLike) {
-                    ivLike.load(R.drawable.ic_like)
+                    ivLike.src = R.drawable.ic_like
                 } else {
-                    ivLike.load(R.drawable.ic_unlike)
+                    ivLike.src = R.drawable.ic_unlike
                 }
             }
             //喜欢点击
@@ -173,7 +174,7 @@ class FoodContentView : RelativeLayout {
                 } else {
                     if (content.isLike) {
                         content.isLike = false
-                        ivLike.load(R.drawable.ic_unlike)
+                        ivLike.src = R.drawable.ic_unlike
                         FoodDataProvider.getUserDatabase().runInTransaction {
                             FoodDataProvider.getUserDatabase().userInfoDao().removeFavoriteRecipe(
                                 CURRENT_USER_ID, content.foodId
@@ -185,7 +186,7 @@ class FoodContentView : RelativeLayout {
 
                     } else {
                         content.isLike = true
-                        ivLike.load(R.drawable.ic_like)
+                        ivLike.src = R.drawable.ic_like
                         FoodDataProvider.getUserDatabase().runInTransaction {
                             FoodDataProvider.getUserDatabase().userInfoDao().insertFavoriteRecipe(
                                 UserFavoriteRecipes(CURRENT_USER_ID, content.foodId)
@@ -201,7 +202,7 @@ class FoodContentView : RelativeLayout {
     }
 
     companion object {
-        val dp10 = (com.develop.base.R.dimen.convert_10px).resId2Dimension()
+        val dp10 = (com.develop.common.R.dimen.convert_10px).resId2Dimension()
     }
 
 }

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

@@ -8,6 +8,7 @@ import android.widget.RelativeLayout
 import com.develop.base.ext.load
 import com.develop.base.R.*
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.src
 import com.develop.base.ext.updateText
 import com.develop.common.R
 import com.develop.common.databinding.HomeFunctionTopBarViewBinding
@@ -39,17 +40,17 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
         binding.ivWifi.setOnClickListener(this)
         binding.ivWifi.setImageResource(R.drawable.icon_wifi_act_signal_level)
         binding.ivWifi.setImageLevel(0)
-        binding.ivFunction.load(R.drawable.ic_home)
+        binding.ivFunction.src = R.drawable.ic_home
 
     }
 
     fun setHomeOrBack(type: HomeOrBack) {
         homeOrBackType = type
         if (type == HomeOrBack.Home) {
-            binding.ivFunction.load(R.drawable.ic_home)
+            binding.ivFunction.src = R.drawable.ic_home
             binding.functionName.text = resources.getString(R.string.home)
         } else {
-            binding.ivFunction.load(R.drawable.ic_white_back)
+            binding.ivFunction.src = R.drawable.ic_white_back
             binding.functionName.text = resources.getString(R.string.back)
         }
     }
@@ -68,15 +69,19 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
             R.id.mode_layout -> {
                 onHomeFunctionClickListener?.onHomeOrBackClick(homeOrBackType)
             }
+
             R.id.user_layout -> {
                 onHomeFunctionClickListener?.onUserClick()
             }
+
             R.id.iv_wifi -> {
                 onHomeFunctionClickListener?.onWifiClick()
             }
+
             R.id.iv_notify -> {
                 onHomeFunctionClickListener?.onNotifyClick()
             }
+
             R.id.iv_tab -> {
                 onHomeFunctionClickListener?.onTabClick()
             }
@@ -111,9 +116,9 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
     }
 
     companion object {
-        var dp35 = (dimen.convert_35px).resId2Dimension().toInt()
-        var dp60 = (dimen.convert_60px).resId2Dimension().toInt()
-        var dp120 = (dimen.convert_120px).resId2Dimension().toInt()
+        var dp35 = (R.dimen.convert_35px).resId2Dimension().toInt()
+        var dp60 = (R.dimen.convert_60px).resId2Dimension().toInt()
+        var dp120 = (R.dimen.convert_120px).resId2Dimension().toInt()
     }
 }
 

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

@@ -91,9 +91,9 @@ class NewsLayout : RelativeLayout {
     }
 
     companion object {
-        var dp39 = (com.develop.base.R.dimen.convert_39px).resId2Dimension().toInt()
-        var dp5 = (com.develop.base.R.dimen.convert_5px).resId2Dimension().toInt()
-        var dp24 = (com.develop.base.R.dimen.convert_24px).resId2Dimension().toInt()
+        var dp39 = (com.develop.common.R.dimen.convert_39px).resId2Dimension().toInt()
+        var dp5 = (com.develop.common.R.dimen.convert_5px).resId2Dimension().toInt()
+        var dp24 = (com.develop.common.R.dimen.convert_24px).resId2Dimension().toInt()
     }
 
 }

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.isNightTheme
 import kotlin.math.*
 
 class RingControlView @JvmOverloads constructor(
@@ -30,6 +31,7 @@ class RingControlView @JvmOverloads constructor(
     private var controlDotY = 0.0
 
     var onRingViewListener: OnRingViewListener? = null
+
     init {
         ringPaint.color = 0xffE60012.toInt()
         ringPaint.style = Paint.Style.STROKE
@@ -63,7 +65,7 @@ class RingControlView @JvmOverloads constructor(
         canvas.drawPath(stubPath, ringPaint)
         ringPaint.color = 0xffE60012.toInt()
         canvas.drawPath(fillPath, ringPaint)
-        extraPaint.color = 0xffFFA627.toInt()
+        extraPaint.color = if (isNightTheme()) 0xffE60012.toInt() else 0xffFFA627.toInt()
 
         // -150 ~ 150
         val angle = 300.0 * progress - 150.0
@@ -109,12 +111,14 @@ class RingControlView @JvmOverloads constructor(
                 calculateCurrentPercent(moveX, moveY)
                 return true
             }
+
             MotionEvent.ACTION_MOVE -> {
                 if (controlling) {
                     calculateCurrentPercent(moveX, moveY)
                     return true
                 }
             }
+
             MotionEvent.ACTION_CANCEL,
             MotionEvent.ACTION_UP -> {
                 if (controlling) {

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

@@ -21,14 +21,14 @@ class WeightView @JvmOverloads constructor(
     private val path = Path()
     private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
     private val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
-    private val outlineStrokeWidth = dimenRes(R.dimen.convert_9px).toFloat()
-    private val scaleStrokeWidth = dimenRes(R.dimen.convert_4px).toFloat()
-    private val scaleTopPosition = dimenRes(R.dimen.convert_20px).toFloat()
-    private val scaleBtmPosition = dimenRes(R.dimen.convert_50px).toFloat()
-    private val textPutPosition = dimenRes(R.dimen.convert_90px).toFloat()
-    private val triangleWidth = dimenRes(R.dimen.convert_60px).toFloat()
-    private val triangleHeight = dimenRes(R.dimen.convert_30px).toFloat()
-    private val triangleMargin = dimenRes(R.dimen.convert_3px).toFloat()
+    private val outlineStrokeWidth = dimenRes(com.develop.common.R.dimen.convert_9px).toFloat()
+    private val scaleStrokeWidth = dimenRes(com.develop.common.R.dimen.convert_4px).toFloat()
+    private val scaleTopPosition = dimenRes(com.develop.common.R.dimen.convert_20px).toFloat()
+    private val scaleBtmPosition = dimenRes(com.develop.common.R.dimen.convert_50px).toFloat()
+    private val textPutPosition = dimenRes(com.develop.common.R.dimen.convert_90px).toFloat()
+    private val triangleWidth = dimenRes(com.develop.common.R.dimen.convert_60px).toFloat()
+    private val triangleHeight = dimenRes(com.develop.common.R.dimen.convert_30px).toFloat()
+    private val triangleMargin = dimenRes(com.develop.common.R.dimen.convert_3px).toFloat()
     private var rotateOffset = 0f
     private val scroller = Scroller(context)
     private val gapCount = 20

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

@@ -8,6 +8,8 @@ import android.util.Log
 import android.view.View
 import android.widget.RelativeLayout
 import androidx.cardview.widget.CardView
+import com.develop.base.ext.skinBackground
+import com.develop.base.ext.skinSrc
 import com.develop.base.ext.updateText
 import com.develop.base.manager.WiFiPwdType
 import com.develop.base.manager.WifiData
@@ -93,7 +95,7 @@ class WifiContentView : RelativeLayout {
                 binding.inputLayout.visibility = View.GONE
             } else {
                 model.isSelected = true
-                binding.contentLayout.setBackgroundResource(R.drawable.shape_10pxf4a12e_stoke)
+                binding.contentLayout.skinBackground(R.drawable.wifi_selected_stoke)
                 binding.inputLayout.visibility = View.VISIBLE
             }
         } else {

BusinessCommon/src/main/res/color/color_cook_tab_tint.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="#ffa627" android:state_selected="false"/>
+    <item android:color="@color/cook_tab_unselected" android:state_selected="false"/>
 </selector>

BusinessCommon/src/main/res/color/color_night_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="#000" android:state_selected="false"/>
+</selector>

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

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

BusinessCommon/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="#f4a12e"/>
+    <item android:state_selected="true" android:color="#E60012"/>
     <item android:state_selected="false" android:color="#b3b4b4"/>
 
 </selector>

BusinessCommon/src/main/res/drawable/about_function_stroke.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_15px" />
+    <stroke android:color="@color/about_function_stroke"
+        android:width="@dimen/convert_2px"/>
+</shape>

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

@@ -0,0 +1,6 @@
+<?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:color="@color/about_update_stroke"
+        android:width="@dimen/convert_2px"/>
+</shape>

BusinessCommon/src/main/res/drawable/about_update_stroke.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" />
+    <stroke android:color="@color/about_update"
+        android:width="@dimen/convert_2px"/>
+</shape>

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

@@ -2,13 +2,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape>
-            <solid android:color="#CCE60012"/>
+            <solid android:color="@color/cook_item_selected_solid"/>
             <corners android:radius="@dimen/convert_15px"/>
         </shape>
     </item>
     <item android:state_selected="false">
         <shape>
-            <solid android:color="#CCFFFFFF"/>
+            <solid android:color="@color/cook_item_unselected_solid"/>
             <corners android:radius="@dimen/convert_15px"/>
         </shape>
     </item>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <stroke android:color="#EE8F08"
+    <stroke android:color="@color/send_email_stroke"
         android:width="2px"/>
-    <solid android:color="#FFF6E9"/>
+    <solid android:color="@color/send_email_solid"/>
     <corners android:topRightRadius="@dimen/convert_40px"
         android:bottomRightRadius="@dimen/convert_40px"/>
 

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

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

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/category_solid" />
+</shape>

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

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

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

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

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:topLeftRadius="@dimen/convert_15px"/>
+    <stroke android:color="@color/category_tab_stroke"  android:width="@dimen/convert_2px"/>
+    <solid android:color="@color/category_tab_solid"/>
+</shape>

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

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

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:topRightRadius="@dimen/convert_15px" />
+    <solid android:color="@color/category_solid" />
+    <stroke android:color="@color/category_tab_stroke"  android:width="@dimen/convert_2px"/>
+</shape>

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

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

BusinessCommon/src/main/res/drawable/forgot_conner.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="@color/forgot_conner"/>
+
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <stroke android:color="@color/forgot_input_stroke"
+        android:width="2px"/>
+    <corners android:topLeftRadius="@dimen/convert_40px"
+        android:bottomLeftRadius="@dimen/convert_40px"/>
+
+</shape>

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

@@ -0,0 +1,8 @@
+<?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:color="@color/forgot_input_stroke"
+        android:width="2px"/>
+
+</shape>

BusinessCommon/src/main/res/drawable/hide_bg_conner.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="@color/hide_bg"/>
+    <corners android:radius="@dimen/convert_30px"/>
+
+</shape>

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

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

BusinessCommon/src/main/res/drawable/home_search_stoke.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" />
+    <stroke
+        android:width="@dimen/convert_2px"
+        android:color="@color/color_E5E5E5" />
+</shape>

BusinessCommon/src/main/res/drawable/language_conner.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/more_bg_conner.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="@color/more_bg"/>
+    <corners android:radius="@dimen/convert_30px"/>
+
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/convert_10px" />
+    <stroke
+        android:width="@dimen/convert_1px"
+        android:color="@color/policy_stroke" />
+    <solid android:color="@color/policy_solid"/>
+</shape>

BusinessCommon/src/main/res/drawable/policy_corners.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/policy_conner" />
+</shape>

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

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

BusinessCommon/src/main/res/drawable/restore_no_stoke.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_2px"
+        android:color="@color/restore_no" />
+
+</shape>

BusinessCommon/src/main/res/drawable/restore_yes_corners.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/restore_yes"/>
+</shape>

BusinessCommon/src/main/res/drawable/search_stroke.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_10px" />
+    <stroke
+        android:width="@dimen/convert_1px"
+        android:color="@color/search_stroke" />
+    <solid android:color="@color/search_soild" />
+</shape>

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

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

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="@dimen/convert_30px"/>
+            <solid android:color="@color/seekbar_unselect"/>
+        </shape>
+    </item>
+
+
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="@dimen/convert_30px"/>
+                <solid android:color="@color/seekbar_selected" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
+

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

@@ -9,7 +9,7 @@
     <corners android:radius="@dimen/convert_45px"/>
 
     <!--设置背景颜色-->
-    <solid android:color="@color/color_F4A12E"/>
+    <solid android:color="@color/thumb_select"/>
 
 
 

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

@@ -9,7 +9,7 @@
     <corners android:radius="@dimen/convert_45px"/>
 
     <!--设置背景颜色-->
-    <solid android:color="@color/color_E5E5E5"/>
+    <solid android:color="@color/thumb_unselect"/>
 
 
 

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

@@ -8,6 +8,6 @@
     <corners android:radius="@dimen/convert_60px"/>
 
     <!--设置背景颜色-->
-    <solid android:color="@color/color_E5E5E5"/>
+    <solid android:color="@color/thumb_unselect"/>
 
 </shape>

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

@@ -8,6 +8,6 @@
     <corners android:radius="@dimen/convert_60px"/>
 
     <!--设置背景颜色-->
-    <solid android:color="@color/color_F4A12E"/>
+    <solid android:color="@color/thumb_select"/>
 
 </shape>

BusinessCommon/src/main/res/drawable/sort_stroke.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_10px" />
+    <stroke
+        android:width="@dimen/convert_1px"
+        android:color="@color/sort_stroke" />
+    <solid android:color="@color/sort_soild" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:bottomLeftRadius="@dimen/convert_60px"
+        android:topLeftRadius="@dimen/convert_60px"/>
+    <stroke
+        android:width="@dimen/convert_2px"
+        android:color="@color/wifi_left_stroke" />
+</shape>

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

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

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

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

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

@@ -17,8 +17,8 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:textColor="@color/color_F4A12E"
-            android:background="@drawable/shape_15pxf4a12e_top_left_conners"
+            android:textColor="@color/category_tab_selected"
+            android:background="@drawable/category_tab_top_left_conners_selected"
             android:gravity="center"
             android:textSize="@dimen/convert_30px" />
 
@@ -26,7 +26,7 @@
             android:id="@+id/line_gap_1"
             android:layout_width="@dimen/convert_2px"
             android:layout_height="match_parent"
-            android:background="@color/color_fff"
+            android:background="@color/category_tab_gap"
             android:visibility="gone" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -34,31 +34,32 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1.5"
-            android:background="@drawable/shape_e5e5e5_solid"
+            android:background="@drawable/category_tab_solid_normal"
             android:gravity="center"
-            android:textColor="@color/color_6B6B6B"
+            android:textColor="@color/category_unselect"
             android:textSize="@dimen/convert_30px" />
 
         <View
             android:id="@+id/line_gap_2"
             android:layout_width="@dimen/convert_2px"
             android:layout_height="match_parent"
-            android:background="@color/color_fff" />
+            android:background="@color/category_tab_gap" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_ingredients"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1.5"
-            android:background="@drawable/shape_15pxe5e5e5_top_right_conners"
+            android:background="@drawable/category_tab_top_right_conners_normal"
             android:gravity="center"
-            android:textColor="@color/color_6B6B6B"
+            android:textColor="@color/category_unselect"
             android:textSize="@dimen/convert_30px" />
     </LinearLayout>
 
     <View
+        android:id="@+id/bottom_gap"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_14px"
         android:layout_marginTop="@dimen/convert_56px"
-        android:background="@color/color_fff" />
+        android:background="@color/category_tab_gap" />
 </RelativeLayout>

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

@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/convert_24px"
         android:text="@string/historical_search"
-        android:textColor="@color/color_1A1A1A"
+        android:textColor="@color/home_search_title"
         android:textSize="@dimen/convert_36px" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -26,7 +26,7 @@
         android:layout_marginStart="@dimen/convert_24px"
         android:layout_marginTop="@dimen/convert_36px"
         android:text="@string/the_most_commonly_searched"
-        android:textColor="@color/color_1A1A1A"
+        android:textColor="@color/home_search_title"
         android:textSize="@dimen/convert_36px" />
 
     <androidx.recyclerview.widget.RecyclerView

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

@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:background="#000">
+    >
 
     <View
         android:id="@+id/view_background"
@@ -22,7 +22,7 @@
         android:layout_marginBottom="@dimen/convert_8px"
         android:includeFontPadding="false"
         tools:text="00:60"
-        android:textColor="@color/cook_panel_text"
+        android:textColor="@color/panel_unselected"
         android:textSize="@dimen/convert_40px"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -44,7 +44,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/convert_70px"
-        android:textColor="@color/cook_panel_text"
+        android:textColor="@color/panel_unselected"
         android:textSize="@dimen/convert_27px"
         tools:text="12"
         app:layout_constraintStart_toStartOf="parent"
@@ -59,7 +59,7 @@
         android:layout_marginTop="@dimen/convert_16px"
         android:layout_marginBottom="@dimen/convert_11px"
         tools:text="--05:00--"
-        android:textColor="@color/cook_panel_text"
+        android:textColor="@color/panel_unselected"
         android:textSize="@dimen/convert_24px"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

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

@@ -10,7 +10,7 @@
         android:layout_width="@dimen/convert_500px"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@drawable/bg_white_button"
+        android:background="@drawable/bg_white_button_round10px"
         android:paddingTop="@dimen/convert_81px"
         android:paddingBottom="@dimen/convert_64px">
 
@@ -56,7 +56,7 @@
             android:elevation="@dimen/convert_15px"
             android:gravity="center"
             android:text="@string/no"
-            android:textColor="#FB900C"
+            android:textColor="@color/no_color"
             android:textSize="@dimen/convert_30px" />
 
     </RelativeLayout>

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

@@ -46,7 +46,7 @@
             android:elevation="@dimen/convert_15px"
             android:text="@string/no"
             android:gravity="center"
-            android:textColor="#FB900C"
+            android:textColor="@color/no_color"
             android:textSize="@dimen/convert_30px"
             android:layout_marginEnd="@dimen/convert_65px"
             android:layout_marginBottom="@dimen/convert_64px"

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

@@ -94,7 +94,7 @@
             android:elevation="@dimen/convert_4px"
             android:gravity="center"
             android:text="@string/no"
-            android:textColor="#FB900C"
+            android:textColor="@color/no_color"
             android:textSize="@dimen/convert_30px" />
 
 

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

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tool="http://schemas.android.com/tools"
     android:id="@+id/content_layout"
+    android:background="@drawable/food_content_conner"
     android:layout_width="match_parent"
     android:layout_height="@dimen/convert_330px">
 
@@ -56,7 +57,7 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:singleLine="true"
-            android:textColor="@color/color_1A1A1A"
+            android:textColor="@color/food_name"
             android:textSize="@dimen/convert_30px"
             tool:text="Guacamole" />
 

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

@@ -4,6 +4,7 @@
     android:id="@+id/page"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_color"
     app:stateEnabled="true">
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/bg_color"
     android:layout_height="@dimen/convert_88px">
 
 
@@ -9,7 +10,7 @@
         android:id="@+id/mode_layout"
         android:layout_width="@dimen/convert_260px"
         android:layout_height="match_parent"
-        android:background="@color/color_F4A12E">
+        android:background="@color/home_tab">
 
         <ImageView
             android:id="@+id/iv_function"
@@ -26,7 +27,7 @@
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/convert_24px"
             android:layout_toEndOf="@id/iv_function"
-            android:textColor="@color/color_fff"
+            android:textColor="@color/home_function_name"
             android:textSize="@dimen/convert_36px" />
 
 
@@ -46,7 +47,7 @@
         <ImageView
             android:layout_width="@dimen/convert_40px"
             android:layout_height="@dimen/convert_40px"
-            android:background="@drawable/ic_no_user" />
+            android:src="@drawable/ic_no_user" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_state"
@@ -55,7 +56,7 @@
             android:layout_marginStart="@dimen/convert_7px"
             android:includeFontPadding="false"
             android:text="@string/login"
-            android:textColor="@color/color_F4A12E"
+            android:textColor="@color/login_state"
             android:textSize="@dimen/convert_30px" />
     </LinearLayout>
 
@@ -96,7 +97,7 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/convert_50px"
         android:layout_toEndOf="@id/mode_layout"
-        android:textColor="@color/color_1A1A1A"
+        android:textColor="@color/home_title"
         android:textSize="@dimen/convert_30px" />
 
     <com.develop.airfryer.ui.DevModeView

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

@@ -17,7 +17,7 @@
             android:id="@+id/filter_card_view"
             android:layout_width="@dimen/convert_207px"
             android:layout_height="@dimen/convert_60px"
-            android:background="@drawable/shape_10px33a3a3a2_stroke">
+            android:background="@drawable/sort_stroke">
 
             <ImageView
                 android:id="@+id/iv_filter_arrow"
@@ -37,7 +37,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="@string/all"
-                android:textColor="@color/color_1A1A1A"
+                android:textColor="@color/sort_value"
                 android:textSize="@dimen/convert_30px" />
         </FrameLayout>
 
@@ -47,7 +47,7 @@
             android:layout_height="@dimen/convert_60px"
             android:layout_marginStart="@dimen/convert_24px"
             android:layout_toEndOf="@id/filter_card_view"
-            android:background="@drawable/shape_10px33a3a3a2_stroke">
+            android:background="@drawable/sort_stroke">
 
             <ImageView
                 android:id="@+id/iv_sort_arrow"
@@ -67,7 +67,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="A-Z"
-                android:textColor="@color/color_1A1A1A"
+                android:textColor="@color/sort_value"
                 android:textSize="@dimen/convert_30px" />
 
         </FrameLayout>
@@ -78,14 +78,14 @@
             android:layout_height="@dimen/convert_60px"
             android:layout_marginStart="@dimen/convert_24px"
             android:layout_toEndOf="@id/sort_card_view"
-            android:background="@drawable/shape_10pxee8f08_stroke">
+            android:background="@drawable/search_stroke">
 
             <ImageView
                 android:layout_width="@dimen/convert_30px"
                 android:layout_height="@dimen/convert_30px"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/convert_38px"
-                android:background="@drawable/ic_search" />
+                android:background="@drawable/ic_home_search" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
@@ -94,7 +94,7 @@
                 android:layout_marginStart="@dimen/convert_79px"
                 android:layout_marginEnd="@dimen/convert_42px"
                 android:text="@string/search"
-                android:textColor="@color/color_EE8F08"
+                android:textColor="@color/search_value"
                 android:textSize="@dimen/convert_30px" />
         </FrameLayout>
 
@@ -166,7 +166,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_centerHorizontal="true"
-            android:background="@drawable/shape_60pxe5e5e5_stoke"
+            android:background="@drawable/home_search_stoke"
             android:gravity="center_vertical"
             android:hint="@string/enter_search"
             android:paddingStart="@dimen/convert_40px"

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/content_view"
+    android:layout_width="@dimen/convert_320px"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:scaleType="centerCrop"
+        android:id="@+id/iv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/convert_52px"
+        android:layout_marginEnd="@dimen/convert_52px"
+        android:layout_marginBottom="@dimen/convert_75px"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:textSize="@dimen/convert_30px"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,10 +5,10 @@
     android:paddingStart="@dimen/convert_40px"
     android:paddingEnd="@dimen/convert_40px"
     android:layout_height="@dimen/convert_60px"
-    android:background="@drawable/shape_10pxf4a12e_stoke"
+    android:background="@drawable/search_tag_stoke"
     android:gravity="center"
     android:layout_marginEnd="@dimen/convert_25px"
-    android:textColor="@color/color_EE8F08"
+    android:textColor="@color/search_tag_content"
     android:textSize="@dimen/convert_39px">
 
 </androidx.appcompat.widget.AppCompatTextView>

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

@@ -41,24 +41,24 @@
                 android:id="@+id/et_pwd"
                 android:layout_width="@dimen/convert_499px"
                 android:layout_height="match_parent"
-                android:background="@drawable/shape_60pxe5e5e5_left_stoke"
+                android:background="@drawable/wifi_left_stoke"
                 android:gravity="center_vertical"
                 android:inputType="textPassword"
                 android:maxLength="18"
                 android:paddingStart="@dimen/convert_54px"
                 android:paddingEnd="@dimen/convert_54px"
                 android:singleLine="true"
-                android:textColor="@color/color_6B6B6B"
+                android:textColor="@color/wifi_pwd_input"
                 android:textSize="@dimen/convert_39px" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_ok"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/shape_60pxf4a12e_right_corners"
+                android:background="@drawable/wifi_right_corners"
                 android:gravity="center"
                 android:text="@string/ok"
-                android:textColor="@color/color_fff"
+                android:textColor="@color/wifi_ok"
                 android:textSize="@dimen/convert_36px" />
         </LinearLayout>
 
@@ -83,7 +83,7 @@
         android:layout_toEndOf="@id/iv_signal"
         android:includeFontPadding="false"
         android:text="WIFI-1001"
-        android:textColor="@color/color_1A1A1A"
+        android:textColor="@color/wifi_name"
         android:textSize="@dimen/convert_30px" />
 
 
@@ -98,6 +98,6 @@
         android:layout_toEndOf="@id/iv_signal"
         android:includeFontPadding="false"
         android:text="@string/off_line"
-        android:textColor="@color/color_1A1A1A"
+        android:textColor="@color/wifi_state"
         android:textSize="@dimen/convert_28px" />
 </RelativeLayout>

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

@@ -35,4 +35,123 @@
     <color name="color_A3A3A2">#A3A3A2</color>
     <color name="color_E4E4E4">#E4E4E4</color>
     <color name="color_6FB1FB">#6FB1FB</color>
+
+
+
+    <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_function_stroke">#E5E5E5</color>
+    <color name="about_function_title">#1A1A1A</color>
+    <color name="about_function_des">#B1B2B2</color>
+    <color name="about_line">#E5E5E5</color>
+    <color name="about_update">#CCF4A12E</color>
+
+    <color name="brightness_content">#1A1A1A</color>
+    <color name="seekbar_selected">#1296DB</color>
+    <color name="seekbar_unselect">#E5E5E5</color>
+    <color name="language_conner">#F4A12E</color>
+    <color name="language_next">#fff</color>
+    <color name="policy_conner">#E5E5E5</color>
+    <color name="policy_content">#1A1A1A</color>
+    <color name="policy_stroke">#E4E4E4</color>
+    <color name="policy_solid">#fff</color>
+    <color name="policy_agree">#fff</color>
+    <color name="policy_agree_tip">#E60012</color>
+    <color name="setting_title">#ffffff</color>
+    <color name="sound_content">#1A1A1A</color>
+    <color name="thumb_unselect">#E5E5E5</color>
+    <color name="thumb_select">#F4A12E</color>
+    <color name="wifi_tip">#F4A12E</color>
+    <color name="wifi_left_stroke">#E5E5E5</color>
+    <color name="wifi_pwd_input">#6B6B6B</color>
+    <color name="wifi_right_conner">#F4A12E</color>
+    <color name="wifi_ok">#fff</color>
+    <color name="wifi_name">#1A1A1A</color>
+    <color name="wifi_state">#1A1A1A</color>
+    <color name="auth_home">#1A1A1A</color>
+    <color name="auth_rest_pwd">#1A1A1A</color>
+    <color name="forgot_input_stroke">#A3A3A2</color>
+    <color name="forget_tip">#E60012</color>
+    <color name="forgot_conner">#ccee8f08</color>
+    <color name="login">#FFA627</color>
+    <color name="launch_content">#1A1A1A</color>
+    <color name="skin_for_now">#FFA627</color>
+    <color name="login_title">#1A1A1A</color>
+    <color name="forget_pwd">#E60012</color>
+    <color name="register">#000000</color>
+    <color name="profile_title">#1A1A1A</color>
+    <color name="register_tip">#E60012</color>
+    <color name="home_tab">#F4A12E</color>
+    <color name="home_function_name">#fff</color>
+    <color name="login_state">#F4A12E</color>
+    <color name="home_title">#1A1A1A</color>
+    <color name="home_menu_bg">#fff</color>
+    <color name="home_menu">#EE8F08</color>
+    <color name="home_menu_title">#fff</color>
+    <color name="home_user_name">#EE8F08</color>
+    <color name="modes_bottom_view">#EE8F08</color>
+    <color name="category_tab_stroke">#F4A12E</color>
+    <color name="category_tab_solid">#fff</color>
+    <color name="category_tab_selected">#F4A12E</color>
+    <color name="category_tab_gap">#fff</color>
+    <color name="category_solid">#E5E5E5</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>
+    <color name="search_stroke">#EE8F08</color>
+    <color name="search_soild">#fff</color>
+    <color name="search_value">#EE8F08</color>
+    <color name="home_category_title">#1A1A1A</color>
+    <color name="sort_filter_name">#1A1A1A</color>
+    <color name="sort_filter_selected_name">#F4A12E</color>
+    <color name="sort_filter_line">#E5E5E5</color>
+    <color name="sort_filter_bg">#fff</color>
+    <color name="mode_guide_title">#F4A12E</color>
+    <color name="online_recipes">#fff</color>
+    <color name="download">#fff</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">#E60012</color>
+    <color name="restore_des">#EE0000</color>
+    <color name="restore_no">#FFA627</color>
+    <color name="restore_yes">#F4A12E</color>
+    <color name="restore_no_str">#EE8F08</color>
+    <color name="restore_yes_str">#fff</color>
+    <color name="food_name">#1A1A1A</color>
+    <color name="send_email_stroke">#EE8F08</color>
+    <color name="send_email_solid">#FFF6E9</color>
+    <color name="wifi_selected">#F4A12E</color>
+    <color name="temp_ring">#E60012</color>
+    <color name="speed_ring">#E60012</color>
+    <color name="temp_ring_cooking">#FFA627</color>
+    <color name="cook_item_selected_solid">#CCE60012</color>
+    <color name="cook_item_unselected_solid">#CCFFFFFF</color>
+    <color name="panel_enabled">#A3A3A2</color>
+    <color name="panel_selected">#FFFFFF</color>
+    <color name="panel_unselected">#E60012</color>
+    <color name="search_tag">#F4A12E</color>
+    <color name="search_tag_content">#EE8F08</color>
+    <color name="category_unselect">#6B6B6B</color>
+    <color name="source_name">#1A1A1A</color>
+    <color name="source_line">#E4E4E4</color>
+    <color name="source_amount">#E83F97</color>
+    <color name="step_title">#FFA627</color>
+    <color name="step_detail">#1A1A1A</color>
+    <color name="tool_name">#EE8F08</color>
+    <color name="more_circle">#E83F97</color>
+    <color name="cook_tab_unselected">#ffa627</color>
+    <color name="step_status_bar">#FFA627</color>
+    <color name="more_bg">#E83F97</color>
+    <color name="hide_bg">#1EABDB</color>
+    <color name="no_color">#FB900C</color>
+    <color name="view_change">#EE8F08</color>
+    <color name="text_hit">#B1B2B2</color>
 </resources>