提交人：jtm

提交内容:设置相关

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

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

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

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--设置大小-->
-    <size android:width="@dimen/convert_90px"
-        android:height="@dimen/convert_90px"/>
+    <size android:width="@dimen/convert_60px"
+        android:height="@dimen/convert_60px"/>
 
     <!--设置圆角-->
     <corners android:radius="@dimen/convert_45px"/>

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

@@ -2,14 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/convert_45px"
-    android:layout_marginEnd="@dimen/convert_45px"
-    android:layout_marginBottom="@dimen/convert_48px"
+    android:layout_marginStart="@dimen/convert_24px"
+    android:layout_marginEnd="@dimen/convert_24px"
+    android:layout_marginBottom="@dimen/convert_40px"
     android:orientation="horizontal">
 
     <LinearLayout
+        android:layout_marginEnd="@dimen/convert_517px"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_122px">
+        android:layout_height="@dimen/convert_60px">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_all"
@@ -19,11 +20,11 @@
             android:textColor="@color/color_F4A12E"
             android:background="@drawable/shape_15pxf4a12e_top_left_conners"
             android:gravity="center"
-            android:textSize="@dimen/convert_39px" />
+            android:textSize="@dimen/convert_30px" />
 
         <View
             android:id="@+id/line_gap_1"
-            android:layout_width="@dimen/convert_4px"
+            android:layout_width="@dimen/convert_2px"
             android:layout_height="match_parent"
             android:background="@color/color_fff"
             android:visibility="gone" />
@@ -32,15 +33,15 @@
             android:id="@+id/tv_recipes"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_weight="1.5"
             android:background="@drawable/shape_e5e5e5_solid"
             android:gravity="center"
             android:textColor="@color/color_6B6B6B"
-            android:textSize="@dimen/convert_39px" />
+            android:textSize="@dimen/convert_30px" />
 
         <View
             android:id="@+id/line_gap_2"
-            android:layout_width="@dimen/convert_4px"
+            android:layout_width="@dimen/convert_2px"
             android:layout_height="match_parent"
             android:background="@color/color_fff" />
 
@@ -48,16 +49,16 @@
             android:id="@+id/tv_ingredients"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_weight="1.5"
             android:background="@drawable/shape_15pxe5e5e5_top_right_conners"
             android:gravity="center"
             android:textColor="@color/color_6B6B6B"
-            android:textSize="@dimen/convert_39px" />
+            android:textSize="@dimen/convert_30px" />
     </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_14px"
-        android:layout_marginTop="@dimen/convert_118px"
+        android:layout_marginTop="@dimen/convert_56px"
         android:background="@color/color_fff" />
 </RelativeLayout>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:layout_marginTop="@dimen/convert_14px"
     android:id="@+id/cl_cook_temp"
-    android:layout_width="@dimen/convert_210px"
-    android:layout_height="wrap_content"
+    android:layout_width="@dimen/convert_280px"
+    android:layout_height="@dimen/convert_140px"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -18,7 +18,7 @@
     <View
         android:id="@+id/view_background"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_330px"
+        android:layout_height="match_parent"
         android:background="@drawable/bg_cook_item_selected"
         app:layout_constraintTop_toBottomOf="@+id/view_select_angle" />
 

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

@@ -2,6 +2,7 @@ package com.develop.main.ui
 
 
 import android.os.Bundle
+import android.util.SparseIntArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -29,7 +30,6 @@ import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.youth.banner.Banner
 
 class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewModel>() {
 
@@ -44,7 +44,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     private var categoryCode: String = ""
 
     private val filterPopupWindow by lazy {
-        CommonPopupWindow.ViewBuilder<FilterSortViewLayout>().width(dp626).height(dp768)
+        CommonPopupWindow.ViewBuilder<FilterSortViewLayout>().width(dp417).height(dp549)
             .outsideTouchable(true).focusable(true).alpha(0.5f).clippingEnabled(false)
             .view(FilterSortViewLayout(hostActivity)).intercept { popupWindow, view ->
 
@@ -64,7 +64,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     }
 
     private val sortPopupWindow by lazy {
-        CommonPopupWindow.ViewBuilder<FilterSortViewLayout>().width(dp626)
+        CommonPopupWindow.ViewBuilder<FilterSortViewLayout>().width(dp417)
             .height(RelativeLayout.LayoutParams.WRAP_CONTENT).outsideTouchable(true).focusable(true)
             .alpha(0.5f).clippingEnabled(false).view(FilterSortViewLayout(hostActivity))
             .intercept { popupWindow, view ->
@@ -127,8 +127,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                         }
                         HOME_FOOD_LIST_PROVIDER -> {
                             val foodListModel = getModel<FoodListModel>()
-                            val foodRecycle =
-                                findView<RecyclerView>(R.id.food_recycle)
+                            val foodRecycle = findView<RecyclerView>(R.id.food_recycle)
                             foodRecycle.apply {
                                 grid(4)
                                 setup {
@@ -204,7 +203,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
         override fun onSortClick(sortView: View) {
             sortRv?.models = sortDataList
-            sortPopupWindow.showAsDropDown(sortView, dp65, 0)
+            sortPopupWindow.showAsDropDown(sortView, -dp24, 0)
         }
 
         override fun onSearchClick() {
@@ -281,15 +280,22 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
 
     /**绑定过滤或排序内容*/
+    private var filterSelectedPos = 0
+    private var sortedSelectedPos = 0
+
     private fun bindFilterSortView(
         adapter: BindingAdapter,
         binder: BindingAdapter.BindingViewHolder,
         name: String,
         isFilter: Boolean
     ) {
-        var selectionPos = 0
         binder.apply {
             val binding = ItemFilterAndSortViewBinding.bind(itemView)
+            val selectionPos = if (isFilter) {
+                filterSelectedPos
+            } else {
+                sortedSelectedPos
+            }
             binding.tvName.updateText(name)
             if (selectionPos == absoluteAdapterPosition) {
                 binding.tvName.setTextColor(context.resources.getColor(checkedColor))
@@ -299,14 +305,18 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                 binding.ivCheck.setBackgroundResource(0)
             }
             binding.itemLayout.setOnClickListener {
-                val tempPosition = selectionPos
-                selectionPos = absoluteAdapterPosition
-                adapter.notifyItemChanged(selectionPos)
-                adapter.notifyItemChanged(tempPosition)
                 if (isFilter) {
+                    val tempPosition = filterSelectedPos
+                    filterSelectedPos = absoluteAdapterPosition
+                    adapter.notifyItemChanged(filterSelectedPos)
+                    adapter.notifyItemChanged(tempPosition)
                     updateCategoryName(categoryDataList[absoluteAdapterPosition])
                     filterPopupWindow.dismiss()
                 } else {
+                    val tempPosition = sortedSelectedPos
+                    sortedSelectedPos = absoluteAdapterPosition
+                    adapter.notifyItemChanged(sortedSelectedPos)
+                    adapter.notifyItemChanged(tempPosition)
                     updateSortName(absoluteAdapterPosition)
                     sortPopupWindow.dismiss()
                 }
@@ -459,7 +469,8 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         var dp21 = (com.develop.base.R.dimen.convert_21px).resId2Dimension().toInt()
         var dp10 = (com.develop.base.R.dimen.convert_10px).resId2Dimension().toInt()
         var dp626 = (com.develop.base.R.dimen.convert_626px).resId2Dimension().toInt()
-        var dp768 = (com.develop.base.R.dimen.convert_768px).resId2Dimension().toInt()
+        var dp417 = (com.develop.base.R.dimen.convert_417px).resId2Dimension().toInt()
+        var dp549 = (com.develop.base.R.dimen.convert_549px).resId2Dimension().toInt()
         var icChecked = com.develop.common.R.drawable.ic_check
         var checkedColor = com.develop.common.R.color.color_F4A12E
         var unCheckedColor = com.develop.common.R.color.color_6B6B6B

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

@@ -2,15 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/item_layout"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/convert_120px">
+    android:layout_height="@dimen/convert_90px">
 
     <ImageView
         android:id="@+id/iv_check"
-        android:layout_width="@dimen/convert_60px"
-        android:layout_height="@dimen/convert_42px"
+        android:layout_width="@dimen/convert_30px"
+        android:layout_height="@dimen/convert_21px"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/convert_66px"
+        android:layout_marginEnd="@dimen/convert_39px"
         android:background="@drawable/ic_check" />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -18,11 +18,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/convert_56px"
-        android:layout_marginEnd="@dimen/convert_80px"
+        android:layout_marginStart="@dimen/convert_29px"
+        android:layout_marginEnd="@dimen/convert_40px"
         android:layout_toStartOf="@id/iv_check"
         android:gravity="center_vertical"
-        android:textSize="@dimen/convert_45px" />
+        android:textSize="@dimen/convert_30px" />
 
     <View
         android:layout_width="match_parent"

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

@@ -7,6 +7,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.azhon.appupdate.listener.OnDownloadListener
 import com.blankj.utilcode.util.AppUtils
 import com.develop.base.ext.getSN
+import com.develop.base.ext.updateText
 import com.develop.base.util.GlobalToast
 import com.develop.common.food_sdk.GlobalDevEvent
 import com.develop.common.router.Screens
@@ -57,8 +58,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.topBar.setTopBarTitle(getString(com.develop.common.R.string.About))
-        binding.topBar.listenBackClick {
+        binding.tvTitle.updateText(getString(com.develop.common.R.string.About))
+        binding.ivClose.setOnClickListener {
             finish()
         }
 

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

@@ -10,6 +10,7 @@ import android.view.LayoutInflater
 import android.widget.SeekBar
 import androidx.annotation.RequiresApi
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.updateText
 import com.develop.base.util.MMkvUtils
 import com.develop.common.router.Screens
 import com.develop.common.tag.SCREENSAVER
@@ -31,8 +32,8 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         Log.i("screen", Settings.System.getInt(contentResolver, SCREEN_OFF_TIMEOUT).toString())
 
         super.onCreate(savedInstanceState)
-        binding.topBar.setTopBarTitle(getString(com.develop.common.R.string.Brightness))
-        binding.topBar.listenBackClick {
+        binding.tvTitle.updateText(getString(com.develop.common.R.string.Brightness))
+        binding.ivClose.setOnClickListener {
             finish()
         }
 

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

@@ -45,20 +45,28 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         val isFromSetting = intent.extras?.getBoolean(LANGUAGE_FROM_SETTING) ?: false
         if (isFromSetting) {
             binding.apply {
                 ivBanner.visibility = View.GONE
-                topBar.visibility = View.VISIBLE
-                topBar.setTopBarTitle(getString(com.develop.common.R.string.language))
-                topBar.listenBackClick {
+                tvLanguage.visibility = View.GONE
+                ivLogo.visibility = View.GONE
+                ivClose.visibility = View.VISIBLE
+                tvTitle.visibility = View.VISIBLE
+                ivClose.setOnClickListener {
                     finish()
                 }
-                tvLanguage.visibility = View.GONE
+                tvTitle.updateText(getString(com.develop.common.R.string.language))
                 val params = languageRecycle.layoutParams as RelativeLayout.LayoutParams
-                params.topMargin = dp251
+                params.topMargin = dp81
+                params.marginStart = dp310
+                params.marginEnd = dp310
                 languageRecycle.layoutParams = params
+                val nextParam = tvNext.layoutParams as RelativeLayout.LayoutParams
+                nextParam.marginStart = dp310
+                nextParam.marginEnd = dp310
+                tvNext.layoutParams = nextParam
                 tvNext.updateText(getString(com.develop.common.R.string.confirm))
             }
         }
@@ -192,12 +200,13 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
 
     override fun onDestroy() {
         super.onDestroy()
-        
+
         cancelConfirmDialog.removeSelf()
     }
 
     companion object {
-        var dp251 = (com.develop.base.R.dimen.convert_251px).resId2Dimension().toInt()
+        var dp81 = (com.develop.base.R.dimen.convert_81px).resId2Dimension().toInt()
+        var dp310 = (com.develop.base.R.dimen.convert_310px).resId2Dimension().toInt()
         var dp6 = (com.develop.base.R.dimen.convert_6px).resId2Dimension()
     }
 

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

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.os.PowerManager
 import android.view.LayoutInflater
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.updateText
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBindingActivity
@@ -22,8 +23,8 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.topBar.setTopBarTitle(getString(com.develop.common.R.string.restore_factory_settings))
-        binding.topBar.listenBackClick {
+        binding.tvTitle.updateText(getString(com.develop.common.R.string.restore_factory_settings))
+        binding.ivClose.setOnClickListener {
             finish()
         }
         dialog.title = getString(com.develop.common.R.string.restore_confirm_tips)
@@ -52,6 +53,9 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
         binding.tvYea.setOnClickListener {
             dialog.showDialog(supportFragmentManager, "confirm")
         }
+        binding.tvNo.setOnClickListener {
+            finish()
+        }
 
     }
 }

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

@@ -40,8 +40,8 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         dataList = DataFactory.genSettingModesList(resources)
-        binding.topBar.setTopBarTitle(getString(com.develop.common.R.string.settings))
-        binding.topBar.listenBackClick {
+        binding.tvTitle.updateText(getString(com.develop.common.R.string.settings))
+        binding.ivClose.setOnClickListener {
             finish()
         }
         binding.mainSettingRecycler.apply {
@@ -50,22 +50,10 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                     outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State
                 ) {
                     super.getItemOffsets(outRect, view, parent, state)
-                    val srcPosition = parent.getChildAdapterPosition(view)
-                    if (srcPosition == 0 || srcPosition == 1) {
-                        outRect.top = dp156
-                    }
-                    when (srcPosition % 2) {
-                        0 -> {
-                            outRect.left = dp40
-                        }
-                        1 -> {
-                            outRect.right = dp40
-                        }
-                    }
-                    outRect.bottom = dp120
+                    outRect.top = dp77
                 }
             })
-            grid(2)
+            grid(4)
             setup {
                 addType<SettingModel>(R.layout.item_setting_main_view)
                 onBind {
@@ -74,7 +62,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                     findView<ImageView>(R.id.iv_icon).load(model.resId)
                 }
                 R.id.iv_icon.onClick {
-                    Log.d("dddddd","---")
+                    Log.d("dddddd", "---")
                     when (dataList[absoluteAdapterPosition].type) {
                         SettingType.BRIGHTNESS -> {
                             navigateTo(Screens.Setting.BRIGHTNESS)
@@ -140,7 +128,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     companion object {
         var dp156 = (com.develop.base.R.dimen.convert_156px).resId2Dimension().toInt()
         var dp40 = (com.develop.base.R.dimen.convert_40px).resId2Dimension().toInt()
-        var dp120 = (com.develop.base.R.dimen.convert_120px).resId2Dimension().toInt()
+        var dp77 = (com.develop.base.R.dimen.convert_77px).resId2Dimension().toInt()
     }
 
 

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

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.widget.SeekBar
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.VolumeUtils
+import com.develop.base.ext.updateText
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBindingActivity
 import com.develop.setting.databinding.ActivitySoundBinding
@@ -19,8 +20,8 @@ class SoundActivity : CommonBindingActivity<ActivitySoundBinding>() {
     private var currentVolume = 0
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.topBar.setTopBarTitle(getString(com.develop.common.R.string.Sound))
-        binding.topBar.listenBackClick {
+        binding.tvTitle.updateText(getString(com.develop.common.R.string.Sound))
+        binding.ivClose.setOnClickListener {
             finish()
         }
 

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

@@ -4,73 +4,94 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
     <ImageView
-        android:id="@+id/iv_logo"
-        android:layout_width="@dimen/convert_400px"
-        android:layout_height="@dimen/convert_400px"
-        android:layout_below="@id/top_bar"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_140px"
-        android:background="@color/color_F4A12E" />
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_app_name"
-        android:text="Product Name"
-        android:textSize="@dimen/convert_54px"
-        android:textColor="@color/color_6B6B6B"
-        android:layout_marginTop="@dimen/convert_135px"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/iv_logo"
+        android:id="@+id/tv_title"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
+
+
+    <RelativeLayout
+        android:id="@+id/logo_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toStartOf="@+id/function_layout">
+
+        <ImageView
+            android:id="@+id/iv_logo"
+            android:layout_width="@dimen/convert_180px"
+            android:layout_height="@dimen/convert_180px"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_156px"
+            android:background="@drawable/ic_logo" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/iv_logo"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_50px"
+            android:gravity="center"
+            android:text="Product Name"
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_36px" />
+    </RelativeLayout>
+
 
     <LinearLayout
+
         android:id="@+id/update_recipes"
-        android:layout_width="@dimen/convert_633px"
-        android:layout_height="@dimen/convert_120px"
-        android:layout_below="@id/tv_app_name"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_116px"
+        android:layout_width="@dimen/convert_509px"
+        android:layout_height="@dimen/convert_98px"
+        android:layout_below="@id/logo_layout"
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginTop="@dimen/convert_90px"
         android:background="@drawable/shape_60px92cf40_stoke"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <ImageView
-            android:layout_width="@dimen/convert_48px"
-            android:layout_height="@dimen/convert_63px"
-            android:layout_marginStart="@dimen/convert_70px"
+            android:layout_width="@dimen/convert_36px"
+            android:layout_height="@dimen/convert_47px"
+            android:layout_marginStart="@dimen/convert_58px"
             android:background="@drawable/ic_download_recipes" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_50px"
+            android:layout_marginStart="@dimen/convert_28px"
             android:text="@string/update_the_recipes"
             android:textColor="@color/color_92cf40"
-            android:textSize="@dimen/convert_48px" />
+            android:textSize="@dimen/convert_36px" />
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/function_layout"
+        android:layout_width="@dimen/convert_650px"
+        android:layout_height="@dimen/convert_494px"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/convert_156px"
+        android:layout_marginEnd="@dimen/convert_40px"
         android:background="@drawable/shape_15pxe5e5e5_stroke"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/update_recipes"
-        android:layout_marginStart="@dimen/convert_45px"
-        android:layout_marginTop="@dimen/convert_122px"
-        android:layout_marginEnd="@dimen/convert_45px"
         android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/update_apk_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
-           >
+            android:layout_height="@dimen/convert_98px">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
@@ -78,110 +99,113 @@
                 android:layout_centerVertical="true"
                 android:layout_marginStart="@dimen/convert_43px"
                 android:text="@string/apk"
-                android:textColor="@color/color_6B6B6B"
-                android:textSize="@dimen/convert_45px" />
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_30px" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_app_version"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="@dimen/convert_33px"
                 android:text="v2.1.2"
-                android:layout_centerVertical="true"
                 android:textColor="@color/color_B1B2B2"
-                android:textSize="@dimen/convert_39px" />
+                android:textSize="@dimen/convert_30px" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:textColor="@color/color_CCF4A12E"
-                android:gravity="center"
-                android:text="@string/update"
-                android:visibility="invisible"
                 android:id="@+id/tv_update"
-                android:background="@drawable/shape_60pxccff4a12e_stroke"
-                android:layout_marginEnd="@dimen/convert_30px"
-                android:layout_width="@dimen/convert_213px"
-                android:layout_height="@dimen/convert_78px"
+                android:layout_width="@dimen/convert_159px"
+                android:layout_height="@dimen/convert_60px"
                 android:layout_centerVertical="true"
-                android:layout_toStartOf="@id/tv_app_version" />
+                android:layout_marginEnd="@dimen/convert_20px"
+                android:layout_toStartOf="@id/tv_app_version"
+                android:background="@drawable/shape_60pxccff4a12e_stroke"
+                android:gravity="center"
+                android:text="@string/update"
+                android:textColor="@color/color_CCF4A12E"
+                android:textSize="@dimen/convert_30px"
+                android:visibility="invisible" />
         </RelativeLayout>
-        
+
         <View
-            android:background="@color/color_E5E5E5"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_2px" />
+            android:layout_height="@dimen/convert_2px"
+            android:background="@color/color_E5E5E5" />
+
         <RelativeLayout
             android:id="@+id/mcu_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
-            >
+            android:layout_height="@dimen/convert_98px">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_43px"
-                android:text="@string/mcu"
                 android:layout_centerVertical="true"
-                android:textColor="@color/color_6B6B6B"
-                android:textSize="@dimen/convert_45px" />
+                android:layout_marginStart="@dimen/convert_23px"
+                android:text="@string/mcu"
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_30px" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="@dimen/convert_33px"
                 android:text="1.0.0"
-                android:layout_centerVertical="true"
                 android:textColor="@color/color_B1B2B2"
-                android:textSize="@dimen/convert_39px" />
+                android:textSize="@dimen/convert_30px" />
         </RelativeLayout>
+
         <View
-            android:background="@color/color_E5E5E5"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_2px" />
+            android:layout_height="@dimen/convert_2px"
+            android:background="@color/color_E5E5E5" />
+
         <RelativeLayout
             android:id="@+id/tp_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
-            >
+            android:layout_height="@dimen/convert_98px">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_43px"
-                android:text="@string/tp"
                 android:layout_centerVertical="true"
-                android:textColor="@color/color_6B6B6B"
-                android:textSize="@dimen/convert_45px" />
+                android:layout_marginStart="@dimen/convert_23px"
+                android:text="@string/tp"
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_30px" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="@dimen/convert_33px"
                 android:text="1.0.0"
-                android:layout_centerVertical="true"
                 android:textColor="@color/color_B1B2B2"
-                android:textSize="@dimen/convert_39px" />
+                android:textSize="@dimen/convert_30px" />
         </RelativeLayout>
+
         <View
-            android:background="@color/color_E5E5E5"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_2px" />
+            android:layout_height="@dimen/convert_2px"
+            android:background="@color/color_E5E5E5" />
+
         <RelativeLayout
             android:id="@+id/serial_number_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
-       >
+            android:layout_height="@dimen/convert_98px">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/convert_43px"
+                android:layout_marginStart="@dimen/convert_23px"
                 android:text="@string/serial_number"
-                android:textColor="@color/color_6B6B6B"
-                android:textSize="@dimen/convert_45px" />
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_30px" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/dev_sn"
@@ -192,36 +216,37 @@
                 android:layout_marginEnd="@dimen/convert_33px"
                 android:text="00000000000000"
                 android:textColor="@color/color_B1B2B2"
-                android:textSize="@dimen/convert_39px" />
+                android:textSize="@dimen/convert_30px" />
         </RelativeLayout>
+
         <View
-            android:background="@color/color_E5E5E5"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_2px" />
+            android:layout_height="@dimen/convert_2px"
+            android:background="@color/color_E5E5E5" />
+
         <RelativeLayout
             android:id="@+id/time_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
-            >
+            android:layout_height="@dimen/convert_98px">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_43px"
-                android:text="@string/standby_time"
-                android:textColor="@color/color_6B6B6B"
                 android:layout_centerVertical="true"
-                android:textSize="@dimen/convert_45px" />
+                android:layout_marginStart="@dimen/convert_23px"
+                android:text="@string/standby_time"
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_30px" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="@dimen/convert_33px"
                 android:text="2022-5-20"
                 android:textColor="@color/color_B1B2B2"
-                android:textSize="@dimen/convert_39px" />
+                android:textSize="@dimen/convert_30px" />
         </RelativeLayout>
 
 

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

@@ -4,25 +4,39 @@
     android:layout_height="match_parent">
 
 
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_sound"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_476px"
+        android:layout_marginTop="@dimen/convert_128px"
         android:includeFontPadding="false"
         android:text="@string/Brightness"
-        android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_54px" />
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
 
     <SeekBar
-        android:layout_marginStart="@dimen/convert_130px"
-        android:layout_marginEnd="@dimen/convert_130px"
+        android:layout_marginStart="@dimen/convert_340px"
+        android:layout_marginEnd="@dimen/convert_340px"
         android:id="@+id/sb_brightness"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_60px"
@@ -33,7 +47,7 @@
         android:thumb="@null" />
 
     <ImageView
-        android:layout_marginStart="@dimen/convert_65px"
+        android:layout_marginStart="@dimen/convert_272px"
         android:layout_marginTop="@dimen/convert_65px"
         android:layout_below="@id/tv_sound"
         android:background="@drawable/ic_brightness_night"
@@ -42,7 +56,7 @@
 
     <ImageView
         android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/convert_65px"
+        android:layout_marginEnd="@dimen/convert_272px"
         android:layout_marginTop="@dimen/convert_65px"
         android:layout_below="@id/tv_sound"
         android:background="@drawable/ic_brightness_day"
@@ -55,10 +69,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/sb_brightness"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_207px"
+        android:layout_marginTop="@dimen/convert_111px"
         android:text="@string/screen_lock_time"
-        android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_54px" />
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 
     <RadioGroup
         android:layout_centerHorizontal="true"
@@ -67,7 +81,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/tv_screen_lock_time"
-        android:layout_marginTop="@dimen/convert_116px">
+        android:layout_marginTop="@dimen/convert_90px">
 
         <RadioButton
             android:id="@+id/rb_3_min"
@@ -78,8 +92,8 @@
             android:text="@string/time_3min"
             android:checked="true"
             android:paddingStart="@dimen/convert_26px"
-            android:textColor="@color/color_6B6B6B"
-            android:textSize="@dimen/convert_45px" />
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_30px" />
 
         <RadioButton
             android:id="@+id/rb_10_min"
@@ -90,8 +104,8 @@
             android:gravity="center_vertical"
             android:text="@string/time_10min"
             android:paddingStart="@dimen/convert_26px"
-            android:textColor="@color/color_6B6B6B"
-            android:textSize="@dimen/convert_45px" />
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_30px" />
 
         <RadioButton
             android:id="@+id/rb_30_min"
@@ -102,8 +116,8 @@
             android:gravity="center_vertical"
             android:paddingStart="@dimen/convert_26px"
             android:text="@string/time_30min"
-            android:textColor="@color/color_6B6B6B"
-            android:textSize="@dimen/convert_45px" />
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_30px" />
 
     </RadioGroup>
 </RelativeLayout>

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

@@ -4,11 +4,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
+    <ImageView
+        android:visibility="invisible"
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:visibility="invisible"
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
 
     <ImageView
         android:id="@+id/iv_banner"
@@ -17,6 +31,7 @@
         android:background="@drawable/guide_bg" />
 
     <ImageView
+        android:id="@+id/iv_logo"
         android:layout_width="@dimen/convert_350px"
         android:layout_height="@dimen/convert_350px"
         android:layout_centerVertical="true"

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

@@ -1,21 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
 
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
+
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_brightness"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_660px"
+        android:layout_marginTop="@dimen/convert_243px"
         android:includeFontPadding="false"
         android:text="@string/are_you_sure_to_restore_factory_settings"
         android:textColor="@color/color_EE0000"
@@ -23,17 +37,29 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_yea"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px"
+        android:layout_width="@dimen/convert_550px"
+        android:layout_height="@dimen/convert_98px"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/convert_45px"
-        android:layout_marginEnd="@dimen/convert_45px"
-        android:layout_marginBottom="@dimen/convert_233px"
+        android:layout_marginStart="@dimen/convert_78px"
+        android:layout_marginBottom="@dimen/convert_50px"
         android:background="@drawable/shape_60pxf4a12e_corners"
         android:gravity="center"
         android:text="@string/yes"
-        android:textSize="@dimen/convert_32px"
-        android:textColor="@color/color_E5E5E5" />
+        android:textColor="@color/white"
+        android:textSize="@dimen/convert_36px" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_no"
+        android:layout_width="@dimen/convert_550px"
+        android:layout_height="@dimen/convert_98px"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="@dimen/convert_78px"
+        android:layout_marginBottom="@dimen/convert_50px"
+        android:background="@drawable/shadow_60pxffa627_stoke"
+        android:gravity="center"
+        android:text="@string/no"
+        android:textColor="@color/color_EE8F08"
+        android:textSize="@dimen/convert_36px" />
 
 </RelativeLayout>

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

@@ -3,13 +3,27 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
+
     <androidx.recyclerview.widget.RecyclerView
-        android:layout_below="@id/top_bar"
         android:id="@+id/main_setting_recycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:layout_below="@id/tv_title" />
 </RelativeLayout>

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

@@ -1,55 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_brightness"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_476px"
+        android:layout_marginTop="@dimen/convert_128px"
         android:includeFontPadding="false"
         android:text="@string/Sound"
-        android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_54px" />
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
 
     <SeekBar
-        android:layout_marginStart="@dimen/convert_130px"
-        android:layout_marginEnd="@dimen/convert_130px"
         android:id="@+id/sb_voice"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_60px"
         android:layout_below="@id/tv_brightness"
+        android:layout_marginStart="@dimen/convert_340px"
         android:layout_marginTop="@dimen/convert_63px"
+        android:layout_marginEnd="@dimen/convert_340px"
         android:duplicateParentState="true"
         android:progressDrawable="@drawable/shape_30px1296db_corners"
         android:thumb="@null" />
 
     <ImageView
-        android:layout_marginStart="@dimen/convert_65px"
-        android:layout_marginTop="@dimen/convert_65px"
-        android:layout_below="@id/tv_brightness"
-        android:background="@drawable/ic_voice_down"
         android:layout_width="@dimen/convert_63px"
-        android:layout_height="@dimen/convert_57px"/>
+        android:layout_height="@dimen/convert_57px"
+        android:layout_below="@id/tv_brightness"
+        android:layout_marginStart="@dimen/convert_269px"
+        android:layout_marginTop="@dimen/convert_65px"
+        android:background="@drawable/ic_voice_down" />
 
     <ImageView
+        android:layout_width="@dimen/convert_63px"
+        android:layout_height="@dimen/convert_57px"
+        android:layout_below="@id/tv_brightness"
         android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/convert_65px"
         android:layout_marginTop="@dimen/convert_65px"
-        android:layout_below="@id/tv_brightness"
-        android:background="@drawable/ic_voice_up"
-        android:layout_width="@dimen/convert_63px"
-        android:layout_height="@dimen/convert_57px"/>
+        android:layout_marginEnd="@dimen/convert_269px"
+        android:background="@drawable/ic_voice_up" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_text_to_speech"
@@ -57,41 +69,42 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/sb_voice"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/convert_207px"
+        android:layout_marginTop="@dimen/convert_111px"
         android:text="@string/text_to_speech"
-        android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_54px" />
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 
     <Switch
         android:id="@+id/switch_view"
-        android:layout_width="@dimen/convert_240px"
-        android:layout_height="@dimen/convert_120px"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_below="@id/tv_text_to_speech"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/convert_75px"
+        android:checked="false"
         android:thumb="@drawable/thumb_selector"
         android:track="@drawable/switch_selector"
-        android:checked="false"
         tools:ignore="UseSwitchCompatOrMaterialXml" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:text="@string/off"
-        android:layout_marginTop="@dimen/convert_100px"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_below="@id/tv_text_to_speech"
+        android:layout_marginTop="@dimen/convert_100px"
         android:layout_toStartOf="@id/switch_view"
-        android:textSize="@dimen/convert_54px"
-        android:textColor="@color/color_E5E5E5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:text="@string/off"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:text="@string/on"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv_text_to_speech"
         android:layout_marginStart="@dimen/convert_54px"
         android:layout_marginTop="@dimen/convert_100px"
-        android:layout_below="@id/tv_text_to_speech"
         android:layout_toEndOf="@id/switch_view"
-        android:textSize="@dimen/convert_54px"
-        android:textColor="@color/color_E5E5E5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:text="@string/on"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 </RelativeLayout>

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

@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
     android:id="@+id/content_view"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clipChildren="false">
 
     <ImageView
-        android:layout_centerHorizontal="true"
         android:id="@+id/iv_icon"
-        android:layout_width="@dimen/convert_192px"
-        android:layout_height="@dimen/convert_192px"
-    />
+        android:layout_width="@dimen/convert_160px"
+        android:layout_height="@dimen/convert_160px"
+        android:layout_centerHorizontal="true" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_name"
-        android:layout_centerHorizontal="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/convert_45px"
+        android:layout_below="@id/iv_icon"
+        android:layout_centerHorizontal="true"
         android:gravity="center"
         android:includeFontPadding="false"
-        android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_45px"
-        android:layout_below="@id/iv_icon" />
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 </RelativeLayout>

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

@@ -5,79 +5,85 @@
     android:layout_height="match_parent"
     android:background="@color/color_E5E5E5">
 
-    <LinearLayout
+
+    <ImageView
+        android:id="@+id/iv_banner"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
         android:id="@+id/title_layout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_132px"
-        android:orientation="horizontal">
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/iv_back"
-            android:layout_width="@dimen/convert_122px"
-            android:layout_height="@dimen/convert_132px"
-            android:background="@drawable/ic_cook_back" />
+            android:layout_width="@dimen/convert_34px"
+            android:layout_height="@dimen/convert_48px"
+            android:layout_marginStart="@dimen/convert_30px"
+            android:layout_marginTop="@dimen/convert_20px"
+            android:padding="@dimen/convert_10px"
+            android:src="@drawable/ic_white_back" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_mode_name"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/color_FFA627"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_38px"
             android:gravity="center"
             android:textColor="@color/color_fff"
-            android:textSize="@dimen/convert_54px" />
-    </LinearLayout>
+            android:textSize="@dimen/convert_36px" />
 
-    <ImageView
-        android:id="@+id/iv_banner"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_525px"
-        android:layout_below="@id/title_layout" />
 
-    <ImageView
-        android:id="@+id/iv_turbo"
-        android:layout_width="@dimen/convert_120px"
-        android:layout_height="@dimen/convert_120px"
-        android:layout_below="@id/iv_banner"
-        android:layout_marginStart="@dimen/convert_48px"
-        android:layout_marginTop="@dimen/convert_60px"
-        android:background="@drawable/ic_turbo_entrance" />
+        <ImageView
+            android:id="@+id/iv_turbo"
+            android:layout_width="@dimen/convert_60px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/convert_28px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/ic_turbo_entrance" />
+
+        <ImageView
+            android:id="@+id/iv_weight"
+            android:layout_width="@dimen/convert_60px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_marginTop="@dimen/convert_28px"
+            android:layout_marginEnd="@dimen/convert_50px"
+            android:layout_toStartOf="@id/iv_turbo"
+            android:background="@drawable/ic_weight_entrance" />
+    </RelativeLayout>
 
-    <ImageView
-        android:id="@+id/iv_weight"
-        android:layout_width="@dimen/convert_120px"
-        android:layout_height="@dimen/convert_120px"
-        android:layout_below="@id/iv_banner"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/convert_48px"
-        android:layout_marginTop="@dimen/convert_60px"
-        android:background="@drawable/ic_weight_entrance" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/function_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/iv_banner"
         android:paddingHorizontal="@dimen/convert_75px">
 
         <com.develop.common.widget.RingControlView
-            app:layout_constraintTop_toTopOf="parent"
             android:id="@+id/temp_ring_view"
-            android:layout_width="@dimen/convert_500px"
-            android:layout_height="@dimen/convert_500px"
+            android:layout_width="@dimen/convert_270px"
+            android:layout_height="@dimen/convert_270px"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintVertical_bias="0.35" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.32" />
 
         <com.develop.common.widget.RingControlView
             android:id="@+id/speed_ring_view"
-            android:visibility="gone"
-            android:layout_width="@dimen/convert_500px"
-            android:layout_height="@dimen/convert_500px"
+            android:layout_width="@dimen/convert_270px"
+            android:layout_height="@dimen/convert_270px"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.35" />
-        
+            app:layout_constraintVertical_bias="0.32" />
+
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/temp_ring_text"
             android:layout_width="wrap_content"
@@ -96,9 +102,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="2"
-            android:visibility="gone"
             android:textColor="#E60012"
             android:textSize="@dimen/convert_90px"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/temp_ring_view"
             app:layout_constraintEnd_toEndOf="@+id/temp_ring_view"
             app:layout_constraintStart_toStartOf="@+id/temp_ring_view"
@@ -121,13 +127,13 @@
             android:id="@+id/cl_set_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
             android:layout_marginBottom="@dimen/convert_74px"
+            android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@+id/cl_cook_temp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:time_color="@color/color_E60012"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintVertical_bias="0.36"/>
+            app:layout_constraintVertical_bias="0.36"
+            app:time_color="@color/color_E60012" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_countdown_time"
@@ -159,8 +165,8 @@
             android:layout_width="@dimen/convert_210px"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/convert_14px"
-            app:cardType="Temperature"
             app:cardSelected="true"
+            app:cardType="Temperature"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/temp_ring_view" />
 
@@ -172,7 +178,7 @@
             app:cardType="Cook_time"
             app:layout_constraintEnd_toStartOf="@+id/cl_cook_speed"
             app:layout_constraintStart_toEndOf="@+id/cl_cook_temp"
-            app:layout_constraintTop_toTopOf="@+id/cl_cook_temp"/>
+            app:layout_constraintTop_toTopOf="@+id/cl_cook_temp" />
 
 
         <com.develop.common.widget.CookCardView
@@ -182,22 +188,22 @@
             app:cardType="Speed"
             app:layout_constraintEnd_toStartOf="@+id/cl_cook_direction"
             app:layout_constraintStart_toEndOf="@+id/cl_cook_time"
-            app:layout_constraintTop_toTopOf="@+id/cl_cook_temp"/>
+            app:layout_constraintTop_toTopOf="@+id/cl_cook_temp" />
 
         <com.develop.common.widget.CookCardView
             android:id="@+id/cl_cook_direction"
-            app:cardType="Direction"
             android:layout_width="@dimen/convert_210px"
             android:layout_height="wrap_content"
+            app:cardType="Direction"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/cl_cook_temp"/>
+            app:layout_constraintTop_toTopOf="@+id/cl_cook_temp" />
 
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_marginTop="@dimen/convert_44px"
             android:id="@+id/btn_start"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_120px"
+            android:layout_marginTop="@dimen/convert_44px"
             android:layout_marginBottom="@dimen/convert_42px"
             android:background="@drawable/bg_orange_button"
             android:gravity="center"
@@ -207,82 +213,82 @@
             app:layout_constraintTop_toBottomOf="@id/cl_cook_speed" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_marginTop="@dimen/convert_44px"
             android:id="@+id/btn_resume"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_120px"
+            android:layout_marginTop="@dimen/convert_44px"
             android:layout_marginBottom="@dimen/convert_42px"
             android:background="@drawable/bg_orange_button"
             android:gravity="center"
             android:text="@string/resume"
-            android:visibility="invisible"
             android:textColor="#ffffff"
             android:textSize="@dimen/convert_54px"
+            android:visibility="invisible"
             app:layout_constraintTop_toBottomOf="@id/cl_cook_speed" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_marginTop="@dimen/convert_44px"
             android:id="@+id/btn_pause"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_120px"
+            android:layout_marginTop="@dimen/convert_44px"
             android:layout_marginBottom="@dimen/convert_42px"
             android:background="@drawable/bg_orange_button"
             android:gravity="center"
             android:text="@string/pause"
-            android:visibility="invisible"
             android:textColor="#ffffff"
             android:textSize="@dimen/convert_54px"
+            android:visibility="invisible"
             app:layout_constraintTop_toBottomOf="@id/cl_cook_speed" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_marginTop="@dimen/convert_42px"
             android:id="@+id/btn_stop"
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_120px"
+            android:layout_marginTop="@dimen/convert_42px"
             android:layout_marginBottom="@dimen/convert_42px"
             android:background="@drawable/bg_white_button"
             android:gravity="center"
             android:text="@string/stop"
             android:textColor="@color/color_FFA627"
             android:textSize="@dimen/convert_54px"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/btn_start" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_marginTop="@dimen/convert_44px"
             android:id="@+id/btn_confirm"
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_120px"
+            android:layout_marginTop="@dimen/convert_44px"
             android:layout_marginBottom="@dimen/convert_42px"
             android:background="@drawable/bg_orange_button"
             android:gravity="center"
             android:text="@string/confirm"
             android:textColor="#ffffff"
             android:textSize="@dimen/convert_54px"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/cl_cook_speed" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_marginTop="@dimen/convert_42px"
             android:id="@+id/btn_cancel"
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_120px"
+            android:layout_marginTop="@dimen/convert_42px"
             android:layout_marginBottom="@dimen/convert_75px"
             android:background="@drawable/bg_white_button"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/color_FFA627"
             android:textSize="@dimen/convert_54px"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/btn_confirm" />
 
         <ImageView
-            android:visibility="gone"
             android:id="@+id/iv_turbo_view"
             android:layout_width="@dimen/convert_200px"
             android:layout_height="@dimen/convert_200px"
             android:layout_marginTop="@dimen/convert_90px"
             android:background="@drawable/ic_turbo_unselected"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cl_cook_speed" />
@@ -293,45 +299,45 @@
         android:id="@+id/ll_weight_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_alignParentBottom="true">
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/tv_weight_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#ffffff"
-            android:textSize="@dimen/convert_72px"
-            android:text="50g"
+            android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/convert_42px"
             android:includeFontPadding="false"
-            android:layout_gravity="center_horizontal"
-            app:layout_constraintStart_toStartOf="parent"
+            android:text="50g"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/convert_72px"
+            app:layout_constraintBottom_toTopOf="@+id/weight_view"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/weight_view"/>
+            app:layout_constraintStart_toStartOf="parent" />
 
         <com.develop.common.widget.WeightView
             android:id="@+id/weight_view"
             android:layout_width="@dimen/convert_740px"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
             android:id="@+id/tv_weight_tare"
             android:layout_width="@dimen/convert_197px"
             android:layout_height="@dimen/convert_80px"
-            android:textColor="#ffffff"
-            android:textSize="@dimen/convert_36px"
-            android:text="@string/tare"
-            android:gravity="center"
-            android:includeFontPadding="false"
             android:layout_marginBottom="@dimen/convert_58px"
             android:background="@drawable/bg_tare_button"
-            app:layout_constraintStart_toStartOf="parent"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="@string/tare"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/convert_36px"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </RelativeLayout>