UI调整，异常处理

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -271,8 +271,13 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
      */
     fun setSettingConfiguration(){
         //设置白昼起止时间
-        SettingConfig.setInitialDayTime(this,(SettingConfiguration.getInstance().dayStart).substring(0,5))
-        SettingConfig.setEndOfDay(this,(SettingConfiguration.getInstance().nightStart).substring(0,5))
+        if (SettingConfiguration.getInstance().dayStart != null) {
+            SettingConfig.setInitialDayTime(this, (SettingConfiguration.getInstance().dayStart).substring(0, 5))
+        }
+        if (SettingConfiguration.getInstance().nightStart != null) {
+            SettingConfig.setEndOfDay(this, (SettingConfiguration.getInstance().nightStart).substring(0, 5))
+        }
+
         //响铃次数 没做白昼区分
         SettingConfig.setCallNumber(this, SettingConfiguration.getInstance().dayRingTimes)
         //主机白天夜晚亮度设置
@@ -1124,10 +1129,10 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
                         LedHelper.updateLedInfo(interactionVO, true, true)
 
                         var sosName = interactionVO.fromFrameFullName.substringBefore("-")
-                        //如果分机绑定了紧急按钮则加上紧急按钮名称
+                        //如果分机绑定了紧急按钮则用紧急按钮名称
                         if (interactionVO.fromDeviceType == DeviceTypeEnum.EMERGENCY_BUTTON.value()
                             || interactionVO.fromDeviceType == DeviceTypeEnum.SIMULATE_EMERGENCY_BUTTON.value()) {
-                            sosName += interactionVO.fromDeviceName
+                            sosName = interactionVO.fromDeviceName
                         }
                         //语音
                         if (SettingConfig.getTtsMode(activity) == SettingConfig.TTS_OFF) {

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/adapter/CallRecordsItemAdapter.kt

@@ -18,6 +18,7 @@ import com.wdkl.ncs.android.middleware.model.vo.CallingHistoryVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
+import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import org.greenrobot.eventbus.EventBus
@@ -103,8 +104,9 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                     //紧急呼叫已处理: 因为紧急按钮是连接在某个分机上，所以收到的紧急呼叫信息会携带该分机的信息，实际需要显示的是该房间的信息
                     var roomNo = itemData.fromFrameFullName.substringBefore("-")
                     //如果分机绑定了紧急按钮则加上紧急按钮名称
-                    if (itemData.fromDeviceType == 21 || itemData.fromDeviceType == 13) {
-                        roomNo += itemData.fromDeviceName
+                    if (itemData.fromDeviceType == DeviceTypeEnum.EMERGENCY_BUTTON.value()
+                        || itemData.fromDeviceType == DeviceTypeEnum.SIMULATE_EMERGENCY_BUTTON.value()) {
+                        roomNo = itemData.fromDeviceName
                     }
                     binding.sickbedTv.text = roomNo
                     binding.nameTv.text = "紧急呼叫"
@@ -131,8 +133,9 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                     //紧急呼叫未处理
                     var roomNo = itemData.fromFrameFullName.substringBefore("-")
                     //如果分机绑定了紧急按钮则加上紧急按钮名称
-                    if (itemData.fromDeviceType == 21 || itemData.fromDeviceType == 13) {
-                        roomNo += itemData.fromDeviceName
+                    if (itemData.fromDeviceType == DeviceTypeEnum.EMERGENCY_BUTTON.value()
+                        || itemData.fromDeviceType == DeviceTypeEnum.SIMULATE_EMERGENCY_BUTTON.value()) {
+                        roomNo = itemData.fromDeviceName
                     }
                     binding.sickbedTv.text = roomNo
                     binding.nameTv.text = "紧急呼叫"

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/window/IncidentWindow.kt

@@ -209,7 +209,7 @@ class IncidentWindow(var contexts: Context) {
                 //如果分机绑定了紧急按钮则加上紧急按钮名称
                 if (interactionVO.fromDeviceType == DeviceTypeEnum.EMERGENCY_BUTTON.value()
                     || interactionVO.fromDeviceType == DeviceTypeEnum.SIMULATE_EMERGENCY_BUTTON.value()) {
-                    room += interactionVO.fromDeviceName
+                    room = interactionVO.fromDeviceName
                 }
                 /*if (interactionVO.createDate != null) {
                     binding.incidentTime.text =

nursehome/src/main/res/layout/adapter_call_records_item.xml

@@ -90,22 +90,23 @@
 
                 <TextView
                     android:id="@+id/call_sos_reply"
-                    android:layout_width="48dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
                     android:gravity="center"
                     android:layout_alignParentRight="true"
                     android:background="@drawable/sp_event_unhandled_bg"
-                    android:textSize="18sp"
+                    android:textSize="16sp"
                     android:text="未处理"/>
 
                 <TextView
                     android:id="@+id/state_text"
-                    android:layout_width="48dp"
-                    android:layout_height="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:layout_alignParentRight="true"
                     android:textSize="18sp"
-                    android:text="开门"/>
+                    android:text="开门" />
 
                 <LinearLayout
                     android:id="@+id/incident_linlyou"

nursehome/src/main/res/layout/adapter_event_list_item.xml

@@ -20,7 +20,7 @@
             android:id="@+id/name_tv"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
+            android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/head_imagev"
             android:gravity="center"
             android:text="SOS"

nursehome/src/main/res/layout/adapter_hospital_frame_part.xml

@@ -34,12 +34,22 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@id/rl_nurse_item"
-            android:paddingBottom="8dp"
-            android:paddingTop="8dp">
+            android:paddingBottom="4dp">
+
+            <TextView
+                android:id="@+id/room_number_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="-房"
+                android:textSize="18sp"
+                android:textColor="#2F9DF1"/>
+
             <ImageView
                 android:id="@+id/patient_imagev"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_below="@id/room_number_tv"
+                android:layout_marginTop="6dp"
                 android:src="@drawable/kong_chuang" />
 
             <TextView
@@ -47,40 +57,33 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@id/patient_imagev"
-                android:layout_marginLeft="4dp"
+                android:layout_below="@id/room_number_tv"
+                android:layout_marginTop="12dp"
+                android:layout_marginLeft="8dp"
                 android:text="--"
                 android:textSize="20sp"
                 android:textColor="@color/black"/>
 
-            <ImageView
-                android:id="@+id/sex_imagev"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/patient_imagev"
-                android:layout_below="@id/patient_name_tv"
-                android:layout_marginTop="6dp"
-                android:layout_marginLeft="4dp"
-                android:src="@drawable/nv" />
-
             <TextView
                 android:id="@+id/patient_age_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_toRightOf="@+id/sex_imagev"
-                android:layout_below="@id/patient_name_tv"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="6dp"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/room_number_tv"
+                android:layout_marginTop="16dp"
+                android:layout_marginRight="10dp"
                 android:text="--"
                 android:textSize="16sp" />
 
-            <TextView
-                android:id="@+id/room_number_tv"
+            <ImageView
+                android:id="@+id/sex_imagev"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="-房"
-                android:textSize="18sp"
-                android:textColor="#2F9DF1"/>
+                android:layout_toLeftOf="@id/patient_age_tv"
+                android:layout_below="@id/room_number_tv"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="4dp"
+                android:src="@drawable/nv" />
 
         </RelativeLayout>
 

nursehome/src/main/res/layout/window_incident.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="600dp"
+        android:layout_width="680dp"
         android:layout_height="360dp"
         android:background="@drawable/alert_window_bg">
 
         <TextView
             android:id="@+id/view_event_title"
-            android:layout_width="600dp"
+            android:layout_width="680dp"
             android:layout_height="wrap_content"
             android:padding="8dp"
             android:gravity="center"
@@ -16,7 +16,7 @@
             android:textSize="48sp"/>
 
         <LinearLayout
-            android:layout_width="600dp"
+            android:layout_width="680dp"
             android:layout_height="280dp"
             android:layout_marginTop="80dp"
             android:gravity="center">