选购UI，后台UI

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

@@ -4,17 +4,17 @@ import com.quyunshuo.androidbaseframemvvm.base.R
 
 enum class PlcDebugAddressEnum(val address: String, val aName: String,val aNameId:Int) {
 //    IO_SE_01("00FB01","次核点位1",R.string.base_plc_debug_1),//这里是开机按钮，不放到调试页
-    IO_SE_02("00FB02","次核点位2",R.string.base_plc_debug_2),
-    IO_SE_03("00FB03","次核点位3",R.string.base_plc_debug_3),
-    IO_SE_04("00FB04","次核点位4",R.string.base_plc_debug_4),
-    IO_SE_05("00FB05","次核点位5",R.string.base_plc_debug_5),
-    IO_SE_06("00FB06","次核点位6",R.string.base_plc_debug_6),
-    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("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_02("02","次核点位2",R.string.base_plc_debug_2),
+    IO_SE_03("03","次核点位3",R.string.base_plc_debug_3),
+    IO_SE_04("04","次核点位4",R.string.base_plc_debug_4),
+    IO_SE_05("05","次核点位5",R.string.base_plc_debug_5),
+    IO_SE_06("06","次核点位6",R.string.base_plc_debug_6),
+    IO_SE_07("07","次核点位7",R.string.base_plc_debug_7),
+    IO_SE_08("08","次核点位8",R.string.base_plc_debug_8),
+    IO_SE_09("09","次核点位9",R.string.base_plc_debug_9),
+    IO_SE_10("0A","次核点位10",R.string.base_plc_debug_10),
+    IO_SE_11("0B","次核点位11",R.string.base_plc_debug_11),
+    IO_SE_12("0C","次核点位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),

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

@@ -3,14 +3,24 @@ package com.quyunshuo.androidbaseframemvvm.base.addressenum
 import com.quyunshuo.androidbaseframemvvm.base.R
 
 enum class PlcParamAddressEnum(val address: String, val aName: String,val aNameId:Int) {
-    D232("D232", "关闭制冷时间", R.string.base_plc_param_1),
-    D231("D231", "抽口味时间",R.string.base_plc_param_2),
-    D230("D230", "蒸发器温度到达才抽水",R.string.base_plc_param_3),
-    D233("D233", "皮带1延时时间",R.string.base_plc_param_4),
-    D234("D234", "拔针时间",R.string.base_plc_param_5),
-    D235("D235", "一瓶饮料所抽的时间",R.string.base_plc_param_6),
-    D236("D236", "制作一次的用量",R.string.base_plc_param_7),
-    D447("D447", "蒸发器保温下限",R.string.base_plc_param_8),
-    D448("D448", "蒸发器保温上限",R.string.base_plc_param_9)
+    Param01("01", "气泵低速", R.string.base_plc_param_1),
+    Param02("02", "气泵中速",R.string.base_plc_param_2),
+    Param03("03", "气泵高速",R.string.base_plc_param_3),
+    Param04("04", "吹大风时间",R.string.base_plc_param_4),
+    Param05("05", "挡片关闭时间",R.string.base_plc_param_5),
+    Param06("06", "温度设定",R.string.base_plc_param_6),
+    Param07("07", "加热时间",R.string.base_plc_param_7),
+    Param08("08", "制作时风速",R.string.base_plc_param_8),
 
+
+//
+//    D232("D232", "关闭制冷时间", R.string.base_plc_param_1),
+//    D231("D231", "抽口味时间",R.string.base_plc_param_2),
+//    D230("D230", "蒸发器温度到达才抽水",R.string.base_plc_param_3),
+//    D233("D233", "皮带1延时时间",R.string.base_plc_param_4),
+//    D234("D234", "拔针时间",R.string.base_plc_param_5),
+//    D235("D235", "一瓶饮料所抽的时间",R.string.base_plc_param_6),
+//    D236("D236", "制作一次的用量",R.string.base_plc_param_7),
+//    D447("D447", "蒸发器保温下限",R.string.base_plc_param_8),
+//    D448("D448", "蒸发器保温上限",R.string.base_plc_param_9)
 }

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

@@ -27,14 +27,14 @@
     <string name="base_plc_debug_23"></string>
 
 
-    <string name="base_plc_param_1">关闭制冷时间</string>
-    <string name="base_plc_param_2">抽口味时间</string>
-    <string name="base_plc_param_3">蒸发器温度到达才抽水</string>
-    <string name="base_plc_param_4">皮带1延时时间</string>
-    <string name="base_plc_param_5">拔针时间</string>
-    <string name="base_plc_param_6">一瓶饮料所抽的时间</string>
-    <string name="base_plc_param_7">制作一次的用量</string>
-    <string name="base_plc_param_8">蒸发器保温下限</string>
+    <string name="base_plc_param_1">气泵低速</string>
+    <string name="base_plc_param_2">气泵中速</string>
+    <string name="base_plc_param_3">气泵高速</string>
+    <string name="base_plc_param_4">吹大风时间</string>
+    <string name="base_plc_param_5">挡片关闭时间</string>
+    <string name="base_plc_param_6">温度设定</string>
+    <string name="base_plc_param_7">加热时间</string>
+    <string name="base_plc_param_8">制作时风速</string>
     <string name="base_plc_param_9">蒸发器保温上限</string>
     <string name="base_pro_01">咸味爆米花</string>
     <string name="base_pro_02">甜味爆米花</string>

module_backstage/src/main/java/com/module/backstage/enums/SettingItemEnum.kt

@@ -6,7 +6,7 @@ import com.module.backstage.R
  */
 enum class SettingItemEnum(val chName: String,val  nameId: Int,val iconId:Int,val id:Int) {
 
-    SETTING_1("冰沙设置", R.string.backstage_setting_1,R.drawable.home,0),
+    SETTING_1("商品设置", R.string.backstage_setting_1,R.drawable.home,0),
     SETTING_2("参数调整", R.string.backstage_setting_2,R.drawable.icon_canshutiaozheng,1),
     SETTING_3("支付方式", R.string.backstage_setting_10,R.drawable.icon_zhifufangshi,2),
     SETTING_4("数据统计", R.string.backstage_setting_3,R.drawable.icon_zongtongji,3),

module_backstage/src/main/java/com/module/backstage/fragment/param/GeneralParamFragment.kt

@@ -49,7 +49,7 @@ class GeneralParamFragment : BaseFragment<BackstageFragmentGeneralParamBinding,
         with(generalRvProduct){
             //设置布局排列方式，默认垂直排列
             val gridLayoutManager: GridLayoutManager =
-                GridLayoutManager(this@GeneralParamFragment.context, 4, GridLayoutManager.VERTICAL, false)
+                GridLayoutManager(this@GeneralParamFragment.context, 2, GridLayoutManager.VERTICAL, false)
             layoutManager = gridLayoutManager
 
             debugParamAdapter = GeneralParamAdapter(mViewModel.getGeneralParamData())
@@ -90,6 +90,7 @@ class GeneralParamFragment : BaseFragment<BackstageFragmentGeneralParamBinding,
         Log.d(TAG, "messageEvent event: "+messageEvent.cmd)
         when (messageEvent.cmd) {
             VboxCommand.CMD_HEARTBEAT ->{
+
             }
             else -> {}
         }

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

@@ -17,15 +17,23 @@ class GeneralParamFragmentRepo @Inject constructor() : BaseRepository() {
     @Inject
     lateinit var mApi: com.module.pay.service.HomeApiService
     var arrayList: MutableList<PlcParamAddressEnum> = Arrays.asList(
-        PlcParamAddressEnum.D232,
-        PlcParamAddressEnum.D231,
-        PlcParamAddressEnum.D230,
-        PlcParamAddressEnum.D233,
-        PlcParamAddressEnum.D234,
-        PlcParamAddressEnum.D235,
-        PlcParamAddressEnum.D236,
-        PlcParamAddressEnum.D447,
-        PlcParamAddressEnum.D448
+        PlcParamAddressEnum.Param01,
+        PlcParamAddressEnum.Param02,
+        PlcParamAddressEnum.Param03,
+        PlcParamAddressEnum.Param04,
+        PlcParamAddressEnum.Param05,
+        PlcParamAddressEnum.Param06,
+        PlcParamAddressEnum.Param07,
+        PlcParamAddressEnum.Param08,
+//        PlcParamAddressEnum.D232,
+//        PlcParamAddressEnum.D231,
+//        PlcParamAddressEnum.D230,
+//        PlcParamAddressEnum.D233,
+//        PlcParamAddressEnum.D234,
+//        PlcParamAddressEnum.D235,
+//        PlcParamAddressEnum.D236,
+//        PlcParamAddressEnum.D447,
+//        PlcParamAddressEnum.D448
     )
 
     //协程

module_backstage/src/main/java/com/module/backstage/vm/GeneralParamFragmentVM.kt

@@ -67,13 +67,13 @@ class GeneralParamFragmentVM @Inject constructor(private val mRepo: GeneralParam
         val results = HexadecimalUtil.flipString(result)
         Log.d(TAG, "response name: " + name)
         when (name) {
-            PlcParamAddressEnum.D230.address -> {
-                D230(results)
-            }
-
-            PlcParamAddressEnum.D447.address -> {
-                D447(results)
-            }
+//            PlcParamAddressEnum.D230.address -> {
+//                D230(results)
+//            }
+//
+//            PlcParamAddressEnum.D447.address -> {
+//                D447(results)
+//            }
 
             else -> {}
         }
@@ -95,13 +95,13 @@ class GeneralParamFragmentVM @Inject constructor(private val mRepo: GeneralParam
         Log.d(TAG, "D234: " + HexadecimalUtil.hex2dec(results[4]).toString())
         Log.d(TAG, "D235: " + HexadecimalUtil.hex2dec(results[5]).toString())
         Log.d(TAG, "D236: " + HexadecimalUtil.hex2dec(results[6]).toString())
-        paramDataList.put(PlcParamAddressEnum.D230.address, HexadecimalUtil.hex2dec(results[0]).toString())
-        paramDataList.put(PlcParamAddressEnum.D231.address, HexadecimalUtil.hex2dec(results[1]).toString())
-        paramDataList.put(PlcParamAddressEnum.D232.address, HexadecimalUtil.hex2dec(results[2]).toString())
-        paramDataList.put(PlcParamAddressEnum.D233.address, HexadecimalUtil.hex2dec(results[3]).toString())
-        paramDataList.put(PlcParamAddressEnum.D234.address, HexadecimalUtil.hex2dec(results[4]).toString())
-        paramDataList.put(PlcParamAddressEnum.D235.address, HexadecimalUtil.hex2dec(results[5]).toString())
-        paramDataList.put(PlcParamAddressEnum.D236.address, HexadecimalUtil.hex2dec(results[6]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D230.address, HexadecimalUtil.hex2dec(results[0]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D231.address, HexadecimalUtil.hex2dec(results[1]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D232.address, HexadecimalUtil.hex2dec(results[2]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D233.address, HexadecimalUtil.hex2dec(results[3]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D234.address, HexadecimalUtil.hex2dec(results[4]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D235.address, HexadecimalUtil.hex2dec(results[5]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D236.address, HexadecimalUtil.hex2dec(results[6]).toString())
         mRepo.threadGeneralParam.isActive230 = false
         mRepo.threadGeneralParam.job230?.cancel()
 
@@ -110,8 +110,8 @@ class GeneralParamFragmentVM @Inject constructor(private val mRepo: GeneralParam
     private fun D447(results: ArrayList<String>) {
         Log.d(TAG, "D447: " + HexadecimalUtil.hex2dec(results[0]).toString())
         Log.d(TAG, "D448: " + HexadecimalUtil.hex2dec(results[1]).toString())
-        paramDataList.put(PlcParamAddressEnum.D447.address, HexadecimalUtil.hex2dec(results[0]).toString())
-        paramDataList.put(PlcParamAddressEnum.D448.address, HexadecimalUtil.hex2dec(results[1]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D447.address, HexadecimalUtil.hex2dec(results[0]).toString())
+//        paramDataList.put(PlcParamAddressEnum.D448.address, HexadecimalUtil.hex2dec(results[1]).toString())
         mRepo.threadGeneralParam.isActive447 = false
         mRepo.threadGeneralParam.job447?.cancel()
 
@@ -137,6 +137,11 @@ class GeneralParamFragmentVM @Inject constructor(private val mRepo: GeneralParam
         val plcParamAddressEnum: PlcParamAddressEnum = mRepo.arrayList.get(position)
         mRepo.threadGeneralParam.writeData(plcParamAddressEnum.address, bin)
     }
+    fun writeData(position: Int, data: String) {
+        //2进制
+        val plcParamAddressEnum: PlcParamAddressEnum = mRepo.arrayList.get(position)
+        mRepo.threadGeneralParam.writeData(plcParamAddressEnum.address, data)
+    }
 
 
 }

module_backstage/src/main/res/drawable/backstage_shape_debug_param_cb_select.xml

@@ -3,9 +3,9 @@
     android:shape="rectangle">
     <solid android:color="#2E80DD" />
     <corners
-        android:bottomLeftRadius="8dp"
-        android:bottomRightRadius="8dp"
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp" />
+        android:bottomLeftRadius="18dp"
+        android:bottomRightRadius="18dp"
+        android:topLeftRadius="18dp"
+        android:topRightRadius="18dp" />
 
 </shape>

module_backstage/src/main/res/drawable/backstage_shape_debug_param_cb_unselect.xml

@@ -3,9 +3,9 @@
     android:shape="rectangle">
     <solid android:color="@color/white" />
     <corners
-        android:bottomLeftRadius="8dp"
-        android:bottomRightRadius="8dp"
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp" />
+        android:bottomLeftRadius="18dp"
+        android:bottomRightRadius="18dp"
+        android:topLeftRadius="18dp"
+        android:topRightRadius="18dp" />
 
 </shape>

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

@@ -114,7 +114,7 @@
             android:layout_height="120dp"
             android:layout_marginStart="20dp"
             android:gravity="center"
-            android:background="@drawable/home_rectangle_t_blue_background"
+            android:background="@drawable/setting_rectangle_t_blue_background"
             android:paddingHorizontal="10dp"
             android:minWidth="232dp"
             android:layout_marginTop="50dp"
@@ -152,7 +152,7 @@
             android:layout_height="120dp"
             android:gravity="center"
             android:layout_marginStart="100dp"
-            android:background="@drawable/home_rectangle_t_blue_background"
+            android:background="@drawable/setting_rectangle_t_blue_background"
             android:minWidth="232dp"
             android:paddingHorizontal="10dp"
             android:text="@string/backstage_connection_server"

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

@@ -6,7 +6,8 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/debug_rv_product"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
+        android:maxHeight="2080dp"
         android:layout_height="match_parent"
         android:layout_marginVertical="40dp"
         android:layout_marginLeft="10dp"

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

@@ -3,13 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="2080dp">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_alarm"
         android:layout_width="1500dp"
         android:paddingVertical="29dp"
         android:layout_height="1880dp"
+        android:minHeight="880dp"
+        android:maxHeight="1880dp"
         android:background="@drawable/backstage_shape_error_white"
         android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -30,8 +32,8 @@
     <TextView
         android:id="@+id/tv_clean_all"
         android:layout_width="wrap_content"
-        android:layout_height="90dp"
-        android:layout_marginRight="50dp"
+        android:layout_height="150dp"
+        android:layout_marginRight="70dp"
         android:background="@drawable/home_rectangle_blue_background"
         android:drawableLeft="@drawable/icon_clean"
         android:drawablePadding="10dp"
@@ -39,7 +41,7 @@
         android:minWidth="290dp"
         android:paddingHorizontal="25dp"
         android:text="清除报警记录"
-        android:layout_marginBottom="20dp"
+        android:layout_marginBottom="120dp"
         android:textColor="@color/white"
         android:textSize="36sp"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -6,7 +6,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/general_rv_product"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:minWidth="1600dp"
         android:minHeight="750dp"

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

@@ -7,7 +7,7 @@
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="wrap_content"
-        android:layout_height="1880dp"
+        android:layout_height="2080dp"
         android:layout_marginStart="40dp"
         android:layout_marginTop="30dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -23,69 +23,72 @@
 
             <RadioButton
                 android:id="@+id/rb_chinese"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
+                android:textSize="46sp"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
-                android:paddingLeft="40dp"
                 android:text="中文"
                 android:textColor="#576478"
-                android:textSize="32sp" />
+                 />
 
             <RadioButton
                 android:id="@+id/rb_english"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
-                android:paddingLeft="40dp"
                 android:text="英语"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
+                android:textSize="46sp"
                 android:id="@+id/rb_german"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:textColor="#576478"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
-                android:paddingLeft="40dp"
-                android:text="Deutsch(德语)"
-                android:textSize="32sp" />
+                android:text="Deutsch(德语)"/>
 
             <RadioButton
                 android:id="@+id/rb_russia"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:textColor="#576478"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="русский язык(俄语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="русский язык(俄语)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
 
             <RadioButton
                 android:id="@+id/rb_japanese"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:textColor="#576478"
                 android:layout_alignStart="@+id/rg_language2"
                 android:layout_alignTop="@+id/rg_language2"
@@ -93,528 +96,566 @@
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="日本語(日语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="日本語(日语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_Spanish"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Español(西班牙语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Español(西班牙语)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_french"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:textColor="#576478"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Français(法语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Français(法语)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_bulgaria"
-                android:layout_width="400dp"
                 android:textColor="#576478"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="България(保加利亚语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="България(保加利亚语)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_danmai"
-                android:layout_width="400dp"
                 android:textColor="#576478"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Dansk(丹麦语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Dansk(丹麦语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_fenlan"
                 android:textColor="#576478"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Suomalainen(芬兰语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Suomalainen(芬兰语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_helan"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:textColor="#576478"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Nederlands(荷兰语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Nederlands(荷兰语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_jieke"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Česky(捷克语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Česky(捷克语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_luomaniya"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Românesc(罗马尼亚语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Românesc(罗马尼亚语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:textColor="#576478"
                 android:id="@+id/rb_nuowei"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Norsk språk(挪威语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Norsk språk(挪威语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_putaoya"
                 android:textColor="#576478"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Português(葡萄牙语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Português(葡萄牙语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_ruishi"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:textColor="#576478"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Svenska(瑞典语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Svenska(瑞典语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_sifaluoke"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Slovenského jazyk(斯洛伐克语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Slovenského jazyk(斯洛伐克语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_xiongyali"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:textColor="#576478"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Magyar(匈牙利语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Magyar(匈牙利语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
 
             <RadioButton
                 android:id="@+id/rb_yidali"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:textColor="#576478"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Lingua italiana(意大利语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Lingua italiana(意大利语)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_taiwang"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
-                android:paddingLeft="40dp"
                 android:textColor="#576478"
                 android:text="繁体中文"
-                android:textSize="32sp" />
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
+                android:textSize="46sp" />
 
 
             <RadioButton
                 android:id="@+id/rb_hany"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
-                android:paddingLeft="40dp"
                 android:textColor="#576478"
                 android:text="한국어(韩语)"
-                android:textSize="32sp" />
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_bolan"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
                 android:textColor="#576478"
+                android:text="Polska(波兰语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Polska(波兰语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_wukelan"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:textColor="#576478"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Ukrainian(乌克兰语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Ukrainian(乌克兰语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_ymny"
                 android:textColor="#576478"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Հայաստան(亚美尼亚语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Հայաստան(亚美尼亚语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
 
             <RadioButton
                 android:id="@+id/rb_alb"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:textColor="#576478"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="عرب(阿拉伯语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="عرب(阿拉伯语)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_tg"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="ไทย(泰语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="ไทย(泰语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
 
             <RadioButton
                 android:id="@+id/rb_ysl"
-                android:layout_width="400dp"
                 android:textColor="#576478"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="(希伯来语)יִשׂרְאֵלִ"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="(希伯来语)יִשׂרְאֵלִ"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_brazil2"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:textColor="#576478"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Brasil-2DHR(巴西语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Brasil-2DHR(巴西语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_gljy"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginEnd="20dp"
                 android:textColor="#576478"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
                 android:paddingVertical="5dp"
                 android:paddingStart="40dp"
                 android:text="საქართველოს(格鲁吉亚语)"
-                android:textSize="32sp" />
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_brazil3"
                 android:textColor="#576478"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Brasil-3(巴西语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Brasil-3(巴西语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_turkey"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Türkiye(土耳其语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Türkiye(土耳其语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_latvia"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:textColor="#576478"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Latvija(拉脱维亚语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Latvija(拉脱维亚语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
 
             <RadioButton
                 android:id="@+id/rb_portugal_ra"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:textColor="#576478"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Portugal RA(葡萄牙语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Portugal RA(葡萄牙语)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
             <RadioButton
                 android:id="@+id/rb_eesti"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:textColor="#576478"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Eesti(爱沙尼亚)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Eesti(爱沙尼亚)"
-                android:textSize="32sp" />
+                android:textSize="46sp"/>
 
 
             <RadioButton
                 android:id="@+id/rb_mgy"
                 android:textColor="#576478"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
+                android:text="Монгол(蒙古语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="Монгол(蒙古语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_bsy"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
                 android:textColor="#576478"
+                android:text="فارسی(波斯语)"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="فارسی(波斯语)"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_slwny"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
                 android:textColor="#576478"
-                android:paddingLeft="40dp"
                 android:text="فارسی(斯洛文尼亚语)"
-                android:textSize="32sp" />
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_kldy"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
                 android:textColor="#576478"
-                android:maxHeight="90dp"
+                android:text="(克罗地亚语)Hrvatski"
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
                 android:minHeight="78dp"
+                android:gravity="center_vertical"
                 android:paddingLeft="40dp"
-                android:text="(克罗地亚语)Hrvatski"
-                android:textSize="32sp" />
+                android:textSize="46sp" />
 
             <RadioButton
                 android:id="@+id/rb_bsny"
-                android:layout_width="400dp"
-                android:layout_height="wrap_content"
                 android:layout_marginRight="20dp"
                 android:layout_marginBottom="40dp"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:maxHeight="90dp"
-                android:minHeight="78dp"
-                android:paddingLeft="40dp"
                 android:text="(波斯尼亚语)Bosanski"
                 android:textColor="#576478"
-                android:textSize="32sp" />
+                android:layout_width="340dp"
+                android:maxHeight="180dp"
+                android:layout_height="180dp"
+                android:minHeight="78dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="40dp"
+                android:textSize="46sp" />
         </com.module.backstage.weight.FlowRadioGroup>
     </ScrollView>
 

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

@@ -25,6 +25,8 @@
         android:layout_marginStart="18dp"
         android:background="@drawable/backstage_shape_debug_param_cb_unselect"
         android:gravity="center"
+        android:paddingRight="20dp"
+        android:paddingLeft="20dp"
         android:text="请选择开始时间"
         android:textColor="@color/black"
         android:textSize="44sp"
@@ -50,7 +52,8 @@
         android:layout_height="60dp"
         android:layout_marginLeft="18dp"
         android:background="@drawable/backstage_shape_debug_param_cb_unselect"
-
+        android:paddingRight="20dp"
+        android:paddingLeft="20dp"
         android:gravity="center"
         android:text="请选择结束时间"
         android:textColor="@color/black"
@@ -155,8 +158,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_alarm"
         android:layout_width="1500dp"
-        android:layout_height="wrap_content"
         android:maxHeight="2080dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
         android:background="@drawable/backstage_shape_error_white"
         android:paddingVertical="10dp"

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

@@ -8,22 +8,22 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:padding="10dp"
-        android:minWidth="680dp"
-        android:layout_height="680dp"
+        android:minWidth="1080dp"
+        android:layout_height="1080dp"
         android:background="@drawable/home_rectangle_background"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="100dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:id="@+id/backstage_textview51"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
             android:textStyle="bold"
-            android:text="@string/backstage_setting_6"
-            android:textSize="32sp"
+            android:text="@string/backstage_setting_6_1"
+            android:textSize="58sp"
             android:textColor="#576478"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -31,17 +31,16 @@
 
         <TextView
             android:id="@+id/backstage_textview4"
-            android:layout_width="wrap_content"
+            android:layout_width="230dp"
             android:minWidth="150dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="67dp"
+            android:layout_marginTop="107dp"
             android:text="@string/backstage_old_password"
-            android:textSize="32sp"
+            android:textSize="52sp"
             app:layout_constraintEnd_toStartOf="@id/backstage_edittext3"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/backstage_textview51" />
 
-
         <EditText
             android:id="@+id/backstage_edittext3"
             android:layout_width="444dp"
@@ -50,20 +49,20 @@
             android:hint="@string/backstage_old_password_input"
             android:paddingLeft="20dp"
             android:textColor="#576478"
-            android:textSize="26sp"
+            android:textSize="46sp"
             app:layout_constraintBaseline_toBaselineOf="@+id/backstage_textview4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/backstage_textview4" />
 
         <TextView
             android:id="@+id/backstage_textview3"
-            android:layout_width="wrap_content"
+            android:layout_width="230dp"
             android:minWidth="150dp"
             app:layout_constraintEnd_toStartOf="@id/backstage_edittext"
             android:layout_height="wrap_content"
-            android:layout_marginTop="75dp"
+            android:layout_marginTop="107dp"
             android:text="@string/backstage_new_password"
-            android:textSize="32sp"
+            android:textSize="52sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/backstage_textview4" />
 
@@ -74,23 +73,23 @@
             android:background="#F4F9FF"
             android:hint="@string/backstage_new_password_input"
             android:paddingLeft="20dp"
-
             app:layout_constraintStart_toEndOf="@id/backstage_textview3"
             android:textColor="#576478"
-            android:textSize="26sp"
+            android:textSize="46sp"
             app:layout_constraintBaseline_toBaselineOf="@+id/backstage_textview3"
             app:layout_constraintEnd_toEndOf="parent" />
 
         <TextView
             android:id="@+id/backstage_textview5"
-            android:layout_width="wrap_content"
+            android:layout_width="230dp"
             android:layout_height="wrap_content"
+            android:maxWidth="330dp"
             android:layout_marginStart="4dp"
-            android:layout_marginTop="72dp"
+            android:layout_marginTop="107dp"
             android:minWidth="150dp"
             app:layout_constraintEnd_toStartOf="@id/backstage_edittext2"
             android:text="@string/backstage_confirm_password"
-            android:textSize="32sp"
+            android:textSize="52sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/backstage_textview3" />
 
@@ -102,7 +101,7 @@
             android:hint="@string/backstage_confirm_password_input"
             android:paddingLeft="20dp"
             android:textColor="#576478"
-            android:textSize="26sp"
+            android:textSize="46sp"
             app:layout_constraintStart_toEndOf="@id/backstage_textview5"
             app:layout_constraintBaseline_toBaselineOf="@+id/backstage_textview5"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -123,7 +122,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/backstage_edittext2" />
 
-
         <TextView
             android:id="@+id/home_return_to_upper_level1"
             android:layout_width="260dp"
@@ -142,8 +140,5 @@
             app:layout_constraintTop_toBottomOf="@+id/backstage_edittext2"
             app:layout_constraintVertical_bias="0.533" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -8,17 +8,18 @@
 
     <CheckBox
         android:id="@+id/cb_manual"
-        android:layout_width="240dp"
-        android:maxHeight="90dp"
-        android:layout_height="wrap_content"
+        android:layout_width="340dp"
+        android:maxHeight="180dp"
+        android:layout_height="180dp"
         android:minHeight="78dp"
         android:background="@drawable/backstage_selector_debug_param_cb_bg"
         android:button="@null"
         android:checked="false"
         android:padding="10dp"
-        android:gravity="left"
+        android:text="调试按钮"
+        android:gravity="center"
         android:textColor="@drawable/backstage_selector_debug_param_cb_color"
-        android:textSize="26sp"
+        android:textSize="46sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -4,46 +4,46 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:background="@drawable/backstage_line_bottom"
-    android:layout_height="80dp">
+    android:layout_height="170dp">
 
     <TextView
         android:id="@+id/tv_time"
         android:layout_width="0dp"
-        android:layout_height="80dp"
+        android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:text="时间"
         android:paddingLeft="60dp"
         android:textColor="#576478"
-        android:textSize="24sp"
+        android:textSize="44sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.3" />
+        app:layout_constraintWidth_percent="0.4" />
 
     <TextView
         android:id="@+id/tv_thingError"
         android:layout_width="0dp"
-        android:layout_height="80dp"
+        android:layout_height="wrap_content"
         android:text="错误事件"
         android:gravity="center_vertical"
         android:textColor="#576478"
-        android:textSize="24sp"
+        android:textSize="44sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_time"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.3" />
+        app:layout_constraintWidth_percent="0.4" />
 
     <TextView
         android:id="@+id/tv_remark"
         android:layout_width="0dp"
-        android:layout_height="80dp"
+        android:layout_height="wrap_content"
         android:text="备注"
         android:textColor="#576478"
-        android:textSize="24sp"
+        android:textSize="44sp"
         android:gravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_thingError"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.4" />
+        app:layout_constraintWidth_percent="0.2" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -9,39 +9,42 @@
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
+        android:layout_width="250dp"
+        android:layout_height="160dp"
         android:layout_marginEnd="8dp"
-        android:textColor="@color/white"
-        android:textSize="20sp"
+        android:textColor="@color/black"
+        android:textSize="40sp"
+        android:gravity="center_vertical"
+        android:text="参数名字"
         app:layout_constraintBottom_toBottomOf="@+id/et_value"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/et_value" />
 
     <EditText
         android:id="@+id/et_value"
-        android:layout_width="120dp"
-        android:layout_height="60dp"
+        android:layout_width="220dp"
+        android:layout_height="100dp"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="8dp"
         android:background="@drawable/backstage_shape_general_param_et"
+        android:text="0000"
+        android:hint="值"
+        android:gravity="center"
         android:inputType="number"
-        android:paddingStart="20dp"
-        android:textSize="18sp"
+        android:textSize="40sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_name"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/btn_update"
-        android:layout_width="85dp"
-        android:layout_height="60dp"
+        android:layout_width="185dp"
+        android:layout_height="100dp"
         android:layout_marginStart="10dp"
         android:background="@drawable/home_rectangle_blue_background"
         android:text="@string/backstage_update"
         android:textColor="@color/white"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textSize="38sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/et_value"
         app:layout_constraintTop_toTopOf="@+id/et_value" />

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

@@ -3,21 +3,23 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_marginTop="40dp"
-    android:layout_width="300dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:padding="5dp">
 
     <CheckBox
         android:id="@+id/cb_pay"
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_width="340dp"
+        android:maxHeight="180dp"
+        android:layout_height="180dp"
+        android:minHeight="78dp"
+        android:textSize="46sp"
+        android:gravity="center"
         android:background="@drawable/backstage_selector_language"
         android:button="@null"
-        android:gravity="left"
         android:padding="10dp"
-        android:text="微信支付宝"
+        android:text="支付方式选择按钮"
         android:textColor="#576478"
-        android:textSize="30sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -10,6 +10,7 @@
     <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_6_1">重置密码</string>
     <string name="backstage_setting_7">定时\n开关机</string>
     <string name="backstage_setting_8">权限\n设置</string>
     <string name="backstage_setting_9">其他</string>

module_home/src/main/res/layout/home_fragment_home.xml

@@ -5,7 +5,7 @@
     android:id="@+id/cl_home_bg"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/dingdian_mg_pic_background_sun">
+    android:background="@drawable/userhome_bg">
 
     <ImageView
         android:id="@+id/home_imageview2"
@@ -82,7 +82,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="2024-07-21 21:06:23"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="50sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -92,22 +92,23 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/home_dev_id"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="50sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_time" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <Button
+        android:visibility="gone"
         android:id="@+id/btn_language_switch"
         android:layout_width="200dp"
         android:layout_height="150dp"
         android:layout_marginTop="20dp"
         android:layout_marginRight="50dp"
-        android:background="@drawable/home_shape_btn"
+        android:background="@drawable/home_rectangle_t_blue_background"
         android:gravity="center"
-        android:text="语言切换"
-        android:textColor="@color/white"
+        android:text="语言\n切换"
+        android:textColor="@color/black"
         android:textSize="40sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@id/btn_cif"
@@ -119,10 +120,10 @@
         android:layout_height="150dp"
         android:layout_marginTop="20dp"
         android:layout_marginRight="50dp"
-        android:background="@drawable/home_shape_btn"
+        android:background="@drawable/home_rectangle_t_blue_background"
         android:gravity="center"
-        android:text="联系方式"
-        android:textColor="@color/white"
+        android:text="联系\n方式"
+        android:textColor="@color/black"
         android:textSize="40sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@id/cl_home_time"
@@ -211,7 +212,7 @@
         android:layout_height="160dp"
         android:layout_marginTop="900dp"
         android:layout_marginRight="10dp"
-        android:background="@drawable/home_shape_gray"
+        android:background="@drawable/shoppingcart_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -224,7 +225,7 @@
             android:id="@+id/iv_shopping_trolley"
             android:layout_width="100dp"
             android:layout_height="100dp"
-            android:layout_marginLeft="20dp"
+            android:layout_marginLeft="50dp"
             android:src="@drawable/shopping_trolley_sun"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -238,7 +239,7 @@
             android:gravity="center"
             android:text="0"
             android:textColor="@android:color/white"
-            android:textSize="20sp"
+            android:textSize="40sp"
             app:layout_constraintStart_toStartOf="@+id/iv_shopping_trolley"
             app:layout_constraintTop_toTopOf="@+id/iv_shopping_trolley" />
 
@@ -260,10 +261,8 @@
             android:id="@+id/tv_pay"
             android:layout_width="550dp"
             android:layout_height="160dp"
-            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="5dp"
-            android:background="@drawable/home_shape_btn"
+            android:background="@drawable/home_pay_bg"
             android:gravity="center"
             android:text="去付款"
             android:textColor="@color/white"
@@ -288,11 +287,12 @@
 
     <LinearLayout
         android:id="@+id/ll_userbottom"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:gravity="center"
         android:orientation="horizontal"
+        android:background="@drawable/userbottom_bg"
         app:layout_constraintBottom_toTopOf="@+id/home_guideline2"
         app:layout_constraintEnd_toStartOf="@+id/home_guideline"
         app:layout_constraintStart_toStartOf="@+id/home_guideline">
@@ -385,7 +385,7 @@
                 android:id="@+id/iv_lutou"
                 android:layout_width="150dp"
                 android:layout_height="150dp"
-                android:src="@drawable/icon_qxlutou_new" />
+                android:src="@drawable/icon_fashengqi" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -399,7 +399,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="40°C"
-                    android:textColor="#d4237a"
+                    android:textColor="#966035"
                     android:textSize="40sp" />
 
                 <TextView
@@ -409,7 +409,7 @@
                     android:layout_below="@id/tv_lutou"
                     android:lines="2"
                     android:text="发生器温度"
-                    android:textColor="#d4237a"
+                    android:textColor="#966035"
                     android:textSize="40sp" />
             </LinearLayout>
         </RelativeLayout>

module_home/src/main/res/layout/home_fragment_userlogin.xml

@@ -4,13 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/dingdian_pic_background_sys">
+    android:background="@drawable/userhome_bg">
 
 
     <ImageView
         android:id="@+id/iv_clogo"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
+        android:layout_width="170dp"
+        android:layout_height="170dp"
         android:layout_gravity="center"
         android:background="@drawable/home_circle_background"
         android:padding="20dp"
@@ -22,8 +22,8 @@
 
     <Spinner
         android:id="@+id/et_home_username"
-        android:layout_width="506dp"
-        android:layout_height="100dp"
+        android:layout_width="706dp"
+        android:layout_height="150dp"
         android:paddingStart="20dp"
         android:textSize="32sp"
         android:text="Admin"
@@ -55,8 +55,8 @@
 
     <EditText
         android:id="@+id/et_home_password"
-        android:layout_width="506dp"
-        android:layout_height="100dp"
+        android:layout_width="706dp"
+        android:layout_height="150dp"
         android:inputType="textPassword"
         android:layout_marginTop="40dp"
         android:drawableStart="@drawable/icon_mima"
@@ -74,16 +74,16 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="50dp"
         android:text="设备编号：1234123412341234"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:layout_marginEnd="50dp"
-        android:textSize="26sp"
+        android:textSize="46sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/home_return_to_upper_level"
         android:layout_width="wrap_content"
-        android:layout_height="90dp"
+        android:layout_height="160dp"
         android:layout_marginEnd="50dp"
         android:background="@drawable/home_rectangle_blue_background"
         android:drawableStart="@drawable/pic_back_01"
@@ -95,14 +95,14 @@
         android:paddingHorizontal="10dp"
         android:text="@string/home_back_user"
         android:textColor="@color/white"
-        android:textSize="32sp"
+        android:textSize="52sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_deviceId" />
 
     <TextView
         android:id="@+id/home_login_setting"
-        android:layout_width="506dp"
-        android:layout_height="100dp"
+        android:layout_width="706dp"
+        android:layout_height="150dp"
         android:layout_marginTop="40dp"
         android:background="@drawable/home_rectangle_gradient_background"
         android:text="@string/home_login"

module_home/src/main/res/layout/home_item_home_product.xml

@@ -2,11 +2,12 @@
 <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/cl_product"
-    android:layout_width="600dp"
+    android:layout_width="700dp"
     android:layout_height="940dp"
     android:layout_marginRight="20dp"
+    android:layout_marginLeft="20dp"
     android:layout_marginBottom="20dp"
-    android:background="@drawable/dingdian_imge_price_bg">
+    android:background="@drawable/item_userhome_product_adapter_background">
 
 
     <ImageView
@@ -15,8 +16,7 @@
         android:layout_height="480dp"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="60dp"
-        android:background="@drawable/home_rectangle_blue_background"
-        android:src="@drawable/icon_coin"
+        android:src="@drawable/product_1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -41,28 +41,28 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="130dp"
         android:layout_marginTop="10dp"
-        android:layout_marginStart="50dp"
+        android:layout_marginStart="30dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_name">
 
         <TextView
             android:id="@+id/tv_unit"
             android:layout_width="0dp"
-            android:layout_weight="1"
+            android:layout_weight="0.6"
             android:layout_height="wrap_content"
             android:text="￥"
             android:textColor="#fa7698"
-            android:textSize="90sp"
+            android:textSize="80sp"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/tv_price"
             android:layout_width="0dp"
             android:layout_weight="2"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
+            android:layout_height="130dp"
+            android:gravity="center"
             android:text="0.00"
             android:textColor="#fa7698"
             android:textSize="90sp"
@@ -73,9 +73,9 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="100dp"
-            android:src="@drawable/add"
+            android:src="@drawable/icon_add"
             android:layout_marginTop="20dp"
-            android:layout_marginEnd="60dp"/>
+            android:layout_marginEnd="40dp"/>
     </LinearLayout>
 
 

module_home/src/main/res/values/home_color.xml

@@ -4,4 +4,6 @@
     <color name="home_colorRedSugar">#FF7A96</color>
     <color name="home_colorYellowSugar">#FFD33E</color>
     <color name="home_colorBlueSugar">#46A0EB</color>
+    <color name="home_colorYellow_btn">#f9d01a</color>
+
 </resources>

serialport-api/src/main/java/com/hboxs/serialport/plc/thread/ThreadDebugParamParam.kt

@@ -214,12 +214,12 @@ class ThreadDebugParamParam : LifecycleObserver {
 
     fun setBtn(address: String) {
         VboxSerialPortSendQueue.getInstance()
-            .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO, address+"01"))
+            .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO, VboxCommand.DEBUG_ID+address+"01"))
     }
 
     fun rstBtn(address: String) {
         VboxSerialPortSendQueue.getInstance()
-            .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO, address+"00"))
+            .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO, VboxCommand.DEBUG_ID+address+"00"))
     }
 
 

serialport-api/src/main/java/com/hboxs/serialport/plc/thread/ThreadGeneralParam.kt

@@ -50,7 +50,7 @@ class ThreadGeneralParam: LifecycleObserver {
         job230 = CoroutineScope(Dispatchers.Main).launch {
             while (isActive230) {
                 //参数 1 2 31 3 4 5   D400 D401 D402 D404 D405 D406
-                SerialPortSendQueue.sendCommand(ReadCommandFrame(PlcParamAddressEnum.D230.address, 14), 400, PlcParamAddressEnum.D230.address)
+//                SerialPortSendQueue.sendCommand(ReadCommandFrame(PlcParamAddressEnum.D230.address, 14), 400, PlcParamAddressEnum.D230.address)
                 // 执行定时任务的操作
                 Log.d(TAG, "startRead: 230")
                 delay(100) // 每隔2秒重复执行
@@ -58,7 +58,7 @@ class ThreadGeneralParam: LifecycleObserver {
         }
         job447 = CoroutineScope(Dispatchers.Main).launch {
             while (isActive447) {
-                SerialPortSendQueue.sendCommand(ReadCommandFrame(PlcParamAddressEnum.D447.address, 4), 400, PlcParamAddressEnum.D447.address)
+//                SerialPortSendQueue.sendCommand(ReadCommandFrame(PlcParamAddressEnum.D447.address, 4), 400, PlcParamAddressEnum.D447.address)
                 // 执行定时任务的操作
                 Log.d(TAG, "startRead: 447")
                 delay(100) // 每隔2秒重复执行

serialport-api/src/main/java/com/hboxs/serialport/plc/thread/ThreadSettingParam.kt

@@ -45,7 +45,7 @@ class ThreadSettingParam @Inject constructor(): LifecycleObserver  {
         jobStartUp = CoroutineScope(Dispatchers.Main).launch {
             while (isActiveM3) {
                 VboxSerialPortSendQueue.getInstance()
-                    .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO, "00FB0100"))
+                    .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO, VboxCommand.DEBUG_ID+"0100"))
 //                VboxSerialPortManager.getInstance().sendData("00FB0100")
                 Log.d(TAG, "startUp: 开机中。")
                 // 执行定时任务的操作

serialport-api/src/main/java/com/hboxs/serialport/sbc/frame/VboxCommand.java

@@ -12,6 +12,29 @@ public class VboxCommand {
      * 帧结束
      */
     public final static String ETX = "DDDD";
+
+    /**
+     * 调试按钮指令
+     */
+    public final static String DEBUG_ID = "00FB";
+    /**
+     * 制作指令
+     */
+    public final static String MAKE_ID = "00FC";
+    /**
+     * 预警指令
+     */
+    public final static String EARLY_WARN_ID = "00FD";
+    /**
+     * 参数调整指令
+     */
+    public final static String PARAM_ID = "00FE";
+    /**
+     * 所有后台参数查询指令
+     */
+    public final static String ALL_PARAM_ID = "00FF";
+
+
     /**
      * CMD指令：查询设备ID
      */