<1.房号后面显示床号 2.床号后面显示姓名>

.gitignore

@@ -3,9 +3,11 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea/
 .DS_Store
 /build
 /captures
 /app/build
+/app/*.apk
 /AmDemo_R/build
 .externalNativeBuild

app/src/main/java/com/wdkl/callingdoor/adapter/StaggeredHomeAdapter.java

@@ -103,7 +103,7 @@ public class StaggeredHomeAdapter extends
         int position = positions % mDatas.size();
         holder.tvDoctorName.setText(indentifyNorString(mDatas.get(position).getDoctorName())/*"大帅哥哥刷个币"*/);
         holder.tvNurseName.setText(indentifyNorString(mDatas.get(position).getNurseName())/*"大帅哥哥刷个币"*/);
-        holder.tvRoomNum.setText(indentifyNorString(mDatas.get(position).getBedNum()) + "床");
+        holder.tvRoomNum.setText(indentifyNorString(mDatas.get(position).getBedNum()) + "床 - " + mDatas.get(position).getPatientName());
 //            holder.tvRoomNum.textTwinkle(statusColor);//床位号颜色变化
         holder.tvRoomNum.textTwinkle(mMapColor.get(position) == null ? 0 : mMapColor.get(position));//床位号颜色变化
 
@@ -112,8 +112,9 @@ public class StaggeredHomeAdapter extends
         {//更新标题栏代托管状态
             EventBus.getDefault().post(new MessageEvent(1, Constants.EVENT_SIP_INTERNETPING));
             holder.ivTrustStatus.setVisibility(View.VISIBLE);
-        } else
+        } else {
             holder.ivTrustStatus.setVisibility(View.GONE);
+        }
         /**
          * 显示效果
          */
@@ -164,13 +165,13 @@ public class StaggeredHomeAdapter extends
                     .load(Constants.URL + Constants.URL_END + mDatas.get(position).getDoctorHeadIcon())
                     //.skipMemoryCache(true)
                     .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    //.placeholder(R.drawable.ic_itme_doctor)//占位图
+                    //.placeholder(R.mipmap.doctor_default)//占位图
                     .into(holder.ivDoctorpic);
             Glide.with(mContext)
                     .load(Constants.URL + Constants.URL_END + mDatas.get(position).getNurseHeadIcon())
                     //.skipMemoryCache(true)
                     .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    //.placeholder(R.drawable.ic_item_nurse)//占位图
+                    //.placeholder(R.mipmap.nurse_default)//占位图
                     .into(holder.ivNursepic);
 
         }

app/src/main/java/com/wdkl/callingdoor/entity/DoorDataEntity.java

@@ -80,6 +80,10 @@ public class DoorDataEntity {
         private String nurseHeadIcon;
         private String bedStatus;
         private String trusteeshipState = "0";
+        private String patientName;
+        private String patientSex;
+        private String patientAge;
+        private String patientAgeUnit;
 
         public String getTrusteeshipState() {
             return trusteeshipState == null ? "暂无" : trusteeshipState;
@@ -136,5 +140,37 @@ public class DoorDataEntity {
         public void setBedStatus(String bedStatus) {
             this.bedStatus = bedStatus;
         }
+
+        public String getPatientName() {
+            return patientName;
+        }
+
+        public void setPatientName(String patientName) {
+            this.patientName = patientName;
+        }
+
+        public String getPatientSex() {
+            return patientSex;
+        }
+
+        public void setPatientSex(String patientSex) {
+            this.patientSex = patientSex;
+        }
+
+        public String getPatientAge() {
+            return patientAge;
+        }
+
+        public void setPatientAge(String patientAge) {
+            this.patientAge = patientAge;
+        }
+
+        public String getPatientAgeUnit() {
+            return patientAgeUnit;
+        }
+
+        public void setPatientAgeUnit(String patientAgeUnit) {
+            this.patientAgeUnit = patientAgeUnit;
+        }
     }
 }

app/src/main/java/com/wdkl/callingdoor/ui/CallingDoorActivity.java

@@ -684,7 +684,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
             return;
         }
         setDeviceNo();
-        tvBedNumList.setText(initDataEntity.getDeviceRoomNum() + "房");
+        tvBedNumList.setText(initDataEntity.getDeviceRoomNum());
         //循环切换网络状态
         mWifiHotBindSipStatusConnectorUtil = WifiHotBindSipStatusConnectorUtil.getInstance(context);
         mWifiHotBindSipStatusConnectorUtil.sendNetStatus(this, initDataEntity);
@@ -735,10 +735,10 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
 
                                         if (mBedDataList.size() > 1) {//20191030 change by waderson
                                             tvBedNum.setText(mBedDataList.get(0).getBedNum() + "-" + mBedDataList.get(mBedDataList.size() - 1).getBedNum() + "床");
-                                            tvBedNumList.setText(doorDataEntity.getWardNum() + "房");
+                                            tvBedNumList.setText(doorDataEntity.getWardNum());
                                         } else {//20191030 change by waderson
                                             tvBedNum.setText(mBedDataList.get(0).getBedNum() + "床");
-                                            tvBedNumList.setText(doorDataEntity.getWardNum() + "房");
+                                            tvBedNumList.setText(doorDataEntity.getWardNum());
                                         }
 
                                         LogUtil.d("QRTGH","======"+mBedDataList.get(0));
@@ -855,7 +855,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
         initDataEntity = (InitDataEntity) getIntent().getSerializableExtra(Constants.INITENTITY);
         if (null == initDataEntity) return;
         setDeviceNo();
-        tvBedNumList.setText(initDataEntity.getDeviceRoomNum() + "房");
+        tvBedNumList.setText(initDataEntity.getDeviceRoomNum());
         if (!StringUtils.notEmpty(Constants.PartID)) return;
         OkHttpUtils
                 .post()
@@ -899,10 +899,10 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
 
                                     if (mBedDataList.size() > 1) {//20191030 change by waderson
                                         tvBedNum.setText(mBedDataList.get(0).getBedNum() + "-" + mBedDataList.get(mBedDataList.size() - 1).getBedNum() + "床");
-                                        tvBedNumList.setText(doorDataEntity.getWardNum() + "房");
+                                        tvBedNumList.setText(doorDataEntity.getWardNum());
                                     } else {//20191030 change by waderson
                                         tvBedNum.setText(mBedDataList.get(0).getBedNum() + "床");
-                                        tvBedNumList.setText(doorDataEntity.getWardNum() + "房");
+                                        tvBedNumList.setText(doorDataEntity.getWardNum());
                                     }
 
                                     //==============================展示数据=============================
@@ -1025,14 +1025,14 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                             //if(udpEntity.getDoorwayMachineID().equals(Constants.MYSELF_ID)){
 
                             if (!udpEntity.getRoomNumber().equals("暂无") && !udpEntity.getBedNumber().equals("暂无")) {
-                                mGroupAdapter.updateData(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床" + "呼叫");
+                                mGroupAdapter.updateData(udpEntity.getRoomNumber() + "-" + udpEntity.getBedNumber() + "床" + "呼叫");
                             }
                             //}
                         }
                         if (udpEntity.getIndexes().equals("call_2")) {
                             //============接收全部床头机呼叫udp============
                             if (!udpEntity.getRoomNumber().equals("暂无") && !udpEntity.getBedNumber().equals("暂无")) {
-                                mGroupAdapter.updateData(udpEntity.getRoomNumber() + "房"  /*+udpEntity.getBedNumber() + "床"*/ + "卫生间紧急呼叫");
+                                mGroupAdapter.updateData(udpEntity.getRoomNumber() + "-"  /*+udpEntity.getBedNumber() + "床"*/ + "卫生间紧急呼叫");
                             }
                             if (udpEntity.getRoomNumber().equals(initDataEntity.getDeviceRoomNum())) {
                                 if (MyApplication.serialPortUtil != null){
@@ -1043,7 +1043,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                         if (udpEntity.getIndexes().equals("call_4")) {
                             //============接收全部床头机呼叫udp============
                             if (!udpEntity.getRoomNumber().equals("暂无") && !udpEntity.getBedNumber().equals("暂无")) {
-                                mGroupAdapter.updateData(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床" + "请求增援");
+                                mGroupAdapter.updateData(udpEntity.getRoomNumber() + "-" + udpEntity.getBedNumber() + "床" + "请求增援");
                             }
                         }
                         if (isEnterNurseControlDoorLight) {
@@ -1088,9 +1088,9 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                         //============接收全部床头机呼叫udp============删除接听中状态的那个床头机
                     {
                         if (!udpEntity.getRoomNumber().equals("暂无") && !udpEntity.getBedNumber().equals("暂无")
-                                && (udpEntity.getType().equals(Constants.SON_CALL) || udpEntity.getType().equals(Constants.TRADITION_CALL))) {
+                                /*&& (udpEntity.getType().equals(Constants.SON_CALL) || udpEntity.getType().equals(Constants.TRADITION_CALL))*/) {
                             try {
-                                mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床" + "呼叫");
+                                mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "-" + udpEntity.getBedNumber() + "床" + "呼叫");
                                 //mGroupAdapter.deleteData(/*udpEntity.getRoomNumber() + "房" +*/ udpEntity.getBedNumber() + "床" + "呼叫");
                             } catch (InvocationTargetException e) {
                                 e.printStackTrace();
@@ -1267,13 +1267,13 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                         if (!udpEntity.getRoomNumber().equals("暂无") && !udpEntity.getBedNumber().equals("暂无")) {
                             try {
                                 if (udpEntity.getType().equals(Constants.SON_CALL) || udpEntity.getType().equals(Constants.TRADITION_CALL)) {
-                                    mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床" + "呼叫");
+                                    mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "-" + udpEntity.getBedNumber() + "床" + "呼叫");
                                 }
                                 if (udpEntity.getType().equals(Constants.ROOMHELP_CALL)) {
-                                    mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床" + "请求增援");
+                                    mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "-" + udpEntity.getBedNumber() + "床" + "请求增援");
                                 }
                                 if (udpEntity.getType().equals(Constants.WSHROOM_CALL)) {
-                                    mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "房"  /*+udpEntity.getBedNumber() + "床"*/ + "卫生间紧急呼叫");
+                                    mGroupAdapter.deleteData(udpEntity.getRoomNumber() + "-"  /*+udpEntity.getBedNumber() + "床"*/ + "卫生间紧急呼叫");
                                     if (udpEntity.getRoomNumber().equals(initDataEntity.getDeviceRoomNum())) {
                                         if (MyApplication.serialPortUtil != null){
                                             if ("0".equals(Constants.MORNING_NIGTH)) {//白天

app/src/main/res/layout/activity_calling_door_layout.xml

@@ -89,11 +89,9 @@
                                 android:id="@+id/activity_calling_door_layout_bed_numlist"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="80dp"
-                                android:layout_centerHorizontal="true"
-                                android:layout_marginTop="-29dp"
-                                android:gravity="center"
-                                android:text="000房"
+                                android:layout_marginLeft="180dp"
+                                android:layout_marginTop="-6dp"
+                                android:text="000"
                                 android:textColor="@color/white"
                                 android:textSize="175sp"
                                 android:textStyle="bold" />
@@ -102,16 +100,16 @@
                                 android:id="@+id/activity_calling_door_layout_bed_num"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_centerVertical="true"
-                                android:layout_marginLeft="15dp"
-                                android:layout_toRightOf="@+id/activity_calling_door_layout_bed_numlist"
+                                android:layout_alignParentBottom="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_marginRight="80dp"
+                                android:paddingBottom="20dp"
                                 android:ellipsize="end"
                                 android:gravity="center"
-                                android:visibility="gone"
                                 android:lines="1"
-                                android:text="000"
+                                android:text="--床"
                                 android:textColor="@color/white"
-                                android:textSize="100sp" />
+                                android:textSize="72sp" />
 
                         </RelativeLayout>
                     </LinearLayout>

app/src/main/res/layout/activity_calling_door_layout_rv_bedview_item.xml

@@ -52,7 +52,7 @@
                         android:id="@+id/doctor_pic_default"
                         android:layout_width="200dp"
                         android:layout_height="200dp"
-                        android:src="@mipmap/ic_itme_doctor"
+                        android:src="@mipmap/ic_item_doctor2"
                         android:visibility="gone" />
 
                     <ImageView
@@ -105,7 +105,7 @@
                         android:id="@+id/nurse_pic_default"
                         android:layout_width="200dp"
                         android:layout_height="200dp"
-                        android:src="@mipmap/ic_item_nurse"
+                        android:src="@mipmap/ic_item_nurse2"
                         android:visibility="gone" />
 
                     <ImageView