提交人：jtm

提交内容：主页功能

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

@@ -4,6 +4,8 @@ import android.content.res.Resources
 import com.develop.common.R
 import com.develop.common.data_repo.db.entity.DevRecipe
 import com.develop.common.data_repo.db.entity.UserFavoriteRecipes
+import com.develop.common.widget.EntranceData
+import com.develop.common.widget.EntranceType
 
 
 object DataFactory {
@@ -166,15 +168,9 @@ object DataFactory {
         categoryName: String,
         recipesList: MutableList<DevRecipe>,
         favoriteRecipes: MutableList<UserFavoriteRecipes>,
-        starList: MutableList<Int>,
         sortedType: SortedType
     ): MutableList<Any> {
         val result = mutableListOf<Any>()
-        val bannerList = mutableListOf<HomeBannerModel>()
-        for (i in 0 until 3) {
-            bannerList.add(HomeBannerModel(R.drawable.ic_auth_banner, ""))
-        }
-        result.add(HomeBannerListModel(bannerList))
         result.add(FilterSortModel(""))
         result.add(categoryName)
         val favoriteRecipesIds = mutableListOf<String>()
@@ -209,9 +205,10 @@ object DataFactory {
                 }
             }
         })
+        val foodList = mutableListOf<FoodContentModel>()
         for (i in recipesList.indices) {
             val recipes = recipesList[i]
-            result.add(
+            foodList.add(
                 FoodContentModel(
                     recipes.photoPath ?: "",
                     recipes.name ?: "",
@@ -227,6 +224,7 @@ object DataFactory {
                 )
             )
         }
+        result.add(FoodListModel(foodList, categoryName))
         return result
     }
 
@@ -328,6 +326,40 @@ object DataFactory {
         }
         return result
     }
+
+    private var bgResIds = arrayListOf<Int>(
+        R.drawable.entrance_bg_1,
+        R.drawable.entrance_bg_2,
+        R.drawable.entrance_bg_3,
+        R.drawable.entrance_bg_4
+    )
+    private var iconResIds = arrayListOf<Int>(
+        R.drawable.entrance_icon_1,
+        R.drawable.entrance_icon_2,
+        R.drawable.entrance_icon_3,
+        R.drawable.entrance_icon_4
+    )
+    private var titleStrIds = mutableListOf<Int>(
+        R.string.automatic_recipes,
+        R.string.automatic_programmes,
+        R.string.manual_cooking,
+        R.string.download_new_recipes
+    )
+
+    private var typeList = mutableListOf<EntranceType>(
+        EntranceType.automatic_recipes,
+        EntranceType.automatic_programmes,
+        EntranceType.manual_cooking,
+        EntranceType.download_new_recipes
+    )
+
+    fun getEntranceData(): MutableList<EntranceData> {
+        val dataList = mutableListOf<EntranceData>()
+        for (i in iconResIds.indices) {
+            dataList.add(EntranceData(bgResIds[i], iconResIds[i], titleStrIds[i], typeList[i]))
+        }
+        return dataList
+    }
 }
 
 fun getTime(hour: Int, minute: Int): String {

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

@@ -25,6 +25,8 @@ data class FoodContentModel(
     var useNum: Int = 0
 )
 
+data class FoodListModel(var foodList: MutableList<FoodContentModel>, var categoryName: String)
+
 data class AuthModel(var success: Boolean, var msg: String? = null)
 
 //====================枚举=============================//

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -168,7 +168,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     }
 
     override fun getResources(): Resources {
-        AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources())
+       // AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources())
         return super.getResources()
     }
 

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

@@ -0,0 +1,49 @@
+package com.develop.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import coil.load
+import com.develop.base.ext.updateText
+import com.develop.common.R
+import com.develop.common.databinding.ItemEntranceViewBinding
+
+class EntranceItemView : ConstraintLayout {
+    private val binding: ItemEntranceViewBinding
+
+    constructor(context: Context) : super(context) {}
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {}
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context, attrs, defStyleAttr
+    ) {
+    }
+
+    init {
+        val root = View.inflate(context, R.layout.item_entrance_view, this)
+        binding = ItemEntranceViewBinding.bind(root)
+    }
+
+
+    fun setEntranceData(data: EntranceData) {
+        binding.apply {
+            ivBg.load(data.bgResId)
+            icIcon.load(data.iconResId)
+            tvTitle.updateText(resources.getString(data.titleStrId))
+        }
+    }
+}
+
+data class EntranceData(
+    var bgResId: Int,
+    var iconResId: Int,
+    var titleStrId: Int,
+    var type: EntranceType
+)
+
+enum class EntranceType {
+    automatic_recipes,
+    automatic_programmes,
+    manual_cooking,
+    download_new_recipes
+}

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

@@ -86,15 +86,16 @@ class FoodContentView : RelativeLayout {
                 FoodDataProvider.getResourcePath(content.cover.toString())
             }
         }
-        val dp30 = (com.develop.base.R.dimen.convert_30px).resId2Dimension()
+        val dp10 = (com.develop.base.R.dimen.convert_10px).resId2Dimension()
         binding.apply {
             ivCover.load(cover) {
-                transformations(RoundedCornersTransformation(dp30, dp30, dp30, dp30))
+                transformations(RoundedCornersTransformation(dp10, dp10, 0f, 0f))
             }
             tvFoodName.updateText(content.foodName)
             starView.apply {
                 setStarCount(content.starCount)
                 setCommentNumber(content.useNum.toString())
+                setCommentTextColorGray()
             }
             tvTimeAndLevel.updateText("${content.time}・${content.level}")
             if (isFoodList) {

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

@@ -45,7 +45,7 @@ class HomeFilterSortSearchView : RelativeLayout {
         binding.sortCardView.setOnClickListener {
             onFunctionCallback?.onSortClick(binding.sortCardView)
         }
-        binding.tvSearch.setOnClickListener {
+        binding.ivSearch.setOnClickListener {
             KeyboardUtils.hideSoftInput(context as Activity)
             val content = binding.etSearch.text.toString()
             if (content.isNotEmpty()) {

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

@@ -8,6 +8,7 @@ import android.widget.RelativeLayout
 import coil.load
 import com.develop.base.R.*
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.updateText
 import com.develop.common.R
 import com.develop.common.databinding.HomeFunctionTopBarViewBinding
 import com.develop.common.data_repo.db.FunType
@@ -133,6 +134,10 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
         binding.ivWifi.setImageLevel(level)
     }
 
+    fun setTitle(title: String) {
+        binding.tvTitle.updateText(title)
+    }
+
     private fun updateIconSize(isLocal: Boolean) {
         val param = binding.ivFunction.layoutParams as LayoutParams
         if (isLocal) {

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

@@ -4,6 +4,8 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
+import coil.load
+import com.develop.base.ext.updateText
 import com.develop.common.R
 import com.develop.common.databinding.StarViewBinding
 
@@ -32,35 +34,39 @@ class StarView : LinearLayout {
         }
         when (starCount) {
             1 -> {
-                binding.star1.setBackgroundResource(R.drawable.ic_star_selected)
+                binding.star1.load(R.drawable.ic_star_selected)
             }
             2 -> {
-                binding.star1.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star2.setBackgroundResource(R.drawable.ic_star_selected)
+                binding.star1.load(R.drawable.ic_star_selected)
+                binding.star2.load(R.drawable.ic_star_selected)
             }
             3 -> {
-                binding.star1.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star2.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star3.setBackgroundResource(R.drawable.ic_star_selected)
+                binding.star1.load(R.drawable.ic_star_selected)
+                binding.star2.load(R.drawable.ic_star_selected)
+                binding.star3.load(R.drawable.ic_star_selected)
             }
             4 -> {
-                binding.star1.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star2.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star3.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star4.setBackgroundResource(R.drawable.ic_star_selected)
+                binding.star1.load(R.drawable.ic_star_selected)
+                binding.star2.load(R.drawable.ic_star_selected)
+                binding.star3.load(R.drawable.ic_star_selected)
+                binding.star4.load(R.drawable.ic_star_selected)
             }
             5 -> {
-                binding.star1.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star2.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star3.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star4.setBackgroundResource(R.drawable.ic_star_selected)
-                binding.star5.setBackgroundResource(R.drawable.ic_star_selected)
+                binding.star1.load(R.drawable.ic_star_selected)
+                binding.star2.load(R.drawable.ic_star_selected)
+                binding.star3.load(R.drawable.ic_star_selected)
+                binding.star4.load(R.drawable.ic_star_selected)
+                binding.star5.load(R.drawable.ic_star_selected)
             }
         }
 
     }
 
     fun setCommentNumber(number: String) {
-        binding.tvNumber.text = "(${number})"
+        binding.tvNumber.updateText("(${number})")
+    }
+
+    fun setCommentTextColorGray() {
+        binding.tvNumber.setTextColor(resources.getColor(R.color.color_A3A3A2))
     }
 }

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

@@ -86,7 +86,7 @@ class WifiContentView : RelativeLayout {
                 binding.inputLayout.visibility = View.GONE
             } else {
                 model.isSelected = true
-                binding.contentLayout.setBackgroundResource(R.drawable.shape_30pxf4a12e_stoke)
+                binding.contentLayout.setBackgroundResource(R.drawable.shape_10pxf4a12e_stoke)
                 binding.inputLayout.visibility = View.VISIBLE
             }
         } else {

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

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

BusinessCommon/src/main/res/drawable/shape_10px33a3a3a2_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/color_A3A3A2" />
+    <solid android:color="@color/color_fff" />
+</shape>

BusinessCommon/src/main/res/drawable/shape_10px33ffffff_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_10px"/>
+    <solid android:color="@color/color_33ffffff" />
+
+</shape>

BusinessCommon/src/main/res/drawable/shape_10pxee8f08_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/color_EE8F08" />
+    <solid android:color="@color/color_fff" />
+</shape>

BusinessCommon/src/main/res/drawable/shape_10pxf4a12e_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/color_F4A12E"  android:width="@dimen/convert_2px"/>
+
+</shape>

BusinessCommon/src/main/res/drawable/shape_40pxee8f08_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/color_EE8F08" />
+
+</shape>

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

@@ -3,15 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/recipes_layout"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/convert_600px"
-    android:layout_marginStart="@dimen/convert_45px"
-    android:layout_marginEnd="@dimen/convert_45px"
-    android:layout_marginBottom="@dimen/convert_30px"
-    app:cardCornerRadius="@dimen/convert_30px"
-    app:cardElevation="@dimen/convert_0px">
+    android:layout_height="@dimen/convert_330px"
+    app:cardCornerRadius="@dimen/convert_10px"
+    app:cardElevation="@dimen/convert_10px">
 
     <com.develop.common.widget.FoodContentView
         android:id="@+id/food_content_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="match_parent" />
 </androidx.cardview.widget.CardView>

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

@@ -3,78 +3,81 @@
     xmlns:tool="http://schemas.android.com/tools"
     android:id="@+id/content_layout"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/convert_600px">
+    android:layout_height="@dimen/convert_330px">
 
     <ImageView
         android:id="@+id/iv_cover"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="@dimen/convert_180px"
         android:scaleType="centerCrop" />
 
     <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_210px"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/shape_30px8000000_bottom_corners">
+        android:id="@+id/like_layout"
+        android:layout_width="@dimen/convert_40px"
+        android:layout_height="@dimen/convert_40px"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/convert_13px"
+        android:layout_marginEnd="@dimen/convert_15px"
+        android:background="@drawable/white_circle">
 
-        <RelativeLayout
-            android:id="@+id/like_layout"
-            android:layout_width="@dimen/convert_90px"
-            android:layout_height="@dimen/convert_90px"
-            android:layout_below="@id/tv_time_and_level"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="@dimen/convert_14px"
-            android:layout_marginEnd="@dimen/convert_51px"
-            android:background="@drawable/white_circle">
+        <ImageView
+            android:id="@+id/iv_like"
+            android:layout_width="@dimen/convert_25px"
+            android:layout_height="@dimen/convert_23px"
+            android:layout_centerInParent="true" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/iv_cover"
+        android:layout_alignParentBottom="true">
 
-            <ImageView
-                android:id="@+id/iv_like"
-                android:layout_width="@dimen/convert_48px"
-                android:layout_height="@dimen/convert_42px"
-                android:layout_centerInParent="true"
-                android:background="@drawable/ic_like" />
-        </RelativeLayout>
 
         <ImageView
             android:id="@+id/iv_net"
-            android:layout_width="@dimen/convert_60px"
-            android:layout_height="@dimen/convert_60px"
-            android:layout_below="@id/star_view"
-            android:layout_marginStart="@dimen/convert_42px"
-            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_width="@dimen/convert_24px"
+            android:layout_height="@dimen/convert_24px"
+            android:layout_marginStart="@dimen/convert_22px"
+            android:layout_marginTop="@dimen/convert_18px"
             android:background="@drawable/ic_net"
             android:visibility="gone" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_food_name"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/star_view"
-            android:layout_marginStart="@dimen/convert_42px"
-            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginStart="@dimen/convert_22px"
+            android:layout_marginTop="@dimen/convert_10px"
+            android:layout_marginEnd="@dimen/convert_10px"
             android:layout_toEndOf="@id/iv_net"
+            android:ellipsize="end"
             android:includeFontPadding="false"
-            android:textColor="@color/color_fff"
-            android:textSize="@dimen/convert_54px"
-            android:textStyle="bold"
+            android:singleLine="true"
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_30px"
             tool:text="Guacamole" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_time_and_level"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="@dimen/convert_32px"
-            android:layout_marginEnd="@dimen/convert_48px"
-            android:textColor="@color/color_fff"
-            android:textSize="@dimen/convert_39px"
+            android:layout_below="@id/tv_food_name"
+            android:layout_marginStart="@dimen/convert_22px"
+            android:layout_marginEnd="@dimen/convert_10px"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="@color/color_A3A3A2"
+            android:textSize="@dimen/convert_26px"
             tool:text="5min・Easy" />
 
         <com.develop.common.widget.StarView
             android:id="@+id/star_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_42px"
-            android:layout_marginTop="@dimen/convert_32px" />
+            android:layout_alignParentBottom="true"
+
+            android:layout_marginStart="@dimen/convert_22px"
+            android:layout_marginBottom="@dimen/convert_28px" />
     </RelativeLayout>
 </RelativeLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView android:id="@+id/food_recycle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+</androidx.recyclerview.widget.RecyclerView>

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

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/convert_142px">
+    android:layout_height="@dimen/convert_88px">
 
 
     <RelativeLayout
         android:id="@+id/mode_layout"
-        android:layout_width="@dimen/convert_449px"
+        android:layout_width="@dimen/convert_314px"
         android:layout_height="match_parent"
         android:background="@drawable/ic_mode_round1">
 
         <ImageView
             android:id="@+id/iv_function"
-            android:layout_width="@dimen/convert_120px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_40px"
+            android:layout_height="@dimen/convert_40px"
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/convert_26px" />
 
@@ -26,28 +26,28 @@
             android:layout_toEndOf="@id/iv_function"
             android:text="@string/mode"
             android:textColor="@color/color_fff"
-            android:textSize="@dimen/convert_45px" />
+            android:textSize="@dimen/convert_36px" />
     </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/user_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/convert_65px"
-        android:layout_marginTop="@dimen/convert_18px"
-        android:layout_toEndOf="@id/mode_layout"
-        android:orientation="vertical">
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="@dimen/convert_58px"
+        android:layout_toStartOf="@+id/iv_wifi"
+        android:orientation="horizontal">
 
         <ImageView
-            android:layout_width="@dimen/convert_72px"
-            android:layout_height="@dimen/convert_72px"
+            android:layout_width="@dimen/convert_40px"
+            android:layout_height="@dimen/convert_40px"
             android:background="@drawable/ic_no_user" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_state"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/convert_6px"
+            android:layout_marginStart="@dimen/convert_7px"
             android:includeFontPadding="false"
             android:text="@string/login"
             android:textColor="@color/color_F4A12E"
@@ -56,27 +56,37 @@
 
     <ImageView
         android:id="@+id/iv_wifi"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
-        android:layout_marginStart="@dimen/convert_98px"
-        android:layout_marginTop="@dimen/convert_27px"
-        android:layout_toEndOf="@id/user_layout" />
+        android:layout_width="@dimen/convert_40px"
+        android:layout_height="@dimen/convert_40px"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="@dimen/convert_18px"
+        android:layout_toStartOf="@id/iv_notify" />
 
     <ImageView
         android:id="@+id/iv_notify"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
-        android:layout_marginStart="@dimen/convert_48px"
-        android:layout_marginTop="@dimen/convert_27px"
-        android:layout_toEndOf="@id/iv_wifi"
+        android:layout_width="@dimen/convert_40px"
+        android:layout_height="@dimen/convert_40px"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="@dimen/convert_18px"
+        android:layout_toStartOf="@+id/iv_tab"
         android:background="@drawable/ic_notify" />
 
     <ImageView
         android:id="@+id/iv_tab"
-        android:layout_width="@dimen/convert_90px"
-        android:layout_height="@dimen/convert_90px"
-        android:layout_marginStart="@dimen/convert_42px"
-        android:layout_marginTop="@dimen/convert_27px"
-        android:layout_toEndOf="@id/iv_notify"
+        android:layout_width="@dimen/convert_40px"
+        android:layout_height="@dimen/convert_40px"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="@dimen/convert_18px"
         android:background="@drawable/ic_tab" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/convert_50px"
+        android:layout_toEndOf="@id/mode_layout"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 </RelativeLayout>

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

@@ -1,100 +1,165 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/convert_48px"
-    android:paddingStart="@dimen/convert_45px"
-    android:paddingEnd="@dimen/convert_45px"
-    android:paddingBottom="@dimen/convert_48px">
+    android:paddingStart="@dimen/convert_24px"
+    android:paddingEnd="@dimen/convert_24px">
 
     <RelativeLayout
         android:id="@+id/card_layout"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/convert_24px"
+        android:layout_marginBottom="@dimen/convert_24px"
         android:visibility="visible">
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:id="@+id/filter_card_view"
-            android:layout_width="@dimen/convert_405px"
-            android:layout_height="@dimen/convert_122px"
-            app:cardCornerRadius="@dimen/convert_15px"
-            app:cardUseCompatPadding="true">
+            android:layout_width="@dimen/convert_207px"
+            android:layout_height="@dimen/convert_60px"
+            android:background="@drawable/shape_10px33a3a3a2_stroke">
 
             <ImageView
                 android:id="@+id/iv_filter_arrow"
-                android:layout_width="@dimen/convert_42px"
-                android:layout_height="@dimen/convert_24px"
+                android:layout_width="@dimen/convert_30px"
+                android:layout_height="@dimen/convert_30px"
                 android:layout_gravity="center_vertical|end"
-                android:layout_marginEnd="@dimen/convert_29px"
+                android:layout_marginEnd="@dimen/convert_15px"
                 android:background="@drawable/ic_down_arrow" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_filter_name"
                 android:layout_width="match_parent"
-                android:layout_marginEnd="@dimen/convert_90px"
-                android:layout_marginStart="@dimen/convert_20px"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text="@string/all"
+                android:layout_marginStart="@dimen/convert_20px"
+                android:layout_marginEnd="@dimen/convert_60px"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:textColor="@color/color_6B6B6B"
-                android:textSize="@dimen/convert_39px" />
-        </androidx.cardview.widget.CardView>
+                android:text="@string/all"
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_30px" />
+        </FrameLayout>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:id="@+id/sort_card_view"
-            android:layout_width="@dimen/convert_405px"
-            android:layout_height="@dimen/convert_122px"
-            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_width="@dimen/convert_198px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_marginStart="@dimen/convert_24px"
             android:layout_toEndOf="@id/filter_card_view"
-            app:cardCornerRadius="@dimen/convert_15px"
-            app:cardUseCompatPadding="true">
+            android:background="@drawable/shape_10px33a3a3a2_stroke">
 
             <ImageView
                 android:id="@+id/iv_sort_arrow"
-                android:layout_width="@dimen/convert_42px"
-                android:layout_height="@dimen/convert_24px"
+                android:layout_width="@dimen/convert_30px"
+                android:layout_height="@dimen/convert_30px"
                 android:layout_gravity="center_vertical|end"
-                android:layout_marginEnd="@dimen/convert_29px"
+                android:layout_marginEnd="@dimen/convert_15px"
                 android:background="@drawable/ic_down_arrow" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_sort_name"
-                android:layout_width="match_parent"
-                android:singleLine="true"
-                android:ellipsize="end"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginEnd="@dimen/convert_90px"
                 android:layout_marginStart="@dimen/convert_20px"
+                android:layout_marginEnd="@dimen/convert_50px"
+                android:ellipsize="end"
+                android:singleLine="true"
                 android:text="@string/most_popular"
-                android:textColor="@color/color_6B6B6B"
-                android:textSize="@dimen/convert_39px" />
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_30px" />
 
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:id="@+id/search_card_view"
-            android:layout_width="@dimen/convert_122px"
-            android:layout_height="@dimen/convert_122px"
-            android:layout_alignParentEnd="true"
-            app:cardCornerRadius="@dimen/convert_15px"
-            app:cardUseCompatPadding="true">
+            android:layout_width="wrap_content"
+            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">
 
             <ImageView
-                android:layout_width="@dimen/convert_48px"
-                android:layout_height="@dimen/convert_47px"
-                android:layout_gravity="center"
+                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" />
-        </androidx.cardview.widget.CardView>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|end"
+                android:layout_marginStart="@dimen/convert_79px"
+                android:layout_marginEnd="@dimen/convert_42px"
+                android:text="@string/search"
+                android:textColor="@color/color_EE8F08"
+                android:textSize="@dimen/convert_30px" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/online_layout"
+            android:layout_width="@dimen/convert_273px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@+id/download_layout"
+            android:background="@drawable/shape_100px6fb1fb_corners">
+
+            <ImageView
+                android:layout_width="@dimen/convert_46px"
+                android:layout_height="@dimen/convert_46px"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/convert_19px"
+                android:background="@drawable/ic_net" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|end"
+                android:layout_marginStart="@dimen/convert_72px"
+                android:layout_marginEnd="@dimen/convert_23px"
+                android:text="@string/online_recipes"
+                android:textColor="@color/white"
+                android:textSize="@dimen/convert_26px" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/download_layout"
+            android:layout_width="@dimen/convert_240px"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/convert_12px"
+            android:background="@drawable/shape_100px79c414_corners">
+
+            <ImageView
+                android:layout_width="@dimen/convert_46px"
+                android:layout_height="@dimen/convert_46px"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/convert_29px"
+                android:background="@drawable/ic_download" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|end"
+                android:layout_marginStart="@dimen/convert_87px"
+                android:layout_marginEnd="@dimen/convert_25px"
+                android:text="@string/download"
+                android:textColor="@color/white"
+                android:textSize="@dimen/convert_26px" />
+        </FrameLayout>
     </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/searchLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px"
+        android:layout_height="@dimen/convert_88px"
+        android:layout_marginStart="@dimen/convert_290px"
+        android:layout_marginTop="@dimen/convert_80px"
+        android:layout_marginEnd="@dimen/convert_290px"
+        android:layout_marginBottom="@dimen/convert_60px"
         android:visibility="gone">
 
         <ImageView
@@ -103,42 +168,32 @@
             android:layout_height="@dimen/convert_90px"
             android:layout_centerVertical="true"
             android:rotation="90"
-            android:src="@drawable/ic_down_arrow" />
+            android:src="@drawable/ic_down_arrow"
+            android:visibility="gone" />
 
         <EditText
             android:id="@+id/et_search"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="@dimen/convert_28px"
             android:layout_toEndOf="@id/iv_back"
             android:background="@drawable/shape_60pxe5e5e5_stoke"
             android:gravity="center_vertical"
             android:hint="@string/enter_search"
-            android:paddingStart="@dimen/convert_143px"
+            android:paddingStart="@dimen/convert_40px"
             android:singleLine="true"
-            android:textColor="@color/color_6B6B6B"
-            android:textColorHint="@color/color_B1B2B2"
+            android:textColor="@color/color_1A1A1A"
+            android:textColorHint="@color/color_1A1A1A"
             android:textSize="@dimen/convert_45px" />
 
         <ImageView
+            android:id="@+id/iv_search"
             android:layout_width="@dimen/convert_60px"
             android:layout_height="@dimen/convert_60px"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/convert_88px"
-            android:layout_toEndOf="@id/iv_back"
-            android:background="@drawable/ic_search" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="@dimen/convert_38px"
-            android:paddingTop="@dimen/convert_10px"
-            android:paddingBottom="@dimen/convert_10px"
-            android:text="@string/search"
-            android:textColor="@color/color_F4A12E"
-            android:textSize="@dimen/convert_54px" />
+            android:layout_marginEnd="@dimen/convert_34px"
+            android:background="@drawable/ic_search"
+            android:padding="@dimen/convert_5px" />
+
     </RelativeLayout>
 </RelativeLayout>

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

@@ -0,0 +1,40 @@
+<?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_640px"
+    android:layout_height="@dimen/convert_400px">
+
+    <ImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:layout_width="@dimen/convert_360px"
+        android:layout_height="@dimen/convert_260px"
+        android:background="@drawable/shape_10px33ffffff_corners"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/ic_icon"
+            android:layout_width="@dimen/convert_100px"
+            android:layout_height="@dimen/convert_100px"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_32px" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/ic_icon"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_14px"
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_30px"
+            android:textStyle="bold" />
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,48 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/convert_330px"
-    android:layout_marginStart="@dimen/convert_135px"
-    android:layout_marginEnd="@dimen/convert_135px"
+    android:layout_width="@dimen/convert_550px"
+    android:layout_height="@dimen/convert_220px"
+    android:layout_marginStart="@dimen/convert_60px"
+    android:layout_marginTop="@dimen/convert_60px"
     android:background="@drawable/shape_30pxccffffff_corners">
 
     <ImageView
         android:id="@+id/iv_day_night"
-        android:layout_width="@dimen/convert_150px"
-        android:layout_height="@dimen/convert_150px"
+        android:layout_width="@dimen/convert_138px"
+        android:layout_height="@dimen/convert_138px"
         android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/convert_90px"
-        android:layout_marginEnd="@dimen/convert_87px" />
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="@dimen/convert_52px" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:includeFontPadding="false"
         android:id="@+id/time_clock"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/convert_58px"
-        android:layout_marginTop="@dimen/convert_18px"
+        android:layout_marginStart="@dimen/convert_62px"
+        android:layout_marginTop="@dimen/convert_11px"
+        android:includeFontPadding="false"
         android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_120px" />
+        android:textSize="@dimen/convert_80px"
+        android:textStyle="bold" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_date"
-        android:includeFontPadding="false"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/time_clock"
         android:layout_marginStart="@dimen/convert_62px"
-        android:layout_marginTop="@dimen/convert_6px"
+        android:includeFontPadding="false"
         android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_39px" />
+        android:textSize="@dimen/convert_30px" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_weak"
-        android:includeFontPadding="false"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/tv_date"
         android:layout_marginStart="@dimen/convert_62px"
-        android:layout_marginTop="@dimen/convert_16px"
+        android:includeFontPadding="false"
         android:textColor="@color/color_6B6B6B" />
 
 

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

@@ -2,44 +2,44 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content_layout"
-    android:layout_width="match_parent"
+    android:layout_width="@dimen/convert_720px"
     android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/iv_signal"
-        android:layout_width="@dimen/convert_70px"
-        android:layout_height="@dimen/convert_70px"
-        android:layout_marginStart="@dimen/convert_60px"
-        android:layout_marginTop="@dimen/convert_35px"
+        android:layout_width="@dimen/convert_32px"
+        android:layout_height="@dimen/convert_32px"
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginTop="@dimen/convert_30px"
         tools:src="@drawable/icon_wifi_signal_level" />
 
     <ImageView
         android:id="@+id/iv_lock"
-        android:layout_width="@dimen/convert_45px"
-        android:layout_height="@dimen/convert_53px"
+        android:layout_width="@dimen/convert_30px"
+        android:layout_height="@dimen/convert_32px"
         android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/convert_65px"
-        android:layout_marginEnd="@dimen/convert_70px"
+        android:layout_marginTop="@dimen/convert_24px"
+        android:layout_marginEnd="@dimen/convert_54px"
         android:background="@drawable/ic_lock" />
 
     <RelativeLayout
         android:id="@+id/input_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
-            android:layout_marginStart="@dimen/convert_90px"
-            android:layout_marginTop="@dimen/convert_267px"
-            android:layout_marginEnd="@dimen/convert_90px"
-            android:layout_marginBottom="@dimen/convert_116px"
+            android:layout_height="@dimen/convert_88px"
+            android:layout_marginStart="@dimen/convert_54px"
+            android:layout_marginTop="@dimen/convert_168px"
+            android:layout_marginEnd="@dimen/convert_54px"
+            android:layout_marginBottom="@dimen/convert_50px"
             android:orientation="horizontal">
 
             <EditText
                 android:id="@+id/et_pwd"
-                android:layout_width="@dimen/convert_600px"
+                android:layout_width="@dimen/convert_499px"
                 android:layout_height="match_parent"
                 android:background="@drawable/shape_60pxe5e5e5_left_stoke"
                 android:gravity="center_vertical"
@@ -59,16 +59,16 @@
                 android:gravity="center"
                 android:text="@string/ok"
                 android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_54px" />
+                android:textSize="@dimen/convert_36px" />
         </LinearLayout>
 
         <CheckBox
             android:id="@+id/ckb_eye"
-            android:layout_width="@dimen/convert_57px"
-            android:layout_height="@dimen/convert_33px"
-            android:layout_marginStart="@dimen/convert_605px"
-            android:layout_marginTop="@dimen/convert_311px"
-            android:layout_marginEnd="@dimen/convert_327px"
+            android:layout_width="@dimen/convert_50px"
+            android:layout_height="@dimen/convert_50px"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/convert_186px"
+            android:layout_marginEnd="@dimen/convert_227px"
             android:background="@drawable/eye_selector"
             android:button="@null" />
 
@@ -78,13 +78,13 @@
         android:id="@+id/tv_wifi_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/convert_40px"
-        android:layout_marginTop="@dimen/convert_35px"
+        android:layout_marginStart="@dimen/convert_22px"
+        android:layout_marginTop="@dimen/convert_24px"
         android:layout_toEndOf="@id/iv_signal"
         android:includeFontPadding="false"
         android:text="WIFI-1001"
-        android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_45px" />
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
 
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -92,12 +92,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/tv_wifi_name"
-        android:layout_marginStart="@dimen/convert_40px"
-        android:layout_marginTop="@dimen/convert_30px"
-        android:layout_marginBottom="@dimen/convert_38px"
+        android:layout_marginStart="@dimen/convert_22px"
+        android:layout_marginTop="@dimen/convert_8px"
+        android:layout_marginBottom="@dimen/convert_22px"
         android:layout_toEndOf="@id/iv_signal"
         android:includeFontPadding="false"
         android:text="@string/off_line"
-        android:textColor="@color/color_6B6B6B"
-        android:textSize="@dimen/convert_39px" />
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_28px" />
 </RelativeLayout>

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

@@ -134,4 +134,8 @@
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
     <string name="repeat">REPEAT</string>
+    <string name="automatic_recipes">Automatic\nrecipes</string>
+    <string name="automatic_programmes">Automatic\nProgrammes</string>
+    <string name="manual_cooking">Manual\ncooking</string>
+    <string name="download_new_recipes">Download\nnew recipes</string>
 </resources>

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

@@ -134,4 +134,8 @@
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
     <string name="repeat">REPEAT</string>
+    <string name="automatic_recipes">Automatic\nrecipes</string>
+    <string name="automatic_programmes">Automatic\nProgrammes</string>
+    <string name="manual_cooking">Manual\ncooking</string>
+    <string name="download_new_recipes">Download\nnew recipes</string>
 </resources>

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

@@ -134,4 +134,8 @@
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
     <string name="repeat">REPEAT</string>
+    <string name="automatic_recipes">Automatic\nrecipes</string>
+    <string name="automatic_programmes">Automatic\nProgrammes</string>
+    <string name="manual_cooking">Manual\ncooking</string>
+    <string name="download_new_recipes">Download\nnew recipes</string>
 </resources>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -134,4 +134,8 @@
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
     <string name="repeat">REPEAT</string>
+    <string name="automatic_recipes">Automatic\nrecipes</string>
+    <string name="automatic_programmes">Automatic\nProgrammes</string>
+    <string name="manual_cooking">Manual\ncooking</string>
+    <string name="download_new_recipes">Download\nnew recipes</string>
 </resources>

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

@@ -34,4 +34,5 @@
     <color name="color_FFF6E9">#FFF6E9</color>
     <color name="color_A3A3A2">#A3A3A2</color>
     <color name="color_E4E4E4">#E4E4E4</color>
+    <color name="color_6FB1FB">#6FB1FB</color>
 </resources>

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

@@ -209,4 +209,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="Password_is_not_the_same">Password is not the same</string>
     <string name="enter">ENTER</string>
     <string name="repeat">REPEAT</string>
+    <string name="automatic_recipes">Automatic\nrecipes</string>
+    <string name="automatic_programmes">Automatic\nProgrammes</string>
+    <string name="manual_cooking">Manual\ncooking</string>
+    <string name="download_new_recipes">Download\nnew recipes</string>
 </resources>

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

@@ -4,11 +4,10 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.lifecycle.MutableLiveData
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.develop.base.ext.globalApp
-import com.develop.common.data_repo.FoodDataProvider
 import com.develop.base.ext.navigateTo
-import com.develop.base.mvvm.BaseBindingActivity
+import com.develop.common.data_repo.FoodDataProvider
 import com.develop.base.util.MMkvUtils
+import com.develop.common.data_repo.db.DataFactory
 import com.develop.common.dialog.LoadingDialog
 import com.develop.common.router.Screens
 import com.develop.common.tag.FIRST_IN
@@ -16,7 +15,14 @@ import com.develop.common.tag.MODE_ENTRANCE
 import com.develop.common.tag.Mode
 import com.develop.common.tag.Recipes
 import com.develop.common.ui.CommonBindingActivity
+import com.develop.common.widget.EntranceData
+import com.develop.common.widget.EntranceItemView
+import com.develop.common.widget.EntranceType
+import com.develop.main.R
 import com.develop.main.databinding.ActivityModeEntranceBinding
+import com.drake.brv.utils.grid
+import com.drake.brv.utils.models
+import com.drake.brv.utils.setup
 
 @Route(path = Screens.Main.ENTRANCE_CHOSEN)
 class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>() {
@@ -33,38 +39,53 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         MMkvUtils.save(FIRST_IN, true)
-        initListener()
         prepareDataLiveData = FoodDataProvider.getPrepareLiveData() as MutableLiveData<Boolean>
         prepareDataLiveData.observe(this) {
             loadingDialog.removeSelf()
         }
-    }
-
-    private fun initListener() {
-        binding.apply {
-            modeLayout.setOnClickListener {
-                val bundle = Bundle()
-                bundle.putInt(MODE_ENTRANCE, Mode)
-                navigateTo(Screens.Main.HOME) {
-                    with(bundle)
+        binding.entranceRecycle.apply {
+            grid(2)
+            setup {
+                addType<EntranceData>(R.layout.item_entrance)
+                onBind {
+                    findView<EntranceItemView>(R.id.entrance_item).setEntranceData(getModel())
                 }
-                finish()
-            }
-            recipesLayout.setOnClickListener {
-                if (FoodDataProvider.checkDataExit()) {
-                    val bundle = Bundle()
-                    bundle.putInt(MODE_ENTRANCE, Recipes)
-                    navigateTo(Screens.Main.HOME) {
-                        with(bundle)
+                R.id.entrance_item.onClick {
+                    val clickModel = getModel<EntranceData>()
+                    when (clickModel.type) {
+                        EntranceType.automatic_recipes -> {
+                            if (FoodDataProvider.checkDataExit()) {
+                                val bundle = Bundle()
+                                bundle.putInt(MODE_ENTRANCE, Recipes)
+                                navigateTo(Screens.Main.HOME) {
+                                    with(bundle)
+                                }
+                                finish()
+                            } else {
+                                showLoading()
+                            }
+                        }
+                        EntranceType.automatic_programmes -> {
+
+                        }
+                        EntranceType.manual_cooking -> {
+                            val bundle = Bundle()
+                            bundle.putInt(MODE_ENTRANCE, Mode)
+                            navigateTo(Screens.Main.HOME) {
+                                with(bundle)
+                            }
+                            finish()
+                        }
+                        EntranceType.download_new_recipes -> {
+
+                        }
                     }
-                    finish()
-                } else {
-                    showLoading()
                 }
             }
-        }
+        }.models = DataFactory.getEntranceData()
     }
 
+
     override fun onDestroy() {
         super.onDestroy()
         loadingDialog.removeSelf()

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

@@ -1,6 +1,7 @@
 package com.develop.main.ui
 
 
+import android.graphics.Rect
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -27,6 +28,7 @@ import com.develop.main.adapter.HomeBannerAdapter
 import com.develop.main.databinding.ItemFilterAndSortViewBinding
 import com.develop.main.viewmodel.HomeViewModel
 import com.drake.brv.BindingAdapter
+import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
@@ -120,10 +122,10 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             setup {
                 addType<String>(HOME_TITLE_PROVIDER)
                 addType<FilterSortModel>(HOME_FUNCTION_PROVIDER)
-                addType<FoodContentModel>(HOME_FOOD_PROVIDER)
                 addType<HomeBannerListModel>(HOME_BANNER_PROVIDER)
                 addType<CommonSearchModel>(HOME_SEARCH_PROVIDER)
                 addType<CategoryModel>(HOME_CATEGORY_PROVIDER)
+                addType<FoodListModel>(HOME_FOOD_LIST_PROVIDER)
                 onBind {
                     when (itemViewType) {
                         HOME_TITLE_PROVIDER -> {
@@ -131,15 +133,37 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                                 getModel()
                             )
                         }
+                        HOME_FOOD_LIST_PROVIDER -> {
+                            val foodListModel = getModel<FoodListModel>()
+                            val foodRecycle =
+                                findView<RecyclerView>(com.develop.common.R.id.food_recycle)
+                            foodRecycle.apply {
+                                addItemDecoration(object : RecyclerView.ItemDecoration() {
+                                    override fun getItemOffsets(
+                                        outRect: Rect,
+                                        view: View,
+                                        parent: RecyclerView,
+                                        state: RecyclerView.State
+                                    ) {
+                                        val srcPosition = parent.getChildAdapterPosition(view)
+                                    }
+                                })
+                                grid(4)
+                                setup {
+                                    addType<FoodContentModel>(com.develop.common.R.layout.food_content_provider)
+                                    onBind {
+                                        findView<FoodContentView>(com.develop.common.R.id.food_content_view).setFoodContent(
+                                                getModel()
+                                            )
+                                    }
+                                }
+                            }.models = foodListModel.foodList
+                        }
                         HOME_FUNCTION_PROVIDER -> {
                             filterSortSearchView =
                                 findView<HomeFilterSortSearchView>(R.id.function_view)
                             filterSortSearchView?.onFunctionCallback = functionCallback
                         }
-                        HOME_FOOD_PROVIDER -> {
-                            findView<FoodContentView>(R.id.food_content_view)
-                                .setFoodContent(getModel())
-                        }
                         HOME_BANNER_PROVIDER -> {
                             val bannerAdapter =
                                 HomeBannerAdapter(getModel<HomeBannerListModel>().data)
@@ -432,7 +456,8 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
 
     companion object {
         val HOME_TITLE_PROVIDER = R.layout.home_title_provider
-        val HOME_FOOD_PROVIDER = R.layout.food_content_provider
+        val HOME_FOOD_PROVIDER = com.develop.common.R.layout.food_content_provider
+        val HOME_FOOD_LIST_PROVIDER = com.develop.common.R.layout.food_grid_view
         val HOME_BANNER_PROVIDER = R.layout.home_banner_provider
         val HOME_SEARCH_PROVIDER = R.layout.home_common_search_provider
         val HOME_CATEGORY_PROVIDER = R.layout.home_category_tab_provider

BusinessMain/src/main/java/com/develop/main/viewmodel/HomeViewModel.kt

@@ -70,7 +70,6 @@ class HomeViewModel : BaseViewModel() {
                         currCategoryName,
                         localRecipeList,
                         favoriteRecipesList,
-                        starList,
                         sortedType
                     )
                 )
@@ -94,7 +93,6 @@ class HomeViewModel : BaseViewModel() {
                         currCategoryName,
                         localRecipeList,
                         favoriteRecipesList,
-                        starList,
                         sortedType
                     )
                 )

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

@@ -23,7 +23,7 @@
 
     <RelativeLayout
         android:id="@+id/right_content_layout"
-        android:layout_width="@dimen/convert_675px"
+        android:layout_width="@dimen/convert_550px"
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_gravity="end"
@@ -31,114 +31,118 @@
 
         <ImageView
             android:id="@+id/iv_avatar"
-            android:layout_width="@dimen/convert_294px"
-            android:layout_height="@dimen/convert_294px"
+            android:layout_width="@dimen/convert_140px"
+            android:layout_height="@dimen/convert_140px"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/convert_183px"
+            android:layout_marginTop="@dimen/convert_100px"
             android:background="@drawable/ic_icon1" />
 
         <LinearLayout
             android:id="@+id/history_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/tv_user_name"
-            android:layout_marginStart="@dimen/convert_77px"
-            android:layout_marginTop="@dimen/convert_140px"
-            android:background="@drawable/shape_60pxf4a12e_left_corners"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_40px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/shape_40pxee8f08_corners"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="@dimen/convert_75px"
-                android:layout_height="@dimen/convert_75px"
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
                 android:layout_marginStart="@dimen/convert_60px"
                 android:background="@drawable/ic_history" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_32px"
+                android:layout_marginStart="@dimen/convert_29px"
                 android:text="@string/cook_history"
                 android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_45px" />
+                android:textSize="@dimen/convert_30px" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/favourite_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/history_layout"
-            android:layout_marginStart="@dimen/convert_77px"
-            android:layout_marginTop="@dimen/convert_89px"
-            android:background="@drawable/shape_60pxf4a12e_left_corners"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/shape_40pxee8f08_corners"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="@dimen/convert_75px"
-                android:layout_height="@dimen/convert_75px"
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
                 android:layout_marginStart="@dimen/convert_60px"
                 android:background="@drawable/ic_favourite" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_32px"
+                android:layout_marginStart="@dimen/convert_29px"
                 android:text="@string/favourite_recipes"
                 android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_45px" />
+                android:textSize="@dimen/convert_30px" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/setting_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/favourite_layout"
-            android:layout_marginStart="@dimen/convert_77px"
-            android:layout_marginTop="@dimen/convert_89px"
-            android:background="@drawable/shape_60pxf4a12e_left_corners"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/shape_40pxee8f08_corners"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="@dimen/convert_75px"
-                android:layout_height="@dimen/convert_75px"
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
                 android:layout_marginStart="@dimen/convert_60px"
                 android:background="@drawable/ic_setting" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_32px"
+                android:layout_marginStart="@dimen/convert_29px"
                 android:text="@string/settings"
                 android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_45px" />
+                android:textSize="@dimen/convert_30px" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/policy_layout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/setting_layout"
-            android:layout_marginStart="@dimen/convert_77px"
-            android:layout_marginTop="@dimen/convert_89px"
-            android:background="@drawable/shape_60pxf4a12e_left_corners"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/shape_40pxee8f08_corners"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="@dimen/convert_75px"
-                android:layout_height="@dimen/convert_75px"
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
                 android:layout_marginStart="@dimen/convert_60px"
                 android:background="@drawable/ic_policy" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_32px"
+                android:layout_marginStart="@dimen/convert_29px"
                 android:text="@string/privacy_policy"
                 android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_45px" />
+                android:textSize="@dimen/convert_30px" />
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -147,11 +151,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/iv_avatar"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/convert_35px"
+            android:layout_marginTop="@dimen/convert_24px"
             android:includeFontPadding="false"
             android:text="@string/login"
-            android:textColor="@color/color_F4A12E"
-            android:textSize="@dimen/convert_45px" />
+            android:textColor="@color/color_EE8F08"
+            android:textSize="@dimen/convert_30px" />
     </RelativeLayout>
 
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -3,68 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/recipes_layout"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/entrance_recycle"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_974px"
-        android:background="@drawable/ic_mode_banner1">
-
-        <RelativeLayout
-            android:layout_width="@dimen/convert_449px"
-            android:layout_height="@dimen/convert_132px"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:background="@drawable/ic_mode_round2">
-
-            <ImageView
-                android:id="@+id/iv_recipes"
-                android:layout_width="@dimen/convert_120px"
-                android:layout_height="@dimen/convert_120px"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/convert_59px"
-                android:background="@drawable/ic_recipes" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/convert_26px"
-                android:layout_toEndOf="@id/iv_recipes"
-                android:text="@string/recipes"
-                android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_54px" />
-        </RelativeLayout>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/mode_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/recipes_layout"
-        android:background="@drawable/ic_mode_banner2">
-
-        <RelativeLayout
-            android:layout_width="@dimen/convert_449px"
-            android:layout_height="@dimen/convert_132px"
-            android:background="@drawable/ic_mode_round1">
-
-            <ImageView
-                android:id="@+id/iv_mode"
-                android:layout_width="@dimen/convert_120px"
-                android:layout_height="@dimen/convert_120px"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/convert_12px"
-                android:background="@drawable/ic_mode" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/convert_26px"
-                android:layout_toEndOf="@id/iv_mode"
-                android:text="@string/mode"
-                android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_54px" />
-        </RelativeLayout>
-    </RelativeLayout>
+        android:layout_height="match_parent" />
 </RelativeLayout>

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

@@ -3,9 +3,9 @@
     android:id="@+id/tv_food_category_name"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/convert_45px"
-    android:layout_marginBottom="@dimen/convert_35px"
-    android:textColor="@color/color_6B6B6B"
-    android:textSize="@dimen/convert_54px">
+    android:layout_marginStart="@dimen/convert_24px"
+    android:layout_marginBottom="@dimen/convert_24px"
+    android:textColor="@color/color_1A1A1A"
+    android:textSize="@dimen/convert_36px">
 
 </androidx.appcompat.widget.AppCompatTextView>

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

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

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

@@ -34,10 +34,9 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             binding.agreeLayout.visibility = View.GONE
         }
         countForPolicyTime()
-        binding.topBar.listenBackClick {
+        binding.ivBack.setOnClickListener {
             finish()
         }
-        binding.topBar.setTopBarTitle(com.develop.common.R.string.privacy_policy)
         binding.agreeLayout.setOnClickListener {
             isAgree = !isAgree
             if (isAgree) {

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

@@ -30,10 +30,10 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         super.onCreate(savedInstanceState)
         hasShowScreenSaver = true
         val dataList = mutableListOf(
-            com.develop.common.R.drawable.ic_screen1,
-            com.develop.common.R.drawable.ic_screen1,
-            com.develop.common.R.drawable.ic_screen1,
-            com.develop.common.R.drawable.ic_screen1
+            com.develop.common.R.drawable.ic_screensaver,
+            com.develop.common.R.drawable.ic_screensaver,
+            com.develop.common.R.drawable.ic_screensaver,
+            com.develop.common.R.drawable.ic_screensaver
         )
         val bannerAdapter = ScreenBannerAdapter(dataList)
         binding.bannerView.adapter = bannerAdapter

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

@@ -52,12 +52,6 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
             binding.tvSkin.visibility = View.GONE
             binding.tvNext.text = getText(com.develop.common.R.string.confirm)
         }
-        binding.topBar.apply {
-            listenBackClick {
-                finish()
-            }
-            setTopBarTitle(getString(com.develop.common.R.string.wifi))
-        }
 
         binding.wifiRecycler.apply {
             addItemDecoration(object : RecyclerView.ItemDecoration() {

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

@@ -46,6 +46,8 @@
         android:layout_alignParentEnd="true"
         android:layout_marginTop="@dimen/convert_40px"
         android:layout_marginEnd="@dimen/convert_72px"
+        android:drawableEnd="@drawable/ic_skin_arrow"
+        android:drawablePadding="@dimen/convert_15px"
         android:gravity="center"
         android:text="@string/skip"
         android:textColor="@color/color_fff"
@@ -81,7 +83,7 @@
                 android:layout_marginStart="@dimen/convert_28px"
                 android:layout_toEndOf="@id/iv_skin"
                 android:text="@string/enter"
-                android:textColor="@color/color_FFA627"
+                android:textColor="@color/color_fff"
                 android:textSize="@dimen/convert_36px" />
         </RelativeLayout>
 

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

@@ -3,11 +3,26 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
+    <ImageView
+        android:id="@+id/iv_back"
+        android:layout_width="@dimen/convert_54px"
+        android:layout_height="@dimen/convert_68px"
+        android:layout_marginStart="@dimen/convert_20px"
+        android:layout_marginTop="@dimen/convert_19px"
+        android:layout_toEndOf="@id/iv_banner"
+        android:padding="@dimen/convert_10px"
+        android:src="@drawable/ic_left_arrow" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/iv_banner" />
+        android:layout_marginStart="@dimen/convert_290px"
+        android:layout_marginTop="@dimen/convert_40px"
+        android:layout_toEndOf="@id/iv_banner"
+        android:text="@string/privacy_policy"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
 
     <ImageView
         android:id="@+id/iv_banner"
@@ -42,15 +57,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/tv_agree"
-        android:layout_marginBottom="@dimen/convert_40px"
+        android:layout_marginStart="@dimen/convert_208px"
+        android:layout_marginBottom="@dimen/convert_20px"
         android:layout_toEndOf="@id/iv_banner"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/iv_selected"
-            android:layout_width="@dimen/convert_45px"
-            android:layout_height="@dimen/convert_45px"
+            android:layout_width="@dimen/convert_30px"
+            android:layout_height="@dimen/convert_30px"
             android:background="@drawable/ic_unselected" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -58,7 +74,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/convert_24px"
             android:text="@string/i_have_read_the_privacy_policy"
-            android:textColor="@color/color_E60012" />
+            android:textColor="@color/color_E60012"
+            android:textSize="@dimen/convert_26px" />
     </LinearLayout>
 
 
@@ -66,8 +83,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/agree_layout"
+        android:layout_below="@id/tv_title"
         android:layout_marginStart="@dimen/convert_40px"
-        android:layout_marginTop="@dimen/convert_110px"
+        android:layout_marginTop="@dimen/convert_24px"
         android:layout_marginEnd="@dimen/convert_40px"
         android:layout_marginBottom="@dimen/convert_40px"
         android:layout_toEndOf="@id/iv_banner"
@@ -84,7 +102,7 @@
                 android:layout_marginStart="@dimen/convert_44px"
                 android:layout_marginTop="@dimen/convert_30px"
                 android:layout_marginEnd="@dimen/convert_44px"
-                android:lineSpacingExtra="@dimen/convert_20px"
+                android:lineHeight="@dimen/convert_48px"
                 android:text="@string/privacy_policy_content"
                 android:textColor="@color/color_1A1A1A"
                 android:textSize="@dimen/convert_28px" />

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

@@ -14,8 +14,7 @@
     <com.develop.common.widget.ShowTimeView
         android:id="@+id/show_time_view"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/convert_147px" />
+        android:layout_height="wrap_content" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/circle_recycler"

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

@@ -1,50 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     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:id="@+id/iv_banner"
+        android:layout_width="@dimen/convert_480px"
+        android:layout_height="match_parent"
+        android:background="@drawable/guide_bg" />
+
+    <ImageView
+        android:layout_width="@dimen/convert_350px"
+        android:layout_height="@dimen/convert_350px"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/convert_65px"
+        android:background="@drawable/ic_guide_logo" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginStart="@dimen/convert_375px"
+        android:layout_marginTop="@dimen/convert_40px"
+        android:layout_toEndOf="@id/iv_banner"
+        android:text="@string/wifi"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_skin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/convert_80px"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="@dimen/convert_312px"
+        android:layout_marginBottom="@dimen/convert_50px"
+        android:layout_toEndOf="@id/iv_banner"
         android:text="@string/skin_for_now"
         android:textColor="@color/color_F4A12E"
-        android:textSize="@dimen/convert_54px"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:textSize="@dimen/convert_30px" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_next"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px"
-        android:layout_above="@id/tv_skin"
-        android:layout_marginStart="@dimen/convert_75px"
-        android:layout_marginEnd="@dimen/convert_75px"
-        android:layout_marginBottom="@dimen/convert_60px"
+        android:layout_height="@dimen/convert_98px"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:layout_marginBottom="@dimen/convert_130px"
+        android:layout_toEndOf="@id/iv_banner"
         android:background="@drawable/shape_60pxf4a12e_corners"
         android:gravity="center"
         android:text="@string/next"
         android:textColor="@color/color_fff"
-        android:textSize="@dimen/convert_54px"
+        android:textSize="@dimen/convert_36px"
         app:layout_constraintBottom_toTopOf="@id/tv_skin" />
 
     <androidx.recyclerview.widget.RecyclerView
+        android:layout_marginTop="@dimen/convert_40px"
         android:id="@+id/wifi_recycler"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
+        android:layout_above="@id/tv_next"
+        android:layout_below="@id/tv_title"
         android:layout_marginBottom="@dimen/convert_20px"
-        app:layout_constraintBottom_toTopOf="@id/tv_next"
-        app:layout_constraintTop_toBottomOf="@id/top_bar" />
+        android:layout_toEndOf="@id/iv_banner" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:cardCornerRadius="@dimen/convert_30px">
+    android:background="@drawable/shape_10px33a3a3a2_stroke">
 
     <com.develop.common.widget.WifiContentView
         android:id="@+id/wifi_content"
@@ -11,4 +10,4 @@
         android:layout_height="wrap_content">
 
     </com.develop.common.widget.WifiContentView>
-</androidx.cardview.widget.CardView>
+</FrameLayout>

BusinessStep/src/main/AndroidManifest.xml

@@ -3,10 +3,20 @@
     package="com.develop.step">
 
     <application>
-        <activity android:name=".ui.FoodListActivity" />
-        <activity android:name=".ui.ModesDetailActivity" />
-        <activity android:name=".ui.recipes_detail.CookDetailActivity" />
-        <activity android:name=".ui.recipes_detail.CookEvaluateActivity" />
-        <activity android:name=".ui.cook_step.CookStepActivity" />
+        <activity
+            android:name=".ui.FoodListActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.ModesDetailActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.recipes_detail.CookDetailActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.recipes_detail.CookEvaluateActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.cook_step.CookStepActivity"
+            android:screenOrientation="landscape" />
     </application>
 </manifest>

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

@@ -7,6 +7,7 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.updateText
 import com.develop.common.data_repo.db.FoodContentModel
 import com.develop.common.event.RefreshDataEvent
 import com.develop.common.router.Screens
@@ -18,6 +19,7 @@ import com.develop.common.widget.FoodContentView
 import com.develop.step.R
 import com.develop.step.databinding.ActivityFoodListBinding
 import com.develop.step.viewmodel.FoodListViewModel
+import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
@@ -41,14 +43,11 @@ class FoodListActivity : CommonBVMActivity<ActivityFoodListBinding, FoodListView
         EventBus.getDefault().register(this)
         val bundle = intent.extras
         title = bundle?.getString(FOOL_LIST_TITLE) ?: ""
-        viewModel.foodListType = bundle?.getInt(FOOD_LIST_TYPE) ?: Favourite
-        binding.topBar.apply {
-            setTopBarTitle(title)
-            listenBackClick {
-                finish()
-            }
+        binding.tvTitle.updateText(title)
+        binding.ivClose.setOnClickListener {
+            finish()
         }
-
+        viewModel.foodListType = bundle?.getInt(FOOD_LIST_TYPE) ?: Favourite
         binding.foodListRecycler.apply {
             addItemDecoration(object : RecyclerView.ItemDecoration() {
                 override fun getItemOffsets(
@@ -64,7 +63,7 @@ class FoodListActivity : CommonBVMActivity<ActivityFoodListBinding, FoodListView
                     }
                 }
             })
-            linear()
+            grid(4)
             setup {
                 addType<FoodContentModel>(R.layout.food_content_provider)
                 onBind {

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

@@ -4,16 +4,29 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_43px"
+        android:layout_height="@dimen/convert_43px"
+        android:layout_marginStart="@dimen/convert_31px"
+        android:layout_marginTop="@dimen/convert_20px"
+        android:padding="@dimen/convert_10px"
+        android:src="@drawable/ic_close" />
 
-    <com.develop.common.widget.TopTitleView
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_36px" />
 
     <androidx.recyclerview.widget.RecyclerView
+        android:layout_below="@id/tv_title"
+        android:layout_marginTop="@dimen/convert_20px"
         android:id="@+id/food_list_recycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/top_bar" />
+        android:layout_height="match_parent" />
 
 </RelativeLayout>