门口机床位显示优化

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

@@ -178,6 +178,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             EventBus.getDefault().register(this)
         }
 
+        Constant.doctorTitle = getString(R.string.doctor_title)
+        Constant.nurseTitle = getString(R.string.nurse_title)
+
         //更新状态图标
         updateNetState()
         //串口设置

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

@@ -84,70 +84,67 @@ class NewFrameRoomAdapter : RecyclerView.Adapter<NewFrameRoomAdapter.BedViewHold
     }
 
     private fun showBedInfo(holder: BedViewHolder, bedVO: FrameBedVO) {
-        holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_male_txt_bg)
-        if (TextUtils.isEmpty(bedVO.customerName)) {
-            //空床位
-            holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
-            holder.bedName.text = StringUtil.getResString(R.string.empty_bed)
-            holder.tv_bed_sex.text =StringUtil.getResString(R.string.str_gender_none)+StringUtil.getResString(R.string.empty)
-            holder.tv_bed_age.text = StringUtil.getResString(R.string.str_age)+StringUtil.getResString(R.string.empty)
-            holder.bed_medic_name.text = StringUtil.getResString(R.string.empty)
-            holder.bed_nurse_name.text = StringUtil.getResString(R.string.empty)
-        } else {
-            holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
-            holder.bedName.text = bedVO.customerName
-            holder.tv_bed_age.text =StringUtil.getResString(R.string.str_age)+ bedVO.customerAge + bedVO.customerAgeUnit
-            if (bedVO.customerSex == 0) {
-                holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_female)
-                holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_txt_bg)
-            } else if (bedVO.customerSex == 1) {
-                holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_male)
-                holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_male_txt_bg)
+        try {
+            holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_male_txt_bg)
+            if (TextUtils.isEmpty(bedVO.customerName)) {
+                //空床位
+                holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
+                holder.bedName.text = StringUtil.getResString(R.string.empty_bed)
+                holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_none) + StringUtil.getResString(R.string.empty)
+                holder.tv_bed_age.text = StringUtil.getResString(R.string.str_age) + StringUtil.getResString(R.string.empty)
+                holder.bed_medic_name.text = StringUtil.getResString(R.string.empty)
+                holder.bed_nurse_name.text = StringUtil.getResString(R.string.empty)
             } else {
-                holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_none)+StringUtil.getResString(R.string.empty)
+                holder.tv_bed_name_title.text = CommonUtils.subStringAfter2(bedVO.frameBed.fullName, "-")
+                holder.bedName.text = bedVO.customerName
+                holder.tv_bed_age.text = StringUtil.getResString(R.string.str_age) + bedVO.customerAge + bedVO.customerAgeUnit
+
+                if (bedVO.customerSex != null) {
+                    if (bedVO.customerSex == 0) {
+                        holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_female)
+                        holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_txt_bg)
+                    } else if (bedVO.customerSex == 1) {
+                        holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_male)
+                        holder.tv_bed_sex.setBackgroundResource(R.drawable.shape_bed_sex_male_txt_bg)
+                    } else {
+                        holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_none) + StringUtil.getResString(R.string.empty)
+                    }
+                } else {
+                    holder.tv_bed_sex.text = StringUtil.getResString(R.string.str_gender_none) + StringUtil.getResString(R.string.empty)
+                }
+
+                if (!TextUtils.isEmpty(bedVO.doctorName)) {
+                    holder.bed_medic_name.text = bedVO.doctorName
+                } else {
+                    holder.bed_medic_name.text = StringUtil.getResString(R.string.empty)
+                }
+
+                if (!TextUtils.isEmpty(bedVO.nurseName)) {
+                    holder.bed_nurse_name.text = bedVO.nurseName
+                } else {
+                    holder.bed_nurse_name.text = StringUtil.getResString(R.string.empty)
+                }
+
+                holder.bed_medic_info.text = Constant.doctorTitle
+                holder.bed_nurse_info.text = Constant.nurseTitle
+
+                val currentLanguage: String = Locale.getDefault().getLanguage()
+                if (currentLanguage.equals("es")) {
+                    //西班牙语
+                    holder.tv_bed_sex.setTextSize(15f)
+                    holder.tv_bed_age.setTextSize(15f)
+                } else if (currentLanguage.equals("en")) {
+                    //英语
+                    holder.tv_bed_sex.setTextSize(16f)
+                    holder.tv_bed_age.setTextSize(16f)
+                } else if (currentLanguage.equals("ru")) {
+                    //俄语
+                    holder.tv_bed_sex.setTextSize(15f)
+                    holder.tv_bed_age.setTextSize(15f)
+                }
             }
-            holder.bed_medic_name.text = bedVO.doctorName
-            holder.bed_nurse_name.text = bedVO.nurseName
-            holder.bed_medic_info.text = Constant.doctorTitle
-            holder.bed_nurse_info.text = Constant.nurseTitle
-
-            val currentLanguage: String = Locale.getDefault().getLanguage()
-            if (currentLanguage.equals("es") ){
-                //西班牙语
-                holder.tv_bed_sex.setTextSize(15f)
-                holder.tv_bed_age.setTextSize(15f)
-            }else if (currentLanguage.equals("en")){
-                //英语
-                holder.tv_bed_sex.setTextSize(16f)
-                holder.tv_bed_age.setTextSize(16f)
-            }else if (currentLanguage.equals("ru")){
-                //俄语
-                holder.tv_bed_sex.setTextSize(15f)
-                holder.tv_bed_age.setTextSize(15f)
-            }
-
-
-//
-//            holder.ll_one.removeAllViews()
-//            //设置TextView的属性
-//            //设置TextView的属性
-//            val lps = RelativeLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
-//            lps.setMargins(20, 6, 20, 6)
-//            if (bedVO.nurseConfigDtos.size==0 )return
-//            for (i in bedVO.nurseConfigDtos.indices) {
-//                val textView = TextView(context)
-//                textView.setText(bedVO.nurseConfigDtos.get(i).nurseOptionName)
-//                textView.setTextColor(Color.WHITE)
-//                textView.setTextSize(11f)
-//                textView.setPadding(20, 6, 20, 6)
-//                val drawableId: Int = context.resources.getIdentifier("shape_bed_ll_txt_bg", "drawable", context.packageName)
-//                val drawable: Drawable? = ContextCompat.getDrawable(context, drawableId)
-//                val rgbValue = Color.parseColor("#" + bedVO.nurseConfigDtos.get(i).nurseColorRbg)
-//                drawable?.setTint(rgbValue)
-//                textView.background = drawable
-//                textView.layoutParams = lps
-//                holder.ll_one.addView(textView)
-//            }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
     }
 

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

@@ -132,7 +132,7 @@
             <ImageView
                 android:layout_width="@dimen/d40"
                 android:layout_height="@dimen/d40"
-                android:layout_marginTop="@dimen/d12"
+                android:layout_marginTop="@dimen/d16"
                 android:background="@mipmap/doctor_pic" />
 
             <TextView
@@ -169,7 +169,7 @@
             <ImageView
                 android:layout_width="@dimen/d40"
                 android:layout_height="@dimen/d40"
-                android:layout_marginTop="@dimen/d12"
+                android:layout_marginTop="@dimen/d16"
                 android:background="@mipmap/nurse_pic" />
 
             <TextView

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

@@ -274,9 +274,9 @@ public class Constant {
     //MCU版本
     public static String MCU_VERSION_NUMBER = "";
 
-    public static String doctorTitle = "责任医生";
+    public static String doctorTitle = "";
     public static Integer doctorValid = 1;
-    public static String nurseTitle = "责任护士";
+    public static String nurseTitle = "";
     public static Integer nurseValid = 1;
 
     public static String NursingTitle = "";