门口机增加支持呼叫护士，责任医生，责任护士标题名称修改和显示隐藏

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

@@ -185,6 +185,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
         Constant.doctorTitle = getString(R.string.doctor_title)
         Constant.nurseTitle = getString(R.string.nurse_title)
+        Constant.callNurseTitle = getString(R.string.str_call_nurse)
 
         //更新状态图标
         updateNetState()
@@ -537,7 +538,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         menu_call_bed.isClickable=false
         menu_call_bed.setBackgroundResource(R.drawable.shape_huli_button_bg)
         menu_call_nurse.setBackgroundResource(R.drawable.shape_huli_button_bg)
-        Constant.NursingTitle = "进入护理"
+        Constant.NursingTitle = getString(R.string.enter_nursing)
         calling_bed_layout_hl_title.visibility=View.VISIBLE
         activity_calling_door_layout_title_new.visibility=View.GONE
         menu_home.visibility=View.GONE
@@ -1012,8 +1013,26 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
             VoiceManagerUtil.setCallVoice(activity, partSetting.dayDoorVol)
 
-            Constant.doctorTitle = partSetting.doctorTitle
-            Constant.nurseTitle = partSetting.nurseTitle
+            if (!TextUtils.isEmpty(partSetting.doorNurseTitle)) {
+                Constant.callNurseTitle = partSetting.doorNurseTitle
+                menu_call_nurse.setText(Constant.callNurseTitle)
+            }
+            if (partSetting.doorNurseValid != null) {
+                Constant.doorNurseValid = partSetting.doorNurseValid
+            }
+            if (Constant.doorNurseValid == 1) {
+                menu_call_nurse.visibility = View.VISIBLE
+            } else {
+                menu_call_nurse.visibility = View.GONE
+            }
+
+            if (!TextUtils.isEmpty(partSetting.doctorTitle)) {
+                Constant.doctorTitle = partSetting.doctorTitle
+            }
+            if (!TextUtils.isEmpty(partSetting.nurseTitle)) {
+                Constant.nurseTitle = partSetting.nurseTitle
+            }
+
             if (partSetting.doctorValid != null) {
                 Constant.doctorValid = partSetting.doctorValid
             }

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/adapter/NewFrameRoomAdapter.kt

@@ -129,8 +129,21 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
                     holder.bed_nurse_name.text = StringUtil.getResString(R.string.empty)
                 }
 
-                holder.bed_medic_info.text = Constant.doctorTitle
-                holder.bed_nurse_info.text = Constant.nurseTitle
+                if (Constant.doctorValid == 1) {
+                    holder.bed_medic_info.visibility = View.VISIBLE
+                    holder.bed_medic_info.text = Constant.doctorTitle
+                } else {
+                    holder.bed_medic_info.visibility = View.GONE
+                    holder.bed_medic_name.text = StringUtil.getResString(R.string.empty)
+                }
+
+                if (Constant.nurseValid == 1) {
+                    holder.bed_nurse_info.visibility = View.VISIBLE
+                    holder.bed_nurse_info.text = Constant.nurseTitle
+                } else {
+                    holder.bed_nurse_info.visibility = View.GONE
+                    holder.bed_nurse_name.text = StringUtil.getResString(R.string.empty)
+                }
 
                 val currentLanguage: String = Locale.getDefault().getLanguage()
                 if (currentLanguage.equals("es")) {

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

@@ -48,7 +48,7 @@
             android:gravity="center"
             android:ellipsize="end"
             android:singleLine="true"
-            android:text="126"
+            android:text="--"
             android:textColor="@color/white"
             android:textSize="45sp"
             android:textStyle="bold" />
@@ -62,7 +62,7 @@
             android:layout_below="@+id/tv_bed_name_title"
             android:ellipsize="marquee"
             android:singleLine="true"
-            android:text="张小斐"
+            android:text="---"
             android:textColor="@color/text_room_color"
             android:textSize="38sp" />
 
@@ -122,7 +122,7 @@
             android:paddingTop="@dimen/d4"
             android:paddingRight="@dimen/d9"
             android:paddingBottom="@dimen/d4"
-            android:text="年龄:28岁"
+            android:text="--"
             android:textColor="@color/txt_age"
             android:textSize="@dimen/font_size_22" />
 
@@ -136,7 +136,7 @@
             android:paddingTop="@dimen/d4"
             android:paddingRight="@dimen/d9"
             android:paddingBottom="@dimen/d4"
-            android:text="性别：女"
+            android:text="--"
             android:textColor="@color/black"
             android:textSize="@dimen/font_size_22" />
     </LinearLayout>
@@ -167,7 +167,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d8"
-                android:text="张德怀"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_20" />
 
@@ -178,7 +178,7 @@
                 android:layout_marginTop="@dimen/d8"
                 android:background="@drawable/shape_bed_medic_txt_bg"
                 android:padding="@dimen/d3"
-                android:text="责任医生"
+                android:text="@string/doctor_title"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_16" />
 
@@ -204,7 +204,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d8"
-                android:text="李小秀"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_20" />
 
@@ -215,7 +215,7 @@
                 android:layout_marginTop="@dimen/d8"
                 android:background="@drawable/shape_bed_nurse_txt_bg"
                 android:padding="@dimen/d3"
-                android:text="责任护士"
+                android:text="@string/nurse_title"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_16" />
 
@@ -223,5 +223,4 @@
 
     </LinearLayout>
 
-
 </LinearLayout>

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

@@ -85,7 +85,10 @@
                 android:background="@drawable/selector_zengyuan_bt"
                 android:drawableTop="@mipmap/zengyuan"
                 android:gravity="center"
-                android:padding="10dp"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
                 android:text="@string/str_supports"
                 android:textColor="@color/white"
                 android:textSize="16sp" />
@@ -101,7 +104,10 @@
                 android:background="@drawable/selector_call_cancel_bt"
                 android:drawableTop="@drawable/ic_cancel_call"
                 android:gravity="center"
-                android:padding="10dp"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
                 android:text="@string/str_cancel_call"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
@@ -117,8 +123,10 @@
                 android:background="@drawable/selector_callhu_bt"
                 android:drawableTop="@mipmap/hujiao"
                 android:gravity="center"
-                android:padding="10dp"
-                android:singleLine="true"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
                 android:text="@string/str_call_nurse"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
@@ -135,7 +143,10 @@
                 android:background="@drawable/selector_call_beds_bt"
                 android:drawableTop="@mipmap/chuang"
                 android:gravity="center"
-                android:padding="10dp"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
                 android:text="@string/str_call_bed"
                 android:textColor="@color/white"
                 android:textSize="14sp" />

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

@@ -20,7 +20,7 @@
             android:gravity="center"
             android:ellipsize="end"
             android:singleLine="true"
-            android:text="126"
+            android:text="--"
             android:textColor="@color/white"
             android:textSize="60sp"
             android:textStyle="bold" />
@@ -34,7 +34,7 @@
             android:layout_toRightOf="@+id/tv_bed_name_title"
             android:ellipsize="marquee"
             android:singleLine="true"
-            android:text="张小斐"
+            android:text="--"
             android:textColor="@color/text_room_color"
             android:textSize="58sp" />
 
@@ -57,7 +57,7 @@
                 android:paddingTop="@dimen/d4"
                 android:paddingRight="@dimen/d9"
                 android:paddingBottom="@dimen/d4"
-                android:text="年龄:28岁"
+                android:text="--"
                 android:textColor="@color/txt_age"
                 android:textSize="@dimen/font_size_22" />
 
@@ -71,7 +71,7 @@
                 android:paddingTop="@dimen/d4"
                 android:paddingRight="@dimen/d9"
                 android:paddingBottom="@dimen/d4"
-                android:text="性别：女"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_22" />
         </LinearLayout>
@@ -140,7 +140,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d8"
-                android:text="张德怀"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_20" />
 
@@ -151,7 +151,7 @@
                 android:layout_marginTop="@dimen/d8"
                 android:background="@drawable/shape_bed_medic_txt_bg"
                 android:padding="@dimen/d3"
-                android:text="责任医生"
+                android:text="@string/doctor_title"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_16" />
 
@@ -177,7 +177,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/d8"
-                android:text="李小秀"
+                android:text="--"
                 android:textColor="@color/black"
                 android:textSize="@dimen/font_size_20" />
 
@@ -188,7 +188,7 @@
                 android:layout_marginTop="@dimen/d8"
                 android:background="@drawable/shape_bed_nurse_txt_bg"
                 android:padding="@dimen/d3"
-                android:text="责任护士"
+                android:text="@string/nurse_title"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_16" />
 

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

@@ -278,6 +278,8 @@ public class Constant {
     public static Integer doctorValid = 1;
     public static String nurseTitle = "";
     public static Integer nurseValid = 1;
+    public static String callNurseTitle = "";
+    public static Integer doorNurseValid = 1;
 
     public static String NursingTitle = "";