创建062换肤文件

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

@@ -67,7 +67,6 @@
         android:layout_height="@dimen/convert_60px"
         android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/convert_26px"
-
         android:layout_toStartOf="@id/iv_notify" />
 
     <ImageView

BusinessMain/build.gradle

@@ -15,6 +15,9 @@ android{
 
 dependencies {
     api project(path: ':BusinessCommon')
+    api 'androidx.appcompat:appcompat:1.3.0'
+    api 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     kapt 'com.alibaba:arouter-compiler:1.5.2'
     kapt  "androidx.room:room-compiler:2.4.2"
 }

BusinessMain/src/main/AndroidManifest.xml

@@ -3,14 +3,19 @@
     package="com.develop.main">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application>
         <activity
+            android:name=".ui.ModeEntrance2Activity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.ModeEntranceActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="landscape"
-            android:name=".ui.ModeEntranceActivity" />
+            android:screenOrientation="landscape" />
         <activity
-            android:screenOrientation="landscape"
+            android:name=".ui.HomeActivity"
             android:launchMode="singleTask"
-            android:name=".ui.HomeActivity" />
+            android:screenOrientation="landscape" />
     </application>
+
 </manifest>

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

@@ -0,0 +1,295 @@
+package com.develop.main.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import androidx.lifecycle.MutableLiveData
+import com.develop.base.ext.getModelNum
+import com.develop.base.ext.navigateTo
+import com.develop.base.ext.src
+import com.develop.base.util.MMkvUtils
+import com.develop.base.util.SettingKeyBoardUtils
+import com.develop.common.data_repo.FoodDataProvider
+import com.develop.common.data_repo.db.entity.UserInfo
+import com.develop.common.dialog.LoadingDialog
+import com.develop.common.router.Screens
+import com.develop.common.tag.CURRENT_LANGUAGE
+import com.develop.common.tag.CURRENT_USER_ID
+import com.develop.common.tag.FIRST_IN
+import com.develop.common.tag.FOOD_LIST_TYPE
+import com.develop.common.tag.FOOL_LIST_TITLE
+import com.develop.common.tag.Favourite
+import com.develop.common.tag.HOME_TITLE
+import com.develop.common.tag.History
+import com.develop.common.tag.LocalFood
+import com.develop.common.tag.MODE_ENTRANCE
+import com.develop.common.tag.MODE_TYPE
+import com.develop.common.tag.Mode
+import com.develop.common.tag.NetFood
+import com.develop.common.tag.POLICY_FROM_MAIN_SETTING
+import com.develop.common.tag.RECIPES_TYPE
+import com.develop.common.tag.Recipes
+import com.develop.common.ui.CommonBindingActivity
+import com.develop.common.utils.AppVersionUtil
+import com.develop.main.databinding.ActivityModeEntrance2Binding
+import com.kuyuntech.cofarcooking.device.sdk.constant.core.CommonEventTypes
+import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevModes
+import com.kuyuntech.cofarcooking.device.sdk.constant.core.WorkModes
+import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevCommonEvent
+import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
+import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
+import com.tuya.smartai.iot_sdk.Log
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+class ModeEntrance2Activity : CommonBindingActivity<ActivityModeEntrance2Binding>() {
+    private var title = ""
+    private var isShowLoading = false
+    private var isDevModes = true
+    private var isModelNum = ""
+    private var devMode = ""
+    private val loadingDialog by lazy {
+        LoadingDialog()
+    }
+
+    var prepareDataLiveData = MutableLiveData<Boolean>()
+
+    override fun createViewBinding(inflater: LayoutInflater): ActivityModeEntrance2Binding {
+        return ActivityModeEntrance2Binding.inflate(inflater)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        MMkvUtils.save(FIRST_IN, true)
+        //设置键盘语言
+        SettingKeyBoardUtils.setTingKeyBoard(
+            this,
+            MMkvUtils.getString(CURRENT_LANGUAGE)?.lowercase() ?: "en"
+        )
+        devMode = CofarSDK.devInfo().devMode
+        isModelNum = getModelNum()
+
+        prepareDataLiveData = FoodDataProvider.getPrepareLiveData() as MutableLiveData<Boolean>
+        prepareDataLiveData.observe(this) {
+            loadingDialog.removeSelf()
+        }
+        binding.ivOneBg.setOnClickListener {
+            if (FoodDataProvider.checkDataExit()) {
+                val bundle = Bundle()
+                bundle.putInt(MODE_ENTRANCE, Recipes)
+                bundle.putInt(RECIPES_TYPE, LocalFood)
+                bundle.putString(HOME_TITLE, title)
+                navigateTo(Screens.Main.HOME) {
+                    with(bundle)
+                }
+            } else {
+                showLoading()
+            }
+        }
+
+        binding.ivTwoBg.setOnClickListener {
+            if (FoodDataProvider.checkDataExit()) {
+                val bundle = Bundle()
+                bundle.putInt(MODE_ENTRANCE, Mode)
+                bundle.putString(HOME_TITLE, title)
+                navigateTo(Screens.Main.HOME) {
+                    with(bundle)
+                }
+            } else {
+                showLoading()
+            }
+        }
+        binding.ivThreeBg.setOnClickListener {
+            if (FoodDataProvider.checkDataExit()) {
+
+                navigateTo(Screens.Cook.COOK_MODES) {
+                    if (CofarSDK.devInfo().devMode == DevModes.SOUP) {
+                        val bundle = Bundle()
+                        bundle.putString(MODE_TYPE, WorkModes.ADAPTED_COOKING)
+                        bundle.putString(
+                            "mode_name",
+                            resources.getString(com.develop.common.R.string.adapted_cooking)
+                        )
+                        with(bundle)
+                    } else {
+                        val bundle = Bundle()
+                        bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
+                        with(bundle)
+                    }
+                }
+            } else {
+                showLoading()
+            }
+        }
+        binding.ivFourBg.setOnClickListener {
+            if (FoodDataProvider.checkDataExit()) {
+                val bundle = Bundle()
+                bundle.putInt(MODE_ENTRANCE, Recipes)
+                bundle.putInt(RECIPES_TYPE, NetFood)
+                bundle.putString(HOME_TITLE, title)
+                navigateTo(Screens.Main.HOME) {
+                    with(bundle)
+                }
+            } else {
+                showLoading()
+            }
+        }
+        binding.settingLayout.setOnClickListener {
+            navigateTo(Screens.Setting.MAIN_SETTING)
+            binding.contentView.closeDrawers()
+        }
+
+        binding.favouriteLayout.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString(
+                FOOL_LIST_TITLE, getString(com.develop.common.R.string.favourite_recipes)
+            )
+            bundle.putInt(FOOD_LIST_TYPE, Favourite)
+            navigateTo(Screens.Cook.FOOD_LIST) {
+                with(bundle)
+            }
+            binding.contentView.closeDrawers()
+        }
+
+        binding.historyLayout.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString(FOOL_LIST_TITLE, getString(com.develop.common.R.string.cook_history))
+            bundle.putInt(FOOD_LIST_TYPE, History)
+            navigateTo(Screens.Cook.FOOD_LIST) {
+                with(bundle)
+            }
+            binding.contentView.closeDrawers()
+        }
+
+        binding.policyLayout.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putBoolean(POLICY_FROM_MAIN_SETTING, true)
+            navigateTo(Screens.Setting.POLICY) {
+                with(bundle)
+            }
+            binding.contentView.closeDrawers()
+        }
+
+        binding.helpLayout.setOnClickListener {
+            navigateTo(Screens.Setting.HELP)
+            binding.contentView.closeDrawers()
+        }
+
+        binding.ivAvatar.setOnClickListener {
+            navigateTo(Screens.Auth.MEMBER) {
+                withBoolean("enter_from_home", true)
+            }
+        }
+
+        binding.ivTab.setOnClickListener {
+            if (FoodDataProvider.checkDataExit()) {
+                binding.contentView.openDrawer(binding.rightContentLayout)
+            } else {
+                showLoading()
+            }
+        }
+
+
+    }
+
+
+    override fun onResume() {
+        devMode = CofarSDK.devInfo().devMode
+        super.onResume()
+        AppVersionUtil.checkRecipeUpdate(false)
+//        UpdateUtil.checkApkVersion(false)
+        val userInfo = FoodDataProvider
+            .getUserDatabase()
+            .userInfoDao()
+            .queryUserInfoByUserId(CURRENT_USER_ID)
+        updateUserInfoUi(userInfo)
+    }
+
+
+    override fun onDestroy() {
+        super.onDestroy()
+        loadingDialog.removeSelf()
+    }
+
+
+    private fun updateUserInfoUi(userInfo: UserInfo?) {
+        if (userInfo?.userName != null) {
+            binding.tvUserName.text = userInfo.userName ?: ""
+            val icon = when (userInfo.userAvatar?.toInt() ?: 0) {
+                0 -> {
+                    com.develop.common.R.drawable.ic_icon1
+                }
+
+                1 -> {
+                    com.develop.common.R.drawable.ic_icon2
+                }
+
+                2 -> {
+                    com.develop.common.R.drawable.ic_icon3
+                }
+
+                3 -> {
+                    com.develop.common.R.drawable.ic_icon4
+                }
+
+                4 -> {
+                    com.develop.common.R.drawable.ic_icon5
+                }
+
+                else -> {
+                    com.develop.common.R.drawable.ic_icon6
+                }
+            }
+            binding.ivAvatar.src = icon
+        } else {
+            binding.ivAvatar.src = com.develop.common.R.drawable.ic_user
+            binding.tvUserName.text = getString(com.develop.common.R.string.login)
+        }
+    }
+
+
+    private fun showLoading() {
+        isShowLoading = true
+        loadingDialog.showDialog(supportFragmentManager, "Loading")
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onDevStateEvent(event: DevStatusEvent) {
+        Log.e("TAG devMode", "devMode :$devMode")
+        ////devInfo.potStatus 0是有锅  1是没锅
+        //当没有锅得时候，默认是汤锅模式 //切当前Fragment可见状态 // 只针对5037的处理
+        if (isModelNum == "5037" && event.devInfo.potStatus.toInt() == 1) {
+            // isDevModes 避免重复刷新
+            if (isDevModes && devMode != DevModes.SOUP) {
+                isDevModes = false
+                CofarSDK.changeDevModeFocus(DevModes.SOUP)
+            }
+        } else if (isModelNum == "5037" && event.devInfo.potStatus.toInt() == 0) {
+            /**
+             * 由于客户无锅状态下是默认汤锅列表，但是在一进来是空炸锅，拿出来（无锅的时候已经换了汤锅模式），
+             * 但重新放空炸锅，onDevModeChange 是不会回调的，固需要用potCoverType 锅盖协议来判断是否需要重新换模式
+             * */
+            //potCoverType 0 是汤锅 1是空炸
+            if (event.devInfo.potCloverType.toInt() == 1 && devMode == DevModes.SOUP) {
+                CofarSDK.changeDevModeFocus(DevModes.AIR_FRYER)
+            } else if (event.devInfo.potCloverType.toInt() == 0 && devMode == DevModes.AIR_FRYER) {
+                CofarSDK.changeDevModeFocus(DevModes.SOUP)
+            }
+            isDevModes = true
+
+        }
+
+
+    }
+
+    @Subscribe
+    fun onDevModeChange(event: DevCommonEvent) {
+        //在当前页面，换了模式以后 重新启动
+        if (CommonEventTypes.DEV_MODE_CHANGE == event.type) {
+            devMode = CofarSDK.devInfo().devMode
+        }
+
+
+    }
+
+
+}

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

@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout 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="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_color">
+
+    <FrameLayout
+        android:id="@+id/home_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/convert_20px"
+            android:orientation="horizontal">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/mode_content_one"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="2">
+
+                <ImageView
+                    android:id="@+id/iv_one_bg"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/entrance_062_bg_1"
+                    />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_one_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/convert_52px"
+                    android:layout_marginEnd="@dimen/convert_52px"
+                    android:layout_marginBottom="@dimen/convert_75px"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/convert_46px"
+                    android:textStyle="bold"
+                    android:text="@string/automatic_programmes"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/convert_30px"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:layout_marginBottom="@dimen/convert_20px"
+                    android:orientation="horizontal">
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:layout_marginRight="@dimen/convert_15px"
+                        >
+                        <ImageView
+                            android:id="@+id/iv_two_bg"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/entrance_062_bg_2"
+
+                            />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_two_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/convert_80px"
+                            android:layout_marginEnd="@dimen/convert_80px"
+                            android:layout_marginBottom="@dimen/convert_75px"
+                            android:gravity="center"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/convert_46px"
+                            android:textStyle="bold"
+                            android:text="@string/automatic_recipes"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:layout_marginLeft="@dimen/convert_15px"
+                        >
+                        <ImageView
+                            android:id="@+id/iv_three_bg"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/entrance_062_bg_3"
+                            />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_three_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/convert_80px"
+                            android:layout_marginEnd="@dimen/convert_80px"
+                            android:layout_marginBottom="@dimen/convert_75px"
+                            android:gravity="center"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/convert_46px"
+                            android:textStyle="bold"
+                            android:text="@string/manual_cooking"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2.5">
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        >
+                        <ImageView
+                            android:id="@+id/iv_four_bg"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/entrance_062_bg_4"
+                            />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_four_title"
+                            android:layout_width="@dimen/convert_450px"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/convert_52px"
+                            android:layout_marginEnd="@dimen/convert_52px"
+                            android:layout_marginBottom="@dimen/convert_75px"
+                            android:gravity="center"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/convert_46px"
+                            android:textStyle="bold"
+                            android:text="@string/download_new_recipes"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/iv_tab"
+            android:layout_width="@dimen/convert_120px"
+            android:layout_height="@dimen/convert_120px"
+            android:layout_marginStart="@dimen/convert_35px"
+            android:layout_marginTop="@dimen/convert_35px"
+            android:src="@drawable/iv_062_tab" />
+    </FrameLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/right_content_layout"
+        android:layout_width="@dimen/convert_550px"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:layout_gravity="end"
+        android:background="@color/home_menu_bg">
+
+        <ImageView
+            android:id="@+id/iv_avatar"
+            android:layout_width="@dimen/convert_140px"
+            android:layout_height="@dimen/convert_140px"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_80px"
+            android:src="@drawable/ic_user" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/iv_avatar"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:includeFontPadding="false"
+            android:text="@string/login"
+            android:textColor="@color/home_user_name"
+            android:textSize="@dimen/convert_30px" />
+
+        <LinearLayout
+            android:id="@+id/history_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/tv_user_name"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_40px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/home_menu_corners"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_60px"
+                android:background="@drawable/ic_history" />
+
+            <com.develop.common.widget.MarqueeTextView
+                android:id="@+id/tv_history"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_29px"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
+                android:text="@string/cook_history"
+                android:textColor="@color/home_menu_title"
+                android:textSize="@dimen/convert_30px" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/favourite_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/history_layout"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/home_menu_corners"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_60px"
+                android:background="@drawable/ic_favourite" />
+
+            <com.develop.common.widget.MarqueeTextView
+                android:id="@+id/tv_favourite"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_29px"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
+                android:text="@string/favourite_recipes"
+                android:textColor="@color/home_menu_title"
+                android:textSize="@dimen/convert_30px" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/setting_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/favourite_layout"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/home_menu_corners"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_60px"
+                android:background="@drawable/ic_setting" />
+
+            <com.develop.common.widget.MarqueeTextView
+                android:id="@+id/tv_setting"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_29px"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
+                android:text="@string/settings"
+                android:textColor="@color/home_menu_title"
+                android:textSize="@dimen/convert_30px" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/help_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/setting_layout"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/home_menu_corners"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_60px"
+                android:background="@drawable/ic_help" />
+
+            <com.develop.common.widget.MarqueeTextView
+                android:id="@+id/tv_help"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_29px"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
+                android:text="@string/help"
+                android:textColor="@color/home_menu_title"
+                android:textSize="@dimen/convert_30px" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/policy_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/help_layout"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/home_menu_corners"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_60px"
+                android:background="@drawable/ic_policy" />
+
+            <com.develop.common.widget.MarqueeTextView
+                android:id="@+id/tv_policy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_29px"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
+                android:text="@string/privacy_policy"
+                android:textColor="@color/home_menu_title"
+                android:textSize="@dimen/convert_30px" />
+        </LinearLayout>
+
+
+    </RelativeLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -0,0 +1 @@
+<resources></resources>

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

@@ -203,7 +203,7 @@ fun getSN(): String {
     var serial: String
     if (BuildConfig.DEBUG) {
 //        return "045A21030020123010190001"
-//    return "000A30150020123010190001"
+    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
 //     return "000A10390020123010190001"
 //        return "000A50370020123010190005"
@@ -212,7 +212,7 @@ fun getSN(): String {
 //        return "011A50370020123010190001"
 //    return "007D20020020123010190001"
 //    return "036I21060020123010190003"
-    return  "030A10390020123010190001"
+//    return  "030A10390020123010190001"
 //    return  "017A20060020123010190001"
 //    return "010D10390020123010190001"
 //    return "000A10390020123010190009"

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

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

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

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

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

@@ -4,6 +4,6 @@
     <corners android:radius="@dimen/convert_10px" />
     <stroke
         android:width="@dimen/convert_1px"
-        android:color="@color/color_A3A3A2" />
+        android:color="@color/color_5887DA" />
     <solid android:color="@color/color_fff" />
 </shape>

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

@@ -3,6 +3,6 @@
     <corners android:radius="@dimen/convert_60px" />
     <stroke
         android:width="@dimen/convert_1px"
-        android:color="@color/color_EE8F08" />
-    <solid android:color="@color/color_FFF6E9"/>
+        android:color="#ff5887da" />
+    <solid android:color="#ffeef4ff"/>
 </shape>

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

@@ -35,6 +35,7 @@
     <color name="color_A3A3A2">#A3A3A2</color>
     <color name="color_E4E4E4">#E4E4E4</color>
     <color name="color_6FB1FB">#6FB1FB</color>
+    <color name="color_5887DA">#5887DA</color>
 
 
 
@@ -52,14 +53,14 @@
     <color name="brightness_content">#ffffff</color>
     <color name="seekbar_selected">#1296DB</color>
     <color name="seekbar_unselect">#E5E5E5</color>
-    <color name="language_conner">#E03E52</color>
+    <color name="language_conner">#5887DA</color>
     <color name="language_next">#fff</color>
     <color name="policy_conner">#E5E5E5</color>
     <color name="policy_content">#1A1A1A</color>
     <color name="policy_stroke">#E4E4E4</color>
     <color name="policy_solid">#fff</color>
     <color name="policy_agree">#fff</color>
-    <color name="policy_agree_tip">#E60012</color>
+    <color name="policy_agree_tip">#FC5B67</color>
 
     <color name="setting_title">#fff</color>
 
@@ -67,10 +68,10 @@
     <color name="thumb_unselect">#E5E5E5</color>
     <color name="thumb_select">#E03E52</color>
 
-    <color name="wifi_tip">#E03E52</color>
+    <color name="wifi_tip">#5887DA </color>
     <color name="wifi_left_stroke">#E5E5E5</color>
     <color name="wifi_pwd_input">#6B6B6B</color>
-    <color name="wifi_right_conner">#E03E52</color>
+    <color name="wifi_right_conner">#5887DA</color>
     <color name="wifi_ok">#fff</color>
     <color name="wifi_name">#1A1A1A</color>
     <color name="wifi_state">#1A1A1A</color>
@@ -79,18 +80,18 @@
     <color name="forgot_input_stroke">#A3A3A2</color>
     <color name="forget_tip">#E60012</color>
     <color name="forgot_conner">#E03E52</color>
-    <color name="login">#000000</color>
+    <color name="login">#5887DA</color>
     <color name="launch_content">#1A1A1A</color>
-    <color name="skin_for_now">#000</color>
+    <color name="skin_for_now">#5887DA</color>
     <color name="login_title">#1A1A1A</color>
-    <color name="forget_pwd">#E60012</color>
-    <color name="register">#E03E52</color>
+    <color name="forget_pwd">#FC5B67</color>
+    <color name="register">#5887DA </color>
     <color name="profile_title">#1A1A1A</color>
-    <color name="register_tip">#E60012</color>
+    <color name="register_tip">#FC5B67</color>
 
-    <color name="home_tab">#E03E52</color>
+    <color name="home_tab">#5887DA</color>
     <color name="home_function_name">#fff</color>
-    <color name="login_state">#fff</color>
+    <color name="login_state">#5887DA</color>
     <color name="home_title">#1A1A1A</color>
 
     <color name="home_menu_bg">#fff</color>
@@ -108,13 +109,13 @@
     <color name="sort_stroke">#fff</color>
     <color name="sort_soild">#000</color>
     <color name="sort_value">#fff</color>
-    <color name="search_stroke">#fff</color>
-    <color name="search_soild">#000</color>
-    <color name="search_value">#fff</color>
+    <color name="search_stroke">#5887DA</color>
+    <color name="search_soild">#fff</color>
+    <color name="search_value">#5887DA</color>
 
     <color name="home_category_title">#fff</color>
     <color name="sort_filter_name">#1A1A1A</color>
-    <color name="sort_filter_selected_name">#E03E52</color>
+    <color name="sort_filter_selected_name">#5887DA</color>
     <color name="sort_filter_line">#E5E5E5</color>
     <color name="sort_filter_bg">#fff</color>
     <color name="mode_guide_title">#E03E52</color>