文本优化，界面优化，报警优化，其他界面优化，语言优化

app/src/main/AndroidManifest.xml

@@ -8,6 +8,10 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- ⾃定义权限  全局对话框 -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_PASSWORD" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
     <uses-permission
         android:name="android.permission.READ_LOGS"

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

@@ -1,41 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="base_network_disconnected">Network disconnected</string>
     <string name="base_network_connected">Network connected</string>
 
-    <string name="base_plc_debug_1">Evaporator fan</string>
-    <string name="base_plc_debug_2">Evaporator compressor</string>
-    <string name="base_plc_debug_3">Evaporator motor</string>
-    <string name="base_plc_debug_4">Food pick-up door</string>
-    <string name="base_plc_debug_5">Flavor belt 1</string>
-    <string name="base_plc_debug_6">Flavor belt 2</string>
-    <string name="base_plc_debug_7">Flavor belt 3</string>
-    <string name="base_plc_debug_8">Flavor belt 4</string>
-    <string name="base_plc_debug_9">Cup drop</string>
-    <string name="base_plc_debug_10">Rotating cup</string>
-    <string name="base_plc_debug_11">Cleaning peristaltic pump</string>
-    <string name="base_plc_debug_12">Flavor pump 1</string>
-    <string name="base_plc_debug_13">Flavor pump 2</string>
-    <string name="base_plc_debug_14">Flavor pump 3</string>
-    <string name="base_plc_debug_15">Flavor pump 4</string>
-    <string name="base_plc_debug_16">Pull out needle 1</string>
-    <string name="base_plc_debug_17">Pin 1</string>
-    <string name="base_plc_debug_18">Pull out needle 2</string>
-    <string name="base_plc_debug_19">Pin 2</string>
-    <string name="base_plc_debug_20">Pull out needle 3</string>
-    <string name="base_plc_debug_21">Pin 3</string>
-    <string name="base_plc_debug_22">Pin 4</string>
-    <string name="base_plc_debug_23">Pin 4</string>
+    <string name="base_plc_debug_1">Secondary core point 1</string>
+    <string name="base_plc_debug_2">Low speed air pump</string>
+    <string name="base_plc_debug_3">Medium speed air pump</string>
+    <string name="base_plc_debug_4">High speed air pump</string>
+    <string name="base_plc_debug_5">Heating wire</string>
+    <string name="base_plc_debug_6">Sweet corn motor forward</string>
+    <string name="base_plc_debug_7">Sweet corn motor reverse</string>
+    <string name="base_plc_debug_8">Salt corn motor forward</string>
+    <string name="base_plc_debug_9">Salt corn motor reverse</string>
+    <string name="base_plc_debug_10">Cup drop motor</string>
+    <string name="base_plc_debug_11">Baffle</string>
+    <string name="base_plc_debug_12">Food pick-up door</string>
+    <string name="base_plc_debug_13">Secondary core position 13</string>
+    <string name="base_plc_debug_14">Secondary core position 14</string>
+    <string name="base_plc_debug_15">Secondary core position 15</string>
+    <string name="base_plc_debug_16">Secondary core position 16</string>
+    <string name="base_plc_debug_17">Secondary core position 17</string>
+    <string name="base_plc_debug_18">Secondary core position 18</string>
+    <string name="base_plc_debug_19">Secondary core position 19</string>
+    <string name="base_plc_debug_20">Secondary core point 20</string>
+    <string name="base_plc_debug_21"></string>
+    <string name="base_plc_debug_22"></string>
+    <string name="base_plc_debug_23"></string>
 
-    <string name="base_plc_param_1">Turn off cooling time</string>
-    <string name="base_plc_param_2">Drinking time</string>
-    <string name="base_plc_param_3">Drinking only after the evaporator temperature reaches</string>
-    <string name="base_plc_param_4">Belt 1 delay time</string>
-    <string name="base_plc_param_5">Needle extraction time</string>
-    <string name="base_plc_param_6">Drinking time for a bottle of beverage</string>
-    <string name="base_plc_param_7">Amount used for one production</string>
-    <string name="base_plc_param_8">Evaporator insulation lower limit</string>
+    <string name="base_plc_param_1">Air pump low speed</string>
+    <string name="base_plc_param_2">Air pump medium speed</string>
+    <string name="base_plc_param_3">Air pump high speed</string>
+    <string name="base_plc_param_4">High wind time</string>
+    <string name="base_plc_param_5">Baffle closing time</string>
+    <string name="base_plc_param_6">Temperature setting</string>
+    <string name="base_plc_param_7">Heating time</string>
+    <string name="base_plc_param_8">Wind speed during production</string>
     <string name="base_plc_param_9">Evaporator insulation upper limit</string>
+    <string name="base_plc_alarm_1">Corn does not pop</string>
+    <string name="base_plc_alarm_2">Cup missing</string>
+    <string name="base_plc_alarm_3">Salt corn missing</string>
+    <string name="base_plc_alarm_4">Sweet corn missing</string>
+    <string name="base_plc_alarm_5">No temperature rise</string>
+    <string name="base_plc_alarm_6">Temperature is too high</string>
+    <string name="base_plc_alarm_7">Baffle reset failed</string>
+    <string name="base_plc_alarm_8">Corn cob stuck</string>
+
     <string name="base_pro_01">Sweet popcorn</string>
     <string name="base_pro_02">Salty popcorn</string>
     <string name="base_two_code">WeChat Alipay</string>
@@ -45,76 +54,231 @@
     <string name="base_soepay">Soepay</string>
     <string name="base_other1">System settings</string>
     <string name="base_other2">Serial port settings</string>
-    <string name="base_other3">Function activation</string>
+    <string name="base_other3">Function enable</string>
     <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="shopping_trolley">Shopping cart</string>
+    <string name="promotion_code">Promotion code</string>
+    <string name="change">Change function</string>
+    <string name="agreement">Communication protocol</string>
+    <string name="bill_country">National banknote selection</string>
+    <string name="ttys_nayax">Nayax serial port</string>
+    <string name="ttys_mdb">MDB serial port</string>
+    <string name="ttys_plc">PLC serial port</string>
+    <string name="nayax_mode">Nayax idle mode</string>
+    <string name="bill_collocation">MDB banknote custody</string>
+    <string name="mdb_level">MDB L3 level</string>
+    <string name="base_free_pay">Free production</string>
+    <string name="way_contacts">Contact:</string>
+    <string name="name_contacts">Contact:</string>
+
+    <string name="backstage_update_success">Update successful</string>
+    <string name="backstage_data_null_tips">Data is empty, can not be operated</string>
+    <string name="backstage_check_update">Check for updates</string>
+    <string name="backstage_system_set">System\nsetting</string>
+    <string name="backstage_setting_1">Product\nsettings</string>
+    <string name="backstage_setting_2">Parameter\nadjustment</string>
+    <string name="backstage_setting_3">Data\nstatistics</string>
+    <string name="backstage_setting_4">Language\nswitch</string>
+    <string name="backstage_setting_5">Alarm\nrecord</string>
+    <string name="backstage_setting_6">Reset\npassword</string>
+    <string name="backstage_setting_6_1">Reset password</string>
+    <string name="backstage_setting_7">Scheduled\npower on and off</string>
+    <string name="backstage_setting_8">Permission\nsettings</string>
+    <string name="backstage_setting_9">Others</string>
+    <string name="backstage_setting_10">Payment\nmethod</string>
+    <string name="backstage_product_1">Product price adjustment</string>
+    <string name="backstage_product_2">Product information setting</string>
+    <string name="backstage_product_3">Product name, picture modification</string>
+    <string name="backstage_product_4">Product debugging</string>
     <string name="backstage_param_set_1">Debug page</string>
-    <string name="backstage_param_set_2">Universal parameter</string>
+    <string name="backstage_param_set_2">General parameters</string>
+    <string name="backstage_param_set_3">Alarm shielding</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_open_dev_tips">Do you want to start the machine immediately? </string>
+    <string name="backstage_start_dev">Start now</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_quit_app">Click the return key again to exit</string>
+    <string name="backstage_latest_version">It is the latest version~</string>
+    <string name="backstage_connecting">Connection application</string>
+    <string name="backstage_update_price">Confirm price adjustment</string>
+    <string name="backstage_connection_server">Connect to 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_connection_server_btn">Apply now</string>
+    <string name="backstage_update_now">Update now</string>
+    <string name="backstage_new_version_discover">New version found:</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_old_password">Old password</string>
+    <string name="backstage_old_password_input">Please enter your old password</string>
+    <string name="backstage_new_password">New password</string>
+    <string name="backstage_new_password_input">Please enter your new password</string>
+    <string name="backstage_confirm_password">Confirm password</string>
+    <string name="backstage_confirm_password_input">Please enter your 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="backstage_ok_dialog_title">Are you sure you want to do this? </string>
+    <string name="backstage_search_hint">Please enter the content to search</string>
+    <string name="backstage_steam_wendu">Steam temperature</string>
+    <string name="backstage_choose_time">Please enter the time</string>
+    <string name="backstage_year_input">Please enter the year</string>
+    <string name="backstage_month_input">Please enter the month</string>
+    <string name="backstage_day_input">Please enter the day</string>`
+    <string name="backstage_hour_input">Please enter the hour</string>
+    <string name="backstage_ringht_month_input">Please enter the correct month</string>
+    <string name="backstage_ringht_day_input">Please enter the correct day</string>
+    <string name="backstage_ringht_hour_input">Please enter the correct hour</string>
+    <string name="tian">The time cannot exceed two days</string>
+    <string name="yue">The time cannot exceed one month</string>
+    <string name="yues">Time cannot exceed 12 months</string>
+    <string name="sjcw">Time error</string>
+    <string name="nian">Time cannot exceed 10 years</string>
+    <string name="open_sleep">Open sleep</string>
+    <string name="close_sleep">Close sleep</string>
+    <string name="close_dev">Shutdown</string>
+    <string name="open_dev">Startup</string>
+    <string name="sunday">Sun</string>
+    <string name="monday">Mon</string>
+    <string name="tuesday">Tue</string>
+    <string name="wednesday">Wed</string>
+    <string name="thursday">Thu</string>
+    <string name="friday">Fri</string>
+    <string name="saturday">Sat</string>
+    <string name="backstage_bar_chart_statistics">Bar chart statistics</string>
+    <string name="backstage_order_details">Order details</string>
+    <string name="backstage_add_lock">Add alarm</string>
+    <string name="backstage_open_lock">Open local alarm</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_back_user">Return to user interface</string>
+    <string name="home_login_tips_1">Please check 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_2">Please go to the backend to turn on the machine before purchasing</string>
+    <string name="home_tips_dialog_3">The machine has alarmed. After solving the problem, please go to the backend to turn on the machine before purchasing</string>
+    <string name="home_tips_dialog_4">The machine is starting up, 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_make_success_tips">Please pull the door below to take the popcorn</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>
+    <string name="home_tips_dialog_6">Please connect to the server before using</string>
+    <string name="home_shopping_cart_null">There are no items in the shopping cart\nPlease select items first</string>
+    <string name="alarm_message_01">Corn does not pop</string>
+    <string name="alarm_message_02">Missing cup</string>
+    <string name="alarm_message_03">Missing salty corn</string>
+    <string name="alarm_message_04">Missing sweet corn</string>
+    <string name="alarm_message_05">No temperature rise</string>
+    <string name="alarm_message_06">Temperature is too high</string>
+    <string name="alarm_message_07">Baffle reset failed</string>
+    <string name="alarm_message_08">Corn cob stuck</string>
+    <string name="heartbeat_temp">Generator temperature</string>
+    <string name="mqtt_con_state">mqtt is not connected yet, please wait</string>
+    <string name="mdb_cash_sale">MDB Cash Sale</string>
+    <string name="contact_way">Contact method</string>
+    <string name="auto_start_hotspot">Start the hotspot</string>
+    <string name="name_hotspot">Hotspot name</string>
+    <string name="long_click_show_status_bar">Show status bar</string>
+    <string name="pwd_hotspot">Hotspot password</string>
+    <string name="mdb_rate">MDB rate</string>
+    <string name="card_text">Guide for consumers to swipe cards</string>
+    <string name="bill_trust">Banknote trust</string>
+    <string name="make_clean_price">Clear the amount after making</string>
+    <string name="ad_rule">Advertising rules</string>
+    <string name="auto_return_home">Auto return(minutes)</string>
+    <string name="sleep_text">Sleeping text</string>
+    <string name="shopping_cart_size">Shopping cart can add</string>
+    <string name="two_price_discount">Second item discount</string>
+    <string name="five_price_discount">Fifth item discount</string>
+    <string name="three_price_discount">Third item discount</string>
+    <string name="tips_discount_text">Discount tips</string>
+    <string name="discount_function">Discount function</string>
+    <string name="change_function">Change function</string>
+    <string name="change_bill">Change bill</string>
+    <string name="change_coin">Change coin</string>
+    <string name="change_dollar">Amount of a coin</string>
+    <string name="change_coin_rep">Change coin inventory</string>
+    <string name="change_allow_number">Number of change allowed at one time</string>
+    <string name="change_warning_number">Change warning inventory</string>
+    <string name="volume">Volume</string>
+    <string name="luminance">Brightness</string>
+    <string name="logo_text">Change icon</string>
+    <string name="sim">SIM</string>
+    <string name="sim_imei">SIM_IMEI</string>
+    <string name="cut_system_set">Switch system settings</string>
+    <string name="contact">Contact name</string>
+    <string name="wifi_hotspot">Wifi hotspot</string>
+    <string name="staff_login">Staff login</string>
+    <string name="backstage_operate">Operation</string>
+    <string name="coin_multiply">Coin pulse multiplication</string>
+    <string name="coin_divide">Coin pulse division</string>
+    <string name="not_selected">Not</string>
+    <string name="go_pay">Pay</string>
+    <string name="have_banknotes">Banknotes \ninserted:</string>
+    <string name="have_coin">Coin \ninserted:</string>
+    <string name="contact_message">Contact information</string>
+    <string name="unify_price">Unify price modification:</string>
+    <string name="software_version">Software version</string>
+    <string name="body_version">Body version</string>
+    <string name="name">Name</string>
+    <string name="show">Show</string>
+    <string name="hide">Hide</string>
+    <string name="image">Picture</string>
+    <string name="replace_picture">Click to replace product image</string>
+    <string name="more_setup">More settings</string>
+    <string name="start_time">Start time</string>
+    <string name="select_start_time">Select the start</string>
+    <string name="select_end_time">Select the end</string>
+    <string name="end_time">End time</string>
+    <string name="unit">Unit</string>
+    <string name="time">Hour</string>
+    <string name="date">Day</string>
+    <string name="month">Month</string>
+    <string name="year">Year</string>
+    <string name="filter">Filter</string>
+    <string name="clear_alarm_records">Clear alarm records</string>
+    <string name="period">Time</string>
+    <string name="no_order_data">No order data</string>
+    <string name="no_alarm_information">No alarm information</string>
+    <string name="error_events">Error events</string>
+    <string name="rewrite">Re-fill</string>
+    <string name="open">Open</string>
+    <string name="close">Close</string>
+    <string name="turn_on_sleep">Turn on sleep</string>
+    <string name="turn_off_sleep">Turn off sleep</string>
+    <string name="device_sleep">Device in sleep</string>
+    <string name="contact_details">Contact\nDetails</string>
+    <string name="custom_name">Custom Name</string>
+    <string name="no_sales_data">There is no sales data for this period</string>
+    <string name="remark">Remark</string>
+    <string name="ict_currency">ICT currency:</string>
+    <string name="customized_payment">Customized payment:</string>
+    <string name="init_success">Initialization success</string>
+    <string name="init_fail">Initialization failure</string>
+    <string name="warn_reminder">Warn reminder</string>
+    <string name="initializing">Initializing...</string>
+    <string name="second">Second</string>
+    <string name="delete">Delete</string>
+    <string name="clear">Clear</string>
+    <string name="shopping_cart">Shopping cart</string>
+    <string name="total_amount">Total Amount</string>
+    <string name="univalent">Unit price</string>
+    <string name="close_interface">Close interface</string>
+    <string name="modific_success">Modification successful</string>
+    <string name="modify">Modify</string>
+    <string name="choose_time">Choose time</string>
+    <string name="week">Week</string>
+    <string name="type">Type</string>
+</resources>
+    <!--英文-->

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

@@ -142,13 +142,6 @@
     <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>
@@ -221,5 +214,72 @@
     <string name="wifi_hotspot">Wifi热点</string>
     <string name="staff_login">员工登录</string>
     <string name="backstage_operate">操作</string>
+    <string name="coin_multiply">硬币脉冲相乘</string>
+    <string name="coin_divide">硬币脉冲相除</string>
+    <string name="not_selected">未选择</string>
+    <string name="go_pay">去付款</string>
+    <string name="have_banknotes">已投纸币:</string>
+    <string name="have_coin">已投硬币:</string>
+    <string name="contact_message">联系信息</string>
+    <string name="unify_price">统一修改价格：</string>
+    <string name="software_version">软件版本号</string>
+    <string name="body_version">软件版本号</string>
+    <string name="name">名字</string>
+    <string name="show">显示</string>
+    <string name="hide">隐藏</string>
+    <string name="image">图片</string>
+    <string name="replace_picture">点击更换商品图片</string>
+    <string name="more_setup">更多设置</string>
+    <string name="start_time">开始时间</string>
+    <string name="select_start_time">请选择开始时间</string>
+    <string name="select_end_time">请选择结束时间</string>
+    <string name="end_time">结束时间</string>
+    <string name="unit">单位</string>
+    <string name="time">小时</string>
+    <string name="date">日</string>
+    <string name="month">月</string>
+    <string name="year">年</string>
+    <string name="filter">筛选</string>
+    <string name="clear_alarm_records">清除报警记录</string>
+    <string name="period">时间</string>
+    <string name="no_order_data">无订单数据</string>
+    <string name="no_alarm_information">无报警信息</string>
+    <string name="error_events">错误事件</string>
+    <string name="rewrite">重新填写</string>
+    <string name="open">开启</string>
+    <string name="close">关闭</string>
+    <string name="turn_on_sleep">开启休眠</string>
+    <string name="turn_off_sleep">关闭休眠</string>
+    <string name="device_sleep">设备休眠中</string>
+    <string name="contact_details">联系\n方式</string>
+    <string name="custom_name">可自定义名字</string>
+    <string name="no_sales_data">这个时间段没有销售数据</string>
+    <string name="remark">备注</string>
+    <string name="ict_currency">ICT 币值选择：</string>
+    <string name="customized_payment">定制支付：</string>
+    <string name="init_success">通电初始化成功</string>
+    <string name="init_fail">通电初始化失败</string>
+    <string name="warn_reminder">报警提醒</string>
+    <string name="initializing">初始化中。。。</string>
+    <string name="second">秒</string>
+    <string name="delete">删除</string>
+    <string name="clear">清空</string>
+    <string name="shopping_cart">购物车</string>
+    <string name="total_amount">合计</string>
+    <string name="univalent">单价</string>
+    <string name="close_interface">后关闭</string>
+    <string name="modific_success">修改成功</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="modify">修改</string>
+    <string name="choose_time">选择时间</string>
+    <string name="week">星期</string>
+    <string name="type">类型</string>
 
-</resources>
+</resources>
+<!--中文-->

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

@@ -65,11 +65,6 @@ abstract class MMKVName {
 //            get()="SYSTEM_ID"//连接设备id
         val MACHINE_TYPE: String
             get() = "MACHINE_TYPE"//机型
-        val CONTACTS_WAY: String
-            get() = "CONTACTS_WAY"
-        val CONTACTS_NAME: String
-            get() = "CONTACTS_NAME"
-
         val PAPERTYPE: String
             //币值选择
             get() = "PAPERTYPE"
@@ -181,6 +176,12 @@ abstract class MMKVName {
         val CHANGE_WARNING_NUMBER: String
             //找零预警库存
             get() = "CHANGE_WARNING_NUMBER"
+        val COIN_PULSE_MULTIPLY: String
+            //硬币脉冲相乘
+            get() = "CHANGE_WARNING_NUMBER"
+        val COIN_PULSE_DIVIDE: String
+            //硬币脉冲相除
+            get() = "COIN_PULSE_DIVIDE"
 
     }
     // 这里可以继续添加其他常量

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

@@ -163,10 +163,10 @@ class SettingActivity : BaseActivity<BackstageActivitySettingBinding, SettingVie
                     return true
                 }
             })
-        mBinding.tvSoftwareVersion.text = "软件版本号:" + SBCHeartbeat.softwareVersion
-        mBinding.tvCrateVersion.text = "机箱版本号:" + SBCHeartbeat.crateVersion
+        mBinding.tvSoftwareVersion.text = UiUtil.getStringRes(R.string.software_version)+":" + SBCHeartbeat.softwareVersion
+        mBinding.tvCrateVersion.text =UiUtil.getStringRes(R.string.body_version)+":" +  SBCHeartbeat.crateVersion
         mBinding.tvAppVersion.text =
-            "App版本号:" + packageManager.getPackageInfo(packageName, 0).versionName
+            "App:" + packageManager.getPackageInfo(packageName, 0).versionName
         val deviceId = FileUtil.getDeviceId()
         if (deviceId.isNotEmpty()) {
             mBinding.tvDevDogtag.text =

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

@@ -3,8 +3,10 @@ package com.module.backstage.adapter
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.module.backstage.R
 import com.module.backstage.databinding.BackstageItemErrorstatBinding
 import com.module.database.room.entity.WarringBean
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import java.text.SimpleDateFormat
 import java.util.Date
 
@@ -16,7 +18,7 @@ class ErrorOldAdapter(var productList: MutableList<WarringBean>) :
         fun bind(warringBean: WarringBean) {
             mBinding.run {
                 if (warringBean.time == 0.toLong()) {
-                    tvTime.text = "时间"
+                    tvTime.text = UiUtil.getStringRes(R.string.period)
                     tvThingError.text = warringBean.thingError
                     tvRemark.text = warringBean.remark
                     return

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import com.module.backstage.R
 import com.module.backstage.databinding.BackstageItemOrderdataBinding
 import com.module.database.room.entity.LocalOrderBean
 import com.quyunshuo.androidbaseframemvvm.base.addressenum.PayEnum
@@ -27,7 +28,7 @@ class OrderDataAdapter(var productList: MutableList<LocalOrderBean>? = null) :
         // 使用ViewBinding来绑定数据  
         holder.binding.run {
             if (warringBean.time == "") {
-                tvTime.text = "时间"
+                tvTime.text = UiUtil.getStringRes(R.string.period)
                 tvTime.setTypeface(null, Typeface.BOLD)
                 tvPrice.text = "价格"
                 tvPrice.setTypeface(null, Typeface.BOLD)

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

@@ -22,6 +22,7 @@ import com.chad.library.adapter4.BaseMultiItemAdapter
 import com.module.backstage.R
 import com.module.backstage.databinding.BackstageItemButtonBinding
 import com.module.backstage.databinding.BackstageItemInputBinding
+import com.module.backstage.databinding.BackstageItemInputTextBinding
 import com.module.backstage.databinding.BackstageItemSliderBinding
 import com.module.backstage.databinding.BackstageItemSpinnerBinding
 import com.module.backstage.databinding.BackstageItemSystemSettingsBinding
@@ -44,7 +45,7 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
     class ItemVH(val viewBinding: BackstageItemSystemSettingsBinding) :
         RecyclerView.ViewHolder(viewBinding.root)
 
-    // 类型 2 的 viewholder 输入项
+    // 类型 2 的 viewholder 输入项数字
     class HeaderVH(val viewBinding: BackstageItemInputBinding) :
         RecyclerView.ViewHolder(viewBinding.root)
 
@@ -64,6 +65,10 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
     class ButtonVH(val viewBinding: BackstageItemButtonBinding) :
         RecyclerView.ViewHolder(viewBinding.root)
 
+    // 类型 7 的 viewholder 输入项文本
+    class EditTextVH(val viewBinding: BackstageItemInputTextBinding) :
+        RecyclerView.ViewHolder(viewBinding.root)
+
     var type3Position: Int = 0 //记录多选值的position
 
     // 在 init 初始化的时候，添加多类型
@@ -99,11 +104,9 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                                     if (item.mmkvName == MMKVName.WIFI_HOTSPOT) {
                                         //打开热点
                                         ZtlManager.GetInstance().openAp(
-                                            SpUtils.getString(
-                                                MMKVName.NAME_HOTSPOT,
-                                                "sunzee"
-                                            ), SpUtils.getString(MMKVName.PWD_HOTSPOT, "66666666")
-                                        );
+                                            SpUtils.getString(MMKVName.NAME_HOTSPOT, "sunzee"),
+                                            SpUtils.getString(MMKVName.PWD_HOTSPOT, "66666666")
+                                        )
                                     }
                                 }
 
@@ -118,7 +121,6 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                         }
                     }
 
-
                 }
             }).addItemType(
             SECTION_TYPE,
@@ -231,15 +233,20 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
 
                 override fun onBind(holder: SliderVH, position: Int, item: OtherEnum?) {
                     // 绑定 item 数据
-                    val mManager = context.getSystemService("xzjh_server") as XzjhSystemManager?
-                    val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+                    val mManager = context.getSystemService("xzjh_server") as XzjhSystemManager
+                    val audioManager =
+                        context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
 
                     itemListener?.onClickListener(holder.itemView, position, null)
                     holder.viewBinding.run {
                         tvName.text = UiUtil.getStringRes(item!!.nameId)
                         when (item.mmkvName) {
                             MMKVName.VOLUME -> {
-                                XLogUtil.d("音量:" + ZtlManager.GetInstance().systemMaxVolume + ":" + ZtlManager.GetInstance().systemCurrenVolume)
+                                XLogUtil.d(
+                                    "音量:" + audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) + ":" + audioManager.getStreamVolume(
+                                        AudioManager.STREAM_MUSIC
+                                    )
+                                )
                                 sbLight.max =
                                     audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
                                 sbLight.progress =
@@ -247,13 +254,10 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                             }
 
                             MMKVName.LUMINANCE -> {
-                                XLogUtil.d("亮度:" + ZtlManager.GetInstance().systemMaxBrightness + ":" + ZtlManager.GetInstance().systemBrightness)
-                                Log.d(TAG, "onBind: "+mManager?.xzjhGetBacklight())
+                                XLogUtil.d("亮度:" + ZtlManager.GetInstance().systemMaxBrightness + ":" + mManager.xzjhGetBacklight())
                                 sbLight.max =
                                     ZtlManager.GetInstance().systemMaxBrightness //maxBrightness 为 Android 系统最大亮度
-                                if (mManager != null) {
-                                    sbLight.progress =mManager.xzjhGetBacklight()
-                                }
+                                sbLight.progress = mManager.xzjhGetBacklight()
                             }
                         }
 
@@ -272,15 +276,18 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                                 when (item.mmkvName) {
                                     MMKVName.VOLUME -> {
                                         //设置 Android 系统媒体音量值为 10
-                                        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC,progress,AudioManager.FLAG_SHOW_UI)
+                                        audioManager.setStreamVolume(
+                                            AudioManager.STREAM_MUSIC,
+                                            progress,
+                                            AudioManager.FLAG_SHOW_UI
+                                        )
                                     }
 
                                     MMKVName.LUMINANCE -> {
                                         //设置 Android 系统亮度为 200
-                                        mManager?.xzjhSetBacklight(progress);
+                                        mManager.xzjhSetBacklight(progress);
                                     }
                                 }
-
                             }
 
                             override fun onStartTrackingTouch(seekBar: SeekBar?) {
@@ -327,23 +334,20 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                                 try {
                                     tvValue.text =
                                         ZtlManager.GetInstance().simTel //simtel 为获取到的 Android 系统 SIM 卡的号码信息
-                                }catch (e:Exception){
+                                } catch (e: Exception) {
                                     //  throw e
                                 }
-
-
                             }
 
                             MMKVName.SIM_IMEI -> {
                                 try {
                                     tvValue.text =
                                         ZtlManager.GetInstance().imei
-                                }catch (E:Exception){
+                                } catch (E: Exception) {
                                     //  throw E
                                 }
 
 
-
                             }
                         }
 
@@ -398,8 +402,46 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                     return true;
                 }
 
-            })
+            }).addItemType(
+            SECTION_TYPE_TEXT,
+            object : OnMultiItemAdapterListener<OtherEnum, EditTextVH> { // 类型 7
+                override fun onCreate(
+                    context: Context,
+                    parent: ViewGroup,
+                    viewType: Int,
+                ): EditTextVH {
+                    // 创建 viewholder
+                    val viewBinding = BackstageItemInputTextBinding.inflate(
+                        LayoutInflater.from(context), parent, false
+                    )
+                    return EditTextVH(viewBinding)
+                }
 
+                override fun onBind(holder: EditTextVH, position: Int, item: OtherEnum?) {
+                    // 绑定 item 数据
+                    itemListener?.onClickListener(holder.itemView, position, null)
+                    holder.viewBinding.run {
+                        tvName.text = UiUtil.getStringRes(item!!.nameId)
+                        var defaultValue = SpUtils.getString(item.mmkvName, item.default as String)
+                        etValue.setText(defaultValue)
+                        btnUpdate.setOnClickListener {
+                            val value = etValue.text.trim().toString()
+                            if (value == "") {
+                                ToastUtil.switchToastStyleToWarn("输入为空")
+                                return@setOnClickListener
+                            }
+                            SpUtils.putString(item.mmkvName, value)
+                            ToastUtil.switchToastStyleToSuccess("更新成功:" + item.mmkvName)
+                        }
+                    }
+                }
+
+                override fun isFullSpanItem(itemType: Int): Boolean {
+                    // 使用GridLayoutManager时，此类型的 item 是否是满跨度
+                    return true;
+                }
+
+            })
             .onItemViewType { position, list -> // 根据数据，返回对应的 ItemViewType
                 when (list[position].type) {
                     SECTION_TYPE -> {
@@ -422,6 +464,10 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
                         BUTTON_TYPE
                     }
 
+                    SECTION_TYPE_TEXT -> {
+                        SECTION_TYPE_TEXT
+                    }
+
                     else -> {
                         ITEM_TYPE
                     }
@@ -431,11 +477,12 @@ class TestAdapter(var productList: MutableList<OtherEnum>) :
 
     companion object {
         private const val ITEM_TYPE = 1//开关
-        private const val SECTION_TYPE = 2//输入值
+        private const val SECTION_TYPE = 2//输入值数字
         private const val MULTIPLE_CHOICE_TYPE = 3//多选值
         private const val SLIDER_TYPE = 4//滑块
         private const val TEXT_TYPE = 5//文本
         private const val BUTTON_TYPE = 6//按钮
+        private const val SECTION_TYPE_TEXT = 7//输入值文本
     }
 
     private var itemListener: AdapterClickListener? = null

module_backstage/src/main/java/com/module/backstage/dialog/LocalAlarmClockDialog.kt

@@ -8,6 +8,7 @@ import com.quyunshuo.androidbaseframemvvm.common.bean.LocalAlarmClockBean
 import com.quyunshuo.androidbaseframemvvm.common.enums.AlarmClockEnum
 import com.quyunshuo.androidbaseframemvvm.common.enums.WeekEnum
 import com.quyunshuo.androidbaseframemvvm.common.util.ToastUtil
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 
 
 /**
@@ -26,6 +27,7 @@ class LocalAlarmClockDialog(mContext: Context) :
     var id:Int? = 0
 
     override fun BackstageDialogLocalAlarmClockBinding.initView() {
+        tvTime.text=UiUtil.getStringRes(R.string.choose_time)+": 12:00"
         tvBack.setOnClickListener {
             dismiss()
         }
@@ -120,7 +122,7 @@ class LocalAlarmClockDialog(mContext: Context) :
 //                            updateApk()
                         }
                         200->{
-                            mBinding.tvTime.text = "选择时间：$text"
+                            mBinding.tvTime.text = UiUtil.getStringRes(R.string.choose_time)+"：$text"
                             selectTime = text!!
                         }
                         else -> {}
@@ -135,7 +137,7 @@ class LocalAlarmClockDialog(mContext: Context) :
     }
 
     fun add(id: Int?, addOrUpdate: Int) {
-        mBinding.tvTime.text = "选择时间：12:00"
+        mBinding.tvTime.text = UiUtil.getStringRes(R.string.choose_time)+"：12:00"
         this.id = id
         this.addOrUpdate = addOrUpdate
         mBinding.cbSunday.isChecked = true

module_backstage/src/main/java/com/module/backstage/fragment/PayFragment.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.gson.Gson
+import com.module.backstage.R
 import com.module.backstage.adapter.PayAdapter
 import com.module.backstage.databinding.BackstageFragmentPayBinding
 import com.module.backstage.dialog.PayGoreSetDialog
@@ -14,6 +15,7 @@ import com.quyunshuo.androidbaseframemvvm.common.bean.LocalAlarmClockBean
 import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
 import com.quyunshuo.androidbaseframemvvm.common.ui.BaseFragment
 import com.quyunshuo.androidbaseframemvvm.common.util.ToastUtil
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -53,7 +55,7 @@ class PayFragment : BaseFragment<BackstageFragmentPayBinding, PayFragmentVM>() {
         if (priceAdapter?.arrayListState?.size!! >0){
             SpUtils.put(MMKVName.PAY_TYPE,Gson().toJson(priceAdapter?.arrayListState))
             Log.d(TAG, "savePayType: "+Gson().toJson(priceAdapter?.arrayListState))
-            ToastUtil.switchToastStyleToSuccess("修改成功")
+            ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.modific_success))
         }
 
     }

module_backstage/src/main/java/com/module/backstage/fragment/PermissionFragment.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.gson.Gson
+import com.module.backstage.R
 import com.module.backstage.adapter.PayAdapter
 import com.module.backstage.adapter.PermissionAdapter
 import com.module.backstage.databinding.BackstageFragmentPermissionBinding
@@ -13,6 +14,7 @@ import com.quyunshuo.androidbaseframemvvm.base.utils.SpUtils
 import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
 import com.quyunshuo.androidbaseframemvvm.common.ui.BaseFragment
 import com.quyunshuo.androidbaseframemvvm.common.util.ToastUtil
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -55,7 +57,7 @@ class PermissionFragment : BaseFragment<BackstageFragmentPermissionBinding, Perm
         if (permissionAdapter?.arrayListState?.size!! >0){
             SpUtils.put(MMKVName.SETTING_TYPE, Gson().toJson(permissionAdapter?.arrayListState))
             Log.d(TAG, "savePayType: "+ Gson().toJson(permissionAdapter?.arrayListState))
-            ToastUtil.switchToastStyleToSuccess("修改成功")
+            ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.modific_success))
         }
 
     }

module_backstage/src/main/java/com/module/backstage/fragment/date/HistogramDataFragment.kt

@@ -9,6 +9,7 @@ import androidx.lifecycle.LifecycleObserver
 import com.github.mikephil.charting.listener.ChartTouchListener
 import com.github.mikephil.charting.listener.OnChartGestureListener
 import com.hboxs.serialport.plc.DialogClickListener
+import com.module.backstage.R
 import com.module.backstage.chart.BarChartManager
 import com.module.backstage.chart.FancyListBean
 import com.module.backstage.databinding.BackstageFragmentHistogramDataBinding
@@ -18,6 +19,7 @@ import com.module.database.room.entity.LocalOrderBean
 import com.quyunshuo.androidbaseframemvvm.base.ktx.observeLiveData
 import com.quyunshuo.androidbaseframemvvm.common.ui.BaseFragment
 import com.quyunshuo.androidbaseframemvvm.common.util.ToastUtil
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.Collections
 import kotlin.math.max
@@ -121,8 +123,8 @@ class HistogramDataFragment : BaseFragment<BackstageFragmentHistogramDataBinding
 
                 else -> {}
             }
-            mBinding.tvStartTime.text = "请选择开始时间"
-            mBinding.tvEndTime.text = "请选择结束时间"
+            mBinding.tvStartTime.text = UiUtil.getStringRes(R.string.select_start_time)
+            mBinding.tvEndTime.text = UiUtil.getStringRes(R.string.select_end_time)
             startTime = ""
             endTime = ""
 

module_backstage/src/main/java/com/module/backstage/fragment/date/OrderDataFragment.kt

@@ -6,6 +6,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.LifecycleObserver
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.hboxs.serialport.plc.DialogClickListener
+import com.module.backstage.R
 import com.module.backstage.adapter.OrderDataAdapter
 import com.module.backstage.databinding.BackstageFragmentOrderDataBinding
 import com.module.backstage.dialog.DateDialog
@@ -14,6 +15,7 @@ import com.module.database.room.entity.LocalOrderBean
 import com.quyunshuo.androidbaseframemvvm.base.ktx.observeLiveData
 import com.quyunshuo.androidbaseframemvvm.common.ui.BaseFragment
 import com.quyunshuo.androidbaseframemvvm.common.util.ToastUtil
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -65,8 +67,8 @@ class OrderDataFragment : BaseFragment<BackstageFragmentOrderDataBinding, OrderD
 
                 else -> {}
             }
-            mBinding.tvStartTime.text = "请选择开始时间"
-            mBinding.tvEndTime.text = "请选择结束时间"
+            mBinding.tvStartTime.text = UiUtil.getStringRes(R.string.select_start_time)
+            mBinding.tvEndTime.text = UiUtil.getStringRes(R.string.select_end_time)
             startTime = ""
             endTime = ""
 
@@ -110,7 +112,7 @@ class OrderDataFragment : BaseFragment<BackstageFragmentOrderDataBinding, OrderD
 
             mBinding.tvScreen.id -> {
                 if (startTime == "" || endTime == "") {
-                    ToastUtil.switchToastStyleToWarn("请选择时间")
+                    ToastUtil.switchToastStyleToWarn(UiUtil.getStringRes(R.string.choose_time))
                     return
                 }
 

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

@@ -1,11 +1,15 @@
 package com.module.backstage.fragment.other
 
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
+import android.view.MotionEvent
 import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.LifecycleObserver
 import androidx.navigation.Navigation
@@ -84,10 +88,10 @@ class OtherFragment : BaseFragment<BackstageFragmentOtherBinding, OtherFragmentV
             otherAdapter = TestAdapter(mViewModel.list)
             otherAdapter!!.setItemListener(object : AdapterClickListener {
                 override fun onClickListener(view: View?, position: Int, data: String?) {
-                    if (data==null) {
-                        addAllKeyboardView(view)
-                        return
-                    }
+//                    if (data==null) {
+//                        addAllKeyboardView(view)
+//                        return
+//                    }
                     if (""==data) {
                         ToastUtil.switchToastStyleToWarn(UiUtil.getStringRes(R.string.backstage_data_null_tips))
                         return

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

@@ -1,6 +1,12 @@
 package com.module.backstage.fragment.other
 
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.Log
+import android.view.MotionEvent
 import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import com.hboxs.serialport.plc.DialogClickListener
@@ -48,15 +54,17 @@ class SystemSettingsFragment : BaseFragment<BackstageFragmentSystemSettingsBindi
             otherAdapter = TestAdapter(mViewModel.getGeneralParamData(functionIndex))
             otherAdapter!!.setItemListener(object : AdapterClickListener {
                 override fun onClickListener(view: View?, position: Int, data: String?) {
-                    if (data==null) {
-                        addAllKeyboardView(view)
-                        return
-                    }
+//                    if (data==null) {
+//                        addAllKeyboardView(view)
+//                        return
+//                    }
                     if ("".equals(data)) {
                         ToastUtil.switchToastStyleToWarn(UiUtil.getStringRes(R.string.backstage_data_null_tips))
                         return
                     }
-                    showOkCancelDialog(position,data)
+                    if (data != null) {
+                        showOkCancelDialog(position,data)
+                    }
                 }
             })
             adapter = otherAdapter

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

@@ -21,7 +21,7 @@ class ErrorStatFragmentRepo @Inject constructor() : BaseRepository() {
     lateinit var mApi: com.module.pay.service.HomeApiService
 
     suspend fun getAllWarringData(): MutableList<WarringBean> {
-        addWarringBean("")
+//        addWarringBean("")
         val all = warringDao.getAll()
         Log.d(TAG, "getAllWarringData: "+all)
         return all

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

@@ -22,10 +22,10 @@ class SystemSettingsFragmentRepo @Inject constructor() : BaseRepository() {
         OtherEnum.CONTACT_WAY,
         OtherEnum.VOLUME,
         OtherEnum.LUMINANCE,
-        OtherEnum.AUTO_START_HOTSPOT,
-        OtherEnum.NAME_HOTSPOT,
-        OtherEnum.PWD_HOTSPOT,
-        OtherEnum.WIFI_HOTSPOT,
+//        OtherEnum.AUTO_START_HOTSPOT,
+//        OtherEnum.NAME_HOTSPOT,
+//        OtherEnum.PWD_HOTSPOT,
+//        OtherEnum.WIFI_HOTSPOT,
         OtherEnum.LONG_CLICK_SHOW_STATUS_BAR,
         OtherEnum.CUT_SYSTEM_SET
     )
@@ -66,7 +66,9 @@ class SystemSettingsFragmentRepo @Inject constructor() : BaseRepository() {
         OtherEnum.CHANGE_COIN_REP,
         OtherEnum.CHANGE_COIN,
         OtherEnum.CHANGE_ALLOW_NUMBER,
-        OtherEnum.CHANGE_WARNING_NUMBER
+        OtherEnum.CHANGE_WARNING_NUMBER,
+        OtherEnum.COIN_MULTIPLY,
+        OtherEnum.COIN_DIVIDE,
     )
     //其他
     var otherSetList: MutableList<OtherEnum> = Arrays.asList(

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

@@ -140,7 +140,7 @@ class HistogramDataFragmentVM @Inject constructor(private val mRepo: HistogramDa
                     orderList.add(fancyListBean)
                 }
                 if (orderList.size == 0) {
-                    ToastUtil.switchToastStyleToWarn("这个时间段没有销售数据")
+                    ToastUtil.switchToastStyleToWarn(UiUtil.getStringRes(R.string.no_sales_data))
                     return@launch
                 }
                 _allLocalOrder.value = orderList

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

@@ -134,7 +134,7 @@ class OrderDataFragmentVM @Inject constructor(private val mRepo: OrderDataFragme
 
                 }
                 if (orderList.size == 0) {
-                    ToastUtil.switchToastStyleToWarn("这个时间段没有销售数据")
+                    ToastUtil.switchToastStyleToWarn(UiUtil.getStringRes(R.string.no_sales_data))
                     return@launch
                 }
                 _allLocalOrder.value = orderList

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

@@ -46,7 +46,7 @@
                 android:minWidth="267dp"
                 android:text="@string/backstage_system_set"
                 android:textColor="@color/system_text"
-                android:textSize="75sp"
+                android:textSize="70sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

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

@@ -44,7 +44,7 @@
                 android:layout_height="70dp"
                 android:background="@drawable/backstage_shape_et_login"
                 android:gravity="center"
-                android:hint="年"
+                android:hint="@string/year"
                 android:inputType="number"
                 android:maxLength="4"
                 android:textAlignment="center"
@@ -58,7 +58,7 @@
                 android:layout_height="70dp"
                 android:layout_marginLeft="10dp"
                 android:gravity="center"
-                android:text="年"
+                android:hint="@string/year"
                 android:textColor="#157DE7"
                 android:textSize="24sp" />
 
@@ -69,7 +69,7 @@
                 android:layout_marginLeft="10dp"
                 android:background="@drawable/backstage_shape_et_login"
                 android:gravity="center"
-                android:hint="月"
+                android:text="@string/month"
                 android:inputType="number"
                 android:maxLength="4"
                 android:textAlignment="center"
@@ -83,7 +83,7 @@
                 android:layout_marginHorizontal="10dp"
                 android:layout_marginLeft="10dp"
                 android:gravity="center"
-                android:text="月"
+                android:text="@string/month"
                 android:textColor="#157DE7"
                 android:textSize="24sp"/>
 
@@ -95,7 +95,7 @@
                 android:layout_marginLeft="10dp"
                 android:background="@drawable/backstage_shape_et_login"
                 android:gravity="center"
-                android:hint="日"
+                android:hint="@string/date"
                 android:inputType="number"
                 android:maxLength="4"
                 android:textAlignment="center"
@@ -110,7 +110,7 @@
                 android:layout_marginHorizontal="10dp"
                 android:layout_marginLeft="10dp"
                 android:gravity="center"
-                android:text="日"
+                android:hint="@string/date"
                 android:textColor="#157DE7"
                 android:textSize="24sp"/>
 
@@ -120,7 +120,7 @@
                 android:layout_height="70dp"
                 android:background="@drawable/backstage_shape_et_login"
                 android:gravity="center"
-                android:hint="小时"
+                android:hint="@string/time"
                 android:inputType="number"
                 android:maxLength="4"
                 android:textAlignment="center"
@@ -133,7 +133,7 @@
                 android:layout_height="70dp"
                 android:layout_marginLeft="10dp"
                 android:gravity="center"
-                android:text="小时"
+                android:text="@string/time"
                 android:textColor="#157DE7"
                 android:textSize="24sp" />
         </LinearLayout>

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

@@ -57,7 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="40dp"
             android:layout_marginStart="30dp"
-            android:text="星期："
+            android:text="@string/week"
             android:textColor="@color/black"
             android:textSize="50sp"
             app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +68,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:text="周日"
+            android:text="@string/sunday"
             android:button="@drawable/backstage_check_select_bg"
             android:layout_marginStart="20dp"
             android:textColor="@color/black"
@@ -82,7 +82,7 @@
             android:layout_width="wrap_content"
             android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
-            android:text="周一"
+            android:text="@string/monday"
             android:padding="10dp"
             android:layout_marginStart="20dp"
             android:textColor="@color/black"
@@ -96,7 +96,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:button="@drawable/backstage_check_select_bg"
-            android:text="周二"
+            android:text="@string/tuesday"
             android:layout_marginStart="20dp"
             android:padding="10dp"
             android:textColor="@color/black"
@@ -109,7 +109,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:text="周三"
+            android:text="@string/wednesday"
             android:layout_marginStart="20dp"
             android:textColor="@color/black"
             android:textSize="50sp"
@@ -123,7 +123,7 @@
             android:layout_width="wrap_content"
             android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
-            android:text="周四"
+            android:text="@string/thursday"
             android:layout_marginStart="20dp"
             android:textColor="@color/black"
             android:textSize="50sp"
@@ -136,7 +136,7 @@
             android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:text="周五"
+            android:text="@string/friday"
             android:layout_marginStart="20dp"
             android:textColor="@color/black"
             android:textSize="50sp"
@@ -149,7 +149,7 @@
             android:padding="10dp"
             android:button="@drawable/backstage_check_select_bg"
             android:layout_height="wrap_content"
-            android:text="周六"
+            android:text="@string/saturday"
             android:layout_marginStart="20dp"
             android:textColor="@color/black"
             android:textSize="50sp"
@@ -171,7 +171,7 @@
             android:layout_marginVertical="40dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="30dp"
-            android:text="类型："
+            android:text="@string/type"
             android:textColor="@color/black"
             android:textSize="50sp"
             app:layout_constraintStart_toStartOf="parent"
@@ -218,7 +218,7 @@
                 android:button="@drawable/backstage_check_select_bg"
                 android:padding="10dp"
                 android:checked="true"
-                android:text="开启休眠"
+                android:text="@string/turn_on_sleep"
                 android:textColor="@color/black"
                 android:textSize="50sp" />
 
@@ -230,7 +230,7 @@
                 android:layout_marginStart="20dp"
                 android:button="@drawable/backstage_check_select_bg"
                 android:checked="true"
-                android:text="关闭休眠"
+                android:text="@string/turn_off_sleep"
                 android:textColor="@color/black"
                 android:textSize="50sp" />
 

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

@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="120dp"
             android:layout_marginTop="60dp"
-            android:text="ICT 币值选择："
+            android:text="@string/ict_currency"
             android:textColor="@color/orange_bg"
             android:textSize="52sp"
             android:textStyle="bold"
@@ -48,7 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="80dp"
-            android:text="定制支付："
+            android:text="@string/customized_payment"
             android:textColor="@color/orange_bg"
             android:textSize="52sp"
             android:textStyle="bold"
@@ -73,7 +73,7 @@
                 android:background="@drawable/backstage_selector_other_rg"
                 android:button="@null"
                 android:gravity="center"
-                android:text="开启"
+                android:text="@string/open"
                 android:textColor="@drawable/backstage_selector_other_tv_color"
                 android:textSize="42sp" />
 
@@ -84,7 +84,7 @@
                 android:background="@drawable/backstage_selector_other_rg"
                 android:button="@null"
                 android:gravity="center"
-                android:text="关闭"
+                android:text="@string/close"
                 android:textColor="@drawable/backstage_selector_other_tv_color"
                 android:textSize="42sp" />
         </RadioGroup>
@@ -99,7 +99,7 @@
             android:layout_marginBottom="60dp"
             android:background="@drawable/btn_back_background"
             android:gravity="center"
-            android:text="返回"
+            android:text="@string/backstage_back"
             android:textColor="@color/white"
             android:textSize="62sp"
             android:textStyle="bold"

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

@@ -22,7 +22,7 @@
         android:id="@+id/tv_error_tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="无报警信息"
+        android:text="@string/no_alarm_information"
         android:textSize="40dp"
         app:layout_constraintBottom_toBottomOf="@+id/rv_alarm"
         app:layout_constraintEnd_toEndOf="@+id/rv_alarm"
@@ -40,7 +40,7 @@
         android:gravity="center"
         android:minWidth="290dp"
         android:paddingHorizontal="25dp"
-        android:text="清除报警记录"
+        android:text="@string/clear_alarm_records"
         android:layout_marginBottom="120dp"
         android:textColor="@color/white"
         android:textSize="36sp"

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

@@ -12,7 +12,7 @@
         android:layout_height="60dp"
         android:layout_marginStart="180dp"
         android:gravity="center"
-        android:text="开始时间"
+        android:text="@string/start_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         android:layout_marginTop="20dp"
@@ -26,7 +26,7 @@
         android:layout_marginStart="18dp"
         android:background="@drawable/backstage_shape_debug_param_cb_unselect"
         android:gravity="center"
-        android:text="请选择开始时间"
+        android:text="@string/select_start_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         app:layout_constraintStart_toEndOf="@+id/backstage_textview"
@@ -39,7 +39,7 @@
         android:layout_height="60dp"
         android:layout_marginStart="40dp"
         android:gravity="center"
-        android:text="结束时间"
+        android:text="@string/end_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         app:layout_constraintStart_toEndOf="@+id/tv_start_time"
@@ -53,7 +53,7 @@
         android:background="@drawable/backstage_shape_debug_param_cb_unselect"
 
         android:gravity="center"
-        android:text="请选择结束时间"
+        android:text="@string/select_end_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         app:layout_constraintStart_toEndOf="@+id/tv_end_time1"
@@ -65,7 +65,7 @@
         android:layout_height="80dp"
         android:layout_marginTop="30dp"
         android:gravity="center"
-        android:text="单位"
+        android:text="@string/unit"
         android:textColor="@color/black"
         android:layout_marginStart="180dp"
         android:textSize="44sp"
@@ -96,7 +96,7 @@
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="小时"
+            android:text="@string/time"
             android:textColor="@color/black"
             android:textSize="36sp" />
 
@@ -109,7 +109,7 @@
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="日"
+            android:text="@string/date"
             android:textColor="@color/black"
             android:textSize="36sp" />
 
@@ -122,7 +122,7 @@
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="月"
+            android:text="@string/month"
             android:textColor="@color/black"
             android:textSize="36sp" />
 
@@ -131,25 +131,26 @@
             android:layout_width="wrap_content"
             android:layout_height="80dp"
             android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
             android:layout_gravity="center"
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="年"
+            android:text="@string/year"
             android:textColor="@color/black"
             android:textSize="36sp" />
     </RadioGroup>
 
     <TextView
         android:id="@+id/tv_screen"
-        android:layout_width="174dp"
-        android:layout_height="70dp"
+        android:layout_width="200dp"
+        android:layout_height="100dp"
         android:layout_marginStart="30dp"
         android:background="@drawable/backstage_shape_gen_content"
         android:gravity="center"
-        android:text="筛选"
+        android:text="@string/filter"
         android:textColor="@color/white"
-        android:textSize="24sp"
+        android:textSize="34sp"
         app:layout_constraintStart_toEndOf="@+id/rg_fancy"
         app:layout_constraintTop_toTopOf="@+id/backstage_textview10" />
 

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

@@ -51,7 +51,7 @@
                 android:textColor="#576478"
                 android:background="@drawable/backstage_selector_language"
                 android:button="@null"
-                android:text="英语"
+                android:text="English(英语)"
                 android:textSize="46sp" />
 
             <RadioButton

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

@@ -11,7 +11,7 @@
         android:layout_height="60dp"
         android:layout_marginStart="180dp"
         android:gravity="center"
-        android:text="开始时间"
+        android:text="@string/start_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         android:layout_marginTop="20dp"
@@ -27,7 +27,7 @@
         android:gravity="center"
         android:paddingRight="20dp"
         android:paddingLeft="20dp"
-        android:text="请选择开始时间"
+        android:text="@string/select_start_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         app:layout_constraintStart_toEndOf="@+id/backstage_textview"
@@ -40,7 +40,7 @@
         android:layout_height="60dp"
         android:layout_marginStart="40dp"
         android:gravity="center"
-        android:text="结束时间"
+        android:text="@string/end_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         app:layout_constraintStart_toEndOf="@+id/tv_start_time"
@@ -55,7 +55,7 @@
         android:paddingRight="20dp"
         android:paddingLeft="20dp"
         android:gravity="center"
-        android:text="请选择结束时间"
+        android:text="@string/select_end_time"
         android:textColor="@color/black"
         android:textSize="44sp"
         app:layout_constraintStart_toEndOf="@+id/tv_end_time1"
@@ -67,7 +67,7 @@
         android:layout_height="80dp"
         android:layout_marginTop="30dp"
         android:gravity="center"
-        android:text="单位"
+        android:text="@string/unit"
         android:textColor="@color/black"
         android:layout_marginStart="180dp"
         android:textSize="44sp"
@@ -98,7 +98,7 @@
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="小时"
+            android:text="@string/time"
             android:textColor="@color/black"
             android:textSize="36sp" />
 
@@ -111,7 +111,7 @@
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="日"
+            android:text="@string/date"
             android:textColor="@color/black"
             android:textSize="36sp" />
 
@@ -124,7 +124,7 @@
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="月"
+            android:text="@string/month"
             android:textColor="@color/black"
             android:textSize="36sp" />
 
@@ -137,21 +137,21 @@
             android:button="@null"
             android:drawableStart="@drawable/backstage_selector_rb_bg"
             android:drawablePadding="5dp"
-            android:text="年"
+            android:text="@string/year"
             android:textColor="@color/black"
             android:textSize="36sp" />
     </RadioGroup>
 
     <TextView
         android:id="@+id/tv_screen"
-        android:layout_width="174dp"
-        android:layout_height="70dp"
+        android:layout_width="200dp"
+        android:layout_height="100dp"
         android:layout_marginStart="30dp"
         android:background="@drawable/backstage_shape_gen_content"
         android:gravity="center"
-        android:text="筛选"
+        android:text="@string/filter"
         android:textColor="@color/white"
-        android:textSize="24sp"
+        android:textSize="34sp"
         app:layout_constraintStart_toEndOf="@+id/rg_fancy"
         app:layout_constraintTop_toTopOf="@+id/backstage_textview10" />
 
@@ -170,7 +170,7 @@
         android:id="@+id/tv_error_tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="无报警信息"
+        android:text="@string/no_order_data"
         android:textSize="40dp"
         app:layout_constraintBottom_toBottomOf="@+id/rv_alarm"
         app:layout_constraintEnd_toEndOf="@+id/rv_alarm"

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

@@ -23,7 +23,7 @@
         android:gravity="center"
         android:padding="25dp"
         android:layout_marginRight="80dp"
-        android:text="更多设置"
+        android:text="@string/more_setup"
         android:textStyle="bold"
         android:textColor="@color/black"
         android:textSize="42sp"

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

@@ -38,7 +38,7 @@
                 android:layout_marginStart="30dp"
                 android:gravity="center"
                 android:textStyle="bold"
-                android:text="统一修改价格："
+                android:text="@string/unify_price"
                 android:textColor="@color/black"
                 android:textSize="45sp"
                 app:layout_constraintEnd_toEndOf="parent"

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="重新填写"
+            android:text="@string/rewrite"
             android:textSize="42sp"
             app:layout_constraintStart_toEndOf="@id/home_return_to_upper_level1"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -11,8 +11,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:text="时间"
-        android:paddingLeft="60dp"
+        android:text="@string/period"
+        android:paddingStart="60dp"
         android:textColor="#576478"
         android:textSize="44sp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -24,26 +24,26 @@
         android:id="@+id/tv_thingError"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="错误事件"
+        android:text="@string/error_events"
         android:gravity="center_vertical"
         android:textColor="#576478"
         android:textSize="44sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_time"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.4" />
+        app:layout_constraintWidth_percent="0.48" />
 
     <TextView
         android:id="@+id/tv_remark"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="备注"
+        android:text="@string/remark"
         android:textColor="#576478"
         android:textSize="44sp"
         android:gravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_thingError"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.2" />
+        app:layout_constraintWidth_percent="0.12" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -28,7 +28,7 @@
         android:layout_marginEnd="8dp"
         android:background="@drawable/backstage_shape_general_param_et"
         android:text="0000"
-        android:hint="值"
+        android:hint="value"
         android:gravity="center"
         android:inputType="number"
         android:textSize="40sp"

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

@@ -0,0 +1,51 @@
+<?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="wrap_content"
+    android:layout_marginTop="40dp">
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        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" />
+
+    <EditText
+        android:id="@+id/et_value"
+        android:layout_width="320dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/backstage_shape_general_param_et"
+        android:layout_marginStart="20dp"
+        android:textSize="50sp"
+        android:textColor="@color/black"
+        android:paddingStart="20dp"
+        app:layout_constraintStart_toEndOf="@+id/tv_name"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:layout_marginStart="20dp"
+        android:id="@+id/btn_update"
+        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="48sp"
+        app:layout_constraintStart_toEndOf="@+id/et_value"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -51,7 +51,7 @@
         android:background="@drawable/backstage_shape_other_select_red"
         android:layout_marginRight="20dp"
         android:gravity="center"
-        android:text="删除"
+        android:text="@string/delete"
         android:textColor="@color/white"
         android:textSize="54sp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -64,7 +64,7 @@
         android:layout_height="120dp"
         android:background="@drawable/backstage_shape_other_select_blue"
         android:gravity="center"
-        android:text="修改"
+        android:text="@string/modify"
         android:layout_marginRight="20dp"
         android:textColor="@color/white"
         android:textSize="54sp"

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

@@ -75,7 +75,7 @@
         android:id="@+id/tv_time"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="时间"
+        android:text="@string/period"
         android:textStyle=""
         android:textColor="#576478"
         android:gravity="center"

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

@@ -81,7 +81,7 @@
         android:id="@+id/tv_time"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:text="时间"
+        android:text="@string/period"
         android:textColor="#576478"
         android:gravity="center"
         android:textSize="26sp"

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

@@ -21,9 +21,9 @@
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="300dp"
+        android:layout_width="550dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="250dp"
+        android:layout_marginStart="170dp"
         android:layout_marginTop="20dp"
         android:maxHeight="90dp"
         android:text="水中芙蓉"
@@ -42,7 +42,7 @@
         android:layout_marginStart="20dp"
         app:layout_constraintTop_toBottomOf="@id/tv_name"
         android:gravity="center"
-        android:text="名字"
+        android:text="@string/name"
         android:textColor="@color/white"
         android:textSize="50sp"
         app:layout_constraintStart_toEndOf="@+id/iv_sugar" />
@@ -52,8 +52,8 @@
         android:layout_width="550dp"
         android:layout_height="150dp"
         android:layout_marginStart="8dp"
+        android:hint="@string/custom_name"
         android:background="@drawable/backstage_shape_general_param_et"
-        android:hint="可自定义名字"
         android:paddingLeft="10dp"
         android:textSize="50sp"
         app:layout_constraintBottom_toBottomOf="@+id/backstage_textview7"
@@ -70,7 +70,7 @@
         android:background="#8194F0"
         android:layout_marginStart="40dp"
         android:gravity="center"
-        android:text="隐藏"
+        android:text="@string/hide"
         android:textColor="@color/white"
         android:textSize="40sp"
         app:layout_constraintStart_toEndOf="@+id/et_sugarprice"
@@ -83,7 +83,7 @@
         android:layout_marginTop="10dp"
         android:background="#8194F0"
         android:gravity="center"
-        android:text="图片"
+        android:text="@string/image"
         android:layout_marginStart="40dp"
         android:textColor="@color/white"
         android:textSize="40sp"
@@ -101,7 +101,7 @@
         android:gravity="center"
         android:inputType="numberDecimal"
         android:paddingLeft="10dp"
-        android:text="点击更换商品图片"
+        android:text="@string/replace_picture"
         android:textColor="@color/white"
         android:textSize="30sp"
         app:layout_constraintStart_toEndOf="@+id/backstage_textview9"
@@ -132,7 +132,7 @@
             android:background="@drawable/backstage_selector_other_rg"
             android:button="@null"
             android:gravity="center"
-            android:text="显示"
+            android:text="@string/show"
             android:textColor="@drawable/backstage_selector_other_tv_color"
             android:textSize="32sp" />
 
@@ -143,7 +143,7 @@
             android:background="@drawable/backstage_selector_other_rg"
             android:button="@null"
             android:gravity="center"
-            android:text="隐藏"
+            android:text="@string/hide"
             android:textColor="@drawable/backstage_selector_other_tv_color"
             android:textSize="32sp"/>
     </RadioGroup>

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

@@ -39,7 +39,7 @@
             android:textSize="48sp"
             android:textColor="@drawable/backstage_selector_other_tv_color"
             android:background="@drawable/backstage_selector_other_rg"
-            android:text="开启"/>
+            android:text="@string/open"/>
         <RadioButton
             android:id="@+id/rb_close"
             android:layout_width="250dp"
@@ -50,7 +50,7 @@
             android:textSize="48sp"
             android:textColor="@drawable/backstage_selector_other_tv_color"
             android:background="@drawable/backstage_selector_other_rg"
-            android:text="关闭"/>
+            android:text="@string/close"/>
     </RadioGroup>
 
     

module_home/src/main/java/com/quyunshuo/module/home/adapter/ShoppingCartAdapter.kt

@@ -28,7 +28,7 @@ class ShoppingCartAdapter(var productList:List<ShoppingCartBean>): RecyclerView.
             mBinding.run {
                 val valueOf = PayEnum.getEnumByValue(payTypeBean.nameChinese)
                 tvName.setText(UiUtil.getResId(payTypeBean.nameId, R.string::class.java))
-                tvPrice.text = "单价："+payTypeBean.price
+                tvPrice.text = UiUtil.getStringRes(R.string.univalent)+"："+payTypeBean.price
                 homeImageview9.setImageResource(UiUtil.getResId(payTypeBean.imgID, R.drawable::class.java))
                 tvDelete.setOnClickListener{
                     listener?.onClickListener(it, this@MyViewHolder.absoluteAdapterPosition,"")

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

@@ -15,6 +15,7 @@ import coil.request.ImageRequest
 import com.hboxs.serialport.plc.DialogClickListener
 import com.quyunshuo.androidbaseframemvvm.base.mvvm.v.BaseFrameDialog
 import com.quyunshuo.androidbaseframemvvm.base.utils.CoilGIFImageLoader
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import com.quyunshuo.module.home.R
 import com.quyunshuo.module.home.databinding.HomeDialogAgainBuyBinding
 import kotlinx.coroutines.CoroutineScope
@@ -116,7 +117,7 @@ class AgainBuyDialog(mContext: Context) : BaseFrameDialog<HomeDialogAgainBuyBind
             var dialog: AgainBuyDialog = mWeakReference.get() as AgainBuyDialog
             when (msg.what) {
                 1 -> {
-                    dialog.binding.homeTextview9.text = dialog.backTime.toString() + "s 后关闭"
+                    dialog.binding.homeTextview9.text = dialog.backTime.toString() + "s"+ UiUtil.getStringRes(R.string.close_interface)
                     dialog.backTime--
                     if (dialog.backTime <= 0) {
                         dialog.againBuyDialoglistener?.onClickListener(dialog.type1, "")

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

@@ -5,6 +5,8 @@ import android.content.Context
 import android.os.Handler
 import com.hboxs.serialport.plc.DialogClickListener
 import com.quyunshuo.androidbaseframemvvm.base.mvvm.v.BaseFrameDialog
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
+import com.quyunshuo.module.home.R
 import com.quyunshuo.module.home.databinding.BackstageDialogCoutDownBinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -89,7 +91,8 @@ class CountDownDialogFragment(mContext: Context) :
             var fragment: CountDownDialogFragment = mWeakReference.get() as CountDownDialogFragment
             when (msg.what) {
                 1 -> {
-                    fragment.mBinding.tvProgress.text = fragment.backTime.toString() + "秒"
+                    fragment.mBinding.tvProgress.text = fragment.backTime.toString() +" "+ UiUtil.getStringRes(
+                        R.string.second)
                     fragment.backTime--
                     if (fragment.backTime <= 0) {
                         fragment.devOnoffDialoglistener?.onClickListener(fragment.type1, null)

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

@@ -25,6 +25,7 @@ import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
 import com.quyunshuo.androidbaseframemvvm.common.constant.PayName
 import com.quyunshuo.androidbaseframemvvm.common.constant.event.ApiMessageEvent
 import com.quyunshuo.androidbaseframemvvm.common.listener.AdapterClickListener
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import com.quyunshuo.module.home.enums.PayNavEnum
 import com.quyunshuo.module.home.R
 import com.quyunshuo.module.home.adapter.PayChooseDialogAdapter
@@ -161,7 +162,7 @@ class PayChooseDialogFragment :
             var fragment: PayChooseDialogFragment = mWeakReference.get() as PayChooseDialogFragment
             when (msg.what) {
                 1 -> {
-                    fragment.mBinding.tvTime.text = fragment.backTime.toString() + "s 后关闭"
+                    fragment.mBinding.tvTime.text = fragment.backTime.toString() + "s"+UiUtil.getStringRes(R.string.close_interface)
                     fragment.backTime--
                     if (fragment.backTime <= 0) {
                         fragment.connectionServerDialoglistener?.onClickListener(fragment.typeBack, "")

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

@@ -17,6 +17,7 @@ import com.quyunshuo.androidbaseframemvvm.base.utils.SpUtils
 import com.quyunshuo.androidbaseframemvvm.common.bean.ShoppingCartBean
 import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
 import com.quyunshuo.androidbaseframemvvm.common.listener.AdapterClickListener
+import com.quyunshuo.androidbaseframemvvm.common.util.UiUtil
 import com.quyunshuo.module.home.R
 import com.quyunshuo.module.home.adapter.ShoppingCartAdapter
 import com.quyunshuo.module.home.databinding.BackstageDialogShoppingCartBinding
@@ -116,7 +117,7 @@ class ShoppingCartDialogFragment :
     }
 
     private fun shoppingCarSumPrice(d: Double) {
-        mBinding.tvPrice.text = "合计：$d"
+        mBinding.tvPrice.text = UiUtil.getStringRes(R.string.total_amount)+": "+d
     }
 
     override fun initRequestData() {

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

@@ -8,10 +8,18 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import com.hboxs.serialport.plc.DialogClickListener
+import com.module.database.room.SZDatabase
+import com.module.database.room.entity.WarringBean
+import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
 import com.quyunshuo.androidbaseframemvvm.base.mvvm.v.BaseFrameDialog
+import com.quyunshuo.androidbaseframemvvm.base.utils.SpUtils
+import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
 import com.quyunshuo.androidbaseframemvvm.common.util.LongClickUtils
 import com.quyunshuo.module.home.databinding.BackstageDialogTipsBinding
 import com.quyunshuo.module.home.databinding.BackstageDialogWarringBinding
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 /**
  * 报警 对话框
@@ -19,16 +27,16 @@ import com.quyunshuo.module.home.databinding.BackstageDialogWarringBinding
 class WarringDialog(mContext: Context) : BaseFrameDialog<BackstageDialogWarringBinding>(mContext),
     LifecycleObserver {
 
-    var type1:Int =1
-    var type2:Int =2
+    var type1: Int = 1
+    var type2: Int = 2
 
 
     private var devOnoffDialoglistener: DialogClickListener? = null
 
     override fun BackstageDialogWarringBinding.initView() {
-        LongClickUtils.setLongClick(Handler(),ivWarringImg, 3000,object : OnLongClickListener{
+        LongClickUtils.setLongClick(Handler(), ivWarringImg, 3000, object : OnLongClickListener {
             override fun onLongClick(v: View?): Boolean {
-                devOnoffDialoglistener?.onClickListener(type1,null)
+                devOnoffDialoglistener?.onClickListener(type1, null)
                 return true
             }
 
@@ -55,7 +63,25 @@ class WarringDialog(mContext: Context) : BaseFrameDialog<BackstageDialogWarringB
 
     fun setContent(content: String) {
         mBinding.tvWarringtitle.text = content
+        CoroutineScope(Dispatchers.Main).launch {
+            addWarringBean(content)
+        }
     }
 
+    fun setContacts() {
+        mBinding.homeTextview7.text =
+            SpUtils.getString(MMKVName.CONTACT, "name") + "\n" +
+                    SpUtils.getString(MMKVName.CONTACT_WAY, "123456")
+    }
 
+    val warringDao = SZDatabase.getDatabase(BaseApplication.context).getWarringDao()
+    suspend fun addWarringBean(thingError: String) {
+        warringDao.insert(
+            WarringBean(
+                time = System.currentTimeMillis(),
+                thingError = thingError,
+                remark = ""
+            )
+        )
+    }
 }

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

@@ -100,6 +100,9 @@ class BuyFragment : BaseFragment<HomeFragmentBuyBinding, BuyFragmentVM>(),
         enumByValue?.navId?.let { ivLogo.setImageResource(it) }
         enumByValue?.width?.let { layoutParams.width = it }
         enumByValue?.height?.let { layoutParams.height = it }
+        if (SpUtils.getInt(MMKVName.LANGUAGE_TYPE,1)!=1){
+            ivBuyIcon.setImageResource(R.drawable.btn_goumai_yy)
+        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

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

@@ -26,12 +26,7 @@ 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.VboxSerialPortManager
-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.addressenum.ProTypeEnum
 import com.quyunshuo.androidbaseframemvvm.base.bean.Global
 import com.quyunshuo.androidbaseframemvvm.base.ktx.observeLiveData
 import com.quyunshuo.androidbaseframemvvm.base.ktx.setVisible
@@ -61,9 +56,9 @@ import com.quyunshuo.module.home.dialog.ShoppingCartDialogFragment
 import com.quyunshuo.module.home.dialog.TipsDialog
 import com.quyunshuo.module.home.enums.LogoEnum
 import com.quyunshuo.module.home.fragment.vm.HomeFragmentVM
-import com.quyunshuo.module.home.weight.NXHooldeIMGView
 import com.quyunshuo.module.home.utils.NetWorkUtils
 import com.quyunshuo.module.home.utils.PhoneStateUtils
+import com.quyunshuo.module.home.weight.NXHooldeIMGView
 import com.zhanshow.mylibrary.network.NetworkStateReceiver.NetworkStateReceiverListener
 import com.zhanshow.mylibrary.phonestate.MyPhoneStateListener.MyPhoneStateListenerListener
 import dagger.hilt.android.AndroidEntryPoint
@@ -88,7 +83,7 @@ import java.math.BigDecimal
 @RegisterEventBus
 @AndroidEntryPoint
 class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), View.OnTouchListener,
-    View.OnClickListener,LifecycleObserver {
+    View.OnClickListener, LifecycleObserver {
 
     private val myHandler: MyHandler = MyHandler(this@HomeFragment)
     private var productList = ArrayList<ProductDataBean>()//传递给make的制作商品list
@@ -119,7 +114,8 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
         startRefreshime()
         with(homeRvProduct) {
             //设置布局排列方式，默认垂直排列
-            val gridLayoutManager = GridLayoutManager(this@HomeFragment.context, 2, GridLayoutManager.VERTICAL, false)
+            val gridLayoutManager =
+                GridLayoutManager(this@HomeFragment.context, 2, GridLayoutManager.VERTICAL, false)
             layoutManager = gridLayoutManager
             //设置adapter
             productList = mViewModel.getPriceData()
@@ -152,7 +148,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
         ivShoppingTrolley.setOnClickListener(this@HomeFragment)
         tvPay.setOnClickListener(this@HomeFragment)
         btnCif.setOnClickListener(this@HomeFragment)
-        tvAacpeBill.setText(""+Heartbeat.acceptBill)
+        tvAacpeBill.setText("" + Heartbeat.acceptBill)
         initUi()
         //刷卡器初始化 在内部要做好判断？在外部吧  支付方式是否保护Nyax来决定。
         CreditCardPresenter.getCreditCardContract()
@@ -223,13 +219,17 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
         lifecycle.addObserver(myHandler)
         lifecycle.addObserver(this)
     }
-    var lastCoin: BigDecimal  = BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
+
+    var lastCoin: BigDecimal = BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
 
     private fun getCoinValue(coin: String) {
-        val coinData= BigDecimal(coin)
-        Heartbeat.coinData=coinData
-        mBinding.tvAacpeCoin.setText(""+Heartbeat.coinData)
-        if (lastCoin!=coinData){
+        val coinData = BigDecimal(coin)
+        val coinMultiply = BigDecimal(SpUtils.getString(MMKVName.COIN_PULSE_MULTIPLY, "1"))
+        val coinDivide = BigDecimal(SpUtils.getString(MMKVName.COIN_PULSE_DIVIDE, "1"))
+        Heartbeat.coinData = (coinData.multiply(coinMultiply)).divide(coinDivide)
+
+        mBinding.tvAacpeCoin.setText("" + Heartbeat.coinData)
+        if (lastCoin != coinData) {
             lastCoin = Heartbeat.coinData
             EventBus.getDefault().post(ApiMessageEvent(PayName.COIN_DATA, Heartbeat.coinData))
         }
@@ -251,7 +251,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
     //选择产品:单选或多选。
     private fun clickProduct(position: Int, view: View?) {
         product = productList[position]
-        Log.d(TAG, "clickProduct: "+product)
+        Log.d(TAG, "clickProduct: " + product)
         //点击前校验 有没有开机、有没有选择支付方式等。
         if (checkToBuy()) return//是否开机
 
@@ -372,15 +372,18 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                 showPaySuccessDialog()
                 lifecycleScope.launch {
                     delay(2000)
-                    gotoMake(message.name,message.data as PaySuccessBean)
+                    gotoMake(message.name, message.data as PaySuccessBean)
                 }
             }
-            PayName.ACCEPT_BILL->{
-                mBinding.tvAacpeBill.setText(""+Heartbeat.acceptBill)
+
+            PayName.ACCEPT_BILL -> {
+                mBinding.tvAacpeBill.setText("" + Heartbeat.acceptBill)
             }
+
             else -> {}
         }
     }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun event(messageEvent: VBoxMessage) {
         XLogUtil.d("VBoxMessage:$messageEvent")
@@ -390,7 +393,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
     var makeList: List<ShoppingCartBean>? = null
 
     private fun gotoMake(name: String, payInfo: PaySuccessBean) {
-        Log.d(TAG, "gotoMake: "+mViewModel.getShoppingTrolleyList())
+        Log.d(TAG, "gotoMake: " + mViewModel.getShoppingTrolleyList())
 //       var selectProductDataBean = ProTypeEnum.getEnumByValue(name) //上线需要使用这个。
         if (product != null) {
             val findNavController = findNavController()
@@ -416,8 +419,8 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                     R.id.home_action_home_homefragment_to_home_makefragment,
                     bundle
                 )
-            }catch (e: IllegalArgumentException){
-                Log.d(TAG, "gotoMake: "+e.message)
+            } catch (e: IllegalArgumentException) {
+                Log.d(TAG, "gotoMake: " + e.message)
             }
         }
         XLog.d("payType:$payInfo")
@@ -651,6 +654,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                     paySuccessDialog?.type1 -> {
                         paySuccessDialog?.dismiss()
                     }
+
                     else -> {}
                 }
             }
@@ -667,16 +671,19 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                 //打开购物车对话框
                 openShoppingCart()
             }
+
             R.id.tv_pay -> {
                 //去付款
                 pay()
 //                gotoMake("","")
             }
+
             R.id.btn_cif -> {
-                val name=SpUtils.getString(MMKVName.CONTACT,"")
-                val way=SpUtils.getString(MMKVName.CONTACT_WAY,"")
-                showContactDialog(name,way)
+                val name = SpUtils.getString(MMKVName.CONTACT, "")
+                val way = SpUtils.getString(MMKVName.CONTACT_WAY, "")
+                showContactDialog(name, way)
             }
+
             else -> {}
         }
     }
@@ -771,11 +778,12 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                     contactDialog?.type1 -> {
                         contactDialog?.dismiss()
                     }
+
                     else -> {}
                 }
             }
         })
-        contactDialog?.setContent(content1,content2)
+        contactDialog?.setContent(content1, content2)
         contactDialog?.show()
         lifecycleScope.launch {
             delay(10000)

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

@@ -87,7 +87,7 @@ class GlobalService :LifecycleService() {
 //        globalServiceViewModel.scheduleDailyAlarmWithWorkManager(this@GlobalService);
         //初始化 支付的串口通讯
         initPayIctMdb()
-        showTipsDialog("通电初次初始化中...")//是否开机
+        showTipsDialog(UiUtil.getStringRes(R.string.initializing))//是否开机
         observeLiveData(globalServiceViewModel.initIsSuccess,::initIsSuccess)
         observeLiveData(globalServiceViewModel.alarmType,::getAlarmType)
 
@@ -97,7 +97,7 @@ class GlobalService :LifecycleService() {
         //是否初始化成功，如果成功，提前结束，如果失败，什么都不做。
         if (initIsSuccess) {
             sbcInitDialog?.dismiss()
-            ToastUtil.switchToastStyleToSuccess("通电初始化成功。")
+            ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.init_success))
             globalServiceViewModel.threadGlobalParam.stopInit()
             //初始化成功，则可以开始读取心跳了。
             globalServiceViewModel.startHeartbeat()
@@ -110,14 +110,14 @@ class GlobalService :LifecycleService() {
         Log.d(TAG, "getAlarmType: "+s)
         if (s!="00"&& Heartbeat.isAlarm){
             when(s){
-                "01"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_01))
-                "02"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_02))
-                "03"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_03))
-                "04"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_04))
-                "05"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_05))
-                "06"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_06))
-                "07"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_07))
-                "08"->showWarringDialog(UiUtil.getStringRes(R.string.alarm_message_08))
+                "01"->showWarringDialog("No.1 "+UiUtil.getStringRes(R.string.alarm_message_01))
+                "02"->showWarringDialog("No.2 "+UiUtil.getStringRes(R.string.alarm_message_02))
+                "03"->showWarringDialog("No.3 "+UiUtil.getStringRes(R.string.alarm_message_03))
+                "04"->showWarringDialog("No.4 "+UiUtil.getStringRes(R.string.alarm_message_04))
+                "05"->showWarringDialog("No.5 "+UiUtil.getStringRes(R.string.alarm_message_05))
+                "06"->showWarringDialog("No.6 "+UiUtil.getStringRes(R.string.alarm_message_06))
+                "07"->showWarringDialog("No.7 "+UiUtil.getStringRes(R.string.alarm_message_07))
+                "08"->showWarringDialog("No.8 "+UiUtil.getStringRes(R.string.alarm_message_08))
                 else->{}
             }
         }
@@ -174,8 +174,8 @@ class GlobalService :LifecycleService() {
                         sbcInitDialog?.dismiss()
                         globalServiceViewModel.threadGlobalParam.stopInit()
                         //判断初始化失败
-                        ToastUtil.switchToastStyleToError("通电初始化失败。")
-                        showWarringDialog("通电初始化失败")
+                        ToastUtil.switchToastStyleToError(UiUtil.getStringRes(R.string.init_fail))
+                        showWarringDialog("No.0 "+UiUtil.getStringRes(R.string.init_fail))
                     }
                     else -> {}
                 }
@@ -218,6 +218,7 @@ class GlobalService :LifecycleService() {
         }
         warringDialog?.setCanceledOnTouchOutside(false)
         warringDialog?.setContent(content)
+        warringDialog?.setContacts()
         warringDialog?.show()
     }
 

module_home/src/main/java/com/quyunshuo/module/home/utils/RemotePushUtil.kt

@@ -362,8 +362,8 @@ class RemotePushUtil @Inject constructor() {
             val contactsName: String = data.substring(0, data.lastIndexOf(":"))
             Log.d(TAG, "savePhone1: " + contactsName)
             Log.d(TAG, "savePhone2: " + contactsWay)
-            SpUtils.putString(MMKVName.CONTACTS_WAY, contactsWay)
-            SpUtils.putString(MMKVName.CONTACTS_NAME, contactsName)
+            SpUtils.putString(MMKVName.CONTACT_WAY, contactsWay)
+            SpUtils.putString(MMKVName.CONTACT, contactsName)
         }
 
 

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

@@ -19,7 +19,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="联系信息"
+            android:text="@string/contact_message"
             android:textColor="@color/home_colorOrange"
             android:textSize="72sp"
             android:layout_marginTop="100dp"

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

@@ -19,7 +19,7 @@
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="购物车"
+            android:text="@string/shopping_cart"
             android:textColor="#576478"
             android:layout_marginTop="30dp"
             android:textSize="32sp"
@@ -37,7 +37,7 @@
             android:layout_marginTop="20dp"
             android:layout_marginRight="20dp"
             android:textSize="30sp"
-            android:text="取消"
+            android:text="@string/home_cancle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -50,7 +50,7 @@
             android:textSize="30sp"
             android:layout_marginTop="20dp"
             android:background="@null"
-            android:text="清空"
+            android:text="@string/clear"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -63,7 +63,7 @@
             android:textColor="@color/white"
             android:background="@drawable/home_rectangle_blue_background"
             android:textSize="30sp"
-            android:text="去付款"
+            android:text="@string/go_pay"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 

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

@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
-            android:text="报警提醒"
+            android:text="@string/warn_reminder"
             android:textSize="42sp"
             android:textColor="#576478"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="10dp"
-        android:text="联系人"
+        android:text="@string/contact"
         android:textColor="#8f4d7d"
         android:textSize="52sp"
         android:textStyle="bold"
@@ -40,7 +40,7 @@
         android:id="@+id/tv_contact_way"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="联系方式"
+        android:text="@string/contact_way"
         android:textColor="#E45DBF"
         android:textSize="52sp"
         android:textStyle="bold"

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

@@ -142,7 +142,7 @@
         android:layout_marginRight="50dp"
         android:background="@drawable/home_rectangle_t_blue_background"
         android:gravity="center"
-        android:text="联系\n方式"
+        android:text="@string/contact_details"
         android:textColor="@color/black"
         android:textSize="40sp"
         android:textStyle="bold"
@@ -164,7 +164,8 @@
         app:layout_constraintGuide_percent="0.98" />
 
     <LinearLayout
-        android:layout_width="950dp"
+        android:layout_width="wrap_content"
+        android:minWidth="950dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="100dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -181,7 +182,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="已投纸币: "
+                android:text="@string/have_banknotes"
                 android:textColor="@color/black"
                 android:textSize="50sp"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -189,6 +190,7 @@
             <TextView
                 android:id="@+id/tv_aacpe_bill"
                 android:layout_width="wrap_content"
+                android:gravity="center"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:text="0.00"
@@ -207,7 +209,7 @@
                 android:id="@+id/tv_aacpe_coin_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="已投硬币: "
+                android:text="@string/have_coin"
                 android:textColor="@color/black"
                 android:textSize="50sp"
                 app:layout_constraintBottom_toTopOf="@+id/tv_aacpe_coin"
@@ -270,7 +272,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="20dp"
             android:gravity="center_vertical"
-            android:text="未选择"
+            android:text="@string/not_selected"
             android:textColor="#d4237a"
             android:textSize="50sp"
             app:layout_constraintBottom_toBottomOf="@+id/iv_shopping_trolley"
@@ -284,7 +286,7 @@
             android:layout_centerVertical="true"
             android:background="@drawable/home_pay_bg"
             android:gravity="center"
-            android:text="去付款"
+            android:text="@string/go_pay"
             android:textColor="@color/white"
             android:textSize="80sp"
             android:textStyle="bold"

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

@@ -10,7 +10,7 @@
         android:id="@+id/tv_title"
         android:layout_width="1800dp"
         android:layout_height="wrap_content"
-        android:text="设备休眠中"
+        android:text="@string/device_sleep"
         android:gravity="center"
         android:textColor="@color/white"
         android:textSize="100sp"

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

@@ -52,7 +52,7 @@
             android:layout_marginRight="20dp"
             android:background="@drawable/backstage_shape_other_select_red"
             android:gravity="center"
-            android:text="删除"
+            android:text="@string/delete"
             android:textColor="@color/white"
             android:textSize="34sp"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -16,31 +16,31 @@ import com.quyunshuo.androidbaseframemvvm.common.util.AmountMoney
  * mmkvName：保存key
  */
 enum class OtherEnum(var nameId:Int,var nameS:String,var category:String,var default:Any,var type:Int,var mmkvName: String) {
-    CONTACT_WAY(R.string.contact_way,"联系方式","系统设置","123456", 2,MMKVName.CONTACT_WAY),
-    CONTACT(R.string.contact,"联系名字","系统设置","联系人", 2,MMKVName.CONTACT),
-    AUTO_START_HOTSPOT(R.string.auto_start_hotspot,"开启自启热点","系统设置",false,1, MMKVName.AUTO_START_HOTSPOT),
-    NAME_HOTSPOT(R.string.name_hotspot,"热点名称","系统设置","sunzee",2, MMKVName.NAME_HOTSPOT),
-    PWD_HOTSPOT(R.string.pwd_hotspot,"热点密码","系统设置","66666666",2, MMKVName.PWD_HOTSPOT),
+    CONTACT_WAY(R.string.contact_way,"联系方式","系统设置","123456", 7,MMKVName.CONTACT_WAY),
+    CONTACT(R.string.contact,"联系名字","系统设置","联系人", 7,MMKVName.CONTACT),
+//    AUTO_START_HOTSPOT(R.string.auto_start_hotspot,"开启自启热点","系统设置",false,1, MMKVName.AUTO_START_HOTSPOT),
+//    NAME_HOTSPOT(R.string.name_hotspot,"热点名称","系统设置","sunzee",2, MMKVName.NAME_HOTSPOT),
+//    PWD_HOTSPOT(R.string.pwd_hotspot,"热点密码","系统设置","66666666",2, MMKVName.PWD_HOTSPOT),
     LONG_CLICK_SHOW_STATUS_BAR(R.string.long_click_show_status_bar,"登录页长按显示状态栏","系统设置",true,1, MMKVName.LONG_CLICK_SHOW_STATUS_BAR),
     VOLUME(R.string.volume,"音量","系统设置",true,4, MMKVName.VOLUME),
     LUMINANCE(R.string.luminance, "亮度", "系统设置", true, 4, MMKVName.LUMINANCE),
 //    SIM(R.string.sim, "SIM", "系统设置", "", 5, MMKVName.SIM),
 //    SIM_IMEI(R.string.sim_imei, "SIM IMEI", "系统设置", "", 5, MMKVName.SIM_IMEI),
     CUT_SYSTEM_SET(R.string.cut_system_set, "切换系统设置", "系统设置", "", 6, MMKVName.CUT_SYSTEM_SET),
-    WIFI_HOTSPOT(R.string.wifi_hotspot, "Wifi热点", "系统设置", false, 1, MMKVName.WIFI_HOTSPOT),
+//    WIFI_HOTSPOT(R.string.wifi_hotspot, "Wifi热点", "系统设置", false, 1, MMKVName.WIFI_HOTSPOT),
 
 
     AGREEMENT(R.string.agreement,"通讯协议","串口设置", PayAgreementUtil.MDB_ICT, 3,MMKVName.ICT),//ArrayList<String>(listOf("MDB","ICT","WMDB"))
     CHANGE(R.string.change,"找零功能","找零设置",false, 1,MMKVName.CHANGE),
     //    BILL_COUNTRY(R.string.bill_country,"国家纸币选择","串口设置",ArrayList<String>(listOf("MDB","ICT")), 3,MMKVName.BILL_COUNTRY),
     NAYAX_MODE(R.string.nayax_mode,"Nayax闲置模式","串口设置",false,1,MMKVName.NAYAX_MODE),
-    TTYS_NAYAX(R.string.ttys_nayax,"Nayax 串口","串口设置","ttyS3",2,MMKVName.TTYS_NAYAX),
-    TTYS_MDB(R.string.ttys_mdb,"MDB 串口","串口设置","ttyS5",2,MMKVName.TTYS_MDB),
-    TTYS_PLC(R.string.ttys_plc,"PLC 串口","串口设置","ttyS7",2,MMKVName.TTYS_PLC),
+    TTYS_NAYAX(R.string.ttys_nayax,"Nayax 串口","串口设置","ttyS3",7,MMKVName.TTYS_NAYAX),
+    TTYS_MDB(R.string.ttys_mdb,"MDB 串口","串口设置","ttyS5",7,MMKVName.TTYS_MDB),
+    TTYS_PLC(R.string.ttys_plc,"PLC 串口","串口设置","ttyS7",7,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_RATE(R.string.mdb_rate,"MDB 倍率","串口设置","100",2,MMKVName.MDB_RATE),
-    CARD_TEXT(R.string.card_text,"指引消费者刷卡文本","串口设置","",2,MMKVName.CARD_TEXT),
+    CARD_TEXT(R.string.card_text,"指引消费者刷卡文本","串口设置","",7,MMKVName.CARD_TEXT),
     BILL_TRUST(R.string.bill_trust,"纸币托管","串口设置",false,1,MMKVName.BILL_TRUST),
     MDB_CASH_SALE(R.string.mdb_cash_sale,"MDB Cash Sale","串口设置",true,1,MMKVName.MDB_CASH_SALE),
 
@@ -51,7 +51,7 @@ enum class OtherEnum(var nameId:Int,var nameS:String,var category:String,var def
     //提示没有退币功能。
     AD_RULE(R.string.ad_rule,"广告规则","其他",true, 1,MMKVName.AD_RULE),
     AUTO_RETURN_HOME(R.string.auto_return_home,"自动返回首页(分钟)","其他","10", 2,MMKVName.AUTO_RETURN_HOME),
-    SLEEP_TEXT(R.string.sleep_text,"休眠中文本","其他","", 2,MMKVName.SLEEP_TEXT),
+    SLEEP_TEXT(R.string.sleep_text,"休眠中文本","其他","", 7,MMKVName.SLEEP_TEXT),
     LOGO_TEXT(R.string.logo_text,"图标变更","其他","7777", 2,MMKVName.LOGO_TEXT),
 
 
@@ -60,16 +60,16 @@ enum class OtherEnum(var nameId:Int,var nameS:String,var category:String,var def
     TWO_PRICE_DISCOUNT(R.string.two_price_discount,"第二件折扣","购物车设置","10", 2,MMKVName.TWO_PRICE_DISCOUNT),
     THREE_PRICE_DISCOUNT(R.string.three_price_discount,"第三件折扣","购物车设置","10", 2,MMKVName.THREE_PRICE_DISCOUNT),
     FIVE_PRICE_DISCOUNT(R.string.five_price_discount,"第五件折扣","购物车设置","10", 2,MMKVName.FIVE_PRICE_DISCOUNT),
-    TIPS_DISCOUNT_TEXT(R.string.tips_discount_text,"折扣提示文本","购物车设置","", 2,MMKVName.TIPS_DISCOUNT_TEXT),
+    TIPS_DISCOUNT_TEXT(R.string.tips_discount_text,"折扣提示文本","购物车设置","", 7,MMKVName.TIPS_DISCOUNT_TEXT),
     DISCOUNT_FUNCTION(R.string.discount_function,"折扣功能","找零设置",false, 1,MMKVName.DISCOUNT_FUNCTION),
 
     CHANGE_FUNCTION(R.string.change_function,"找零功能","找零设置",false, 1,MMKVName.CHANGE_FUNCTION),
     CHANGE_BILL(R.string.change_bill,"找零纸币","找零设置",false, 1,MMKVName.CHANGE_BILL),
     CHANGE_COIN(R.string.change_coin,"找零硬币","找零设置",false, 1,MMKVName.CHANGE_COIN),
-    //找零类型
     CHANGE_DOLLAR(R.string.change_dollar,"币值设置(一枚硬币等于的金额)","找零设置","1", 2,MMKVName.CHANGE_DOLLAR),
     CHANGE_COIN_REP(R.string.change_coin_rep,"找零硬币库存","找零设置","200", 2,MMKVName.CHANGE_COIN_REP),
     CHANGE_ALLOW_NUMBER(R.string.change_allow_number,"允许一次找零个数","找零设置","7", 2,MMKVName.CHANGE_ALLOW_NUMBER),
     CHANGE_WARNING_NUMBER(R.string.change_warning_number,"找零预警库存","找零设置","100", 2,MMKVName.CHANGE_WARNING_NUMBER),
-
+    COIN_MULTIPLY(R.string.coin_multiply,"硬币脉冲相乘","找零设置","1", 2,MMKVName.COIN_PULSE_MULTIPLY),
+    COIN_DIVIDE(R.string.coin_divide,"硬币脉冲相除","找零设置","1", 2,MMKVName.COIN_PULSE_DIVIDE),
 }