8寸卡尔竖屏主机优化

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/adapter/FrameRoomBedAdapter.java

@@ -43,7 +43,7 @@ public class FrameRoomBedAdapter extends RecyclerView.Adapter<FrameRoomBedAdapte
 
     @Override
     public MyHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = null;
+        View view;
         //如果是房间，则使用房间布局文件来构建holder，内容也如此
         if(viewType == TYPE_ROOM) {
             view = LayoutInflater.from(context).inflate(R.layout.adapter_room_item, parent, false);

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/DoctorHostFragment.kt

@@ -102,9 +102,16 @@ class DoctorHostFragment: BaseFragment<DoctorHostPresenter, FragmentDoctorHostBi
     override fun showDoctorDevices(devices: ArrayList<DeviceDO>) {
         doctor_host_refresh.finishRefresh()
 
-        doctorHostAdapter!!.data.clear()
-        doctorHostAdapter!!.data.addAll(devices)
-        doctorHostAdapter!!.notifyDataSetChanged()
+        if (devices.size > 0) {
+            doctorHostAdapter!!.data.clear()
+            for (doctorDevice in devices) {
+                if (doctorDevice.id != Constants.ids) {
+                    doctorHostAdapter!!.data.add(doctorDevice)
+                }
+            }
+
+            doctorHostAdapter!!.notifyDataSetChanged()
+        }
     }
     /**
      *处理错误信息

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -135,7 +135,11 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
                 bedItemClick(it)
             }
 
-            listView.layoutManager = GridLayoutManager(this.activity, 3)
+            if (BuildConfig.APP_DEVICE_TYPE == "zj_s8_w_ke_1") {
+                listView.layoutManager = GridLayoutManager(this.activity, 2)
+            } else {
+                listView.layoutManager = GridLayoutManager(this.activity, 3)
+            }
             listView.adapter = roomAdapter
 
             val space = DisplayUtils.dp2px(this.activity, 4f).toInt()

android_host/src/main/h10_wke_1h/res/layout/activity_nurse_home.xml

@@ -8,16 +8,17 @@
             <RelativeLayout
                 android:id="@+id/title_relayout"
                 android:layout_width="match_parent"
-                android:layout_height="48dp">
+                android:layout_height="60dp">
 
                 <!--SIP状态图标-->
                 <TextView
                     android:id="@+id/view_title_layout_tv_point"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:layout_marginLeft="10dp"
+                    android:textSize="16sp"
                     android:textColor="@color/text_room_color"
                     android:background="@color/red_color"/>
 
@@ -30,7 +31,7 @@
                     android:gravity="center"
                     android:text="----"
                     android:textColor="#2F9DF1"
-                    android:textSize="22sp" />
+                    android:textSize="28sp" />
 
                 <TextClock
                     android:layout_width="wrap_content"
@@ -40,7 +41,7 @@
                     android:format12Hour="yyyy-MM-dd HH:mm EEEE"
                     android:format24Hour="yyyy-MM-dd HH:mm EEEE"
                     android:textColor="#2F9DF1"
-                    android:textSize="22sp" />
+                    android:textSize="24sp" />
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
@@ -78,7 +79,7 @@
                             android:layout_marginRight="16dp"
                             android:text="ID: --"
                             android:textColor="#2F9DF1"
-                            android:textSize="20sp"/>
+                            android:textSize="22sp"/>
 
                         <ImageView
                             android:id="@+id/battery_state_img"
@@ -161,7 +162,7 @@
             <LinearLayout
                 android:id="@+id/bottom_linlyout"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
+                android:layout_height="80dp"
                 android:layout_alignParentBottom="true"
                 android:background="#2F9DF1"
                 android:orientation="horizontal">
@@ -183,11 +184,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/shou_ye_no"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_home"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/broadcast_radio_bt"
@@ -196,11 +197,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/guang_bo"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_broadcast"
-                            android:textSize="24sp"
+                            android:textSize="30sp"
                             android:visibility="gone"/>
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -213,7 +214,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="@string/str_visiting"
-                            android:textSize="16sp"
+                            android:textSize="30sp"
                             android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -223,11 +224,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/ic_doctor"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_doctor"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/inpatient_ward_radio_bt"
@@ -239,7 +240,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="@string/str_ward"
-                            android:textSize="16sp"
+                            android:textSize="30sp"
                             android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -252,7 +253,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="@string/str_sick_bed"
-                            android:textSize="16sp"
+                            android:textSize="30sp"
                             android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -262,11 +263,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/selt_move_icon"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_mobile"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/other_host_radio_bt"
@@ -275,11 +276,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/selt_other_host_icon"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_other_host"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/collocation_radio_bt"
@@ -288,11 +289,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/selt_other_host_icon"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_trusteeship"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/led_settings_radio_bt"
@@ -301,11 +302,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/selt_set_icon"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_led"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <com.wdkl.ncs.android.lib.widget.BadgeRadioButton
                             android:id="@+id/nb_device_radio_bt"
@@ -314,11 +315,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/ic_nb_iot_device"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_nb_iot"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/note_message_radio_bt"
@@ -331,7 +332,7 @@
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_note_message"
-                            android:textSize="24sp"
+                            android:textSize="30sp"
                             android:visibility="gone"/>
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -341,11 +342,11 @@
                             android:layout_weight="1"
                             android:button="@null"
                             android:drawableLeft="@drawable/selt_set_icon"
-                            android:drawablePadding="10px"
+                            android:drawablePadding="10dp"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="@string/str_settings"
-                            android:textSize="24sp" />
+                            android:textSize="30sp" />
 
                         <TextView
                             android:layout_width="0dp"
@@ -394,7 +395,7 @@
                 android:layout_height="wrap_content"
                 android:text="IP:"
                 android:textColor="@color/black"
-                android:textSize="20sp" />
+                android:textSize="26sp" />
 
             <TextView
                 android:id="@+id/home_view_local_mac"
@@ -402,7 +403,7 @@
                 android:layout_height="wrap_content"
                 android:text="MAC:"
                 android:textColor="@color/black"
-                android:textSize="20sp" />
+                android:textSize="26sp" />
 
             <TextView
                 android:id="@+id/home_view_local_imei"
@@ -410,7 +411,7 @@
                 android:layout_height="wrap_content"
                 android:text="IMEI:"
                 android:textColor="@color/black"
-                android:textSize="20sp" />
+                android:textSize="26sp" />
 
             <TextView
                 android:id="@+id/home_view_app_version"
@@ -418,7 +419,7 @@
                 android:layout_height="wrap_content"
                 android:text="App version:"
                 android:textColor="@color/black"
-                android:textSize="20sp" />
+                android:textSize="26sp" />
 
             <TextView
                 android:id="@+id/home_view_mcu_version"
@@ -427,7 +428,7 @@
                 android:layout_marginTop="10dp"
                 android:text="MCU:"
                 android:textColor="@color/black"
-                android:textSize="20sp"
+                android:textSize="26sp"
                 android:visibility="gone"/>
 
             <TextView
@@ -436,7 +437,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:textColor="@color/black"
-                android:textSize="20sp" />
+                android:textSize="26sp" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -450,7 +451,7 @@
                     android:padding="4dp"
                     android:background="?attr/buttonBgImage"
                     android:text="@string/register_auto_config"
-                    android:textSize="20sp"
+                    android:textSize="24sp"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:maxLines="2"
                     android:ellipsize="end"
@@ -466,7 +467,7 @@
                     android:layout_toRightOf="@+id/btn_get_server"
                     android:background="?attr/buttonBgImage"
                     android:text="Debug"
-                    android:textSize="20sp"
+                    android:textSize="24sp"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:maxLines="2"
                     android:ellipsize="end"
@@ -481,7 +482,7 @@
                     android:layout_toRightOf="@+id/btn_set_debug"
                     android:background="?attr/buttonBgImage"
                     android:text="@string/language_settings"
-                    android:textSize="20sp"
+                    android:textSize="24sp"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:maxLines="2"
                     android:ellipsize="end"
@@ -496,7 +497,7 @@
                     android:layout_toRightOf="@+id/btn_set_language"
                     android:background="?attr/buttonBgImage"
                     android:text="@string/server_config"
-                    android:textSize="20sp"
+                    android:textSize="24sp"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:maxLines="2"
                     android:ellipsize="end"
@@ -512,7 +513,7 @@
                     android:layout_below="@+id/btn_set_debug"
                     android:background="?attr/buttonBgImage"
                     android:text="@string/register_reload"
-                    android:textSize="20sp"
+                    android:textSize="24sp"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:maxLines="2"
                     android:ellipsize="end"
@@ -529,7 +530,7 @@
                     android:layout_toRightOf="@+id/home_view_btn_reload"
                     android:background="?attr/buttonBgImage"
                     android:text="@string/register_reboot"
-                    android:textSize="20sp"
+                    android:textSize="24sp"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:maxLines="2"
                     android:ellipsize="end"
@@ -546,7 +547,7 @@
                     android:layout_toRightOf="@+id/btn_reboot"
                     android:background="?attr/buttonBgImage"
                     android:text="@string/register_test"
-                    android:textSize="20sp"
+                    android:textSize="24sp"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:maxLines="2"
                     android:ellipsize="end"

android_host/src/main/h10_wke_1h/res/layout/adapter_call_records_item.xml

@@ -3,7 +3,7 @@
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="96dp"
+        android:layout_height="112dp"
         android:background="#ffffff"
         android:layout_marginTop="6dp"
         android:paddingTop="4dp"
@@ -48,7 +48,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text=""
-                    android:textSize="20sp"
+                    android:textSize="26sp"
                     android:singleLine="true"
                     android:ellipsize="end"/>
 
@@ -58,7 +58,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:text=""
-                    android:textSize="12sp"
+                    android:textSize="20sp"
                     android:visibility="gone"/>
 
             </RelativeLayout>
@@ -77,7 +77,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text=""
-                    android:textSize="20sp"
+                    android:textSize="26sp"
                     android:singleLine="true"
                     android:ellipsize="end"/>
 
@@ -99,7 +99,7 @@
                     android:padding="4dp"
                     android:layout_alignParentRight="true"
                     android:background="@drawable/sp_event_unhandled_bg"
-                    android:textSize="16sp"
+                    android:textSize="22sp"
                     android:text="@string/call_record_unhandled"/>
 
                 <LinearLayout
@@ -128,7 +128,7 @@
                         android:singleLine="true"
                         android:text=""
                         android:background="@drawable/sp_event_handled"
-                        android:textSize="16sp" />
+                        android:textSize="22sp" />
 
                     <ImageView
                         android:id="@+id/play_tv"
@@ -155,7 +155,7 @@
                     android:layout_marginRight="10dp"
                     android:textColor="#3490de"
                     android:text=""
-                    android:textSize="16sp"
+                    android:textSize="22sp"
                     android:visibility="gone"/>
 
                 <TextView
@@ -164,7 +164,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="#F78B8F"
                     android:text=""
-                    android:textSize="16sp" />
+                    android:textSize="22sp" />
             </LinearLayout>
         </RelativeLayout>
     </RelativeLayout>

android_host/src/main/h10_wke_1h/res/layout/adapter_doctor_host.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="140dp"
+      android:layout_width="match_parent"
       android:layout_height="100dp"
       android:padding="10dp"
       android:background="@drawable/item_selector">
@@ -20,7 +20,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="10dp"
         android:text="--"
-        android:textSize="24sp" />
+        android:textSize="28sp" />
 
   </LinearLayout>
 </layout>

android_host/src/main/h10_wke_1h/res/layout/adapter_hospital_frame_part.xml

@@ -4,14 +4,14 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/rl_bed_info"
         android:layout_width="match_parent"
-        android:layout_height="112dp"
+        android:layout_height="132dp"
         android:background="@drawable/item_selector"
         android:padding="4dp">
 
         <LinearLayout
             android:id="@+id/rl_nurse_item"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="28dp"
             android:layout_alignParentBottom="true">
             <TextView
                 android:id="@+id/tv_nurse_config_name"
@@ -22,7 +22,7 @@
                 android:ellipsize="end"
                 android:text="--"
                 android:textColor="@color/gray_deep"
-                android:textSize="14sp"/>
+                android:textSize="20sp"/>
 
             <TextView
                 android:id="@+id/tv_nurse_config_color"
@@ -34,7 +34,7 @@
                 android:ellipsize="end"
                 android:background="@color/color_gray"
                 android:textColor="@color/color_white"
-                android:textSize="12sp" />
+                android:textSize="20sp" />
 
         </LinearLayout>
 
@@ -56,7 +56,7 @@
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:text="--"
-                    android:textSize="18sp"
+                    android:textSize="26sp"
                     android:textColor="#2F9DF1"/>
 
                 <TextView
@@ -68,7 +68,7 @@
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:textColor="@color/color_white"
-                    android:textSize="16sp" />
+                    android:textSize="26sp" />
 
             </LinearLayout>
 
@@ -94,7 +94,7 @@
                     android:paddingLeft="6dp"
                     android:singleLine="true"
                     android:text="--"
-                    android:textSize="20sp"
+                    android:textSize="28sp"
                     android:textColor="@color/black"/>
 
                 <TextView
@@ -105,7 +105,7 @@
                     android:layout_marginTop="10dp"
                     android:gravity="center"
                     android:text="--"
-                    android:textSize="16sp"
+                    android:textSize="26sp"
                     android:textColor="@color/black"/>
 
                 <ImageView

android_host/src/main/h10_wke_1h/res/layout/adapter_mobile_device.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="140dp"
+        android:layout_width="match_parent"
         android:layout_height="100dp"
         android:padding="10dp"
         android:background="@drawable/item_selector">
@@ -20,7 +20,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:text="--"
-            android:textSize="24sp" />
+            android:textSize="28sp" />
 
     </LinearLayout>
 </layout>

android_host/src/main/h10_wke_1h/res/layout/adapter_other_host.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="140dp"
-        android:layout_height="100dp"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
         android:padding="10dp"
         android:background="@drawable/item_selector">
 
@@ -20,7 +20,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:text="--"
-            android:textSize="20sp" />
+            android:textSize="28sp" />
 
     </LinearLayout>
 </layout>

android_host/src/main/h10_wke_1h/res/layout/adapter_responsibility_bed.xml

@@ -11,6 +11,6 @@
             android:background="@drawable/responsible_bed_bg"
             android:gravity="center"
             android:text=""
-            android:textSize="16sp" />
+            android:textSize="22sp" />
     </LinearLayout>
 </layout>

android_host/src/main/h10_wke_1h/res/layout/adapter_room_item.xml

@@ -9,8 +9,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="--"
-            android:textSize="24sp"
-            android:textColor="@color/main_color" />
+            android:textSize="32sp"
+            android:textColor="?attr/roomColor" />
 
     </LinearLayout>
 </layout>

android_host/src/main/h10_wke_1h/res/layout/fragment_call_records.xml

@@ -9,7 +9,7 @@
         <LinearLayout
             android:id="@+id/button_linlyout"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="54dp"
             android:layout_marginTop="10dp"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
@@ -30,7 +30,7 @@
                     android:layout_marginTop="8dp"
                     android:singleLine="true"
                     android:text="@string/str_call"
-                    android:textSize="22sp" />
+                    android:textSize="26sp" />
 
                 <ImageView
                     android:id="@+id/calling_imagev"
@@ -52,7 +52,7 @@
                     android:gravity="center"
                     android:background="@drawable/shape_untreated_quantity"
                     android:text="9+"
-                    android:textSize="14sp"
+                    android:textSize="18sp"
                     android:textStyle="bold"
                     android:visibility="gone"/>
 
@@ -73,7 +73,7 @@
                     android:layout_marginTop="8dp"
                     android:singleLine="true"
                     android:text="@string/str_missed_call"
-                    android:textSize="22sp" />
+                    android:textSize="26sp" />
                 <ImageView
                     android:id="@+id/no_answer_calls_imagev"
                     android:layout_width="12dp"
@@ -110,7 +110,7 @@
                     android:layout_marginTop="8dp"
                     android:singleLine="true"
                     android:text="@string/str_all_call"
-                    android:textSize="22sp" />
+                    android:textSize="26sp" />
                 <ImageView
                     android:id="@+id/call_records_imagev"
                     android:layout_width="12dp"

android_host/src/main/h10_wke_1h/res/layout/fragment_doctor_host.xml

@@ -2,13 +2,14 @@
 <layout xmlns:bind="http://schemas.android.com/apk/res-auto">
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/doctor_host_refresh"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.74"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="8"
             bind:srlEnableLoadMore="false"
             bind:srlEnableRefresh="true">
 
@@ -21,9 +22,9 @@
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
         <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.26"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="2"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="6dp"
             android:layout_marginRight="6dp">
@@ -35,9 +36,11 @@
                 android:layout_alignParentBottom="true"
                 android:padding="16dp"
                 android:gravity="center"
-                android:paddingLeft="40dp"
-                android:drawableLeft="@drawable/ic_call_out"
-                android:background="#2584CC"
+                android:paddingLeft="10dp"
+                android:drawableLeft="@drawable/ic_voice_call"
+                android:background="#F3F9FE"
+                android:singleLine="true"
+                android:ellipsize="end"
                 android:textSize="28sp"
                 android:text="@string/str_call"
                 android:textColor="@drawable/selector_action_button_text_color"/>
@@ -56,7 +59,7 @@
                     android:padding="4dp"
                     android:gravity="center"
                     android:text="--"
-                    android:textSize="24sp"
+                    android:textSize="28sp"
                     android:textColor="#2F9DF1"/>
 
             </LinearLayout>

android_host/src/main/h10_wke_1h/res/layout/fragment_frame_part.xml

@@ -6,15 +6,16 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#EAF2F9"
-        android:baselineAligned="false">
+        android:baselineAligned="false"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginBottom="8dp"
-            android:layout_weight="0.74"
+            android:layout_weight="6"
             android:orientation="vertical">
 
             <ViewFlipper
@@ -72,10 +73,11 @@
         </LinearLayout>
 
         <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginRight="6dp"
-            android:layout_weight="0.26">
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="4">
 
             <include
                 android:id="@+id/right_incident_relyout"

android_host/src/main/h10_wke_1h/res/layout/fragment_nurse_move.xml

@@ -3,15 +3,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:background="#EAF2F9">
 
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/nurse_mobile_refresh"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="0.74"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="7"
         bind:srlEnableLoadMore="false"
         bind:srlEnableRefresh="true">
 
@@ -24,9 +24,9 @@
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
     <RelativeLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="0.26"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="3"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="6dp"
         android:layout_marginRight="6dp">
@@ -38,13 +38,16 @@
             android:layout_alignParentBottom="true"
             android:padding="16dp"
             android:gravity="center"
-            android:paddingLeft="40dp"
-            android:drawableLeft="@drawable/ic_call_out"
-            android:background="#2584CC"
+            android:paddingLeft="10dp"
+            android:drawableLeft="@drawable/ic_voice_call"
+            android:background="#F3F9FE"
+            android:singleLine="true"
+            android:ellipsize="end"
             android:textSize="28sp"
             android:text="@string/str_call"
             android:textColor="@drawable/selector_action_button_text_color"/>
 
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -59,7 +62,7 @@
                 android:padding="4dp"
                 android:gravity="center"
                 android:text="@string/responsible_bed"
-                android:textSize="24sp"
+                android:textSize="28sp"
                 android:textColor="#2F9DF1"/>
 
             <android.support.v7.widget.RecyclerView

android_host/src/main/h10_wke_1h/res/layout/fragment_other_host.xml

@@ -1,87 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:bind="http://schemas.android.com/apk/res-auto">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.22"
-            android:padding="10dp"
-            android:background="#EAF2F9">
-
-            <RadioGroup
-                android:id="@+id/group_host"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <RadioButton
-                    android:id="@+id/rb_other_host"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="20dp"
-                    android:background="@drawable/selector_button_bg_color"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="@string/str_other_host"
-                    android:textSize="24sp"/>
-
-                <RadioButton
-                    android:id="@+id/rb_manager_host"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="20dp"
-                    android:background="@drawable/selector_button_bg_color"
-                    android:button="@null"
-                    android:gravity="center"
-                    android:text="@string/str_manager_host"
-                    android:textSize="24sp"/>
-            </RadioGroup>
-        </LinearLayout>
-
-        <com.scwang.smartrefresh.layout.SmartRefreshLayout
-            android:id="@+id/other_host_refresh"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.52"
-            bind:srlEnableLoadMore="false"
-            bind:srlEnableRefresh="false">
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/rv_other_host"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="#EAF2F9"
-                android:padding="10dp"/>
-
-        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
         <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:id="@+id/rl_bottom_view"
+            android:layout_width="match_parent"
+            android:layout_height="160dp"
             android:layout_marginTop="10dp"
             android:layout_marginRight="6dp"
             android:layout_marginBottom="6dp"
-            android:layout_weight="0.26">
+            android:layout_alignParentBottom="true">
 
             <TextView
                 android:id="@+id/call_other_host"
                 android:layout_width="match_parent"
                 android:layout_height="72dp"
                 android:layout_alignParentBottom="true"
-                android:background="#2584CC"
-                android:drawableLeft="@drawable/ic_call_out"
-                android:gravity="center"
                 android:padding="16dp"
-                android:paddingLeft="40dp"
+                android:gravity="center"
+                android:paddingLeft="10dp"
+                android:drawableLeft="@drawable/ic_voice_call"
+                android:background="#F3F9FE"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textSize="28sp"
                 android:text="@string/str_call"
-                android:textColor="@drawable/selector_action_button_text_color"
-                android:textSize="28sp" />
+                android:textColor="@drawable/selector_action_button_text_color"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -104,6 +51,70 @@
 
         </RelativeLayout>
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/rl_bottom_view">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="3"
+                android:background="#EAF2F9"
+                android:padding="10dp">
+
+                <RadioGroup
+                    android:id="@+id/group_host"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <RadioButton
+                        android:id="@+id/rb_other_host"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/selector_button_bg_color"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="20dp"
+                        android:text="@string/str_other_host"
+                        android:textSize="28sp" />
+
+                    <RadioButton
+                        android:id="@+id/rb_manager_host"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:background="@drawable/selector_button_bg_color"
+                        android:button="@null"
+                        android:gravity="center"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="20dp"
+                        android:text="@string/str_manager_host"
+                        android:textSize="28sp" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/other_host_refresh"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="7"
+                bind:srlEnableLoadMore="false"
+                bind:srlEnableRefresh="false">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rv_other_host"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#EAF2F9"
+                    android:padding="10dp" />
+
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
 
 </layout>

android_host/src/main/h10_wke_1h/res/layout/right_basic_information.xml

@@ -47,7 +47,8 @@
                 android:ellipsize="end"
                 android:textSize="28sp"
                 android:text="@string/video_call"
-                android:textColor="@drawable/selector_action_button_text_color"/>
+                android:textColor="@drawable/selector_action_button_text_color"
+                android:visibility="gone"/>
         </LinearLayout>
 
         <LinearLayout
@@ -78,7 +79,7 @@
                     android:ellipsize="end"
                     android:textColor="@drawable/selt_call_records_text"
                     android:text="@string/basic_info"
-                    android:textSize="18sp" />
+                    android:textSize="26sp" />
 
                 <RadioButton
                     android:id="@+id/fee_radio"
@@ -93,7 +94,7 @@
                     android:ellipsize="end"
                     android:textColor="@drawable/selt_call_records_text"
                     android:text="@string/fees_info"
-                    android:textSize="18sp" />
+                    android:textSize="26sp" />
 
                 <RadioButton
                     android:id="@+id/exam_radio"
@@ -108,320 +109,325 @@
                     android:ellipsize="end"
                     android:textColor="@drawable/selt_call_records_text"
                     android:text="@string/inspection_info"
-                    android:textSize="18sp" />
+                    android:textSize="26sp" />
             </RadioGroup>
 
-            <RelativeLayout
-                android:id="@+id/rl_basic_info"
+            <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="6dp"
                 android:background="#ffffff">
 
-                <ImageView
-                    android:id="@+id/head_portrait_imagev"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
-                    android:src="@drawable/kong_chuang" />
-
-                <TextView
-                    android:id="@+id/roomNumber"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_toRightOf="@+id/head_portrait_imagev"
-                    android:text="--"
-                    android:textColor="#2F9DF1"
-                    android:textSize="20sp" />
-
-                <!--<RelativeLayout
-                    android:id="@+id/basic_information_relalyou"
+                <RelativeLayout
+                    android:id="@+id/rl_basic_info"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10px"
-                    android:layout_marginRight="10px"
-                    android:layout_marginLeft="10px"
-                    android:layout_toRightOf="@+id/head_portrait_imagev">
+                    android:layout_height="wrap_content">
 
-                    <TextView
-                        android:id="@+id/name_tv"
+                    <ImageView
+                        android:id="@+id/head_portrait_imagev"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8px"
-                        android:text="-&#45;&#45;"
-                        android:textSize="16sp"
-                        android:textColor="#0D0D0D"/>
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="10dp"
+                        android:src="@drawable/kong_chuang" />
 
                     <TextView
                         android:id="@+id/roomNumber"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:text="&#45;&#45;"
-                        android:textColor="#2F9DF1"
-                        android:textSize="14sp" />
-
-                </RelativeLayout>-->
-
-                <LinearLayout
-                    android:id="@+id/custom_information_linlayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/roomNumber"
-                    android:layout_alignLeft="@+id/roomNumber"
-                    android:layout_marginTop="6dp">
-
-                    <TextView
-                        android:id="@+id/name_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:singleLine="true"
-                        android:text="---"
-                        android:textSize="20sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <ImageView
-                        android:id="@+id/gender_imagev"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:layout_gravity="center_vertical" />
-
-                    <TextView
-                        android:id="@+id/age_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        android:gravity="center"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="6dp"
+                        android:layout_toRightOf="@+id/head_portrait_imagev"
                         android:text="--"
-                        android:textColor="#B4B4B4"
-                        android:textSize="18sp" />
-
-                </LinearLayout>
-
-                <RelativeLayout
-                    android:id="@+id/time_relalyout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:layout_below="@+id/custom_information_linlayout"
-                    android:layout_marginTop="20dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/indate"
-                        android:textSize="18sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <TextView
-                        android:id="@+id/time_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginLeft="8dp"
-                        android:text="----"
-                        android:textColor="#B4B4B4"
-                        android:textSize="16sp" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/phone_relalyout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:layout_marginRight="10dp"
-                    android:layout_below="@+id/time_relalyout"
-                    android:layout_marginTop="8dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/mobile"
-                        android:textSize="18sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="2dp"
-                        android:layout_centerVertical="true"
-                        android:layout_toLeftOf="@+id/mobile_tv"
-                        android:src="@drawable/dian_hua" />
+                        android:textColor="#2F9DF1"
+                        android:textSize="24sp" />
 
-                    <TextView
-                        android:id="@+id/mobile_tv"
-                        android:layout_width="wrap_content"
+                    <!--<RelativeLayout
+                        android:id="@+id/basic_information_relalyou"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/empty"
-                        android:textColor="#B4B4B4"
-                        android:textSize="16sp" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/doctor_duty_relalyout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:layout_below="@+id/phone_relalyout"
-                    android:layout_marginTop="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/tv_doctor_title"
-                        android:layout_width="wrap_content"
+                        android:layout_marginTop="10px"
+                        android:layout_marginRight="10px"
+                        android:layout_marginLeft="10px"
+                        android:layout_toRightOf="@+id/head_portrait_imagev">
+
+                        <TextView
+                            android:id="@+id/name_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8px"
+                            android:text="-&#45;&#45;"
+                            android:textSize="16sp"
+                            android:textColor="#0D0D0D"/>
+
+                        <TextView
+                            android:id="@+id/roomNumber"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:text="&#45;&#45;"
+                            android:textColor="#2F9DF1"
+                            android:textSize="14sp" />
+
+                    </RelativeLayout>-->
+
+                    <LinearLayout
+                        android:id="@+id/custom_information_linlayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/duty_doctor"
-                        android:textSize="18sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <TextView
-                        android:id="@+id/tv_doctor_name"
-                        android:layout_width="wrap_content"
+                        android:layout_below="@+id/roomNumber"
+                        android:layout_alignLeft="@+id/roomNumber"
+                        android:layout_marginTop="6dp">
+
+                        <TextView
+                            android:id="@+id/name_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="5"
+                            android:singleLine="true"
+                            android:text="---"
+                            android:textColor="#0D0D0D"
+                            android:textSize="26sp" />
+
+                        <ImageView
+                            android:id="@+id/gender_imagev"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="4dp"
+                            android:layout_marginRight="4dp"
+                            android:layout_gravity="center_vertical" />
+
+                        <TextView
+                            android:id="@+id/age_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:text="--"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </LinearLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/time_relalyout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginLeft="8dp"
-                        android:text="----"
-                        android:textColor="#B4B4B4"
-                        android:textSize="16sp" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/nurse_duty_relalyout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:layout_below="@+id/doctor_duty_relalyout"
-                    android:layout_marginTop="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/tv_nurse_title"
-                        android:layout_width="wrap_content"
+                        android:layout_below="@+id/custom_information_linlayout"
+                        android:layout_marginTop="20dp"
+                        android:layout_marginRight="10dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/indate"
+                            android:textColor="#0D0D0D"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/time_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginLeft="8dp"
+                            android:text="----"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/phone_relalyout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/duty_nurse"
-                        android:textSize="18sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <TextView
-                        android:id="@+id/tv_nurse_name"
-                        android:layout_width="wrap_content"
+                        android:layout_below="@+id/time_relalyout"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="10dp"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/mobile"
+                            android:textColor="#0D0D0D"
+                            android:textSize="24sp" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginRight="2dp"
+                            android:layout_toLeftOf="@+id/mobile_tv"
+                            android:src="@drawable/dian_hua" />
+
+                        <TextView
+                            android:id="@+id/mobile_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/empty"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/doctor_duty_relalyout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginLeft="8dp"
-                        android:text="----"
-                        android:textColor="#B4B4B4"
-                        android:textSize="16sp" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/nurse_config_relalyout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
-                    android:layout_below="@+id/nurse_duty_relalyout"
-                    android:layout_marginTop="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/tv_nurse_config_title"
-                        android:layout_width="wrap_content"
+                        android:layout_below="@+id/phone_relalyout"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="10dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/tv_doctor_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/duty_doctor"
+                            android:textColor="#0D0D0D"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/tv_doctor_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginLeft="8dp"
+                            android:text="----"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/nurse_duty_relalyout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/nursing_configs"
-                        android:textSize="18sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <TextView
-                        android:id="@+id/tv_nurse_config"
-                        android:layout_width="wrap_content"
-                        android:layout_height="100dp"
-                        android:layout_below="@id/tv_nurse_config_title"
-                        android:layout_marginLeft="8dp"
-                        android:text="----"
-                        android:textColor="#B4B4B4"
-                        android:textSize="16sp" />
-
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:id="@+id/advice_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/nurse_config_relalyout"
-                    android:layout_marginTop="4dp"
-                    android:paddingTop="4dp"
-                    android:background="#F3F9FE"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_below="@+id/doctor_duty_relalyout"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="10dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/tv_nurse_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/duty_nurse"
+                            android:textColor="#0D0D0D"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/tv_nurse_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginLeft="8dp"
+                            android:text="----"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/nurse_config_relalyout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/orders"
-                        android:textSize="18sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <TextView
-                        android:id="@+id/tv_advice_info"
+                        android:layout_below="@+id/nurse_duty_relalyout"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="10dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/tv_nurse_config_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/nursing_configs"
+                            android:textColor="#0D0D0D"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/tv_nurse_config"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_nurse_config_title"
+                            android:layout_marginLeft="8dp"
+                            android:text="----"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </RelativeLayout>
+
+                    <LinearLayout
+                        android:id="@+id/advice_layout"
                         android:layout_width="match_parent"
-                        android:layout_height="64dp"
-                        android:layout_marginLeft="8dp"
-                        android:scrollbars="vertical"
-                        android:fadeScrollbars="true"
-                        android:text="----"
-                        android:textColor="#B4B4B4"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/illness_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/advice_layout"
-                    android:layout_marginTop="8dp"
-                    android:paddingTop="4dp"
-                    android:background="#F3F9FE"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:text="@string/illness"
-                        android:textSize="18sp"
-                        android:textColor="#0D0D0D"/>
-
-                    <TextView
-                        android:id="@+id/tv_illness_info"
+                        android:layout_below="@+id/nurse_config_relalyout"
+                        android:layout_marginTop="4dp"
+                        android:background="#F3F9FE"
+                        android:orientation="vertical"
+                        android:paddingTop="4dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/orders"
+                            android:textColor="#0D0D0D"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/tv_advice_info"
+                            android:layout_width="match_parent"
+                            android:layout_height="64dp"
+                            android:layout_marginLeft="8dp"
+                            android:fadeScrollbars="true"
+                            android:scrollbars="vertical"
+                            android:text="----"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/illness_layout"
                         android:layout_width="match_parent"
-                        android:layout_height="64dp"
-                        android:layout_marginLeft="8dp"
-                        android:scrollbars="vertical"
-                        android:fadeScrollbars="true"
-                        android:text="----"
-                        android:textColor="#B4B4B4"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-            </RelativeLayout>
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/advice_layout"
+                        android:layout_marginTop="8dp"
+                        android:background="#F3F9FE"
+                        android:orientation="vertical"
+                        android:paddingTop="4dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:text="@string/illness"
+                            android:textColor="#0D0D0D"
+                            android:textSize="24sp" />
+
+                        <TextView
+                            android:id="@+id/tv_illness_info"
+                            android:layout_width="match_parent"
+                            android:layout_height="64dp"
+                            android:layout_marginLeft="8dp"
+                            android:fadeScrollbars="true"
+                            android:scrollbars="vertical"
+                            android:text="----"
+                            android:textColor="#B4B4B4"
+                            android:textSize="22sp" />
+
+                    </LinearLayout>
+                </RelativeLayout>
+            </ScrollView>
 
             <LinearLayout
                 android:id="@+id/ll_fee_config"

middleware/src/main/code/com/wdkl/ncs/android/middleware/helper/SoundPoolManager.java

@@ -33,7 +33,7 @@ public class SoundPoolManager {
         if(Build.VERSION.SDK_INT > 21){
             SoundPool.Builder builder = new SoundPool.Builder();
             //传入音频数量
-            builder.setMaxStreams(5);
+            builder.setMaxStreams(7);
             //AudioAttributes是一个封装音频各种属性的方法
             AudioAttributes.Builder attrBuilder = new AudioAttributes.Builder();
             //设置音频流的合适的属性
@@ -42,7 +42,7 @@ public class SoundPoolManager {
             builder.setAudioAttributes(attrBuilder.build());
             soundPool = builder.build();
         }else{
-            soundPool = new SoundPool(5, AudioManager.STREAM_MUSIC, 0);
+            soundPool = new SoundPool(7, AudioManager.STREAM_MUSIC, 0);
         }
 
         //来电