护理项增加病危标识，并且背景色改成红色

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

@@ -86,16 +86,42 @@ class FrameBedVosConfinementAdapter(val data: ArrayList<FrameBedVO>) : BaseDeleg
                 binding.patientAgeTv.text = "--"
             }
 
+            binding.roomNumberTv.text = itemData.frameBed.fullName
+            binding.roomNumberTv.setTextColor(Color.parseColor("#2F9DF1"))
+
+            var critical = false
+            binding.rlBedInfo.setBackgroundResource(R.drawable.item_selector)
             if (itemData.nurseConfigDtos != null && itemData.nurseConfigDtos.size > 0) {
-                val nurseItem = itemData.nurseConfigDtos.get(0)
-                binding.tvNurseConfigName.text = nurseItem.nurseConfigName
-                if (!TextUtils.isEmpty(nurseItem.nurseColorRbg)) {
-                    binding.tvNurseConfigColor.text = nurseItem.nurseOptionName
-                    binding.tvNurseConfigColor.visibility = View.VISIBLE
-                    binding.tvNurseConfigColor.setBackgroundColor(Color.parseColor("#" + nurseItem.nurseColorRbg))
-                } else {
-                    binding.tvNurseConfigColor.text = ""
-                    binding.tvNurseConfigColor.visibility = View.INVISIBLE
+                for (nurseConfig in itemData.nurseConfigDtos) {
+                    if (nurseConfig.boolCritical) {
+                        binding.roomNumberTv.setTextColor(Color.WHITE)
+                        //病危标识
+                        binding.rlBedInfo.setBackgroundResource(R.drawable.item_selector_critical)
+                        binding.tvNurseConfigName.text = nurseConfig.nurseConfigName
+                        if (!TextUtils.isEmpty(nurseConfig.nurseColorRbg)) {
+                            binding.tvNurseConfigColor.visibility = View.VISIBLE
+                            binding.tvNurseConfigColor.setBackgroundColor(Color.parseColor("#" + nurseConfig.nurseColorRbg))
+                            binding.tvNurseConfigColor.text = nurseConfig.nurseOptionName
+                        } else {
+                            binding.tvNurseConfigColor.text = ""
+                            binding.tvNurseConfigColor.visibility = View.INVISIBLE
+                        }
+                        critical = true
+                        break
+                    }
+                }
+
+                if (!critical) {
+                    val nurseItem = itemData.nurseConfigDtos.get(0)
+                    binding.tvNurseConfigName.text = nurseItem.nurseConfigName
+                    if (!TextUtils.isEmpty(nurseItem.nurseColorRbg)) {
+                        binding.tvNurseConfigColor.text = nurseItem.nurseOptionName
+                        binding.tvNurseConfigColor.visibility = View.VISIBLE
+                        binding.tvNurseConfigColor.setBackgroundColor(Color.parseColor("#" + nurseItem.nurseColorRbg))
+                    } else {
+                        binding.tvNurseConfigColor.text = ""
+                        binding.tvNurseConfigColor.visibility = View.INVISIBLE
+                    }
                 }
             } else {
                 binding.tvNurseConfigName.text = ""
@@ -115,7 +141,7 @@ class FrameBedVosConfinementAdapter(val data: ArrayList<FrameBedVO>) : BaseDeleg
             } else {
                 binding.sexImagev.visibility = View.GONE
             }
-            binding.roomNumberTv.text = itemData.frameBed.fullName
+
             //Log.e("FrameBedVosAdapter ", "FrameBedVosAdapter...." + itemData.customerName)
         }
     }

android_host/src/main/h10_wke_1h/res/drawable/item_selector_critical.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/color_gray" android:state_pressed="true"/>
+    <item android:drawable="@color/color_critical" />
+</selector>

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

@@ -422,7 +422,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:background="#2F9DF1"
-                    android:text="@string/register_manual_config"
+                    android:text="@string/server_config"
                     android:textSize="20sp" />
 
                 <Button

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

@@ -2,6 +2,7 @@
 <layout>
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rl_bed_info"
         android:layout_width="140dp"
         android:layout_height="112dp"
         android:background="@drawable/item_selector"
@@ -20,7 +21,7 @@
                 android:singleLine="true"
                 android:ellipsize="end"
                 android:text="--"
-                android:textColor="#B4B4B4"
+                android:textColor="@color/gray_deep"
                 android:textSize="14sp"/>
 
             <TextView
@@ -41,7 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@id/rl_nurse_item"
-            android:paddingBottom="4dp">
+            android:padding="2dp">
 
             <TextView
                 android:id="@+id/room_number_tv"
@@ -84,7 +85,8 @@
                     android:layout_marginTop="10dp"
                     android:gravity="center"
                     android:text="--"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:textColor="@color/black"/>
 
                 <ImageView
                     android:id="@+id/sex_imagev"

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/adapter/FrameBedVosConfinementAdapter.kt

@@ -86,16 +86,42 @@ class FrameBedVosConfinementAdapter(val data: ArrayList<FrameBedVO>) : BaseDeleg
                 binding.patientAgeTv.text = "--"
             }
 
+            binding.roomNumberTv.text = itemData.frameBed.fullName
+            binding.roomNumberTv.setTextColor(Color.parseColor("#2F9DF1"))
+
+            var critical = false
+            binding.rlBedInfo.setBackgroundResource(R.drawable.item_selector)
             if (itemData.nurseConfigDtos != null && itemData.nurseConfigDtos.size > 0) {
-                val nurseItem = itemData.nurseConfigDtos.get(0)
-                binding.tvNurseConfigName.text = nurseItem.nurseConfigName
-                if (!TextUtils.isEmpty(nurseItem.nurseColorRbg)) {
-                    binding.tvNurseConfigColor.visibility = View.VISIBLE
-                    binding.tvNurseConfigColor.setBackgroundColor(Color.parseColor("#" + nurseItem.nurseColorRbg))
-                    binding.tvNurseConfigColor.text = nurseItem.nurseOptionName
-                } else {
-                    binding.tvNurseConfigColor.text = ""
-                    binding.tvNurseConfigColor.visibility = View.INVISIBLE
+                for (nurseConfig in itemData.nurseConfigDtos) {
+                    if (nurseConfig.boolCritical) {
+                        binding.roomNumberTv.setTextColor(Color.WHITE)
+                        //病危标识
+                        binding.rlBedInfo.setBackgroundResource(R.drawable.item_selector_critical)
+                        binding.tvNurseConfigName.text = nurseConfig.nurseConfigName
+                        if (!TextUtils.isEmpty(nurseConfig.nurseColorRbg)) {
+                            binding.tvNurseConfigColor.visibility = View.VISIBLE
+                            binding.tvNurseConfigColor.setBackgroundColor(Color.parseColor("#" + nurseConfig.nurseColorRbg))
+                            binding.tvNurseConfigColor.text = nurseConfig.nurseOptionName
+                        } else {
+                            binding.tvNurseConfigColor.text = ""
+                            binding.tvNurseConfigColor.visibility = View.INVISIBLE
+                        }
+                        critical = true
+                        break
+                    }
+                }
+
+                if (!critical) {
+                    val nurseItem = itemData.nurseConfigDtos.get(0)
+                    binding.tvNurseConfigName.text = nurseItem.nurseConfigName
+                    if (!TextUtils.isEmpty(nurseItem.nurseColorRbg)) {
+                        binding.tvNurseConfigColor.visibility = View.VISIBLE
+                        binding.tvNurseConfigColor.setBackgroundColor(Color.parseColor("#" + nurseItem.nurseColorRbg))
+                        binding.tvNurseConfigColor.text = nurseItem.nurseOptionName
+                    } else {
+                        binding.tvNurseConfigColor.text = ""
+                        binding.tvNurseConfigColor.visibility = View.INVISIBLE
+                    }
                 }
             } else {
                 binding.tvNurseConfigName.text = ""
@@ -115,7 +141,7 @@ class FrameBedVosConfinementAdapter(val data: ArrayList<FrameBedVO>) : BaseDeleg
             } else {
                 binding.sexImagev.visibility = View.GONE
             }
-            binding.roomNumberTv.text = itemData.frameBed.fullName
+
             //Log.e("FrameBedVosAdapter ", "FrameBedVosAdapter...." + itemData.customerName)
         }
     }

android_host/src/main/h10_z3128_1h/res/drawable/item_selector_critical.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/color_gray" android:state_pressed="true"/>
+    <item android:drawable="@color/color_critical" />
+</selector>

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rl_bed_info"
         android:layout_width="156dp"
         android:layout_height="120dp"
         android:background="@drawable/item_selector"
-        android:padding="6dp">
+        android:padding="4dp">
 
         <LinearLayout
             android:id="@+id/rl_nurse_item"
@@ -19,7 +20,7 @@
                 android:singleLine="true"
                 android:ellipsize="end"
                 android:text="--"
-                android:textColor="#B4B4B4"
+                android:textColor="@color/gray_deep"
                 android:textSize="14sp"/>
 
             <TextView
@@ -40,8 +41,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@id/rl_nurse_item"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp">
+            android:padding="4dp">
             <TextView
                 android:id="@+id/room_number_tv"
                 android:layout_width="match_parent"
@@ -83,7 +83,8 @@
                     android:layout_marginTop="10dp"
                     android:gravity="center"
                     android:text="--"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:textColor="@color/black"/>
 
                 <ImageView
                     android:id="@+id/sex_imagev"

common/src/main/res/values/colors.xml

@@ -11,5 +11,6 @@
     <color name="color_red">#ea3a3d</color>
     <color name="color_pop_header">#878a8a</color>
     <color name="gray_deep">#5c5c5c</color>
+    <color name="color_critical">#FFEA3A3D</color>
 
 </resources>

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/dto/NurseConfigDto.java

@@ -15,6 +15,10 @@ public class NurseConfigDto {
 
     private String nurseConfigName;
 
+    private Boolean boolBasic;
+
+    private Boolean boolCritical;
+
     public Integer getId() {
         return id;
     }
@@ -70,4 +74,20 @@ public class NurseConfigDto {
     public void setNurseConfigName(String nurseConfigName) {
         this.nurseConfigName = nurseConfigName;
     }
+
+    public Boolean getBoolBasic() {
+        return boolBasic;
+    }
+
+    public void setBoolBasic(Boolean boolBasic) {
+        this.boolBasic = boolBasic;
+    }
+
+    public Boolean getBoolCritical() {
+        return boolCritical;
+    }
+
+    public void setBoolCritical(Boolean boolCritical) {
+        this.boolCritical = boolCritical;
+    }
 }

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

@@ -226,6 +226,7 @@
     <string name="new_event_title">Nuevo evento</string>
     <string name="responsible_bed">responsible bed</string>
     <string name="str_manager_host">Manager host</string>
+    <string name="server_config">Configuración del servidor</string>
 
     <string name="broadcast_init_error">Broadcast init error</string>
     <string name="broadcast_init_success">Broadcast init success</string>

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

@@ -228,6 +228,7 @@
     <string name="new_event_title">Новое мероприятие</string>
     <string name="call_stay_time">Время ожидания входящего вызова</string>
     <string name="str_manager_host">Manager host</string>
+    <string name="server_config">Конфигурация сервера</string>
 
     <string name="broadcast_init_error">Broadcast init error</string>
     <string name="broadcast_init_success">Broadcast init success</string>

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

@@ -208,6 +208,7 @@
     <string name="str_no">否</string>
     <string name="str_confirm">确定</string>
     <string name="str_cancel">取消</string>
+    <string name="server_config">服务器配置</string>
     <string name="register_auto_config">自动配置</string>
     <string name="register_manual_config">手动配置</string>
     <string name="register_reboot">重新启动</string>

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

@@ -202,6 +202,7 @@
     <string name="system_settings">System settings</string>
     <string name="save_settings">Save settings</string>
 
+    <string name="server_config">Server config</string>
     <string name="language_set_title">Language:</string>
     <string name="language_set_mode">Sync language from server:</string>
     <string name="str_yes">Yes</string>