测试模式中增加功能板按键键值显示

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivationActivity.kt

@@ -738,6 +738,9 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
             } else if (status=="@") {
                 EventBus.getDefault().post(MessageEvent("sos_cancel", Constant.EVENT_SERIAL_TEST))
             }
+
+            EventBus.getDefault().post(MessageEvent(status, Constant.EVENT_SERIAL_TEST_VALUE))
+
             return
         }
         if (status==">") {

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -1603,13 +1603,14 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
                 //卫生间按键 需要同时发送命令开灯
                 EventBus.getDefault().post(MessageEvent("button8", Constant.EVENT_SERIAL_TEST))
             }
+
+            EventBus.getDefault().post(MessageEvent(status, Constant.EVENT_SERIAL_TEST_VALUE))
+
             return
         }
         setButtonType(status)
     }
-    /**
-     * 设置 按钮功能
-     * */
+
     /**
      * 设置 按钮功能
      */

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedDormitoryActivity.kt

@@ -1003,6 +1003,9 @@ class CallingbedDormitoryActivity :BaseActivity<BedCallingbedActivityPresenter,
             } else if (status=="@") {
                 EventBus.getDefault().post(MessageEvent("sos_cancel", Constant.EVENT_SERIAL_TEST))
             }
+
+            EventBus.getDefault().post(MessageEvent(status, Constant.EVENT_SERIAL_TEST_VALUE))
+
             return
         }
         setButtonType(status)

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/TextActivity.kt

@@ -283,52 +283,54 @@ class TextActivity : BaseActivity<BedTextActivityPresenter, CallingbedTestMainBi
         if (Constant.EVENT_SERIAL_TEST == messageEvent.type) {
             val message = messageEvent.message as String
             Log.d("serialPortBedOnclick", "面板按键: " + message)
-           if (message == "call1" || message == "dch_mb_zy"|| message == "button3") {
-               //面版增援/呼叫按键
-               mbhj_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               mbh_img.visibility=View.VISIBLE
-           }else if(message == "call_sos"){
-               //紧急按钮
-               SerialPortHelper.setSosLight("2")
-               sos_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               sos_img.visibility=View.VISIBLE
-           }else if(message == "sos_cancel"){
-               //紧急按钮
-               SerialPortHelper.setSosLight("0")
-               sos_no_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               sos_no_img.visibility=View.VISIBLE
-           }else if(message == "call2"|| message == "dch_sb_h"|| message == "button1"){
-               //手柄按键或者呼叫
-               text_sbaj_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               sbaj_img.visibility=View.VISIBLE
-           }else if(message == "call_end"|| message == "button4"){
-               //面板挂断
-               mbhjqx_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               mbhjjqx_img.visibility=View.VISIBLE
-           }else if(message == "dch_sb_q"|| message == "button2"){
-               //手柄取消
-               text_sbqx_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               sbqx_img.visibility=View.VISIBLE
-           }else if(message == "bo"){
-               //手柄取消
-               lycs_button.setCompoundDrawablesWithIntrinsicBounds(R.mipmap.bo, 0, 0, 0)
-               lycs_button.setText(R.string.str_record_playing)
-           }else if(message == "bo_w"){
-               //手柄取消
-               lycs_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               lycs_button.setText(R.string.str_record_play_complete)
-               lycs_img.visibility=View.VISIBLE
-           }else if(message == "lu"){
-               lycs_button.setText(R.string.str_recording)
-           }else if(message == "Loar") {
-               //loar信号
-               loar_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
-               loar_img.visibility = View.VISIBLE
-           }
-
-           }else if (Constant.EVENT_FINISHh == messageEvent.type){
-            finish()
-
+            if (message == "call1" || message == "dch_mb_zy" || message == "button3") {
+                //面版增援/呼叫按键
+                mbhj_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                mbh_img.visibility = View.VISIBLE
+            } else if (message == "call_sos") {
+                //紧急按钮
+                SerialPortHelper.setSosLight("2")
+                sos_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                sos_img.visibility = View.VISIBLE
+            } else if (message == "sos_cancel") {
+                //紧急按钮
+                SerialPortHelper.setSosLight("0")
+                sos_no_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                sos_no_img.visibility = View.VISIBLE
+            } else if (message == "call2" || message == "dch_sb_h" || message == "button1") {
+                //手柄按键或者呼叫
+                text_sbaj_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                sbaj_img.visibility = View.VISIBLE
+            } else if (message == "call_end" || message == "button4") {
+                //面板挂断
+                mbhjqx_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                mbhjjqx_img.visibility = View.VISIBLE
+            } else if (message == "dch_sb_q" || message == "button2") {
+                //手柄取消
+                text_sbqx_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                sbqx_img.visibility = View.VISIBLE
+            } else if (message == "bo") {
+                //手柄取消
+                lycs_button.setCompoundDrawablesWithIntrinsicBounds(R.mipmap.bo, 0, 0, 0)
+                lycs_button.setText(R.string.str_record_playing)
+            } else if (message == "bo_w") {
+                //手柄取消
+                lycs_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                lycs_button.setText(R.string.str_record_play_complete)
+                lycs_img.visibility = View.VISIBLE
+            } else if (message == "lu") {
+                lycs_button.setText(R.string.str_recording)
+            } else if (message == "Loar") {
+                //loar信号
+                loar_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+                loar_img.visibility = View.VISIBLE
+            }
+        } else if (Constant.EVENT_SERIAL_TEST_VALUE == messageEvent.type) {
+            val keyValue = messageEvent.message as String
+            tv_serial_key_value.setText(keyValue)
+            //showMessage("serial key value: $keyValue")
+        } else if (Constant.EVENT_FINISHh == messageEvent.type){
+               finish()
         }
     }
 

android_bed/src/main/res/layout-land/callingbed_test_main.xml

@@ -10,7 +10,6 @@
             android:id="@+id/activity_calling_door_layout_title"
             layout="@layout/view_title_layout" />
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -77,19 +76,44 @@
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="Key value"
+                        android:textColor="#369890"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tv_serial_key_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:gravity="center"
+                        android:textColor="#D81B60"
+                        android:textSize="@dimen/font_size_22"
+                        android:textStyle="bold" />
+                </LinearLayout>
 
             </LinearLayout>
 
             <ScrollView
                 android:layout_width="@dimen/d491"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/d10"
+                android:layout_marginBottom="@dimen/d20"
+                android:layout_marginLeft="@dimen/d16"
+                android:layout_marginRight="@dimen/d28">
+
                 <LinearLayout
-                    android:layout_width="@dimen/d491"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/d16"
-                    android:layout_marginTop="@dimen/d10"
-                    android:layout_marginRight="@dimen/d28"
-                    android:layout_marginBottom="@dimen/d20"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:background="@drawable/shape_bed_bg"
                     android:gravity="center_horizontal"
                     android:orientation="vertical">
@@ -221,9 +245,6 @@
                             android:visibility="invisible" />
                     </LinearLayout>
 
-
-
-
                     <LinearLayout
                         android:id="@+id/text_ll_5"
                         android:layout_width="match_parent"
@@ -277,7 +298,7 @@
                             android:visibility="invisible" />
                     </LinearLayout>
                     <LinearLayout
-                        android:id="@+id/text_ll_7"
+                        android:id="@+id/text_ll_6"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/d16"
@@ -309,7 +330,7 @@
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/text_ll_6"
+                        android:id="@+id/text_ll_7"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/d16"
@@ -367,11 +388,8 @@
                 </LinearLayout>
             </ScrollView>
 
-
-
         </LinearLayout>
 
-
     </LinearLayout>
 
 </layout>

android_bed/src/main/res/layout/callingbed_test_main.xml

@@ -1,10 +1,11 @@
 <?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"
@@ -22,8 +23,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d400"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d23"
+                android:layout_marginRight="@dimen/d24"
                 android:background="@drawable/shape_bed_bg"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
@@ -77,212 +78,325 @@
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="16sp" />
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="Key value"
+                        android:textColor="#369890"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tv_serial_key_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:gravity="center"
+                        android:textColor="#D81B60"
+                        android:textSize="@dimen/font_size_22"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
             </LinearLayout>
 
-            <LinearLayout
+            <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/d24"
-                android:layout_marginRight="@dimen/d24"
                 android:layout_marginTop="@dimen/d23"
-                android:layout_marginBottom="@dimen/d50"
-                android:background="@drawable/shape_bed_bg"
-                android:gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d20"
-                    android:gravity="center"
-                    android:text="@string/test_peripheral"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
-                    android:textStyle="bold" />
+                android:layout_marginRight="@dimen/d24"
+                android:layout_marginBottom="@dimen/d50">
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d7"
-                    android:gravity="center"
-                    android:text="@string/test_peripheral_connect_check"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_13" />
                 <LinearLayout
-                    android:id="@+id/text_ll_1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d23"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/text_sbaj_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                    android:background="@drawable/shape_bed_bg"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d20"
                         android:gravity="center"
-                        android:text="@string/test_handle_call_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/sbaj_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d23"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/text_sbqx_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:text="@string/test_peripheral"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d7"
                         android:gravity="center"
-                        android:text="@string/test_handle_cancel_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/sbqx_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_3"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/mbhj_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:text="@string/test_peripheral_connect_check"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_13" />
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d23"
                         android:gravity="center"
-                        android:text="@string/test_device_call_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/mbh_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_4"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/mbhjqx_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/text_sbaj_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_handle_call_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sbaj_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d23"
                         android:gravity="center"
-                        android:text="@string/test_device_cancel_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/mbhjjqx_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_5"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/sos_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/text_sbqx_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_handle_cancel_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sbqx_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_3"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
                         android:gravity="center"
-                        android:text="@string/test_sos_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/sos_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_6"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/lycs_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/mbhj_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_device_call_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/mbh_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_4"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/mbhjqx_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_device_cancel_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/mbhjjqx_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_5"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/sos_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_sos_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sos_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_9"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/sos_no_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="紧急取消按钮"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sos_no_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_6"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
                         android:clickable="true"
-                        android:drawableLeft="@mipmap/lu"
-                        android:drawablePadding="@dimen/d16"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="@dimen/d88"
-                        android:text="@string/test_mic_record"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/lycs_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/lycs_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:clickable="true"
+                            android:drawableLeft="@mipmap/lu"
+                            android:drawablePadding="@dimen/d16"
+                            android:gravity="center_vertical"
+                            android:paddingLeft="@dimen/d88"
+                            android:text="@string/test_mic_record"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/lycs_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_7"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:clickable="true"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/loar_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:text="loar信号测试"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/loar_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_8"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:clickable="true"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/others_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:text="其他测试"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/others_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
 
+                </LinearLayout>
 
-            </LinearLayout>
+            </ScrollView>
 
         </LinearLayout>
 
-
     </LinearLayout>
 
 </layout>

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -658,4 +658,5 @@ public class Constant {
 
     public static final int EVENT_WIFI_ENABLE = 0x221;
     public static final int EVENT_NETWORK_CHANGE = 0x222;
+    public static final int EVENT_SERIAL_TEST_VALUE = 0x223;
 }