系统设置UI界面

lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcDebugAddressEnum.kt

@@ -12,17 +12,17 @@ enum class PlcDebugAddressEnum(val address: String, val aName: String,val aNameI
     IO_SE_07("00FB07","次核点位7",R.string.base_plc_debug_7),
     IO_SE_08("00FB08","次核点位8",R.string.base_plc_debug_8),
     IO_SE_09("00FB09","次核点位9",R.string.base_plc_debug_9),
-    IO_SE_10("00FB10","次核点位10",R.string.base_plc_debug_10),
-    IO_SE_11("00FB11","次核点位11",R.string.base_plc_debug_11),
-    IO_SE_12("00FB12","次核点位12",R.string.base_plc_debug_12),
-    IO_SE_13("00FB13","次核点位13",R.string.base_plc_debug_13),
-    IO_SE_14("00FB14","次核点位14",R.string.base_plc_debug_14),
-    IO_SE_15("00FB15","次核点位15",R.string.base_plc_debug_15),
-    IO_SE_16("00FB16","次核点位16",R.string.base_plc_debug_16),
-    IO_SE_17("00FB17","次核点位17",R.string.base_plc_debug_17),
-    IO_SE_18("00FB18","次核点位18",R.string.base_plc_debug_18),
-    IO_SE_19("00FB19","次核点位19",R.string.base_plc_debug_19),
-    IO_SE_20("00FB20","次核点位20",R.string.base_plc_debug_20),
+    IO_SE_10("00FB0A","次核点位10",R.string.base_plc_debug_10),
+    IO_SE_11("00FB0B","次核点位11",R.string.base_plc_debug_11),
+    IO_SE_12("00FB0C","次核点位12",R.string.base_plc_debug_12),
+//    IO_SE_13("00FB0D","次核点位13",R.string.base_plc_debug_13),
+//    IO_SE_14("00FB0F","次核点位14",R.string.base_plc_debug_14),
+//    IO_SE_15("00FB15","次核点位15",R.string.base_plc_debug_15),
+//    IO_SE_16("00FB16","次核点位16",R.string.base_plc_debug_16),
+//    IO_SE_17("00FB17","次核点位17",R.string.base_plc_debug_17),
+//    IO_SE_18("00FB18","次核点位18",R.string.base_plc_debug_18),
+//    IO_SE_19("00FB19","次核点位19",R.string.base_plc_debug_19),
+//    IO_SE_20("00FB20","次核点位20",R.string.base_plc_debug_20),
 
 }
 

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

@@ -3,17 +3,17 @@
     <string name="base_network_connected">网络已连接</string>
 
     <string name="base_plc_debug_1">次核点位1</string>
-    <string name="base_plc_debug_2">次核点位2</string>
-    <string name="base_plc_debug_3">次核点位3</string>
-    <string name="base_plc_debug_4">次核点位4</string>
-    <string name="base_plc_debug_5">次核点位5</string>
-    <string name="base_plc_debug_6">次核点位6</string>
-    <string name="base_plc_debug_7">次核点位7</string>
-    <string name="base_plc_debug_8">次核点位8</string>
-    <string name="base_plc_debug_9">次核点位9</string>
-    <string name="base_plc_debug_10">次核点位10</string>
-    <string name="base_plc_debug_11">次核点位11</string>
-    <string name="base_plc_debug_12">次核点位12</string>
+    <string name="base_plc_debug_2">低速气泵</string>
+    <string name="base_plc_debug_3">中速气泵</string>
+    <string name="base_plc_debug_4">高速气泵</string>
+    <string name="base_plc_debug_5">发热丝</string>
+    <string name="base_plc_debug_6">甜玉米电机正转</string>
+    <string name="base_plc_debug_7">甜玉米电机反转</string>
+    <string name="base_plc_debug_8">咸玉米电机正转</string>
+    <string name="base_plc_debug_9">咸玉米电机反转</string>
+    <string name="base_plc_debug_10">落杯电机</string>
+    <string name="base_plc_debug_11">挡片</string>
+    <string name="base_plc_debug_12">电磁锁</string>
     <string name="base_plc_debug_13">次核点位13</string>
     <string name="base_plc_debug_14">次核点位14</string>
     <string name="base_plc_debug_15">次核点位15</string>

lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/util/ProductAbout.kt

@@ -9,6 +9,6 @@ object ProductAbout {
     )
 
     val imgIdsS: Array<String> = arrayOf(
-        "pic_sc_01", "pic_sc_01",
+        "product_1", "product_2",
     )
 }

module_backstage/src/main/AndroidManifest.xml

@@ -4,10 +4,10 @@
     <application>
         <activity android:name=".activity.setting.SettingActivity"
             android:exported="true">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
     </application>

module_backstage/src/main/java/com/module/backstage/activity/setting/SettingActivity.kt

@@ -4,16 +4,21 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
+import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Handler
 import android.util.Log
+import android.view.MenuItem
 import android.view.View
 import android.view.View.VISIBLE
 import android.view.WindowManager
+import android.widget.ImageView
+import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import androidx.navigation.findNavController
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -34,7 +39,6 @@ import com.module.backstage.dialog.ConnectionServerDialog
 import com.module.backstage.dialog.DevOnOffDialog
 import com.module.backstage.dialog.UpdateAppDialog
 import com.module.backstage.model.ApkInfoBean
-import com.quyunshuo.androidbaseframemvvm.common.enums.ConnectStateEnum
 import com.quyunshuo.androidbaseframemvvm.base.ktx.observeLiveData
 import com.quyunshuo.androidbaseframemvvm.base.utils.RegisterEventBus
 import com.quyunshuo.androidbaseframemvvm.base.utils.SpUtils
@@ -44,6 +48,7 @@ import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
 import com.quyunshuo.androidbaseframemvvm.common.constant.MqName
 import com.quyunshuo.androidbaseframemvvm.common.constant.RouteUrl
 import com.quyunshuo.androidbaseframemvvm.common.constant.event.ApiMessageEvent
+import com.quyunshuo.androidbaseframemvvm.common.enums.ConnectStateEnum
 import com.quyunshuo.androidbaseframemvvm.common.ui.BaseActivity
 import com.quyunshuo.androidbaseframemvvm.common.util.LanguageUtil
 import com.quyunshuo.androidbaseframemvvm.common.util.LongClickUtils
@@ -72,6 +77,9 @@ class SettingActivity : BaseActivity<BackstageActivitySettingBinding, SettingVie
     var updateAppDialog: UpdateAppDialog? = null
     var apkInfoBean: ApkInfoBean? = null//更新信息
 
+    private var selectedMenuItemView: View?=null // 存储当前选中的MenuItem
+    private var selectedMenuItemTextView: TextView?=null // 存储当前选中的MenuItem
+
     /**
      * 通过 viewModels() + Hilt 获取 ViewModel 实例
      */
@@ -87,17 +95,26 @@ class SettingActivity : BaseActivity<BackstageActivitySettingBinding, SettingVie
         window.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
 
         val resource: Resources = baseContext.resources as Resources
-
-        /**设置MenuItem默认选中项 */
+//        /**设置MenuItem默认选中项 */
         showItem()
-        bnvMainNavigationbar.setNavigationItemSelectedListener {
+
+//        bnvMainNavigationbar.setItemIconTintList(null)
+        setupCustomMenuItems()
+        bnvMainNavigationbar.setNavigationItemSelectedListener { menuItem ->
+            selectedMenuItemView?.setBackgroundColor(Color.TRANSPARENT)
+            selectedMenuItemTextView?.setTextColor(ContextCompat.getColor(baseContext, R.color.white))
+            val customView = menuItem.actionView
+            if (customView != null) {
+                customView.setBackgroundColor(ContextCompat.getColor(baseContext, R.color.system_btn))
+                selectedMenuItemView = customView
+                val textView = customView.findViewById<TextView>(R.id.menu_title)
+                textView.setTextColor(ContextCompat.getColor(baseContext, R.color.system_text))
+                selectedMenuItemTextView = textView
+            }
             val findNavController = findNavController(homeFragmentcontainerview.id)
-            findNavController.navigate(it.itemId)
+            findNavController.navigate(menuItem.itemId)
             true
-
         }
-
-        bnvMainNavigationbar.setItemIconTintList(null)
         homeReturnToUpperLevel.setOnClickListener(this@SettingActivity)
         ivDevOnAndOff.setOnClickListener(this@SettingActivity)
         btnConnectionServer.setOnClickListener(this@SettingActivity)
@@ -402,7 +419,6 @@ class SettingActivity : BaseActivity<BackstageActivitySettingBinding, SettingVie
                     Log.d(TAG, "initView: $settingTypeBean")
                 }
             }
-
         }
     }
 
@@ -416,4 +432,94 @@ class SettingActivity : BaseActivity<BackstageActivitySettingBinding, SettingVie
             else -> {}
         }
     }
+
+    private fun setupCustomMenuItems() {
+        // 清除默认菜单项
+        mBinding.bnvMainNavigationbar.getMenu().clear()
+        // 添加自定义菜单项
+        addCustomMenuItem(
+            R.id.backstage_cottoncandyfragment,
+            R.drawable.setting_icon9,
+            R.string.backstage_setting_1
+        )
+        addCustomMenuItem(
+            R.id.backstage_paramsetfragment,
+            R.drawable.setting_icon5,
+            R.string.backstage_setting_2
+        )
+        addCustomMenuItem(
+            R.id.backstage_payfragment,
+            R.drawable.setting_icon10,
+            R.string.backstage_setting_10
+        )
+        addCustomMenuItem(
+            R.id.backstage_datefragment,
+            R.drawable.setting_icon7,
+            R.string.backstage_setting_3
+        )
+        addCustomMenuItem(
+            R.id.backstage_languagefragment,
+            R.drawable.setting_icon8,
+            R.string.backstage_setting_4
+        )
+        addCustomMenuItem(
+            R.id.backstage_errorstatfragment,
+            R.drawable.setting_icon4,
+            R.string.backstage_setting_5
+        )
+        addCustomMenuItem(
+            R.id.backstage_resetpwdfragment,
+            R.drawable.setting_icon6,
+            R.string.backstage_setting_6
+        )
+        addCustomMenuItem(
+            R.id.backstage_localalarmclockfragment,
+            R.drawable.setting_icon3,
+            R.string.backstage_setting_7
+        )
+        addCustomMenuItem(
+            R.id.backstage_permissionfragment,
+            R.drawable.setting_icon3,
+            R.string.backstage_setting_8
+        )
+        addCustomMenuItem(
+            R.id.backstage_otherfragment,
+            R.drawable.setting_icon2,
+            R.string.backstage_setting_9
+        )
+        setDefaultSelectedItem()
+    }
+
+    private fun addCustomMenuItem(itemId: Int, iconRes: Int, title: Int) {
+        // 为每个菜单项创建自定义布局
+        val customView: View = layoutInflater.inflate(R.layout.custom_menu_item, null)
+
+        // 设置图标和标题
+        val icon = customView.findViewById<ImageView>(R.id.menu_icon)
+        val titleView = customView.findViewById<TextView>(R.id.menu_title)
+        icon.setImageResource(iconRes)
+        titleView.text =UiUtil.getStringRes(title)
+
+        // 将自定义布局添加到NavigationView的菜单中
+        val menuItem: MenuItem = mBinding.bnvMainNavigationbar.getMenu().add(itemId, itemId, 0, title)
+        menuItem.setActionView(customView)
+        menuItem.title = null // 禁用默认的title显示
+    }
+
+    private fun setDefaultSelectedItem() {
+        // 找到默认选中的MenuItem
+        val menuItem = mBinding.bnvMainNavigationbar.menu.findItem(R.id.backstage_cottoncandyfragment)
+        menuItem?.let {
+            // 获取自定义视图
+            val customView = it.actionView
+            // 设置选中状态的背景和文本颜色
+            customView?.setBackgroundColor(ContextCompat.getColor(this, R.color.system_btn))
+            val textView = customView?.findViewById<TextView>(R.id.menu_title)
+            textView?.setTextColor(ContextCompat.getColor(this, R.color.system_text))
+
+            // 记录当前选中的视图
+            selectedMenuItemView = customView
+            selectedMenuItemTextView = textView
+        }
+    }
 }

module_backstage/src/main/java/com/module/backstage/fragment/product/PriceFragment.kt

@@ -40,7 +40,7 @@ class PriceFragment : BaseFragment<BackstageFragmentPriceBinding, PriceFragmentV
         with(priceRvProduct) {
             //设置布局排列方式，默认垂直排列
             val gridLayoutManager: GridLayoutManager =
-                GridLayoutManager(this@PriceFragment.context, 4, GridLayoutManager.VERTICAL, false)
+                GridLayoutManager(this@PriceFragment.context, 1, GridLayoutManager.VERTICAL, false)
             layoutManager = gridLayoutManager
 
             priceAdapter = PriceAdapter(mViewModel.getPriceData())

module_backstage/src/main/java/com/module/backstage/fragment/product/ProductFragment.kt

@@ -96,22 +96,19 @@ class ProductFragment : BaseFragment<BackstageFragmentCottonCandyBinding, Produc
 
             override fun getTitleView(context: Context, index: Int): IPagerTitleView {
                 val simplePagerTitleView = SimplePagerTitleView(context)
-                simplePagerTitleView.textSize = 32f
+                simplePagerTitleView.textSize = 45f
                 simplePagerTitleView.setPadding(20, 0, 20, 0)
                 simplePagerTitleView.text = UiUtil.getStringRes(mDataList[index].nameId)
                 simplePagerTitleView.normalColor = Color.parseColor("#ffffff")
-                simplePagerTitleView.selectedColor = Color.parseColor("#1969FF")
+                simplePagerTitleView.selectedColor = Color.parseColor("#000000")
                 simplePagerTitleView.setOnClickListener {
                     mBinding.magicIndicator8.onPageSelected(index)
                     mBinding.magicIndicator8.onPageScrolled(index, 0.0F, 0);
-
-
                     val navController = Navigation.findNavController(
                         requireActivity(),
                         mBinding.cottoncandyFragmenttcontainerview.id
                     )
                     navController.navigate(fragmentid[index])
-                    Log.d(TAG, "getTitleView: ")
                 }
                 if (arrayListState!=null) {
                     val selected = arrayListState!![mDataList[index].id]?.isSelected
@@ -127,7 +124,6 @@ class ProductFragment : BaseFragment<BackstageFragmentCottonCandyBinding, Produc
             }
         }
         mBinding.magicIndicator8.navigator = commonNavigator
-//        ViewPagerHelper.bind(mBinding.magicIndicator8, mBinding.viewPager)
     }
 
 }

module_backstage/src/main/java/com/module/backstage/repo/DebugParamFragmentRepo.kt

@@ -29,14 +29,14 @@ class DebugParamFragmentRepo @Inject constructor() : BaseRepository() {
         PlcDebugAddressEnum.IO_SE_10,
         PlcDebugAddressEnum.IO_SE_11,
         PlcDebugAddressEnum.IO_SE_12,
-        PlcDebugAddressEnum.IO_SE_13,
-        PlcDebugAddressEnum.IO_SE_14,
-        PlcDebugAddressEnum.IO_SE_15, //暂时还不行
-        PlcDebugAddressEnum.IO_SE_16,
-        PlcDebugAddressEnum.IO_SE_17,
-        PlcDebugAddressEnum.IO_SE_18,
-        PlcDebugAddressEnum.IO_SE_19,
-        PlcDebugAddressEnum.IO_SE_20,
+//        PlcDebugAddressEnum.IO_SE_13,
+//        PlcDebugAddressEnum.IO_SE_14,
+//        PlcDebugAddressEnum.IO_SE_15, //暂时还不行
+//        PlcDebugAddressEnum.IO_SE_16,
+//        PlcDebugAddressEnum.IO_SE_17,
+//        PlcDebugAddressEnum.IO_SE_18,
+//        PlcDebugAddressEnum.IO_SE_19,
+//        PlcDebugAddressEnum.IO_SE_20,
     )
 
 

module_backstage/src/main/res/layout/backstage_activity_setting.xml

@@ -9,56 +9,62 @@
 
     <com.google.android.material.navigation.NavigationView
         android:id="@+id/bnv_main_navigationbar"
-        android:layout_width="240dp"
+        android:layout_width="350dp"
         android:layout_height="match_parent"
-        app:itemIconPadding="25dp"
-        android:paddingHorizontal="10dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="150dp"
-        android:layout_marginEnd="20dp"
-        android:background="@drawable/backstage_shape_product_left_nav_content"
-        app:itemTextAppearance="@style/Menu"
+        android:layout_marginTop="350dp"
+        android:background="@drawable/system_select"
+        app:theme="@style/ItemHeight"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/backstage_constraintlayout"
-        app:menu="@menu/backstage_menu_setting"
-        app:theme="@style/ItemHeight" >
+        app:layout_constraintTop_toBottomOf="@+id/backstage_constraintlayout"/>
 
-    </com.google.android.material.navigation.NavigationView>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/backstage_constraintlayout"
         android:layout_width="match_parent"
-        android:layout_height="118dp"
-        android:background="#2B95FF"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/tv_system_set"
-            android:layout_width="wrap_content"
-            android:minWidth="267dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:padding="10dp"
-            android:gravity="center"
-            android:text="@string/backstage_system_set"
-            android:layout_marginStart="20dp"
-            android:textColor="@color/white"
-            android:textSize="45sp"
+        <RelativeLayout
+            android:id="@+id/rl_system"
+            android:layout_width="280dp"
+            android:background="@drawable/home_system_btn_pale_yellow_background"
+            android:layout_height="280dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginStart="25dp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                android:layout_centerInParent="true"
+                android:id="@+id/tv_system_set"
+                android:layout_width="250dp"
+                android:gravity="center"
+                android:minWidth="267dp"
+                android:layout_height="250dp"
+                android:layout_centerVertical="true"
+                android:text="@string/backstage_system_set"
+                android:textColor="@color/system_text"
+                android:textSize="75sp"
+                android:textStyle="bold"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+        </RelativeLayout>
+
+
 
         <TextView
             android:id="@+id/tv_software_version"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="40dp"
             android:gravity="center"
             android:text="plcc版本号："
-            android:textColor="@color/white"
-            android:textSize="24sp"
+            android:textColor="@color/black"
+            android:textSize="40sp"
             app:layout_constraintStart_toEndOf="@+id/btn_update_app"
             app:layout_constraintTop_toTopOf="@+id/btn_update_app" />
 
@@ -67,11 +73,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="40dp"
             android:gravity="center"
             android:text="机箱版本号:"
-            android:textColor="@color/white"
-            android:textSize="24sp"
+            android:textColor="@color/black"
+            android:textSize="40sp"
             app:layout_constraintStart_toEndOf="@+id/btn_update_app"
             app:layout_constraintTop_toBottomOf="@+id/tv_software_version" />
 
@@ -83,8 +89,8 @@
             android:gravity="center"
             android:text="App版本号:"
             android:layout_marginLeft="20dp"
-            android:textColor="@color/white"
-            android:textSize="24sp"
+            android:textColor="@color/black"
+            android:textSize="40sp"
             app:layout_constraintStart_toEndOf="@+id/tv_software_version"
             app:layout_constraintTop_toTopOf="@+id/tv_software_version" />
 
@@ -97,37 +103,37 @@
             android:layout_marginLeft="20dp"
             android:gravity="center"
             android:text="铭牌号:"
-            android:textColor="@color/white"
-            android:textSize="24sp"
+            android:textColor="@color/black"
+            android:textSize="40sp"
             app:layout_constraintStart_toEndOf="@+id/tv_crate_version"
             app:layout_constraintTop_toBottomOf="@+id/tv_app_version" />
 
         <TextView
             android:id="@+id/btn_update_app"
-            android:layout_width="wrap_content"
-            android:layout_height="66dp"
+            android:layout_width="300dp"
+            android:layout_height="120dp"
             android:layout_marginStart="20dp"
             android:gravity="center"
             android:background="@drawable/home_rectangle_t_blue_background"
             android:paddingHorizontal="10dp"
             android:minWidth="232dp"
+            android:layout_marginTop="50dp"
             android:text="@string/backstage_check_update"
-            android:textColor="@color/white"
-            android:textSize="34sp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintStart_toEndOf="@+id/btn_connection_server"
             app:layout_constraintTop_toTopOf="parent" />
         <TextView
             android:id="@+id/tv_update_hint"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:background="@drawable/home_rectangle_update_red_background"
             android:gravity="center"
             android:text="1"
             android:textColor="@android:color/white"
-            android:textSize="20sp"
+            android:textSize="24sp"
             app:layout_constraintEnd_toEndOf="@+id/btn_update_app"
-            android:visibility="gone"
+            android:visibility="visible"
             app:layout_constraintTop_toTopOf="@+id/btn_update_app" />
 
         <ImageView
@@ -135,29 +141,27 @@
             android:layout_width="58dp"
             android:layout_height="58dp"
             android:layout_marginEnd="60dp"
+            android:layout_marginTop="50dp"
             android:src="@drawable/shutdwon"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/btn_connection_server"
-            android:layout_width="wrap_content"
-            android:layout_height="66dp"
+            android:layout_width="300dp"
+            android:layout_height="120dp"
             android:gravity="center"
-            android:layout_marginStart="40dp"
+            android:layout_marginStart="100dp"
             android:background="@drawable/home_rectangle_t_blue_background"
             android:minWidth="232dp"
             android:paddingHorizontal="10dp"
             android:text="@string/backstage_connection_server"
-            android:textColor="@color/white"
-            android:textSize="34sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/tv_system_set"
+            android:textColor="@color/black"
+            android:layout_marginTop="50dp"
+            android:textSize="50sp"
+            app:layout_constraintStart_toEndOf="@+id/rl_system"
             app:layout_constraintTop_toTopOf="parent" />
 
-
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
@@ -166,9 +170,9 @@
         android:id="@+id/home_fragmentcontainerview"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_marginStart="260dp"
+        android:layout_marginStart="370dp"
         android:layout_marginEnd="20dp"
-        android:layout_marginTop="150dp"
+        android:layout_marginTop="350dp"
         android:layout_marginBottom="100dp"
         android:layout_height="match_parent"
         app:layout_constraintTop_toBottomOf="@+id/backstage_constraintlayout"
@@ -180,18 +184,19 @@
     <TextView
         android:gravity="center"
         android:id="@+id/home_return_to_upper_level"
-        android:layout_width="wrap_content"
-        android:layout_height="80dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginBottom="30dp"
-        android:drawableStart="@drawable/black"
+        android:layout_width="300dp"
+        android:layout_height="120dp"
+        android:layout_marginEnd="80dp"
+        android:layout_marginBottom="80dp"
+        android:drawableStart="@drawable/icon_back"
         android:maxWidth="220dp"
         android:drawablePadding="10dp"
         android:paddingHorizontal="22dp"
         android:text="@string/backstage_back"
-        android:background="@drawable/home_rectangle_background"
-        android:textColor="@color/black"
-        android:textSize="32sp"
+        android:textStyle="bold"
+        android:background="@drawable/btn_back_background"
+        android:textColor="@color/white"
+        android:textSize="50sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 

module_backstage/src/main/res/layout/backstage_fragment_cotton_candy.xml

@@ -2,41 +2,18 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:background="@drawable/setting_fragment_bg"
-
     android:layout_height="match_parent">
 
-<!--    <com.google.android.material.bottomnavigation.BottomNavigationView-->
-<!--        android:id="@+id/bn_cotton_topnavigation"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="100dp"-->
-<!--        android:layout_marginLeft="40dp"-->
-
-<!--        android:background="#167ee7"-->
-<!--        app:elevation="0dp"-->
-<!--        app:itemBackground="@drawable/backstage_bottom_item_selector"-->
-<!--        app:itemHorizontalTranslationEnabled="false"-->
-<!--        app:itemTextAppearanceActive="@style/BottomNavigationView.Active"-->
-<!--        app:itemTextAppearanceInactive="@style/BottomNavigationView.Inactive"-->
-<!--        app:labelVisibilityMode="labeled"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent"-->
-<!--        app:menu="@menu/backstage_menu_product" />-->
-
-
-
-
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/magic_indicator8"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
+        android:layout_height="150dp"
         android:paddingLeft="20dp"
-        android:background="@drawable/backstage_shape_product_nav"
+        android:background="@drawable/system_select_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/cottoncandy_fragmenttcontainerview"
         android:name="androidx.navigation.fragment.NavHostFragment"

module_backstage/src/main/res/layout/backstage_fragment_date.xml

@@ -2,17 +2,16 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    android:background="@drawable/setting_fragment_bg">
+    android:layout_height="match_parent">
 
 
 
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/magic_indicator2"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
+        android:layout_height="150dp"
         android:paddingLeft="20dp"
-        android:background="@drawable/backstage_shape_product_nav"
+        android:background="@drawable/system_select_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

module_backstage/src/main/res/layout/backstage_fragment_local_alarm_clock.xml

@@ -3,45 +3,43 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@drawable/no_nav_bg"
     android:layout_height="match_parent">
 
     <View
         android:id="@+id/magic_indicator2"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
-        android:background="@drawable/backstage_shape_product_nav"
+        android:layout_height="150dp"
         android:paddingStart="20dp"
+        android:background="@drawable/system_select_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
 
     <TextView
+        app:layout_constraintTop_toTopOf="parent"
         android:id="@+id/tv_time"
         android:layout_width="wrap_content"
-        android:layout_height="60dp"
+        android:layout_height="150dp"
         android:gravity="center"
         android:padding="5dp"
         android:text="1212"
         android:layout_marginRight="20dp"
         android:textColor="@color/white"
-        android:textSize="28sp"
-        app:layout_constraintBottom_toBottomOf="@+id/cb_open_lock"
+        android:textSize="42sp"
         app:layout_constraintEnd_toStartOf="@+id/cb_open_lock"
-        app:layout_constraintTop_toTopOf="@+id/cb_open_lock"
         app:layout_constraintVertical_bias="0.0" />
 
     <CheckBox
         android:id="@+id/cb_open_lock"
         android:layout_width="wrap_content"
-        android:layout_height="60dp"
+        android:layout_height="120dp"
         android:background="@drawable/backstage_shape_clock"
         android:gravity="center"
-        android:padding="5dp"
+        android:padding="25dp"
         android:text="@string/backstage_open_lock"
-        android:textColor="#157DE7"
-        android:textSize="28sp"
+        android:textColor="@color/black"
+        android:textSize="42sp"
         android:layout_marginRight="20dp"
         app:layout_constraintBottom_toBottomOf="@+id/magic_indicator2"
         app:layout_constraintEnd_toStartOf="@+id/tv_add_lock"
@@ -50,14 +48,14 @@
     <TextView
         android:id="@+id/tv_add_lock"
         android:layout_width="wrap_content"
-        android:layout_height="60dp"
+        android:layout_height="120dp"
         android:background="@drawable/backstage_shape_clock"
         android:gravity="center"
-        android:padding="5dp"
-        android:layout_marginRight="40dp"
+        android:padding="25dp"
+        android:layout_marginRight="80dp"
         android:text="@string/backstage_add_lock"
-        android:textColor="#157DE7"
-        android:textSize="28sp"
+        android:textColor="@color/black"
+        android:textSize="42sp"
         app:layout_constraintBottom_toBottomOf="@+id/magic_indicator2"
         app:layout_constraintEnd_toEndOf="@+id/magic_indicator2"
         app:layout_constraintTop_toTopOf="@+id/magic_indicator2" />

module_backstage/src/main/res/layout/backstage_fragment_other.xml

@@ -1,19 +1,15 @@
 <?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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@drawable/no_nav_bg"
     android:layout_height="match_parent">
 
-
-
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/magic_other"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
-        android:background="@drawable/backstage_shape_product_nav"
+        android:layout_height="150dp"
         android:paddingLeft="20dp"
+        android:background="@drawable/system_select_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

module_backstage/src/main/res/layout/backstage_fragment_param_set.xml

@@ -2,22 +2,18 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    android:background="@drawable/setting_fragment_bg">
-
-
+    android:layout_height="match_parent">
 
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/magic_indicator2"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
+        android:layout_height="150dp"
         android:paddingLeft="20dp"
-        android:background="@drawable/backstage_shape_product_nav"
+        android:background="@drawable/system_select_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/cottoncandy_fragmenttcontainerview"
         android:name="androidx.navigation.fragment.NavHostFragment"
@@ -29,5 +25,4 @@
         app:layout_constraintTop_toBottomOf="@+id/magic_indicator2"
         app:navGraph="@navigation/backstage_param_nav" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

module_backstage/src/main/res/layout/backstage_fragment_pay.xml

@@ -3,16 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@drawable/no_nav_bg"
-
     android:layout_height="match_parent">
 
     <View
         android:id="@+id/magic_indicator2"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
-        android:background="@drawable/backstage_shape_product_nav"
+        android:layout_height="150dp"
         android:paddingStart="20dp"
+        android:background="@drawable/system_select_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -20,14 +18,15 @@
     <TextView
         android:id="@+id/tv_gore_set"
         android:layout_width="wrap_content"
-        android:layout_height="60dp"
+        android:layout_height="120dp"
         android:background="@drawable/backstage_shape_clock"
         android:gravity="center"
-        android:padding="5dp"
-        android:layout_marginRight="40dp"
+        android:padding="25dp"
+        android:layout_marginRight="80dp"
         android:text="更多设置"
-        android:textColor="#157DE7"
-        android:textSize="28sp"
+        android:textStyle="bold"
+        android:textColor="@color/black"
+        android:textSize="42sp"
         app:layout_constraintBottom_toBottomOf="@+id/magic_indicator2"
         app:layout_constraintEnd_toEndOf="@+id/magic_indicator2"
         app:layout_constraintTop_toTopOf="@+id/magic_indicator2" />
@@ -45,17 +44,17 @@
     <TextView
         android:id="@+id/tv_confirm"
         android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="280dp"
-        android:minHeight="80dp"
-        android:background="@drawable/backstage_shape_gen_content"
+        android:layout_width="380dp"
+        android:layout_height="120dp"
+        android:layout_marginBottom="360dp"
+        android:minWidth="380dp"
+        android:minHeight="100dp"
+        android:background="@drawable/update_btn_background"
         android:text="@string/backstage_confirm_update"
         android:paddingHorizontal="10dp"
         android:textSize="42sp"
         android:textStyle="bold"
         android:textColor="@color/white"
-        android:layout_marginBottom="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

module_backstage/src/main/res/layout/backstage_fragment_price.xml

@@ -6,56 +6,76 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/price_rv_product"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="50dp"
         android:layout_marginVertical="30dp"
         android:minHeight="750dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_confirm"
-        android:gravity="center"
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="280dp"
-        android:minHeight="80dp"
-        android:background="@drawable/backstage_shape_gen_content"
-        android:text="@string/backstage_update_price"
-        android:paddingHorizontal="10dp"
-        android:textSize="42sp"
-        android:textStyle="bold"
-        android:textColor="@color/white"
-        android:layout_marginBottom="20dp"
+        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="680dp"
+        android:gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_height="wrap_content">
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_marginBottom="50dp"
+            android:gravity="center"
+            android:background="@drawable/backstage_shape_orange_line"
+            android:layout_height="120dp">
+            <TextView
+                android:id="@+id/backstage_textview7"
+                android:layout_width="wrap_content"
+                android:layout_height="90dp"
+                android:layout_marginStart="30dp"
+                android:gravity="center"
+                android:textStyle="bold"
+                android:text="统一修改价格："
+                android:textColor="@color/black"
+                android:textSize="45sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/tv_confirm"
+                app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
-        android:id="@+id/backstage_textview7"
-        android:layout_width="200dp"
-        android:layout_height="70dp"
-        android:background="@drawable/backstage_shape_zise_param_et"
-        android:layout_marginBottom="20dp"
-        android:gravity="center"
-        android:layout_marginStart="20dp"
-        android:text="统一修改价格："
-        android:textColor="@color/white"
-        android:textSize="26sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+            <EditText
+                android:id="@+id/et_sugarprice"
+                android:layout_width="wrap_content"
+                android:minWidth="200dp"
+                android:layout_marginEnd="40dp"
+                android:layout_height="70dp"
+                android:background="@color/c_transparent"
+                android:textSize="45sp"
+                android:textStyle="bold"
+                android:textColor="@color/color_red"
+                android:hint="0.00"
+                android:inputType="numberDecimal"
+                android:paddingLeft="10dp"
+                app:layout_constraintBottom_toBottomOf="@+id/backstage_textview7"
+                app:layout_constraintStart_toEndOf="@+id/backstage_textview7"
+                app:layout_constraintTop_toTopOf="@+id/backstage_textview7" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_confirm"
+            android:gravity="center"
+            android:layout_width="480dp"
+            android:layout_height="120dp"
+            android:minWidth="280dp"
+            android:minHeight="80dp"
+            android:background="@drawable/update_btn_background"
+            android:text="@string/backstage_update_price"
+            android:paddingHorizontal="10dp"
+            android:textSize="50sp"
+            android:textStyle="bold"
+            android:textColor="@color/white" />
+    </LinearLayout>
 
-    <EditText
-        android:id="@+id/et_sugarprice"
-        android:layout_width="130dp"
-        android:layout_height="70dp"
-        android:background="@drawable/backstage_shape_general_param_et"
-        android:textSize="26sp"
-        android:inputType="numberDecimal"
-        android:paddingLeft="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/backstage_textview7"
-        app:layout_constraintStart_toEndOf="@+id/backstage_textview7"
-        app:layout_constraintTop_toTopOf="@+id/backstage_textview7" />
 </androidx.constraintlayout.widget.ConstraintLayout>

module_backstage/src/main/res/layout/backstage_item_price.xml

@@ -1,61 +1,73 @@
 <?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:layout_width="match_parent"
+    android:layout_height="280dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginTop="50dp"
     android:layout_marginRight="40dp"
-    android:layout_width="350dp"
-    android:background="@drawable/home_rectangle_background"
-    android:layout_height="180dp"
-    android:padding="5dp">
+    android:background="@drawable/item_price_adapter_background">
 
-    <ImageView
-        android:id="@+id/iv_sugar"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:layout_marginLeft="20dp"
-        android:src="@drawable/product_1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical">
 
-    <TextView
-        android:id="@+id/tv_name"
-        android:layout_width="178dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="90dp"
-        android:layout_marginLeft="10dp"
-        android:text="水中芙蓉"
-        android:textColor="#576478"
-        android:textSize="30sp"
-        app:layout_constraintStart_toEndOf="@+id/iv_sugar"
-        app:layout_constraintTop_toTopOf="@+id/iv_sugar" />
+        <ImageView
+            android:id="@+id/iv_sugar"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_marginLeft="90dp"
+            android:layout_marginRight="90dp"
+            android:src="@drawable/product_1" />
 
-    <TextView
-        android:id="@+id/backstage_textview7"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp"
-        android:background="#8194F0"
-        android:gravity="center"
-        android:text="RMB"
-        android:textColor="@color/white"
-        android:textSize="24sp"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_sugar"
-        app:layout_constraintStart_toEndOf="@+id/iv_sugar"
-        app:layout_constraintTop_toBottomOf="@+id/tv_name" />
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="200dp"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@id/iv_sugar"
+            android:gravity="center"
+            android:maxHeight="90dp"
+            android:text="商品名字"
+            android:textColor="#576478"
+            android:textSize="50sp"
+            android:textStyle="bold" />
 
-    <EditText
-        android:id="@+id/et_sugarprice"
-        android:layout_width="100dp"
-        android:layout_height="50dp"
-        android:background="@drawable/backstage_shape_general_param_et"
-        android:text="6.5"
-        android:inputType="numberDecimal"
-        android:paddingLeft="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/backstage_textview7"
-        app:layout_constraintStart_toEndOf="@+id/backstage_textview7"
-        app:layout_constraintTop_toTopOf="@+id/backstage_textview7" />
+        <LinearLayout
+            android:layout_width="400dp"
+            android:layout_height="150dp"
+            android:layout_marginTop="10dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="100dp"
+            android:background="@drawable/backstage_shape_general_param_yellow_et">
 
+            <TextView
+                android:layout_marginLeft="10dp"
+                android:id="@+id/backstage_textview7"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.5"
+                android:gravity="center"
+                android:text="￥"
+                android:textColor="@color/color_red"
+                android:textSize="50sp"
+                android:textStyle="bold" />
 
+            <EditText
+                android:id="@+id/et_sugarprice"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@id/backstage_textview7"
+                android:layout_weight="2"
+                android:inputType="numberDecimal"
+                android:layout_marginRight="20dp"
+                android:background="@color/c_transparent"
+                android:text="5.00"
+                android:textColor="@color/color_red"
+                android:textSize="70sp"
+                android:textStyle="bold" />
+        </LinearLayout>
 
+    </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -8,7 +8,10 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="nav_item_bg">#157DE7</color>
-    <color name="update_btn">#68B4FF</color>
+    <color name="update_btn">#f9d01a</color>
     <color name="update_tips">#FF1100</color>
+    <color name="system_text">#b38247</color>
+    <color name="system_btn">#f9f5c6</color>
+    <color name="orange_bg">#ff9101</color>
 
 </resources>

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

@@ -3,16 +3,17 @@
     <string name="backstage_update_success">更新成功</string>
     <string name="backstage_data_null_tips">数据为空，不可以操作</string>
     <string name="backstage_check_update">检查更新</string>
-    <string name="backstage_system_set">系统设置</string>
-    <string name="backstage_setting_1">冰沙设置</string>
-    <string name="backstage_setting_2">参数调整</string>
-    <string name="backstage_setting_3">数据统计</string>
-    <string name="backstage_setting_4">语言切换</string>
-    <string name="backstage_setting_5">报警记录</string>
-    <string name="backstage_setting_6">重置密码</string>
-    <string name="backstage_setting_7">定时开关机</string>
-    <string name="backstage_setting_8">权限设置</string>
+    <string name="backstage_system_set">系统\n设置</string>
+    <string name="backstage_setting_1">商品\n设置</string>
+    <string name="backstage_setting_2">参数\n调整</string>
+    <string name="backstage_setting_3">数据\n统计</string>
+    <string name="backstage_setting_4">语言\n切换</string>
+    <string name="backstage_setting_5">报警\n记录</string>
+    <string name="backstage_setting_6">重置\n密码</string>
+    <string name="backstage_setting_7">定时\n开关机</string>
+    <string name="backstage_setting_8">权限\n设置</string>
     <string name="backstage_setting_9">其他</string>
+    <string name="backstage_setting_10">支付\n方式</string>
     <string name="backstage_product_1">商品调价</string>
     <string name="backstage_product_2">商品信息设置</string>
     <string name="backstage_product_3">商品名称、图片修改</string>
@@ -45,7 +46,6 @@
     <string name="backstage_confirm">确定</string>
     <string name="backstage_update_progress_init_status">下载进度：0%</string>
     <string name="backstage_update">更新</string>
-    <string name="backstage_setting_10">支付方式</string>
     <string name="backstage_confirm_update">确认修改</string>
     <string name="backstage_ok_dialog_title">是否确定操作？</string>
     <string name="backstage_search_hint">请输入要搜索的内容</string>

module_backstage/src/main/res/values/styles.xml

@@ -1,19 +1,23 @@
 <resources>
 
     <style name="Menu" parent="TextAppearance.Compat.Notification.Title">
-        <item name="android:textSize">30sp</item>
+        <item name="android:textSize">65sp</item>
 <!--        <item name="android:textColor">@color/home_colorBlueSugar</item>-->
+        <item name="android:maxLines">8</item>
+        <item name="android:ellipsize">none</item>
+        <item name="android:width">60dp</item>
+        <item name="android:height">100dp</item>
         <item name="android:textStyle">normal</item>
+        <item name="android:layout_gravity">center</item>
         <item name="android:background">#343434</item>
-        <item name="android:gravity">center</item>
         <item name="android:textColor">@color/white</item>
         <item name="colorControlActivated">@color/black</item>
     </style>
 
     <style name="ItemHeight">
-        <item name="listPreferredItemHeightSmall">100dp</item>
-
+        <item name="listPreferredItemHeightSmall">200dp</item>
     </style>
+
     <style name="Dialog_Alarm" parent="android:Theme.Holo.Light">
         <item name="android:editTextStyle">@color/white</item>
         <item name="android:textColor">#4A4A4A</item>

module_home/src/main/AndroidManifest.xml

@@ -13,10 +13,10 @@
         <activity
             android:name=".activity.main.MainActivity"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <service

module_home/src/main/java/com/quyunshuo/module/home/activity/main/MainViewModel.kt

@@ -46,7 +46,6 @@ class MainViewModel @Inject constructor(private val mRepository: MainRepository)
         if (!productDataContains!!) {
             val goodsBeans: ArrayList<ProductDataBean> = ArrayList<ProductDataBean>()
             for (i in 0 until ProductAbout.namesS.size) {
-
                 val productDataBean: ProductDataBean = ProductDataBean(
                     0.0,
                     ProductAbout.namesS[i],