弹窗UI，细节UI

app/build.gradle

@@ -115,6 +115,8 @@ dependencies {
     } else {
         implementation project(path: ':lib_common')
     }
+    implementation project(path: ':lib_base')
+
     implementation DependencyConfig.JetPack.HiltCore
 
     kapt DependencyConfig.GitHub.AutoServiceAnnotations

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Snow Cone Machine</string>
-</resources>

buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectBuildConfig.kt

@@ -12,7 +12,7 @@ object ProjectBuildConfig {
     const val minSdkVersion = 21
     const val targetSdkVersion = 34
     const val versionCode = 1
-    const val versionName = "1.0"
+    const val versionName = "1.0.0"
     const val isAppMode = false
 
     /**

lib_base/build.gradle

@@ -19,7 +19,7 @@ android {
         viewBinding = true
     }
 
-    resourcePrefix "base_"
+//    resourcePrefix "base_"
     namespace 'com.quyunshuo.androidbaseframemvvm.base'
 }
 

lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/vm/BaseViewModel.kt

@@ -55,6 +55,4 @@ abstract class BaseViewModel : ViewModel() {
         }
     }
 
-
-
 }

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

@@ -49,4 +49,72 @@
     <string name="base_other4">Shopping cart settings</string>
     <string name="base_other5">Change settings</string>
     <string name="base_other6">Others</string>
+    <string name="backstage_update_success">Update success</string>
+    <string name="backstage_data_null_tips">The data is empty, not operating</string>
+    <string name="backstage_check_update">Check the update</string>
+    <string name="backstage_system_set">System settings</string>
+    <string name="backstage_setting_1">Set up</string>
+    <string name="backstage_setting_2">Parameter adjustment</string>
+    <string name="backstage_setting_3">Data statistics</string>
+    <string name="backstage_setting_4">Language switch</string>
+    <string name="backstage_setting_5">Alarm records</string>
+    <string name="backstage_setting_6">Reset password</string>
+    <string name="backstage_setting_7">Local alarm clock</string>
+    <string name="backstage_setting_8">Permissions settings</string>
+    <string name="backstage_setting_9">Othe </string>
+    <string name="backstage_product_1">Commodity price adjustment</string>
+    <string name="backstage_product_2">Hidden the commodity</string>
+    <string name="backstage_product_3">Modify the name of the commodity picture</string>
+    <string name="backstage_product_4">Debug commodity</string>
+    <string name="backstage_param_set_1">Debug page</string>
+    <string name="backstage_param_set_2">Universal parameter</string>
+    <string name="backstage_back">Return</string>
+    <string name="backstage_version">Version number:</string>
+    <string name="backstage_connected">Connected:</string>
+    <string name="backstage_open_dev_tips">Operate immediately?</string>
+    <string name="backstage_start_dev">Immediately turn on</string>
+    <string name="backstage_cancle">Cancel</string>
+    <string name="backstage_quit_app">Click the return key to exit</string>
+    <string name="backstage_latest_version">It is the latest version ~</string>
+    <string name="backstage_connecting">Connecting application</string>
+    <string name="backstage_update_price">Confirm the price adjustment</string>
+    <string name="backstage_connection_server">Connect to the server</string>
+    <string name="backstage_connection_server_tips">Apply for remote connection system</string>
+    <string name="backstage_connection_server_hint">Please enter the management system ID</string>
+    <string name="backstage_connection_server_btn">Apply immediately</string>
+    <string name="backstage_update_now">Update immediately </string>
+    <string name="backstage_new_version_discover">Find the new version:</string>
+    <string name="backstage_down_progress">Download progress:</string>
+    <string name="backstage_old_password"> Old password </string>
+    <string name="backstage_old_password_input"> Please enter the old password </string>
+    <string name="backstage_new_password"> New password </string>
+    <string name="backstage_new_password_input"> Please enter the new password </string>
+    <string name="backstage_confirm_password"> Confirm the password </string>
+    <string name="backstage_confirm_password_input"> Please enter the confirmation password </string>
+    <string name="backstage_confirm"> Confirm </string>
+    <string name="backstage_update_progress_init_status">Download progress: 0%</string>
+    <string name="backstage_update">Update</string>
+    <string name="backstage_setting_10">Payment method</string>
+    <string name="backstage_confirm_update">Confirm changes</string>
+    <string name="backstage_ok_dialog_title">Are you sure about the operation? </string>
+    <string name="backstage_search_hint">Please enter the content you want to search</string>
+    <string name="home_dev_id">Device number:</string>
+    <string name="home_steam_wendu">Steam temperature</string>
+    <string name="home_login">Login</string>
+    <string name="home_back_user">Return to the user interface</string>
+    <string name="home_login_tips_1">Please check your account password</string>
+    <string name="home_login_tips_2">Login successful</string>
+    <string name="home_tips_dialog_1">Machine communication failed</string>
+    <string name="home_tips_dialog_2">Please go to the backstage to turn on the machine before purchasing</string>
+    <string name="home_tips_dialog_3">The machine has an alarm. After solving the problem, please go to the backstage to turn on the machine before purchasing</string>
+    <string name="home_tips_dialog_4">The machine is turning on, please wait</string>
+    <string name="home_tips_dialog_5">The machine is making, please wait</string>
+    <string name="home_confirm">Confirm</string>
+    <string name="home_cancle">Cancel</string>
+    <string name="home_make_success">Making completed</string>
+    <string name="home_make_success_tips">Please pull the door below to take the smoothie</string>
+    <string name="home_residue_s">Remaining 40s</string>
+    <string name="home_again_buy">Buy again</string>
+    <string name="home_quit_app">Click the return key again to exit</string>
+    <string name="home_choosepay_title">Select payment method</string>
 </resources>

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

@@ -1,4 +1,5 @@
 <resources>
+
     <string name="base_network_disconnected">网路已断开</string>
     <string name="base_network_connected">网络已连接</string>
 
@@ -26,7 +27,6 @@
     <string name="base_plc_debug_22"></string>
     <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>
@@ -61,5 +61,108 @@
     <string name="bill_collocation">MDB 纸币托管</string>
     <string name="mdb_level">MDB L3级别</string>
     <string name="base_free_pay">免费制作</string>
+    <string name="way_contacts">联系方式:</string>
+    <string name="name_contacts">联系人:</string>
+
+    <string name="backstage_update_success">更新成功</string>
+    <string name="backstage_data_null_tips">数据为空，不可以操作</string>
+    <string name="backstage_check_update">检查更新</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_6_1">重置密码</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>
+    <string name="backstage_product_4">商品调试</string>
+    <string name="backstage_param_set_1">调试页</string>
+    <string name="backstage_param_set_2">通用参数</string>
+    <string name="backstage_back">返回</string>
+    <string name="backstage_version">版本号:</string>
+    <string name="backstage_connected">已连接：</string>
+    <string name="backstage_open_dev_tips">是否立即开机？</string>
+    <string name="backstage_start_dev">立即开机</string>
+    <string name="backstage_cancle">取消</string>
+    <string name="backstage_quit_app">再次点击返回键退出</string>
+    <string name="backstage_latest_version">已是最新版本~</string>
+    <string name="backstage_connecting">连接申请中</string>
+    <string name="backstage_update_price">确认调价</string>
+    <string name="backstage_connection_server">连接服务器</string>
+    <string name="backstage_connection_server_tips">申请远程连接系统</string>
+    <string name="backstage_connection_server_hint">请输入管理系统ID</string>
+    <string name="backstage_connection_server_btn">立即申请</string>
+    <string name="backstage_update_now">立即更新</string>
+    <string name="backstage_new_version_discover">发现新版本:</string>
+    <string name="backstage_down_progress">下载进度：</string>
+    <string name="backstage_old_password">旧密码</string>
+    <string name="backstage_old_password_input">请输入旧密码</string>
+    <string name="backstage_new_password">新密码</string>
+    <string name="backstage_new_password_input">请输入新密码</string>
+    <string name="backstage_confirm_password">确认密码</string>
+    <string name="backstage_confirm_password_input">请输入确认密码</string>
+    <string name="backstage_confirm">确定</string>
+    <string name="backstage_update_progress_init_status">下载进度：0%</string>
+    <string name="backstage_update">更新</string>
+    <string name="backstage_confirm_update">确认修改</string>
+    <string name="backstage_ok_dialog_title">是否确定操作？</string>
+    <string name="backstage_search_hint">请输入要搜索的内容</string>
+    <string name="backstage_steam_wendu">蒸气温度</string>
+    <string name="backstage_choose_time">请输入时间</string>
+    <string name="backstage_year_input">请输入年份</string>
+    <string name="backstage_month_input">请输入月份</string>
+    <string name="backstage_day_input">请输入天数</string>`
+    <string name="backstage_hour_input">请输入小时</string>
+    <string name="backstage_ringht_month_input">请输入正确的月份</string>
+    <string name="backstage_ringht_day_input">请输入正确的天数</string>
+    <string name="backstage_ringht_hour_input">请输入正确的小时</string>
+    <string name="tian">时间不能超过两天</string>
+    <string name="yue">时间不能超过一个月</string>
+    <string name="yues">时间不能超过12个月</string>
+    <string name="sjcw">时间错误</string>
+    <string name="nian">时间不能超过10年</string>
+    <string name="open_sleep">开启睡眠</string>
+    <string name="close_sleep">关闭睡眠</string>
+    <string name="close_dev">关机</string>
+    <string name="open_dev">开机</string>
+    <string name="sunday">日</string>
+    <string name="monday">一</string>
+    <string name="tuesday">二</string>
+    <string name="wednesday">三</string>
+    <string name="thursday">四</string>
+    <string name="friday">五</string>
+    <string name="saturday">六</string>
+    <string name="backstage_bar_chart_statistics">柱状图统计</string>
+    <string name="backstage_order_details">订单明细</string>
+    <string name="backstage_add_lock">添加闹钟</string>
+    <string name="backstage_open_lock">开启本地闹钟</string>
 
+    <string name="home_dev_id">设备编号:</string>
+    <string name="home_steam_wendu">蒸气温度</string>
+    <string name="home_login">登录</string>
+    <string name="home_back_user">返回用户界面</string>
+    <string name="home_login_tips_1">请检查账户密码</string>
+    <string name="home_login_tips_2">登录成功</string>
+    <string name="home_tips_dialog_1">机器通讯失败</string>
+    <string name="home_tips_dialog_2">请到后台开机后再购买</string>
+    <string name="home_tips_dialog_3">机器报警了，处理问题后，请到后台开机后再购买</string>
+    <string name="home_tips_dialog_4">机器开机中，请稍等</string>
+    <string name="home_tips_dialog_5">机器制作中，请稍等</string>
+    <string name="home_confirm">确定</string>
+    <string name="home_cancle">取消</string>
+    <string name="home_make_success">制作完成</string>
+    <string name="home_make_success_tips">请在下方拉门取走冰沙</string>
+    <string name="home_residue_s">剩余 40s</string>
+    <string name="home_again_buy">再次购买</string>
+    <string name="home_quit_app">再次点击返回键退出</string>
+    <string name="home_choosepay_title">选择支付方式</string>
+    <string name="home_tips_dialog_6">请先连接服务器后进行使用</string>
+    <string name="home_shopping_cart_null">购物车里没有商品\n请先选择商品</string>
 </resources>

lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/MMKVName.kt

@@ -21,6 +21,8 @@ abstract class MMKVName {
             get() = "MDB"//支付通讯协议
         val CHANGE: String
             get() = "CHANGE"//找零功能
+        val CONTACT_NAME: String
+            get() = "CONTACT_NAME"//联系人
         val CONTACT_NUMBER: String
             get() = "CONTACT_NUMBER"//联系方式
         val PLAY_RULE: String
@@ -90,7 +92,7 @@ abstract class MMKVName {
             get() = "DIY_PAY"
         val typeface1: Typeface
             //自定义字体样式
-            get() =  Typeface.createFromAsset(BaseApplication.context.applicationContext.assets, "huayang.ttf")
+            get() =  Typeface.createFromAsset(BaseApplication.context.applicationContext.assets, "jiangchengyuanti.ttf")
     }
 
     // 这里可以继续添加其他常量

lib_common/src/main/res/layout/toast_error.xml

@@ -12,8 +12,8 @@
     android:paddingBottom="12dp">
 
     <ImageView
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:src="@drawable/toast_error_ic" />
@@ -24,7 +24,9 @@
         android:layout_height="wrap_content"
         android:lineSpacingExtra="5dp"
         android:textColor="@android:color/white"
-        android:textSize="15sp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:textSize="75sp"
         tools:text="我是 Toast 文本" />
 
 </LinearLayout>

lib_common/src/main/res/layout/toast_info.xml

@@ -23,8 +23,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:lineSpacingExtra="5dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         android:textColor="@android:color/white"
-        android:textSize="15sp"
+        android:textSize="75sp"
         tools:text="我是 Toast 文本" />
 
 </LinearLayout>

lib_common/src/main/res/layout/toast_success.xml

@@ -12,8 +12,8 @@
     android:paddingBottom="12dp">
 
     <ImageView
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:src="@drawable/toast_success_ic" />
@@ -24,7 +24,9 @@
         android:layout_height="wrap_content"
         android:lineSpacingExtra="5dp"
         android:textColor="@android:color/white"
-        android:textSize="15sp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:textSize="75sp"
         tools:text="我是 Toast 文本" />
 
 </LinearLayout>

lib_common/src/main/res/layout/toast_warn.xml

@@ -12,19 +12,21 @@
     android:paddingBottom="12dp">
 
     <ImageView
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:src="@drawable/toast_warn_ic" />
 
     <TextView
         android:id="@android:id/message"
-        android:layout_width="wrap_content"
+        android:layout_width="665dp"
         android:layout_height="wrap_content"
         android:lineSpacingExtra="5dp"
         android:textColor="@android:color/white"
-        android:textSize="15sp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:textSize="75sp"
         tools:text="我是 Toast 文本" />
 
 </LinearLayout>

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

@@ -55,4 +55,6 @@
     <color name="dingdianqingshui">#C8E0FF</color>
     <color name="fense">#506e80</color>
     <color name="qy_text_color">#7ab0df</color>
+    <color name="price_color">#fa4444</color>
+
 </resources>

module_backstage/build.gradle

@@ -26,5 +26,6 @@ dependencies{
     implementation project(path: ':module_pay')
     implementation project(':serialport-api')
     implementation project(path: ':module_database')
+    implementation project(path: ':lib_base')
 
 }

module_backstage/src/main/AndroidManifest.xml

@@ -9,8 +9,5 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
     </application>
-
-
 </manifest>

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

@@ -37,7 +37,7 @@ class SettingRepository @Inject constructor() : BaseRepository() {
         params["clientId"] = Heartbeat.deviceId!!
         params["managerId"] = text!!
         params["gtClientId"] = Heartbeat.clientId!!
-        params["equimentType"] = "MG320"
+        params["equimentType"] = "P10_SBM"
         Log.d(TAG, "initDev1: "+params)
         mApi.initDev(params).run {
             emit(this)

module_backstage/src/main/java/com/module/backstage/adapter/DebugParamAdapter.kt

@@ -34,7 +34,6 @@ class DebugParamAdapter (var productList:MutableList<PlcDebugAddressEnum>): Recy
                         cbManual.isChecked =true
                     }else{
                         cbManual.isChecked =false
-
                     }
                 }
             }

module_backstage/src/main/java/com/module/backstage/adapter/OtherAdapter.kt

@@ -54,7 +54,7 @@ class OtherAdapter(var productList: MutableList<OtherEnum>) :
                         else -> {}
                     }
                 }
-                var flag = SpUtils.getBoolean(otherEnum.mmkvName, otherEnum.drfault as Boolean)
+                var flag = SpUtils.getBoolean(otherEnum.mmkvName, otherEnum.default as Boolean)
                 if (flag == true) {
                     rbOpen.isChecked = true
                 } else {
@@ -85,7 +85,7 @@ class OtherAdapter(var productList: MutableList<OtherEnum>) :
                 tvName.text = UiUtil.getStringRes(productList[layoutPosition].nameId)
 
                 var defaultValue =
-                    SpUtils.getString(otherEnum.mmkvName, otherEnum.drfault as String)
+                    SpUtils.getString(otherEnum.mmkvName, otherEnum.default as String)
                 etValue.setText(defaultValue)
                 btnUpdate.setOnClickListener {
                     val value = etValue.text.trim().toString()

module_backstage/src/main/java/com/module/backstage/adapter/TestAdapter.kt

@@ -9,12 +9,10 @@ import android.widget.AdapterView.OnItemSelectedListener
 import android.widget.ArrayAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter4.BaseMultiItemAdapter
-import com.google.gson.Gson
 import com.module.backstage.R
 import com.module.backstage.databinding.BackstageItemInputBinding
 import com.module.backstage.databinding.BackstageItemSpinnerBinding
 import com.module.backstage.databinding.BackstageItemSystemSettingsBinding
-import com.module.pay.strategy.StrategyType
 import com.module.pay.common.OtherEnum
 import com.quyunshuo.androidbaseframemvvm.base.utils.SpUtils
 import com.quyunshuo.androidbaseframemvvm.common.listener.AdapterClickListener
@@ -67,7 +65,7 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                             else -> {}
                         }
                     }
-                    var flag = SpUtils.getBoolean(item.mmkvName, item.drfault as Boolean)
+                    var flag = SpUtils.getBoolean(item.mmkvName, item.default as Boolean)
                     if (flag == true) {
                         rbOpen.isChecked = true
                     } else {
@@ -98,7 +96,7 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
 
                         tvName.text = UiUtil.getStringRes(item!!.nameId)
 
-                        var defaultValue = SpUtils.getString(item.mmkvName, item.drfault as String)
+                        var defaultValue = SpUtils.getString(item.mmkvName, item.default as String)
                         etValue.setText(defaultValue)
                         btnUpdate.setOnClickListener {
                             val value = etValue.text.trim().toString()
@@ -140,7 +138,7 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                     //需要进行比较特殊的处理。比如语言的不同。
                     var language2ArrayAdapter =
                         ArrayAdapter<String>(this@TestAdapter.context, R.layout.spinner_text)
-                    language2ArrayAdapter.addAll(item.drfault as ArrayList<String>)
+                    language2ArrayAdapter.addAll(item.default as ArrayList<String>)
                     mBinding.spMultiple.adapter = language2ArrayAdapter
                     mBinding.spMultiple.setOnItemSelectedListener(object : OnItemSelectedListener {
                         override fun onItemSelected(

module_backstage/src/main/java/com/module/backstage/fragment/other/SystemSettingsFragment.kt

@@ -41,7 +41,7 @@ class SystemSettingsFragment : BaseFragment<BackstageFragmentSystemSettingsBindi
         with(generalRvProduct){
             //设置布局排列方式，默认垂直排列
             val gridLayoutManager: GridLayoutManager =
-                GridLayoutManager(this@SystemSettingsFragment.context, 2, GridLayoutManager.VERTICAL, false)
+                GridLayoutManager(this@SystemSettingsFragment.context, 1, GridLayoutManager.VERTICAL, false)
             layoutManager = gridLayoutManager
             val functionIndex = arguments?.getInt("FUNCTION")
 
@@ -58,24 +58,19 @@ class SystemSettingsFragment : BaseFragment<BackstageFragmentSystemSettingsBindi
                     }
                     showOkCancelDialog(position,data)
                 }
-
             })
             adapter = otherAdapter
-            addItemDecoration(HorizontalSpaceItemDecoration(100))
-
+            addItemDecoration(HorizontalSpaceItemDecoration(10))
         }
-
     }
 
-
     override fun initObserve() {
     }
 
-
-
     override fun initRequestData() {
         mViewModel.getArticleData()
     }
+
     private fun showOkCancelDialog(position: Int, data: String) {
         if (okCancelDialog == null) {
             okCancelDialog = this@SystemSettingsFragment.context?.let { OKCancelDialog(it) }
@@ -85,14 +80,11 @@ class SystemSettingsFragment : BaseFragment<BackstageFragmentSystemSettingsBindi
                 when (type) {
                     okCancelDialog?.type1-> {
                         okCancelDialog?.dismiss()
-
                     }
                     else -> {}
                 }
             }
-
         })
-
         okCancelDialog?.show()
     }
 }

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

@@ -16,10 +16,11 @@ class SystemSettingsFragmentRepo @Inject constructor() : BaseRepository() {
     @Inject
     lateinit var mApi: com.module.pay.service.HomeApiService
 
+    //系统设置
     var arrayList: MutableList<OtherEnum> = Arrays.asList(
         OtherEnum.BILL_COUNTRY,
         OtherEnum.AGREEMENT,
-        OtherEnum.CHANGE,
+        OtherEnum.CONTACT_NAME,
         OtherEnum.CONTACT_NUMBER,
         OtherEnum.TTYS_NAYAX,
         OtherEnum.TTYS_MDB,
@@ -27,15 +28,25 @@ class SystemSettingsFragmentRepo @Inject constructor() : BaseRepository() {
         OtherEnum.NAYAX_MODE,
         OtherEnum.BILL_COLLOCATION,
         OtherEnum.MDB_LEVEL
-
     )
 
-    var shoppingCartList: MutableList<OtherEnum> = Arrays.asList(
-        OtherEnum.SHOPPING_TROLLEY
+    //串口设置
+    var comSetList: MutableList<OtherEnum> = Arrays.asList(
     )
-
+    //功能开启
     var functionOpenList: MutableList<OtherEnum> = Arrays.asList(
         OtherEnum.PROMOTION_CODE
     )
+    //购物车设置
+    var shoppingCartList: MutableList<OtherEnum> = Arrays.asList(
+        OtherEnum.SHOPPING_TROLLEY
+    )
+    //找零设置
+    var changeSetList: MutableList<OtherEnum> = Arrays.asList(
+        OtherEnum.CHANGE
+    )
+    //其他
+    var otherSetList: MutableList<OtherEnum> = Arrays.asList(
+    )
 
 }

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

@@ -60,7 +60,7 @@ class DebugParamFragmentVM @Inject constructor(private val mRepo: DebugParamFrag
     private var _paramDataListM171 = MutableLiveData<List<String>>()
     val paramDataListM171: MutableLiveData<List<String>> get() = _paramDataListM171
 
-    public var _paramDataMap = mutableMapOf<String, String>()
+    var _paramDataMap = mutableMapOf<String, String>()
         get() = field
 
     private val _refreshPage = MutableLiveData<Boolean>();
@@ -129,8 +129,6 @@ class DebugParamFragmentVM @Inject constructor(private val mRepo: DebugParamFrag
 //
 //            else -> {}
 //        }
-
-
     }
 
     private fun M228(hex: String) {
@@ -260,7 +258,6 @@ class DebugParamFragmentVM @Inject constructor(private val mRepo: DebugParamFrag
                 cmdHeartbeat(messageEvent)
             }
         }
-
     }
 
     private fun cmdHeartbeat(messageEvent: VBoxMessage) {

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

@@ -28,11 +28,9 @@ class OtherFragmentVM @Inject constructor(private val mRepo: OtherFragmentRepo)
     //2. 首先把所有的功能项拿到，进行遍历
     //3. 具体的数据展示:如何展示呢？navigation+fragment？？【搜索的时候展示另外一个fragment，而不搜索的时候展示其中一个。】
 
-
     //1.拿到所有的通讯设置
     var list :ArrayList<OtherEnum> = ArrayList()
 
-
     private var _readAllDataSuccess = MutableLiveData<Int>()//是否读取所有数据成功
     val readAllDataSuccess: LiveData<Int> get() = _readAllDataSuccess
 
@@ -48,5 +46,4 @@ class OtherFragmentVM @Inject constructor(private val mRepo: OtherFragmentRepo)
         }
         _readAllDataSuccess.value = list.size
     }
-
 }

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

@@ -1,5 +1,6 @@
 package com.module.backstage.vm
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.module.backstage.repo.SystemSettingsFragmentRepo
@@ -31,13 +32,23 @@ class SystemSettingsFragmentVM @Inject constructor(private val mRepo: SystemSett
     }
 
     fun getGeneralParamData(functionIndex: Int?): MutableList<OtherEnum> {
+        Log.d(TAG, "getGeneralParamData: " + functionIndex)
         when (functionIndex) {
-            2->{
+            1 -> {
+                return mRepo.comSetList
+            }
+            2 -> {
                 return mRepo.functionOpenList
             }
             3 -> {
                 return mRepo.shoppingCartList
             }
+            4 -> {
+                return mRepo.changeSetList
+            }
+            5 -> {
+                return mRepo.otherSetList
+            }
             else -> {
                 return mRepo.arrayList
             }

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

@@ -133,7 +133,7 @@
             android:textColor="@android:color/white"
             android:textSize="24sp"
             app:layout_constraintEnd_toEndOf="@+id/btn_update_app"
-            android:visibility="visible"
+            android:visibility="gone"
             app:layout_constraintTop_toTopOf="@+id/btn_update_app" />
 
         <ImageView

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

@@ -7,9 +7,9 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="880dp"
-        android:layout_height="420dp"
+        android:layout_height="880dp"
         android:layout_gravity="center"
-        android:background="@drawable/home_rectangle_background"
+        android:background="@drawable/home_contact_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,10 +19,11 @@
             android:id="@+id/home_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="50dp"
+            android:layout_marginTop="100dp"
+            android:padding="20dp"
             android:text="@string/backstage_connection_server_tips"
-            android:textColor="#576478"
-            android:textSize="42sp"
+          android:textColor="@color/orange_bg"
+            android:textSize="62sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -30,10 +31,10 @@
 
         <EditText
             android:id="@+id/et_server_id"
-            android:layout_width="500dp"
-            android:layout_height="110dp"
-            android:layout_marginTop="30dp"
-            android:textSize="32sp"
+            android:layout_width="700dp"
+            android:layout_height="150dp"
+            android:layout_marginTop="300dp"
+            android:textSize="52sp"
             android:paddingLeft="20dp"
             android:maxLines="1"
             android:inputType="text"
@@ -42,16 +43,17 @@
             android:background="@drawable/backstage_shape_general_param_et"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/home_textview" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_connection_server"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
+            android:layout_width="300dp"
+            android:layout_height="100dp"
             android:minHeight="100dp"
-            android:background="@drawable/home_rectangle_blue_background"
-            android:layout_marginTop="30dp"
+            android:background="@drawable/update_btn_background"
+            android:layout_marginTop="140dp"
             android:gravity="center"
+            android:textStyle="bold"
             android:text="@string/backstage_connection_server_btn"
             android:textColor="@color/white"
             android:textSize="42sp"
@@ -61,12 +63,14 @@
 
         <TextView
             android:id="@+id/tv_back"
-            android:layout_width="260dp"
+            android:layout_width="300dp"
             android:layout_height="100dp"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="140dp"
             android:gravity="center"
             android:text="@string/backstage_cancle"
-            android:textColor="#569DF6"
+            android:background="@drawable/btn_back_background"
+            android:textColor="@color/white"
+            android:textStyle="bold"
             android:textSize="42sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/backstage_guideline"

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

@@ -6,10 +6,10 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="1180dp"
-        android:layout_height="420dp"
+        android:layout_width="1280dp"
+        android:layout_height="400dp"
         android:layout_gravity="center"
-        android:background="@drawable/home_rectangle_background"
+        android:background="@drawable/backstage_onoff_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,10 +19,10 @@
             android:id="@+id/home_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="120dp"
+            android:layout_marginTop="50dp"
             android:text="@string/backstage_open_dev_tips"
             android:textColor="#576478"
-            android:textSize="42sp"
+            android:textSize="62sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -31,15 +31,15 @@
 
         <TextView
             android:id="@+id/tv_start_dev"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
-            android:background="@drawable/home_rectangle_blue_background"
+            android:layout_width="300dp"
+            android:layout_height="120dp"
+            android:background="@drawable/update_btn_background"
             android:gravity="center"
             android:minHeight="100dp"
-            android:padding="10dp"
             android:text="@string/backstage_start_dev"
             android:textColor="@color/white"
-            android:textSize="42sp"
+            android:textStyle="bold"
+            android:textSize="52sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/tv_shutdown"
             app:layout_constraintHorizontal_bias="0.362"
@@ -48,13 +48,14 @@
 
         <TextView
             android:id="@+id/tv_shutdown"
-            android:layout_width="260dp"
-            android:layout_height="100dp"
+            android:layout_width="300dp"
+            android:layout_height="120dp"
             android:background="@drawable/home_rectangle_red_background"
             android:gravity="center"
             android:text="关机"
+            android:visibility="gone"
             android:textColor="@color/white"
-            android:textSize="42sp"
+            android:textSize="52sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/tv_back"
             app:layout_constraintStart_toEndOf="@+id/tv_start_dev"
@@ -62,12 +63,14 @@
 
         <TextView
             android:id="@+id/tv_back"
-            android:layout_width="260dp"
-            android:layout_height="100dp"
+            android:layout_width="300dp"
+            android:layout_height="120dp"
             android:gravity="center"
             android:text="@string/backstage_cancle"
-            android:textColor="#569DF6"
-            android:textSize="42sp"
+            android:background="@drawable/btn_back_background"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            android:textSize="52sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/tv_shutdown"

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

@@ -6,10 +6,13 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="1080dp"
-        android:layout_height="600dp"
+        android:layout_width="wrap_content"
+        android:minWidth="1380dp"
+        android:maxHeight="1680dp"
+        android:layout_height="900dp"
         android:layout_gravity="center"
-        android:background="@drawable/home_rectangle_background"
+        android:padding="30dp"
+        android:background="@drawable/home_contact_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,11 +22,11 @@
             android:id="@+id/tv_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="30dp"
             android:layout_marginTop="40dp"
             android:text="选择时间：12:00"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -32,10 +35,10 @@
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:checked="true"
-            android:scaleX="2.0"
-            android:scaleY="2.0"
-            android:layout_marginEnd="80dp"
-            android:layout_marginTop="40dp"
+            android:scaleX="4.0"
+            android:scaleY="4.0"
+            android:layout_marginEnd="120dp"
+            android:layout_marginTop="30dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
@@ -53,22 +56,23 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginVertical="40dp"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="30dp"
             android:text="星期："
-            android:textColor="#2791FF"
-            android:textSize="40sp"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/backstage_textview14" />
 
         <CheckBox
             android:id="@+id/cb_sunday"
             android:layout_width="wrap_content"
-
             android:layout_height="wrap_content"
+            android:padding="10dp"
             android:text="周日"
+            android:button="@drawable/backstage_check_select_bg"
             android:layout_marginStart="20dp"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintBaseline_toBaselineOf="@+id/backstage_textview12"
             app:layout_constraintStart_toEndOf="@+id/backstage_textview12" />
 
@@ -76,12 +80,13 @@
         <CheckBox
             android:id="@+id/cb_monday"
             android:layout_width="wrap_content"
-
+            android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
             android:text="周一"
+            android:padding="10dp"
             android:layout_marginStart="20dp"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintBaseline_toBaselineOf="@+id/cb_sunday"
             app:layout_constraintStart_toEndOf="@+id/cb_sunday" />
 
@@ -89,60 +94,65 @@
         <CheckBox
             android:id="@+id/cb_tuesday"
             android:layout_width="wrap_content"
-
             android:layout_height="wrap_content"
+            android:button="@drawable/backstage_check_select_bg"
             android:text="周二"
             android:layout_marginStart="20dp"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
+            android:padding="10dp"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintBaseline_toBaselineOf="@+id/cb_monday"
             app:layout_constraintStart_toEndOf="@+id/cb_monday" />
 
         <CheckBox
             android:id="@+id/cb_wednesday"
             android:layout_width="wrap_content"
-
             android:layout_height="wrap_content"
+            android:padding="10dp"
             android:text="周三"
             android:layout_marginStart="20dp"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/cb_monday"
-            app:layout_constraintStart_toEndOf="@+id/cb_monday" />
+            android:textColor="@color/black"
+            android:textSize="50sp"
+            android:button="@drawable/backstage_check_select_bg"
+            app:layout_constraintBaseline_toBaselineOf="@+id/cb_tuesday"
+            app:layout_constraintStart_toEndOf="@+id/cb_tuesday" />
 
         <CheckBox
             android:id="@+id/cb_thursday"
+            android:padding="10dp"
             android:layout_width="wrap_content"
-
+            android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
             android:text="周四"
             android:layout_marginStart="20dp"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/cb_wednesday"
-            app:layout_constraintStart_toEndOf="@+id/cb_wednesday" />
+            android:textColor="@color/black"
+            android:textSize="50sp"
+            app:layout_constraintStart_toEndOf="@+id/backstage_textview12"
+            app:layout_constraintTop_toBottomOf="@id/cb_sunday"/>
 
         <CheckBox
             android:id="@+id/cb_friday"
             android:layout_width="wrap_content"
-
+            android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
+            android:padding="10dp"
             android:text="周五"
             android:layout_marginStart="20dp"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/cb_wednesday"
-            app:layout_constraintStart_toEndOf="@+id/cb_thursday" />
+            android:textColor="@color/black"
+            android:textSize="50sp"
+            app:layout_constraintBaseline_toBaselineOf="@+id/cb_thursday"
+            app:layout_constraintStart_toEndOf="@+id/cb_thursday"/>
 
         <CheckBox
             android:id="@+id/cb_saturday"
             android:layout_width="wrap_content"
-
+            android:padding="10dp"
+            android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
             android:text="周六"
             android:layout_marginStart="20dp"
-            android:textColor="#2791FF"
-            android:textSize="40sp"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintBaseline_toBaselineOf="@+id/cb_friday"
             app:layout_constraintStart_toEndOf="@+id/cb_friday" />
 
@@ -150,7 +160,7 @@
             android:id="@+id/backstage_textview15"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginVertical="40dp"
+            android:layout_marginVertical="90dp"
             android:background="#d9d9d9"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/backstage_textview12" />
@@ -160,10 +170,10 @@
             android:layout_width="wrap_content"
             android:layout_marginVertical="40dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="30dp"
             android:text="类型："
-            android:textColor="#2791FF"
-            android:textSize="40sp"
+            android:textColor="@color/black"
+            android:textSize="50sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/backstage_textview15" />
 
@@ -181,45 +191,51 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
+                android:padding="10dp"
+                android:button="@drawable/backstage_check_select_bg"
                 android:checked="true"
                 android:text="@string/open_dev"
-                android:textColor="#2791FF"
-                android:textSize="40sp" />
+                android:textColor="@color/black"
+                android:textSize="50sp"/>
 
             <RadioButton
                 android:id="@+id/rb_close_dev"
                 android:layout_width="wrap_content"
+                android:padding="10dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
+                android:button="@drawable/backstage_check_select_bg"
                 android:checked="true"
                 android:text="@string/close_dev"
-                android:textColor="#2791FF"
-                android:textSize="40sp" />
+                android:textColor="@color/black"
+                android:textSize="50sp"/>
 
             <RadioButton
                 android:id="@+id/rb_open_sleep"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
+                android:button="@drawable/backstage_check_select_bg"
+                android:padding="10dp"
                 android:checked="true"
                 android:text="开启休眠"
-                android:textColor="#2791FF"
-                android:textSize="40sp" />
+                android:textColor="@color/black"
+                android:textSize="50sp" />
 
             <RadioButton
                 android:id="@+id/rb_close_sleep"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:padding="10dp"
                 android:layout_marginStart="20dp"
+                android:button="@drawable/backstage_check_select_bg"
                 android:checked="true"
                 android:text="关闭休眠"
-                android:textColor="#2791FF"
-                android:textSize="40sp" />
-
+                android:textColor="@color/black"
+                android:textSize="50sp" />
 
         </RadioGroup>
 
-
         <TextView
             android:layout_width="match_parent"
             android:layout_marginVertical="40dp"
@@ -231,29 +247,30 @@
 
         <TextView
             android:id="@+id/tv_confirm"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
-            android:background="@drawable/home_rectangle_blue_background"
+            android:layout_width="300dp"
+            android:layout_height="120dp"
+            android:background="@drawable/update_btn_background"
             android:gravity="center"
-            android:minHeight="100dp"
             android:text="@string/backstage_confirm"
-
+            android:textStyle="bold"
             android:textColor="@color/white"
-            android:textSize="42sp"
+            android:textSize="52sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/backstage_guideline"
-            android:layout_marginBottom="40dp"
+            android:layout_marginBottom="80dp"
             app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
             android:id="@+id/tv_back"
-            android:layout_width="260dp"
-            android:layout_height="100dp"
+            android:layout_width="300dp"
+            android:layout_height="120dp"
             android:gravity="center"
             android:text="@string/backstage_cancle"
-            android:textColor="#569DF6"
-            android:textSize="42sp"
-            android:layout_marginBottom="40dp"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            android:textSize="52sp"
+            android:background="@drawable/btn_back_background"
+            android:layout_marginBottom="80dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/backstage_guideline" />

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

@@ -6,10 +6,11 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="880dp"
-        android:layout_height="420dp"
+        android:layout_width="wrap_content"
+        android:layout_height="680dp"
+        android:minWidth="880dp"
         android:layout_gravity="center"
-        android:background="@drawable/home_rectangle_background"
+        android:background="@drawable/home_contact_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,7 +23,7 @@
             android:layout_marginTop="120dp"
             android:text="@string/backstage_ok_dialog_title"
             android:textColor="#576478"
-            android:textSize="42sp"
+            android:textSize="62sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -30,27 +31,30 @@
 
         <TextView
             android:id="@+id/tv_start_dev"
-            android:layout_width="260dp"
-            android:layout_height="100dp"
+            android:layout_width="360dp"
+            android:layout_height="150dp"
+            android:minHeight="100dp"
+            android:background="@drawable/update_btn_background"
             android:gravity="center"
             android:text="@string/backstage_confirm"
-            android:layout_marginTop="70dp"
-            android:textSize="42sp"
+            android:layout_marginTop="150dp"
+            android:textSize="62sp"
+            android:textStyle="bold"
             android:textColor="@color/white"
-            android:background="@drawable/home_rectangle_blue_background"
             app:layout_constraintEnd_toStartOf="@+id/backstage_guideline"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
         <TextView
             android:id="@+id/tv_back"
-            android:layout_width="260dp"
-            android:layout_height="100dp"
-            android:layout_marginTop="70dp"
+            android:layout_width="360dp"
+            android:layout_height="150dp"
+            android:layout_marginTop="150dp"
             android:gravity="center"
-            android:textColor="#569DF6"
+            android:textColor="@color/white"
+            android:background="@drawable/btn_back_background"
             android:text="@string/backstage_cancle"
-            android:textSize="42sp"
+            android:textSize="62sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/backstage_guideline"
             app:layout_constraintTop_toBottomOf="@+id/tv_title" />

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

@@ -7,9 +7,10 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="1080dp"
-        android:layout_height="600dp"
+        android:layout_height="1080dp"
         android:layout_gravity="center"
-        android:background="@drawable/no_nav_bg"
+        android:background="@drawable/home_contact_background"
+        android:padding="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -17,15 +18,14 @@
 
 
         <TextView
-            android:layout_marginTop="20dp"
             android:id="@+id/tv_name"
-            android:layout_width="200dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="120dp"
+            android:layout_marginTop="60dp"
             android:text="ICT 币值选择："
-            android:textColor="@color/white"
-
-            android:textSize="32sp"
+            android:textColor="@color/orange_bg"
+            android:textSize="52sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -33,77 +33,80 @@
 
         <androidx.appcompat.widget.AppCompatSpinner
             android:id="@+id/sp_multiple"
-            android:layout_width="200dp"
+            android:layout_width="wrap_content"
             android:layout_height="100dp"
-            android:background="@null"
             android:layout_marginLeft="20dp"
-            android:textSize="20sp"
+            android:background="@null"
+            android:minWidth="200dp"
+            android:textSize="52sp"
             app:layout_constraintBottom_toBottomOf="@+id/tv_name"
             app:layout_constraintStart_toEndOf="@+id/tv_name"
             app:layout_constraintTop_toTopOf="@+id/tv_name" />
 
         <TextView
-            android:layout_marginTop="40dp"
             android:id="@+id/tv_diy_pay"
-            android:layout_width="200dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="80dp"
             android:text="定制支付："
-            android:textColor="@color/white"
-            android:textSize="32sp"
+            android:textColor="@color/orange_bg"
+            android:textSize="52sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@+id/tv_name"
             app:layout_constraintTop_toBottomOf="@+id/tv_name" />
 
         <RadioGroup
             android:id="@+id/rg_diy_pay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
-            android:layout_width="300dp"
-            android:layout_height="80dp"
-            android:orientation="horizontal"
             android:background="@drawable/backstage_shape_other_rg_bg"
+            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="@+id/tv_diy_pay"
             app:layout_constraintStart_toEndOf="@+id/tv_diy_pay"
             app:layout_constraintTop_toTopOf="@+id/tv_diy_pay">
 
             <RadioButton
                 android:id="@+id/rb_diy_pay_open"
-                android:layout_width="150dp"
-                android:layout_height="80dp"
+                android:layout_width="200dp"
+                android:layout_height="120dp"
+                android:background="@drawable/backstage_selector_other_rg"
                 android:button="@null"
                 android:gravity="center"
-                android:textSize="32sp"
+                android:text="开启"
                 android:textColor="@drawable/backstage_selector_other_tv_color"
-                android:background="@drawable/backstage_selector_other_rg"
-                android:text="开启"/>
+                android:textSize="42sp" />
+
             <RadioButton
                 android:id="@+id/rb_diy_pay_close"
-                android:layout_width="150dp"
-                android:layout_height="80dp"
+                android:layout_width="200dp"
+                android:layout_height="120dp"
+                android:background="@drawable/backstage_selector_other_rg"
                 android:button="@null"
                 android:gravity="center"
-                android:textSize="32sp"
+                android:text="关闭"
                 android:textColor="@drawable/backstage_selector_other_tv_color"
-                android:background="@drawable/backstage_selector_other_rg"
-                android:text="关闭"/>
+                android:textSize="42sp" />
         </RadioGroup>
 
 
         <TextView
             android:id="@+id/tv_back"
-            android:layout_width="200dp"
-            android:layout_height="100dp"
-            android:layout_marginBottom="20dp"
-            android:background="@drawable/home_rectangle_background"
+            android:layout_width="360dp"
+            android:layout_height="150dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginRight="60dp"
+            android:layout_marginBottom="60dp"
+            android:background="@drawable/btn_back_background"
             android:gravity="center"
             android:text="返回"
-            android:layout_marginEnd="20dp"
-            android:textColor="@color/black"
-            android:textSize="42sp"
+            android:textColor="@color/white"
+            android:textSize="62sp"
+            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,10 +6,10 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="880dp"
-        android:layout_height="650dp"
+        android:layout_width="1080dp"
+        android:layout_height="1080dp"
         android:layout_gravity="center"
-        android:background="@drawable/home_rectangle_background"
+        android:background="@drawable/home_contact_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,8 +21,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="50dp"
             android:text="@string/backstage_check_update"
-            android:textColor="#576478"
-            android:textSize="42sp"
+            android:textColor="@color/orange_bg"
+            android:textSize="72sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -32,7 +32,7 @@
             android:id="@+id/tv_update_progress"
             android:layout_width="700dp"
             android:text="@string/backstage_update_progress_init_status"
-            android:textSize="32sp"
+            android:textSize="52sp"
             android:visibility="gone"
             android:paddingHorizontal="20dp"
             android:textColor="#576478"
@@ -42,10 +42,12 @@
             app:layout_constraintTop_toBottomOf="@+id/home_textview" />
         <TextView
             android:id="@+id/tv_update_info"
-            android:layout_width="700dp"
-            android:layout_height="310dp"
+            android:layout_width="980dp"
+            android:layout_height="wrap_content"
+            android:minHeight="310dp"
+            android:maxHeight="500dp"
             android:layout_marginTop="30dp"
-            android:textSize="32sp"
+            android:textSize="52sp"
             android:textColor="#576478"
             android:padding="20dp"
             android:text="发现新版本\n1.更新了新的设置icon;\n2.维修了一些bug"
@@ -55,32 +57,34 @@
 
         <TextView
             android:id="@+id/tv_update_now"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
+            android:layout_width="360dp"
+            android:layout_height="150dp"
             android:minHeight="100dp"
-            android:background="@drawable/home_rectangle_blue_background"
-            android:layout_marginTop="30dp"
+            android:background="@drawable/update_btn_background"
+            android:layout_marginTop="650dp"
             android:gravity="center"
             android:text="@string/backstage_update_now"
-
             android:textColor="@color/white"
-            android:textSize="42sp"
+            android:textSize="62sp"
+            android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@+id/backstage_guideline"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_update_info" />
+            app:layout_constraintTop_toBottomOf="@+id/home_textview" />
 
         <TextView
             android:id="@+id/tv_back"
-            android:layout_width="260dp"
-            android:layout_height="100dp"
-            android:layout_marginTop="30dp"
+            android:layout_width="360dp"
+            android:layout_height="150dp"
+            android:layout_marginTop="650dp"
             android:gravity="center"
+            android:background="@drawable/btn_back_background"
             android:text="@string/backstage_cancle"
-            android:textColor="#569DF6"
-            android:textSize="42sp"
+            android:textColor="@color/white"
+            android:textSize="62sp"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/backstage_guideline"
-            app:layout_constraintTop_toBottomOf="@+id/tv_update_info" />
+            app:layout_constraintTop_toBottomOf="@+id/home_textview" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/backstage_guideline"

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="2080dp"
+        android:layout_height="1880dp"
         android:layout_marginStart="40dp"
         android:layout_marginTop="30dp"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/tv_add_lock"
-        android:layout_width="wrap_content"
+        android:layout_width="300dp"
         android:layout_height="120dp"
         android:layout_marginRight="80dp"
         android:background="@drawable/backstage_shape_clock"
@@ -70,7 +70,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_local_alarm_clock"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="700dp"
         android:layout_marginTop="40dp"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -8,7 +8,8 @@
         android:id="@+id/magic_other"
         android:layout_width="match_parent"
         android:layout_height="150dp"
-        android:paddingLeft="20dp"
+        android:paddingStart="40dp"
+        android:paddingEnd="40dp"
         android:background="@drawable/system_select_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -17,15 +18,15 @@
     <EditText
         android:id="@+id/et_search"
         android:layout_width="1000dp"
-        android:layout_height="80dp"
+        android:layout_height="100dp"
         android:background="@drawable/home_other_rectangle_background"
-        android:paddingLeft="20dp"
+        android:paddingLeft="50dp"
         android:maxLines="1"
         android:inputType="text"
-        android:layout_marginVertical="10dp"
+        android:layout_marginVertical="50dp"
         android:hint="@string/backstage_search_hint"
-        android:textColor="#2E80DD"
-        android:textSize="32sp"
+        android:textColor="@color/black"
+        android:textSize="52sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.51"
@@ -34,8 +35,8 @@
 
     <ImageView
         android:id="@+id/iv_search"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:padding="10dp"
         android:layout_marginLeft="10dp"
         android:src="@drawable/search"
@@ -47,8 +48,7 @@
         android:id="@+id/fcv_other"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="2080dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/et_search"

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

@@ -115,7 +115,7 @@
             android:background="@color/white"
             android:minWidth="260dp"
             android:textColor="#569DF6"
-            android:text="@string/backstage_cancle"
+            android:text="重新填写"
             android:textSize="42sp"
             app:layout_constraintStart_toEndOf="@id/home_return_to_upper_level1"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -133,7 +133,7 @@
             android:minWidth="260dp"
             android:textColor="@color/white"
             android:textSize="42sp"
-            android:text="@string/backstage_confirm"
+            android:text="@string/backstage_confirm_update"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/home_return_to_upper_level"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -7,9 +7,10 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/general_rv_product"
         android:layout_width="wrap_content"
-        android:layout_height="600dp"
-        android:layout_margin="30dp"
+        android:layout_height="2080dp"
+        android:layout_marginTop="30dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,19 +2,19 @@
 <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="650dp"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="20dp"
     android:layout_marginTop="40dp">
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="200dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:textColor="@color/white"
-        android:textSize="32sp"
+        android:textColor="@color/black"
+        android:textSize="52sp"
         android:textStyle="bold"
+        android:text="功能"
         app:layout_constraintBottom_toBottomOf="@+id/et_value"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/et_value" />
@@ -22,29 +22,28 @@
     <EditText
         android:id="@+id/et_value"
         android:layout_width="320dp"
-        android:layout_height="60dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="8dp"
         android:background="@drawable/backstage_shape_general_param_et"
         android:inputType="number"
-        android:textSize="20sp"
+        android:textSize="50sp"
+        android:textColor="@color/black"
         android:paddingStart="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_name"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/btn_update"
-        android:layout_width="85dp"
-        android:layout_height="60dp"
-        android:layout_marginStart="10dp"
+        android:layout_width="185dp"
+        android:layout_height="100dp"
         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="48sp"
         app:layout_constraintStart_toEndOf="@+id/et_value"
-        app:layout_constraintTop_toTopOf="@+id/et_value" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 
 

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

@@ -2,10 +2,10 @@
 <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="1000dp"
-    android:layout_height="210dp"
+    android:layout_width="match_parent"
+    android:layout_height="310dp"
     android:background="@drawable/backstage_shape_clock"
-    android:padding="5dp"
+    android:padding="25dp"
     android:layout_marginBottom="20dp">
 
     <TextView
@@ -13,10 +13,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
         android:text="07:30"
         android:textColor="#2791FF"
-        android:textSize="68sp"
+        android:textSize="78sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -26,7 +25,8 @@
         android:layout_height="wrap_content"
         android:text="@string/open_dev"
         android:textColor="#2791FF"
-        android:textSize="34sp"
+        android:textSize="54sp"
+        android:textStyle="bold"
         android:layout_marginLeft="20dp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
         app:layout_constraintStart_toEndOf="@+id/tv_time" />
@@ -36,38 +36,38 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="日  一  二  三  四  五  六"
-        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginTop="20dp"
         android:background="@drawable/backstage_shape_other_select_blue"
-        android:textSize="32sp"
-        android:padding="5dp"
+        android:textSize="52sp"
+        android:padding="25dp"
         android:textColor="@color/white"
         app:layout_constraintStart_toStartOf="@+id/tv_time"
         app:layout_constraintTop_toBottomOf="@+id/tv_time" />
 
     <TextView
         android:id="@+id/tv_delete"
-        android:layout_width="160dp"
-        android:layout_height="80dp"
+        android:layout_width="260dp"
+        android:layout_height="120dp"
         android:background="@drawable/backstage_shape_other_select_red"
         android:layout_marginRight="20dp"
         android:gravity="center"
         android:text="删除"
         android:textColor="@color/white"
-        android:textSize="34sp"
+        android:textSize="54sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_update"
-        android:layout_width="160dp"
-        android:layout_height="80dp"
+        android:layout_width="260dp"
+        android:layout_height="120dp"
         android:background="@drawable/backstage_shape_other_select_blue"
         android:gravity="center"
         android:text="修改"
         android:layout_marginRight="20dp"
         android:textColor="@color/white"
-        android:textSize="34sp"
+        android:textSize="54sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/tv_delete"
         app:layout_constraintTop_toTopOf="parent"

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

@@ -2,49 +2,45 @@
 <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="650dp"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="20dp"
     android:layout_marginTop="40dp">
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="200dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:textColor="@color/white"
-        android:textSize="32sp"
+        android:textColor="@color/black"
+        android:textSize="52sp"
         android:textStyle="bold"
+        android:text="功能"
         app:layout_constraintBottom_toBottomOf="@+id/sp_multiple"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/sp_multiple" />
 
-
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/sp_multiple"
-        android:layout_width="200dp"
+        android:layout_width="wrap_content"
+        android:minWidth="200dp"
         android:layout_height="100dp"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="20dp"
         android:layout_marginEnd="8dp"
-        android:textSize="20sp"
+        android:textSize="52sp"
         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_marginStart="10dp"
+        android:layout_width="185dp"
+        android:layout_height="100dp"
+        android:layout_marginStart="20dp"
         android:background="@drawable/home_rectangle_blue_background"
         android:text="@string/backstage_update"
         android:textColor="@color/white"
-        android:textSize="18sp"
+        android:textSize="48sp"
         app:layout_constraintBottom_toBottomOf="@+id/sp_multiple"
         app:layout_constraintStart_toEndOf="@+id/sp_multiple"
         app:layout_constraintTop_toTopOf="@+id/sp_multiple" />
 
-
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,18 +2,17 @@
 <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="650dp"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="20dp"
     android:layout_marginTop="40dp">
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="200dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="同意游客登录："
-        android:textColor="@color/white"
-        android:textSize="32sp"
+        android:textColor="@color/black"
+        android:textSize="50sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,8 +21,8 @@
     <RadioGroup
         android:id="@+id/rg_switch"
         android:layout_marginLeft="20dp"
-        android:layout_width="300dp"
-        android:layout_height="80dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:background="@drawable/backstage_shape_other_rg_bg"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
@@ -32,21 +31,23 @@
 
         <RadioButton
             android:id="@+id/rb_open"
-            android:layout_width="150dp"
-            android:layout_height="80dp"
+            android:layout_width="250dp"
+            android:layout_height="100dp"
             android:button="@null"
             android:gravity="center"
-            android:textSize="32sp"
+            android:textStyle="bold"
+            android:textSize="48sp"
             android:textColor="@drawable/backstage_selector_other_tv_color"
             android:background="@drawable/backstage_selector_other_rg"
             android:text="开启"/>
         <RadioButton
             android:id="@+id/rb_close"
-            android:layout_width="150dp"
-            android:layout_height="80dp"
+            android:layout_width="250dp"
+            android:layout_height="100dp"
             android:button="@null"
+            android:textStyle="bold"
             android:gravity="center"
-            android:textSize="32sp"
+            android:textSize="48sp"
             android:textColor="@drawable/backstage_selector_other_tv_color"
             android:background="@drawable/backstage_selector_other_rg"
             android:text="关闭"/>

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

@@ -2,9 +2,9 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     android:textColor="#576478"
-    android:textSize="20dp"
+    android:textSize="52sp"
     android:layout_width="match_parent"
-    android:layout_height="50dp"
+    android:layout_height="wrap_content"
     android:background="@drawable/backstage_shape_general_param_et"
     android:layout_margin="10dp"
     android:paddingBottom="8dp"

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

@@ -1,52 +0,0 @@
-<resources>
-    <string name="backstage_app_name">Swalked</string>
-    <string name="backstage_update_success">Update success</string>
-    <string name="backstage_data_null_tips">The data is empty, not operating</string>
-    <string name="backstage_check_update">Check the update</string>
-    <string name="backstage_system_set">System settings</string>
-    <string name="backstage_setting_1">Set up</string>
-    <string name="backstage_setting_2">Parameter adjustment</string>
-    <string name="backstage_setting_3">Data statistics</string>
-    <string name="backstage_setting_4">Language switch</string>
-    <string name="backstage_setting_5">Alarm records</string>
-    <string name="backstage_setting_6">Reset password</string>
-    <string name="backstage_setting_7">Local alarm clock</string>
-    <string name="backstage_setting_8">Permissions settings</string>
-    <string name="backstage_setting_9">Othe </string>
-    <string name="backstage_product_1">Commodity price adjustment</string>
-    <string name="backstage_product_2">Hidden the commodity</string>
-    <string name="backstage_product_3">Modify the name of the commodity picture</string>
-    <string name="backstage_product_4">Debug commodity</string>
-    <string name="backstage_param_set_1">Debug page</string>
-    <string name="backstage_param_set_2">Universal parameter</string>
-    <string name="backstage_back">Return</string>
-    <string name="backstage_version">Version number:</string>
-    <string name="backstage_connected">Connected:</string>
-    <string name="backstage_open_dev_tips">Operate immediately?</string>
-    <string name="backstage_start_dev">Immediately turn on</string>
-    <string name="backstage_cancle">Cancel</string>
-    <string name="backstage_quit_app">Click the return key to exit</string>
-    <string name="backstage_latest_version">It is the latest version ~</string>
-    <string name="backstage_connecting">Connecting application</string>
-    <string name="backstage_update_price">Confirm the price adjustment</string>
-    <string name="backstage_connection_server">Connect to the server</string>
-    <string name="backstage_connection_server_tips">Apply for remote connection system</string>
-    <string name="backstage_connection_server_hint">Please enter the management system ID</string>
-    <string name="backstage_connection_server_btn">Apply immediately</string>
-    <string name="backstage_update_now">Update immediately </string>
-    <string name="backstage_new_version_discover">Find the new version:</string>
-    <string name="backstage_down_progress">Download progress:</string>
-    <string name="backstage_old_password"> Old password </string>
-    <string name="backstage_old_password_input"> Please enter the old password </string>
-    <string name="backstage_new_password"> New password </string>
-    <string name="backstage_new_password_input"> Please enter the new password </string>
-    <string name="backstage_confirm_password"> Confirm the password </string>
-    <string name="backstage_confirm_password_input"> Please enter the confirmation password </string>
-    <string name="backstage_confirm"> Confirm </string>
-    <string name="backstage_update_progress_init_status">Download progress: 0%</string>
-    <string name="backstage_update">Update</string>
-    <string name="backstage_setting_10">Payment method</string>
-    <string name="backstage_confirm_update">Confirm changes</string>
-    <string name="backstage_ok_dialog_title">Are you sure about the operation? </string>
-    <string name="backstage_search_hint">Please enter the content you want to search</string>
-</resources>

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

@@ -1,89 +0,0 @@
-<resources>
-    <string name="backstage_app_name">P10</string>
-    <string name="backstage_update_success">更新成功</string>
-    <string name="backstage_data_null_tips">数据为空，不可以操作</string>
-    <string name="backstage_check_update">检查更新</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_6_1">重置密码</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>
-    <string name="backstage_product_4">商品调试</string>
-    <string name="backstage_param_set_1">调试页</string>
-    <string name="backstage_param_set_2">通用参数</string>
-    <string name="backstage_back">返回</string>
-    <string name="backstage_version">版本号:</string>
-    <string name="backstage_connected">已连接：</string>
-    <string name="backstage_open_dev_tips">是否立即开机？</string>
-    <string name="backstage_start_dev">立即开机</string>
-    <string name="backstage_cancle">取消</string>
-    <string name="backstage_quit_app">再次点击返回键退出</string>
-    <string name="backstage_latest_version">已是最新版本~</string>
-    <string name="backstage_connecting">连接申请中</string>
-    <string name="backstage_update_price">确认调价</string>
-    <string name="backstage_connection_server">连接服务器</string>
-    <string name="backstage_connection_server_tips">申请远程连接系统</string>
-    <string name="backstage_connection_server_hint">请输入管理系统ID</string>
-    <string name="backstage_connection_server_btn">立即申请</string>
-    <string name="backstage_update_now">立即更新</string>
-    <string name="backstage_new_version_discover">发现新版本:</string>
-    <string name="backstage_down_progress">下载进度：</string>
-    <string name="backstage_old_password">旧密码</string>
-    <string name="backstage_old_password_input">请输入旧密码</string>
-    <string name="backstage_new_password">新密码</string>
-    <string name="backstage_new_password_input">请输入新密码</string>
-    <string name="backstage_confirm_password">确认密码</string>
-    <string name="backstage_confirm_password_input">请输入确认密码</string>
-    <string name="backstage_confirm">确定</string>
-    <string name="backstage_update_progress_init_status">下载进度：0%</string>
-    <string name="backstage_update">更新</string>
-    <string name="backstage_confirm_update">确认修改</string>
-    <string name="backstage_ok_dialog_title">是否确定操作？</string>
-    <string name="backstage_search_hint">请输入要搜索的内容</string>
-    <string name="backstage_steam_wendu">蒸气温度</string>
-    <string name="backstage_choose_time">请输入时间</string>
-
-    <string name="backstage_year_input">请输入年份</string>
-    <string name="backstage_month_input">请输入月份</string>
-    <string name="backstage_day_input">请输入天数</string>`
-    <string name="backstage_hour_input">请输入小时</string>
-
-    <string name="backstage_ringht_month_input">请输入正确的月份</string>
-    <string name="backstage_ringht_day_input">请输入正确的天数</string>
-    <string name="backstage_ringht_hour_input">请输入正确的小时</string>
-
-
-    <string name="tian">时间不能超过两天</string>
-    <string name="yue">时间不能超过一个月</string>
-    <string name="yues">时间不能超过12个月</string>
-    <string name="sjcw">时间错误</string>
-    <string name="nian">时间不能超过10年</string>
-
-
-    <string name="open_sleep">开启睡眠</string>
-    <string name="close_sleep">关闭睡眠</string>
-    <string name="close_dev">关机</string>
-    <string name="open_dev">开机</string>
-
-    <string name="sunday">日</string>
-    <string name="monday">一</string>
-    <string name="tuesday">二</string>
-    <string name="wednesday">三</string>
-    <string name="thursday">四</string>
-    <string name="friday">五</string>
-    <string name="saturday">六</string>
-    <string name="backstage_bar_chart_statistics">柱状图统计</string>
-    <string name="backstage_order_details">订单明细</string>
-    <string name="backstage_add_lock">点击添加闹钟</string>
-    <string name="backstage_open_lock">开启本地闹钟</string>
-</resources>

module_database/build.gradle

@@ -30,4 +30,5 @@ dependencies {
     api DependencyConfig.AndroidX.Room
     kapt DependencyConfig.AndroidX.RoomCompiler
     api DependencyConfig.AndroidX.RoomKtx
+    implementation project(path: ':lib_base')
 }

module_home/build.gradle

@@ -28,4 +28,6 @@ dependencies {
     implementation project(path: ':module_pay')
     implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.4'
     implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
+    implementation project(path: ':lib_base')
+
 }

module_home/src/main/java/com/quyunshuo/module/home/dialog/ContactDialog.kt

@@ -0,0 +1,53 @@
+package com.quyunshuo.module.home.dialog
+
+import android.content.Context
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import com.hboxs.serialport.plc.DialogClickListener
+import com.quyunshuo.androidbaseframemvvm.base.mvvm.v.BaseFrameDialog
+import com.quyunshuo.module.home.databinding.BackstageDialogContactBinding
+import com.quyunshuo.module.home.databinding.BackstageDialogTipsBinding
+
+/**
+ * 确定和取消对话框
+ */
+class ContactDialog(mContext: Context) : BaseFrameDialog<BackstageDialogContactBinding>(mContext),
+    LifecycleObserver {
+
+    var type1:Int =1
+    var type2:Int =2
+
+
+    private var devOnoffDialoglistener: DialogClickListener? = null
+
+    override fun BackstageDialogContactBinding.initView() {
+        tvStartDev.setOnClickListener {
+            dismiss()
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    override fun dismiss() {
+        super.dismiss()
+    }
+
+    override fun createVB() = BackstageDialogContactBinding.inflate(layoutInflater)
+
+
+    override fun initObserve() {
+    }
+
+    override fun initRequestData() {
+    }
+
+    fun setListener(listener: DialogClickListener) {
+        this.devOnoffDialoglistener = listener
+    }
+
+    fun setContent(content1: String?,content2: String?) {
+        mBinding.tvTitle1.text = content1
+        mBinding.tvTitle2.text = content2
+    }
+
+}

module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/HomeFragment.kt

@@ -1,9 +1,7 @@
 package com.quyunshuo.module.home.fragment.fragment
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.graphics.Point
-import android.graphics.Typeface
 import android.os.Bundle
 import android.os.Handler
 import android.text.format.DateFormat
@@ -24,12 +22,7 @@ import com.google.gson.Gson
 import com.hboxs.serialport.plc.DialogClickListener
 import com.hboxs.serialport.plc.message.Message
 import com.hboxs.serialport.sbc.SBCHeartbeat
-import com.hboxs.serialport.sbc.VBoxMessage
-import com.hboxs.serialport.sbc.VboxSerialPortSendQueue
-import com.hboxs.serialport.sbc.frame.VboxCommand
-import com.hboxs.serialport.sbc.frame.VboxWriteCommand
 import com.module.pay.nayax.CreditCardPresenter
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
 import com.quyunshuo.androidbaseframemvvm.base.addressenum.ProTypeEnum
 import com.quyunshuo.androidbaseframemvvm.base.ktx.observeLiveData
 import com.quyunshuo.androidbaseframemvvm.base.ktx.setVisible
@@ -47,9 +40,9 @@ import com.quyunshuo.androidbaseframemvvm.common.util.LongClickUtils
 import com.quyunshuo.androidbaseframemvvm.common.util.ToastUtil
 import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import com.quyunshuo.module.home.R
-import com.quyunshuo.module.home.activity.main.MainActivity
 import com.quyunshuo.module.home.adapter.HomeProductAdapter
 import com.quyunshuo.module.home.databinding.HomeFragmentHomeBinding
+import com.quyunshuo.module.home.dialog.ContactDialog
 import com.quyunshuo.module.home.dialog.PayChooseDialogFragment
 import com.quyunshuo.module.home.dialog.PaySuccessDialog
 import com.quyunshuo.module.home.dialog.ShoppingCartDialogFragment
@@ -65,7 +58,6 @@ import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import java.io.File
 import java.lang.ref.WeakReference
 
 
@@ -93,6 +85,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
     private var product: ProductDataBean? = null//产品
     override fun createVB() = HomeFragmentHomeBinding.inflate(layoutInflater)
     private var tipsDialog: TipsDialog? = null//条件不足提示对话框
+    private var contactDialog: ContactDialog? = null//联系方式对话框
     private var paySuccessDialog: PaySuccessDialog? = null//支付成功对话框
     private var shoppingCartDialog: ShoppingCartDialogFragment? = null//购物车列表对话框
     private var promotionCode: String? = "" //用户输入的优惠码
@@ -133,6 +126,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
         tvTotal.setOnClickListener(this@HomeFragment)
         ivShoppingTrolley.setOnClickListener(this@HomeFragment)
         tvPay.setOnClickListener(this@HomeFragment)
+        btnCif.setOnClickListener(this@HomeFragment)
         tvAacpeBill.setText(""+Heartbeat.acceptBill)
         initUi()
         //刷卡器初始化 在内部要做好判断？在外部吧  支付方式是否保护Nyax来决定。
@@ -445,11 +439,9 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                     paySuccessDialog?.type1 -> {
                         paySuccessDialog?.dismiss()
                     }
-
                     else -> {}
                 }
             }
-
         })
         paySuccessDialog?.show()
     }
@@ -463,12 +455,16 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                 //打开购物车对话框
                 openShoppingCart()
             }
-
             R.id.tv_pay -> {
                 //去付款
                 pay()
+//                gotoMake("","")
+            }
+            R.id.btn_cif -> {
+                val name=SpUtils.getString(MMKVName.CONTACT_NAME,"")
+                val way=SpUtils.getString(MMKVName.CONTACT_NUMBER,"")
+                showContactDialog(name,way)
             }
-
             else -> {}
         }
     }
@@ -554,4 +550,26 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
         nxHooldeView.startBeizerAnimation()
     }
 
+    private fun showContactDialog(content1: String?, content2: String?) {
+        if (contactDialog == null) {
+            contactDialog = this@HomeFragment.context?.let { ContactDialog(it) }
+            lifecycle.addObserver(contactDialog!!)
+        }
+        contactDialog?.setListener(object : DialogClickListener {
+            override fun onClickListener(type: Int, text: String?) {
+                when (type) {
+                    contactDialog?.type1 -> {
+                        contactDialog?.dismiss()
+                    }
+                    else -> {}
+                }
+            }
+        })
+        contactDialog?.setContent(content1,content2)
+        contactDialog?.show()
+        lifecycleScope.launch {
+            delay(10000)
+            contactDialog?.dismiss()
+        }
+    }
 }

module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/MakeFragment.kt

@@ -15,6 +15,7 @@ import com.google.gson.reflect.TypeToken
 import com.hboxs.serialport.plc.DialogClickListener
 import com.hboxs.serialport.plc.message.Message
 import com.hboxs.serialport.plc.util.HexUtils
+import com.hboxs.serialport.sbc.SBCHeartbeat
 import com.hboxs.serialport.sbc.VBoxMessage
 import com.hboxs.serialport.sbc.frame.VboxCommand
 import com.quyunshuo.androidbaseframemvvm.base.addressenum.PlcD2StatusEnum
@@ -169,6 +170,8 @@ class MakeFragment : BaseFragment<HomeFragmentMakeBinding, MakeFragmentVM>() {
                     fragment.mBinding.progressView.setCurrentProgress(fragment.plannedSpeed)
                     fragment.mBinding.tvProgressDescribe.text = "制作中，请耐心等待"
                     fragment.mBinding.tvTime.text = sysTimeStr //更新时间
+                    fragment.mBinding.tvLutou.text = SBCHeartbeat.headTemp+"°C"
+
 //                    fragment.mBinding.tvBackTime.text = fragment.backTime.toString()
 //                    fragment.backTime--
 //                    Log.d(fragment.TAG, "backTime: " + fragment.backTime)

module_home/src/main/java/com/quyunshuo/module/home/service/MqService.kt

@@ -141,7 +141,7 @@ class MqService : Service() {
         if (("" == updateMaterialStatus)) { //因为脱离系统了，那么就清空，重新创建
             data = ""
         }
-        val machineType: String = SpUtils.getString(MMKVName.MACHINE_TYPE, "MG320")!!
+        val machineType: String = SpUtils.getString(MMKVName.MACHINE_TYPE, "P10_SBM")!!
         Log.d(TAG, "$data: mq getAddQueue: $machineType")
         // SharedPreferencesUtils.setParam(Name.QUEUE_DATA, data);
         if (("" == Heartbeat.deviceId)) {
@@ -176,7 +176,7 @@ class MqService : Service() {
     private fun initView1() {
         val data = SpUtils.getString(MMKVName.QUEUE_DATA, "") as String //连接设备id
         Log.d(TAG, "1data initView: $data")
-        val machineType: String = SpUtils.getString(MMKVName.MACHINE_TYPE, "MG320")!!
+        val machineType: String = SpUtils.getString(MMKVName.MACHINE_TYPE, "P10_SBM")!!
         Log.d(TAG, "$data: mq getAddQueue: $machineType")
         // SharedPreferencesUtils.setParam(Name.QUEUE_DATA, data);
         if (("" == FileUtil.getDeviceId())) {

module_home/src/main/java/com/quyunshuo/module/home/service/MqServiceRepository.kt

@@ -37,7 +37,7 @@ class MqServiceRepository @Inject constructor() : BaseRepository() {
         val params= HashMap<String, Any>()
         Log.d(TAG, "Heartbeat.deviceId-->" + Heartbeat.deviceId)
 
-        val machineType: String = SpUtils.getString(MMKVName.MACHINE_TYPE, "MG320")!!
+        val machineType: String = SpUtils.getString(MMKVName.MACHINE_TYPE, "P10_SBM")!!
         params["exchange"] = machineType //交换机的名称，机型
         params["queue"] = Heartbeat.deviceId!! //队列的名称，机器的设备编码
         params["routingKey"] = Heartbeat.deviceId!! //队列的key，机器的设备编码

module_home/src/main/java/com/quyunshuo/module/home/weight/ProgressView.kt

@@ -23,20 +23,20 @@ import kotlin.math.sin
 
 internal class ProgressView : View {
     //进度条颜色
-    private val FIRST_COLOR =  /*0xfffff000;*/-0x3624 /*0xff00574B;*/
+    private val FIRST_COLOR =  /*0xfffff000;*/ /*0xfffff000;*/-0x158ef /*0xff00574B;*/ /*0xff00574B;*/
 
     //背景颜色
-    private val SECOND_COLOR = -0xd9a68
+    private val SECOND_COLOR = -0x41c64
 
     private var mSecondWidth = 0
     private var mFirstWidth = 0
     private var mHeight = 0
     private var mSecondRadius = 0
     private var mFirstRadius = 0
-    private val progressPadding = 15 //背景与内部进度条的间距
+    private val progressPadding = 5 //背景与内部进度条的间距
 
     private var currentValue = 0f
-    var maxProgress: Float = 120f //进度条
+    var maxProgress: Float = 150f //进度条
 
     //画笔
     private var paint: Paint? = null
@@ -76,14 +76,17 @@ internal class ProgressView : View {
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
         super.onSizeChanged(w, h, oldw, oldh)
-        mHeight = 130 //设置y轴坐标
+        mHeight = 105 //设置y轴坐标
+
+        // 设置缩小比例因子
+        val scaleFactor = 0.5f
         //外围
-        mSecondWidth = 1100 //设置x轴坐标
-        mSecondRadius = ((mSecondWidth * 1f / 5) / 4.5).toInt() //设置整体比例
+        mSecondWidth = (1150 * scaleFactor).toInt(); //设置x轴坐标
+        mSecondRadius = ((mSecondWidth * 1f / 5) / 5).toInt() //设置整体比例
         //内部进度条
         mFirstWidth = mSecondWidth - progressPadding - mSecondRadius
         mFirstRadius = mSecondRadius - progressPadding
-        mLeafInfos = LeafFactory(mFirstRadius - mLeafWidth, 6).generateLeafs() //叶子数量
+        mLeafInfos = LeafFactory(mFirstRadius - mLeafWidth, 8).generateLeafs() //叶子数量
         Log.e(
             "zhen", " mSecondWidth: " + mSecondWidth + " mHeight: " + mHeight +
                     " mSecondRadius: " + mSecondRadius + " mFirstWidth: " + mFirstWidth + " mFirstRadius: " + mFirstRadius
@@ -91,8 +94,8 @@ internal class ProgressView : View {
         // 设置叶子对象的初始坐标
         for (i in mLeafInfos!!.indices) {
             val leaf = mLeafInfos!![i]
-            leaf.x = (mFirstWidth - mFirstRadius - (i * 50)).toFloat() // 根据具体需求设置 x 坐标
-            leaf.y = 0f // 设置 y 坐标
+            leaf.x = (mFirstWidth - mFirstRadius - (i * 30)).toFloat() // 根据具体需求设置 x 坐标
+            leaf.y = 10f // 设置 y 坐标
         }
     }
 
@@ -179,7 +182,7 @@ internal class ProgressView : View {
         val y = 0f
         canvas.drawCircle(x, y, mSecondRadius.toFloat(), paint!!) //飘落的逻辑
         paint!!.style = Paint.Style.FILL
-        paint!!.color = -0x3624
+        paint!!.color = -0x158ef
         //        paint.setColor(0xfffff000);
         canvas.drawCircle(x, y, (mSecondRadius - 5).toFloat(), paint!!)
     }
@@ -253,9 +256,9 @@ internal class ProgressView : View {
             val leaf = Leaf()
             randomValue = random.nextInt(3)
             when (randomValue) {
-                Amplitude.SMALL -> leaf.amplitude = (mHeight * 1f / 3).toInt()
-                Amplitude.MIDDLE -> leaf.amplitude = (mHeight * 2f / 3).toInt()
-                Amplitude.LARGE -> leaf.amplitude = (mHeight * 3f / 3).toInt()
+                Amplitude.SMALL -> leaf.amplitude = (mHeight * 1f / 8).toInt()
+                Amplitude.MIDDLE -> leaf.amplitude = (mHeight * 2f / 8).toInt()
+                Amplitude.LARGE -> leaf.amplitude = (mHeight * 3f / 8).toInt()
             }
             leaf.startTime = random.nextInt(Leaf.CIRCLE_TIME.toInt()).toLong()
             leaf.phaseOffeset = random.nextInt(8)

module_home/src/main/res/drawable/home_rectangle_t_blue_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/home_colorYellow_btn" />
+    <corners android:radius="80dp" />
+</shape>

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

@@ -0,0 +1,119 @@
+<?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:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="1080dp"
+        android:layout_height="980dp"
+        android:layout_gravity="center"
+        android:background="@drawable/home_contact_background"
+        android:padding="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="联系信息"
+            android:textColor="@color/home_colorOrange"
+            android:textSize="72sp"
+            android:layout_marginTop="100dp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/ll_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="320dp"
+            android:gravity="center"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_marginTop="10dp"
+                android:gravity="center"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/name_contacts"
+                    android:textColor="#576478"
+                    android:textSize="62sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_title1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="null"
+                    android:textColor="#576478"
+                    android:textSize="62sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:gravity="center"
+                android:layout_marginTop="10dp"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_way"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/way_contacts"
+                    android:textColor="#576478"
+                    android:textSize="62sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_title2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="null"
+                    android:textColor="#576478"
+                    android:textSize="62sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/tv_start_dev"
+            android:layout_width="360dp"
+            android:layout_height="150dp"
+            android:background="@drawable/btn_back_background"
+            android:gravity="center"
+            android:text="@string/home_confirm"
+            android:textColor="@color/white"
+            android:layout_marginTop="100dp"
+            android:textSize="62sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll_title" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/backstage_guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.5" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -161,7 +161,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="投入纸币: "
+                android:text="已投纸币: "
                 android:textColor="@color/black"
                 android:textSize="50sp"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -172,7 +172,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:text="0.00"
-                android:textColor="#d4237a"
+                android:textColor="@color/price_color"
                 android:textSize="50sp"
                 app:layout_constraintBottom_toTopOf="@+id/tv_aacpe_coin"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -187,7 +187,7 @@
                 android:id="@+id/tv_aacpe_coin_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="投入硬币: "
+                android:text="已投硬币: "
                 android:textColor="@color/black"
                 android:textSize="50sp"
                 app:layout_constraintBottom_toTopOf="@+id/tv_aacpe_coin"
@@ -199,7 +199,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:text="0.00"
-                android:textColor="#d4237a"
+                android:textColor="@color/price_color"
                 android:textSize="50sp"
                 app:layout_constraintBottom_toTopOf="@+id/home_guideline2"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -383,14 +383,13 @@
 
             <ImageView
                 android:id="@+id/iv_lutou"
-                android:layout_width="150dp"
-                android:layout_height="150dp"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
                 android:src="@drawable/icon_fashengqi" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
                 android:layout_toRightOf="@id/iv_lutou"
                 android:orientation="vertical">
 

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

@@ -9,8 +9,13 @@
         android:id="@+id/sv_video"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:visibility="gone"
         tools:layout_editor_absoluteX="0dp"
         tools:layout_editor_absoluteY="-16dp" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/make_background"/>
 
     <ImageView
         android:id="@+id/iv_logo"
@@ -24,8 +29,9 @@
 
     <com.quyunshuo.module.home.weight.ProgressView
         android:id="@+id/progressView"
-        android:layout_width="1130dp"
-        android:layout_height="120dp"
+        android:layout_width="1380dp"
+        android:layout_height="200dp"
+        android:layout_marginLeft="55dp"
         android:layout_alignParentBottom="true"
         android:layout_centerInParent="true"
         app:layout_constraintStart_toStartOf="@+id/home_guideline"
@@ -85,7 +91,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.7212963"
+        app:layout_constraintGuide_percent="0.63"
         app:layout_constraintStart_toStartOf="parent" />
 
 
@@ -97,8 +103,9 @@
         app:layout_constraintGuide_percent="0.5" />
 
     <LinearLayout
+        android:background="@drawable/userbottom_bg"
         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"
@@ -109,6 +116,7 @@
         app:layout_constraintStart_toStartOf="@+id/home_guideline">
 
         <RelativeLayout
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
@@ -148,6 +156,7 @@
         </RelativeLayout>
 
         <RelativeLayout
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
@@ -192,9 +201,9 @@
 
             <ImageView
                 android:id="@+id/iv_lutou"
-                android:layout_width="90dp"
-                android:layout_height="90dp"
-                android:src="@drawable/icon_qxlutou_new" />
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:src="@drawable/icon_fashengqi" />
 
             <TextView
                 android:id="@+id/tv_lutou"
@@ -202,8 +211,8 @@
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@id/iv_lutou"
                 android:text="40°C"
-                android:textColor="#d4237a"
-                android:textSize="34sp" />
+                android:textColor="#966035"
+                android:textSize="40sp" />
 
             <TextView
                 android:id="@+id/tv_lutou_content"
@@ -213,12 +222,13 @@
                 android:layout_toRightOf="@id/iv_lutou"
                 android:lines="2"
                 android:text="炉头温度"
-                android:textColor="#d4237a"
-                android:textSize="24sp" />
+                android:textColor="#966035"
+                android:textSize="40sp" />
 
         </RelativeLayout>
 
         <RelativeLayout
+            android:visibility="gone"
             android:id="@+id/rl_fashengqi"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">

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

@@ -25,7 +25,7 @@
         android:layout_width="706dp"
         android:layout_height="150dp"
         android:paddingStart="20dp"
-        android:textSize="32sp"
+        android:textSize="52sp"
         android:text="Admin"
         android:layout_marginTop="40dp"
         android:drawablePadding="10dp"
@@ -60,7 +60,7 @@
         android:inputType="textPassword"
         android:layout_marginTop="40dp"
         android:drawableStart="@drawable/icon_mima"
-        android:textSize="32sp"
+        android:textSize="52sp"
         android:paddingStart="20dp"
         android:drawablePadding="10dp"
         android:background="@drawable/home_rectangle_background"
@@ -107,7 +107,7 @@
         android:background="@drawable/home_rectangle_gradient_background"
         android:text="@string/home_login"
         android:gravity="center"
-        android:textSize="42sp"
+        android:textSize="62sp"
         android:textStyle="bold"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -32,7 +32,7 @@
         android:minHeight="90dp"
         android:paddingHorizontal="10dp"
         android:text="商品名字"
-        android:textColor="#fa7698"
+        android:textColor="@color/black"
         android:textSize="70sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -53,7 +53,7 @@
             android:layout_weight="0.6"
             android:layout_height="wrap_content"
             android:text="￥"
-            android:textColor="#fa7698"
+            android:textColor="@color/price_color"
             android:textSize="80sp"
             android:textStyle="bold" />
 
@@ -64,11 +64,10 @@
             android:layout_height="130dp"
             android:gravity="center"
             android:text="0.00"
-            android:textColor="#fa7698"
+            android:textColor="@color/price_color"
             android:textSize="90sp"
             android:textStyle="bold" />
         <ImageView
-
             android:id="@+id/home_imageview"
             android:layout_width="0dp"
             android:layout_weight="1"

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

@@ -2,11 +2,11 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     android:layout_width="match_parent"
-    android:layout_height="60dp"
+    android:layout_height="100dp"
     android:drawableLeft="@drawable/icon_yonghu"
     android:drawablePadding="12dp"
     android:gravity="center_vertical"
     android:background="@color/white"
     android:text="111"
     android:textColor="@color/black"
-    android:textSize="32sp" />
+    android:textSize="52sp" />

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

@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="home_dev_id">Device number:</string>
-    <string name="home_steam_wendu">Steam temperature</string>
-    <string name="home_login">Login</string>
-    <string name="home_back_user">Return to the user interface</string>
-    <string name="home_login_tips_1">Please check your account password</string>
-    <string name="home_login_tips_2">Login successful</string>
-    <string name="home_tips_dialog_1">Machine communication failed</string>
-    <string name="home_tips_dialog_2">Please go to the backstage to turn on the machine before purchasing</string>
-    <string name="home_tips_dialog_3">The machine has an alarm. After solving the problem, please go to the backstage to turn on the machine before purchasing</string>
-    <string name="home_tips_dialog_4">The machine is turning on, please wait</string>
-    <string name="home_tips_dialog_5">The machine is making, please wait</string>
-    <string name="home_confirm">Confirm</string>
-    <string name="home_cancle">Cancel</string>
-    <string name="home_make_success">Making completed</string>
-    <string name="home_make_success_tips">Please pull the door below to take the smoothie</string>
-    <string name="home_residue_s">Remaining 40s</string>
-    <string name="home_again_buy">Buy again</string>
-    <string name="home_quit_app">Click the return key again to exit</string>
-    <string name="home_choosepay_title">Select payment method</string>
+
 </resources>

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

@@ -1,23 +1,3 @@
 <resources>
-    <string name="home_dev_id">设备编号:</string>
-    <string name="home_steam_wendu">蒸气温度</string>
-    <string name="home_login">登录</string>
-    <string name="home_back_user">返回用户界面</string>
-    <string name="home_login_tips_1">请检查账户密码</string>
-    <string name="home_login_tips_2">登录成功</string>
-    <string name="home_tips_dialog_1">机器通讯失败</string>
-    <string name="home_tips_dialog_2">请到后台开机后再购买</string>
-    <string name="home_tips_dialog_3">机器报警了，处理问题后，请到后台开机后再购买</string>
-    <string name="home_tips_dialog_4">机器开机中，请稍等</string>
-    <string name="home_tips_dialog_5">机器制作中，请稍等</string>
-    <string name="home_confirm">确定</string>
-    <string name="home_cancle">取消</string>
-    <string name="home_make_success">制作完成</string>
-    <string name="home_make_success_tips">请在下方拉门取走冰沙</string>
-    <string name="home_residue_s">剩余 40s</string>
-    <string name="home_again_buy">再次购买</string>
-    <string name="home_quit_app">再次点击返回键退出</string>
-    <string name="home_choosepay_title">选择支付方式</string>
-    <string name="home_tips_dialog_6">请先连接服务器后进行使用</string>
-    <string name="home_shopping_cart_null">购物车里没有商品，请先选择商品</string>
+
 </resources>

module_pay/build.gradle

@@ -24,4 +24,6 @@ android {
 
 dependencies {
     implementation files('libs\\marshall-java-sdk.main.jar')
+    implementation project(path: ':lib_base')
+
 }

module_pay/src/main/java/com/module/pay/common/OtherEnum.kt

@@ -14,18 +14,19 @@ import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
  * type：类型 1  开关 2 输入类 3 多选项值（国家，语言，通讯）
  * mmkvName：保存key
  */
-enum class OtherEnum(var nameId:Int,var nameS:String,var category:String,var drfault:Any,var type:Int,var mmkvName: String) {
+enum class OtherEnum(var nameId:Int, var nameS:String, var category:String, var default:Any, var type:Int, var mmkvName: String) {
     AGREEMENT(R.string.agreement,"通讯协议","串口设置", PayAgreementUtil.MDB_ICT, 3,MMKVName.MDB),//ArrayList<String>(listOf("MDB","ICT","WMDB"))
     CHANGE(R.string.change,"找零功能","找零设置",false, 1,MMKVName.CHANGE),
-    CONTACT_NUMBER(R.string.base_nayax,"联系方式","系统设置","123456", 2,MMKVName.CONTACT_NUMBER),
     SHOPPING_TROLLEY(R.string.shopping_trolley,"购物车","购物车设置",true, 1,MMKVName.SHOPPING_TROLLEY),
     PROMOTION_CODE(R.string.promotion_code,"优惠码","功能开启",false, 1,MMKVName.PROMOTION_CODE),
     BILL_COUNTRY(R.string.bill_country,"国家纸币选择","串口设置",ArrayList<String>(listOf("MDB","ICT")), 3,MMKVName.BILL_COUNTRY),
-    NAYAX_MODE(R.string.nayax_mode,"PLC 串口","串口设置",false,1,MMKVName.NAYAX_MODE),
+    NAYAX_MODE(R.string.nayax_mode,"Nayax闲置模式","串口设置",false,1,MMKVName.NAYAX_MODE),
     TTYS_NAYAX(R.string.ttys_nayax,"Nayax 串口","串口设置","ttyS1",2,MMKVName.TTYS_NAYAX),
     TTYS_MDB(R.string.ttys_mdb,"MDB 串口","串口设置","ttyS3",2,MMKVName.TTYS_MDB),
-    TTYS_PLC(R.string.ttys_plc,"PLC 串口","串口设置","ttyS4",2,MMKVName.TTYS_PLC),
+    TTYS_PLC(R.string.ttys_plc,"PLC 串口","串口设置","ttyS7",2,MMKVName.TTYS_PLC),
     BILL_COLLOCATION(R.string.bill_collocation,"MDB 纸币托管","通讯设置",false,1,MMKVName.BILL_COLLOCATION),
-    MDB_LEVEL(R.string.mdb_level,"MDB L3级别","通讯设置",true,1,MMKVName.MDB_LEVEL)
+    MDB_LEVEL(R.string.mdb_level,"MDB L3级别","通讯设置",true,1,MMKVName.MDB_LEVEL),
+    CONTACT_NAME(R.string.way_contacts,"联系人","系统设置","名字", 2,MMKVName.CONTACT_NAME),
+    CONTACT_NUMBER(R.string.way_contacts,"联系方式","系统设置","123456", 2,MMKVName.CONTACT_NUMBER),
 
 }

serialport-api/build.gradle

@@ -27,5 +27,6 @@ dependencies {
     implementation project(path: ':module_database')
     implementation "io.reactivex.rxjava2:rxjava:2.1.16"
     implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
+    implementation project(path: ':lib_base')
 
 }

serialport-api/src/main/java/com/hboxs/serialport/sbc/SBCHeartbeat.kt

@@ -17,7 +17,8 @@ object SBCHeartbeat {
     var devDogtag: String = ""//设备铭牌号
     var softwareVersion: String = ""//软件版本号
 
-    var headTemp:String = "40"//炉头温度
+    var headTemp:String = "40"//发生器温度
+
     var steamTemp:String = "40"//蒸汽温度
     var outsideTemp:String = "40"//柜外温度
     var outsideHumidity:String = "40"//柜外湿度

serialportlib/build.gradle

@@ -29,4 +29,5 @@ android {
 }
 
 dependencies {
+    implementation project(path: ':lib_base')
 }