修复竖屏设备进入设备配置界面崩溃问题

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/DeviceSystemActivity.kt

@@ -135,7 +135,7 @@ class DeviceSystemActivity : BaseActivity<BedTextActivityPresenter, CallingbedDe
             finish()
         }
 
-        device_sys_group_sip.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { group, checkedId ->
+        device_sys_group_language.setOnCheckedChangeListener(RadioGroup.OnCheckedChangeListener { group, checkedId ->
             if (checkedId == R.id.device_sys_radio_language_on) {
                 SettingConfigNew.setLanguageMode(activity, 0)
             } else {

callingdoor/src/main/res/layout-land/callingbed_device_sys.xml

@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="#F7F7F7">
+        android:background="#F7F7F7"
+        android:orientation="vertical">
 
         <include
             android:id="@+id/activity_calling_door_layout_title"
             layout="@layout/view_title_layout" />
 
-
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:id="@+id/ll_device_config_view"
                 android:layout_width="@dimen/d450"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d30"
+                android:layout_marginRight="@dimen/d24"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
@@ -36,13 +35,12 @@
                         android:id="@+id/nurse_msg_tx_1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d18"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginTop="@dimen/d18"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -55,35 +53,31 @@
 
                 </LinearLayout>
 
-
                 <Spinner
                     android:id="@+id/device_sys_ed_1"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d52"
-                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginLeft="@dimen/d40"
                     android:layout_marginTop="@dimen/d40"
+                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginBottom="@dimen/d40"
                     android:background="@drawable/shape_device_sys_ed_bg"
-                    android:gravity="center_vertical"
                     android:entries="@array/device_list"
-
-                    />
+                    android:gravity="center_vertical" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/ll_device_config_view_2"
-                android:layout_below="@+id/ll_device_config_view"
                 android:layout_width="@dimen/d450"
                 android:layout_height="wrap_content"
+                android:layout_below="@+id/ll_device_config_view"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d30"
+                android:layout_marginRight="@dimen/d24"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -91,13 +85,12 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d18"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginTop="@dimen/d18"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -114,16 +107,15 @@
                     android:id="@+id/device_sys_ed_2"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d52"
-                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginLeft="@dimen/d40"
                     android:layout_marginTop="@dimen/d40"
+                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginBottom="@dimen/d40"
                     android:background="@drawable/shape_device_sys_ed_bg"
-                    android:gravity="center_vertical"
                     android:entries="@array/language_list"
+                    android:gravity="center_vertical"
                     android:textSize="@dimen/font_size_18"
-                    android:textStyle="bold"
-                    />
+                    android:textStyle="bold" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -132,12 +124,11 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -150,7 +141,7 @@
                 </LinearLayout>
 
                 <RadioGroup
-                    android:id="@+id/device_sys_group_sip"
+                    android:id="@+id/device_sys_group_language"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/d24"
@@ -162,44 +153,41 @@
                         android:id="@+id/device_sys_radio_language_on"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_yes"
-                        android:textColor="@drawable/radio_button_selector_txt2"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg2"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_yes"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:textSize="14sp" />
 
                     <RadioButton
                         android:id="@+id/device_sys_radio_language_off"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_no"
-                        android:textColor="@drawable/radio_button_selector_txt2"
                         android:layout_marginLeft="@dimen/d10"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg2"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_no"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:textSize="14sp" />
                 </RadioGroup>
 
 
-
-
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/ll_device_config_view_3"
-                android:layout_toRightOf="@+id/ll_device_config_view"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d180"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d30"
+                android:layout_marginRight="@dimen/d24"
+                android:layout_toRightOf="@+id/ll_device_config_view"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -207,13 +195,12 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d18"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginTop="@dimen/d18"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -239,25 +226,26 @@
                         android:id="@+id/device_sys_radio_window_on"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_device_sys_window_on"
-                        android:textColor="@drawable/radio_button_selector_txt2"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg2"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_device_sys_window_on"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:textSize="14sp" />
 
                     <RadioButton
                         android:id="@+id/device_sys_radio_window_off"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_device_sys_window_off"
-                        android:textColor="@drawable/radio_button_selector_txt2"
                         android:layout_marginLeft="@dimen/d10"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg2"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_device_sys_window_off"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:textSize="14sp" />
                 </RadioGroup>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -265,12 +253,11 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -295,39 +282,35 @@
                         android:id="@+id/device_huli_time_on"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_yes"
-                        android:textColor="@drawable/radio_button_selector_txt2"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg2"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_yes"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:textSize="14sp" />
 
                     <RadioButton
                         android:id="@+id/device_huli_time_off"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_no"
-                        android:textColor="@drawable/radio_button_selector_txt2"
                         android:layout_marginLeft="@dimen/d10"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg2"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_no"
+                        android:textColor="@drawable/radio_button_selector_txt2"
+                        android:textSize="14sp" />
                 </RadioGroup>
 
-
-
             </LinearLayout>
 
-
-
             <LinearLayout
-                android:layout_below="@+id/ll_device_config_view_3"
-                android:layout_toRightOf="@+id/ll_device_config_view_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_below="@+id/ll_device_config_view_3"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="10dp"
+                android:layout_toRightOf="@+id/ll_device_config_view_2"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -337,76 +320,71 @@
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
                     android:layout_marginRight="@dimen/d24"
-                    android:gravity="center_vertical"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_bao"
-                    android:paddingLeft="@dimen/d200"
                     android:drawablePadding="@dimen/d15"
-                    android:background="@drawable/shape_bed_bg"
-                    android:textStyle="bold"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d200"
                     android:text="@string/save_settings"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/device_sys_language_settings_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
-                    android:layout_marginRight="@dimen/d24"
                     android:layout_marginTop="@dimen/d15"
-                    android:gravity="center_vertical"
+                    android:layout_marginRight="@dimen/d24"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_yu"
                     android:drawablePadding="@dimen/d15"
+                    android:gravity="center_vertical"
                     android:paddingLeft="@dimen/d200"
-                    android:background="@drawable/shape_bed_bg"
-                    android:textStyle="bold"
                     android:text="@string/call_config"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/device_sys_system_settings_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
-                    android:layout_marginRight="@dimen/d24"
                     android:layout_marginTop="@dimen/d15"
-                    android:gravity="center_vertical"
+                    android:layout_marginRight="@dimen/d24"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_xi"
-                    android:paddingLeft="@dimen/d200"
                     android:drawablePadding="@dimen/d15"
-                    android:background="@drawable/shape_bed_bg"
-                    android:textStyle="bold"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d200"
                     android:text="@string/system_settings"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
-
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/device_sys_software_and_information_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
-                    android:layout_marginRight="@dimen/d24"
                     android:layout_marginTop="15dp"
-                    android:gravity="center_vertical"
+                    android:layout_marginRight="@dimen/d24"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_guan"
-                    android:paddingLeft="@dimen/d200"
                     android:drawablePadding="@dimen/d15"
-                    android:background="@drawable/shape_bed_bg"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d200"
                     android:text="@string/str_about"
-                    android:textStyle="bold"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
-
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
             </LinearLayout>
 
-
-
         </RelativeLayout>
 
-
     </LinearLayout>
 
 </layout>

callingdoor/src/main/res/layout/callingbed_device_sys.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="#F7F7F7">
+        android:background="#F7F7F7"
+        android:orientation="vertical">
 
         <include
             android:id="@+id/activity_calling_door_layout_title"
             layout="@layout/view_title_layout" />
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -21,13 +21,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d30"
+                android:layout_marginRight="@dimen/d24"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -36,13 +35,12 @@
                         android:id="@+id/nurse_msg_tx_1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d18"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginTop="@dimen/d18"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -55,22 +53,20 @@
 
                 </LinearLayout>
 
-
                 <Spinner
                     android:id="@+id/device_sys_ed_1"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d52"
-                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginLeft="@dimen/d40"
                     android:layout_marginTop="@dimen/d40"
+                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginBottom="@dimen/d40"
                     android:background="@drawable/shape_device_sys_ed_bg"
+                    android:entries="@array/language_list"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/d26"
-                    android:entries="@array/language_list"
                     android:textSize="@dimen/font_size_18"
-                    android:textStyle="bold"
-                    />
+                    android:textStyle="bold" />
 
             </LinearLayout>
 
@@ -78,13 +74,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d30"
+                android:layout_marginRight="@dimen/d24"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -92,13 +87,12 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
+                        android:layout_marginTop="@dimen/d18"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginTop="@dimen/d18"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -110,21 +104,21 @@
                         android:textStyle="bold" />
 
                 </LinearLayout>
+
                 <Spinner
                     android:id="@+id/device_sys_ed_2"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d52"
-                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginLeft="@dimen/d40"
                     android:layout_marginTop="@dimen/d40"
+                    android:layout_marginRight="@dimen/d40"
                     android:layout_marginBottom="@dimen/d40"
                     android:background="@drawable/shape_device_sys_ed_bg"
+                    android:entries="@array/language_list"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/d26"
-                    android:entries="@array/language_list"
                     android:textSize="@dimen/font_size_18"
-                    android:textStyle="bold"
-                    />
+                    android:textStyle="bold" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -133,12 +127,11 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -151,7 +144,7 @@
                 </LinearLayout>
 
                 <RadioGroup
-                    android:id="@+id/device_sys_group_sip"
+                    android:id="@+id/device_sys_group_language"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/d24"
@@ -160,61 +153,55 @@
                     android:orientation="horizontal">
 
                     <RadioButton
-                        android:id="@+id/device_sys_radio_sip_on"
+                        android:id="@+id/device_sys_radio_language_on"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_yes"
-                        android:textColor="@drawable/radio_button_selector_txt"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_yes"
+                        android:textColor="@drawable/radio_button_selector_txt"
+                        android:textSize="14sp" />
 
                     <RadioButton
-                        android:id="@+id/device_sys_radio_sip_off"
+                        android:id="@+id/device_sys_radio_language_off"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/str_no"
-                        android:textColor="@drawable/radio_button_selector_txt"
                         android:layout_marginLeft="@dimen/d10"
                         android:button="@null"
                         android:drawableLeft="@drawable/radio_button_selector_bg"
                         android:drawablePadding="@dimen/d5"
-                        android:textSize="14px" />
+                        android:text="@string/str_no"
+                        android:textColor="@drawable/radio_button_selector_txt"
+                        android:textSize="14sp" />
                 </RadioGroup>
 
-
-
-
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d30"
+                android:layout_marginRight="@dimen/d24"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
                     android:layout_marginTop="@dimen/d20"
-                    >
+                    android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -228,55 +215,51 @@
                         android:id="@+id/device_sys_group_window"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d24"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/d24"
                         android:orientation="horizontal">
 
                         <RadioButton
                             android:id="@+id/device_sys_radio_window_on"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/str_device_sys_window_on"
-                            android:textColor="@drawable/radio_button_selector_txt"
                             android:button="@null"
                             android:drawableLeft="@drawable/radio_button_selector_bg"
                             android:drawablePadding="@dimen/d5"
-                            android:textSize="14px" />
+                            android:text="@string/str_device_sys_window_on"
+                            android:textColor="@drawable/radio_button_selector_txt"
+                            android:textSize="14sp" />
 
                         <RadioButton
                             android:id="@+id/device_sys_radio_window_off"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/str_device_sys_window_off"
-                            android:textColor="@drawable/radio_button_selector_txt"
                             android:layout_marginLeft="@dimen/d10"
                             android:button="@null"
                             android:drawableLeft="@drawable/radio_button_selector_bg"
                             android:drawablePadding="@dimen/d5"
-                            android:textSize="14px" />
+                            android:text="@string/str_device_sys_window_off"
+                            android:textColor="@drawable/radio_button_selector_txt"
+                            android:textSize="14sp" />
                     </RadioGroup>
 
                 </LinearLayout>
 
-
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
                     android:layout_marginTop="@dimen/d20"
                     android:layout_marginBottom="@dimen/d20"
-                    >
+                    android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d28"
                         android:text="*"
-                        android:textSize="@dimen/font_size_18"
                         android:textColor="@color/txt_number"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="@dimen/d28"
-                        />
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -290,38 +273,35 @@
                         android:id="@+id/device_huli_group_time"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/d24"
                         android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/d24"
                         android:orientation="horizontal">
 
                         <RadioButton
                             android:id="@+id/device_huli_time_on"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/str_yes"
-                            android:textColor="@drawable/radio_button_selector_txt2"
                             android:button="@null"
                             android:drawableLeft="@drawable/radio_button_selector_bg2"
                             android:drawablePadding="@dimen/d5"
-                            android:textSize="14px" />
+                            android:text="@string/str_yes"
+                            android:textColor="@drawable/radio_button_selector_txt2"
+                            android:textSize="14sp" />
 
                         <RadioButton
                             android:id="@+id/device_huli_time_off"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/str_no"
-                            android:textColor="@drawable/radio_button_selector_txt2"
                             android:layout_marginLeft="@dimen/d10"
                             android:button="@null"
                             android:drawableLeft="@drawable/radio_button_selector_bg2"
                             android:drawablePadding="@dimen/d5"
-                            android:textSize="14px" />
+                            android:text="@string/str_no"
+                            android:textColor="@drawable/radio_button_selector_txt2"
+                            android:textSize="14sp" />
                     </RadioGroup>
                 </LinearLayout>
 
-
-
-
             </LinearLayout>
 
             <LinearLayout
@@ -338,76 +318,71 @@
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
                     android:layout_marginRight="@dimen/d24"
-                    android:gravity="center_vertical"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_bao"
-                    android:paddingLeft="@dimen/d200"
                     android:drawablePadding="@dimen/d15"
-                    android:background="@drawable/shape_bed_bg"
-                    android:textStyle="bold"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d200"
                     android:text="@string/save_settings"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/device_sys_language_settings_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
-                    android:layout_marginRight="@dimen/d24"
                     android:layout_marginTop="@dimen/d15"
-                    android:gravity="center_vertical"
+                    android:layout_marginRight="@dimen/d24"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_yu"
                     android:drawablePadding="@dimen/d15"
+                    android:gravity="center_vertical"
                     android:paddingLeft="@dimen/d200"
-                    android:background="@drawable/shape_bed_bg"
-                    android:textStyle="bold"
                     android:text="@string/language_settings"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/device_sys_system_settings_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
-                    android:layout_marginRight="@dimen/d24"
                     android:layout_marginTop="@dimen/d15"
-                    android:gravity="center_vertical"
+                    android:layout_marginRight="@dimen/d24"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_xi"
-                    android:paddingLeft="@dimen/d200"
                     android:drawablePadding="@dimen/d15"
-                    android:background="@drawable/shape_bed_bg"
-                    android:textStyle="bold"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d200"
                     android:text="@string/system_settings"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
-
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/device_sys_software_and_information_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
-                    android:layout_marginRight="@dimen/d24"
                     android:layout_marginTop="15dp"
-                    android:gravity="center_vertical"
+                    android:layout_marginRight="@dimen/d24"
+                    android:background="@drawable/shape_bed_bg"
                     android:drawableLeft="@mipmap/kssz_guan"
-                    android:paddingLeft="@dimen/d200"
                     android:drawablePadding="@dimen/d15"
-                    android:background="@drawable/shape_bed_bg"
-                    android:text="关于主机"
-                    android:textStyle="bold"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="@dimen/d200"
+                    android:text="@string/str_about"
                     android:textColor="#000000"
-                    android:textSize="18sp" />
-
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
             </LinearLayout>
 
-
-
         </LinearLayout>
 
-
     </LinearLayout>
 
 </layout>

resource/src/main/res/values-zh/strings.xml

@@ -221,7 +221,7 @@
     <string name="plugin_start_error">升级服务插件启动失败</string>
 
     <string name="your_card_number">您的卡号 :</string>
-    <string name="str_about">关于主机</string>
+    <string name="str_about">关于本机</string>
 
     <string name="bluetooth_connect_failed">蓝牙连接失败</string>
     <string name="bluetooth_connect_success">蓝牙连接成功</string>