<房间号默认带房字>

Signed-off-by: weizhengliang <weizhengliang@hnwdit.com>

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName "2.13"
+        versionName "1.84"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/CallListAdapter.java

@@ -80,7 +80,7 @@ public class CallListAdapter extends RecyclerView.Adapter<CallListAdapter.MyView
                 holder.llRoom.setVisibility(View.VISIBLE);
                 
                 holder.ivLogo.setImageResource(R.mipmap.ic_door);
-                holder.tvRoomNum.setText(list.get(position).getRoomNumber());//房间号
+                holder.tvRoomNum.setText(list.get(position).getRoomNumber() + "房");//房间号
                 holder.tvName.setText(" 门口机 ");
                 break;
             case Constants.SON_CALL:
@@ -89,7 +89,7 @@ public class CallListAdapter extends RecyclerView.Adapter<CallListAdapter.MyView
                 holder.llRoom.setVisibility(View.VISIBLE);
 
                 holder.ivLogo.setImageResource(R.mipmap.ic_call_bed);
-                holder.tvRoomNum.setText(list.get(position).getRoomNumber());//房间号
+                holder.tvRoomNum.setText(list.get(position).getRoomNumber() + "房");//房间号
                 holder.tvBedNum.setText(list.get(position).getBedNumber() + "床");//床号
                 holder.tvName.setText(" " + list.get(position).getName() + " ");//机型
                 break;
@@ -98,7 +98,7 @@ public class CallListAdapter extends RecyclerView.Adapter<CallListAdapter.MyView
                 holder.llRoom.setVisibility(View.VISIBLE);
 
                 holder.ivLogo.setImageResource(R.mipmap.ic_support);
-                holder.tvRoomNum.setText(list.get(position).getRoomNumber());//房间号
+                holder.tvRoomNum.setText(list.get(position).getRoomNumber() + "房");//房间号
                 holder.tvBedNum.setText(list.get(position).getBedNumber() + "床");//床号
                 holder.tvName.setText(" 请求增援 ");
                 break;
@@ -107,7 +107,7 @@ public class CallListAdapter extends RecyclerView.Adapter<CallListAdapter.MyView
                 holder.llRoom.setVisibility(View.VISIBLE);
 
                 holder.ivLogo.setImageResource(R.mipmap.ic_wc);
-                holder.tvRoomNum.setText(list.get(position).getRoomNumber());
+                holder.tvRoomNum.setText(list.get(position).getRoomNumber() + "房");
                 holder.tvName.setText(" 紧急呼叫 ");
                 break;
             case Constants.MANAGER_CALL:

app/src/main/java/com/wdkl/callingmainnurse/adapter/SicknessRoomAdapter.java

@@ -86,7 +86,7 @@ public class SicknessRoomAdapter extends RecyclerView.Adapter<SicknessRoomAdapte
                 holder.tvRoomNum.setTextColor(Color.parseColor("#000000"));
                 holder.tvBedNum.setTextColor(Color.parseColor("#000000"));
             }
-            holder.tvRoomNum.setText(list.get(position).getRoomNum());
+            holder.tvRoomNum.setText(list.get(position).getRoomNum() + "房");
 
             if (list.get(position).getTrusteeshipState().equals("1")) {//更新标题栏代托管状态//正在托管中
                 EventBus.getDefault().post(new MessageEvent(1, Constants.EVENT_SIP_INTERNETPING_));

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

@@ -1245,8 +1245,8 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
 
     private void setPatientView(RoomEntity.WardInformation.SickbedInformation bedEntity) {
         if (null != bedEntity) {
-            tvRoomBedAnswerState.setText(wardInformationList.get(this.position).getRoomNum() + "-" + bedEntity.getBedNum() + "床");
-            tvRoomMsg.setText(wardInformationList.get(this.position).getRoomNum() + "-" + bedEntity.getBedNum() + "床");
+            tvRoomBedAnswerState.setText(wardInformationList.get(this.position).getRoomNum() + "房" + bedEntity.getBedNum() + "床");
+            tvRoomMsg.setText(wardInformationList.get(this.position).getRoomNum() + "房" + bedEntity.getBedNum() + "床");
             tvPatientInfo.setText(bedEntity.getPatientName() + "  " + bedEntity.getPatientGender() + "  " + bedEntity.getPatientAge());
             tvPatientInfoAdmissionTime.setText("入院时间：" + bedEntity.getAdmissionTime());
             tvAttendingDoctor.setText("责任医生：" + bedEntity.getAttendingDoctor());
@@ -1263,8 +1263,8 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
             tvInsulateLevel.setText("隔离等级：" + bedEntity.getInsulateLevel() + "级");
             tvCondition.setText("病情状况：" + bedEntity.getCondition());
         } else {
-            tvRoomBedAnswerState.setText(wardInformationList.get(this.position).getRoomNum());
-            tvRoomMsg.setText(wardInformationList.get(this.position).getRoomNum());
+            tvRoomBedAnswerState.setText(wardInformationList.get(this.position).getRoomNum() + "房");
+            tvRoomMsg.setText(wardInformationList.get(this.position).getRoomNum() + "房");
             tvPatientInfo.setText("--");
             tvPatientInfoAdmissionTime.setText("--");
             tvAttendingDoctor.setText("--");
@@ -1927,7 +1927,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         String text = "";
         switch (type) {
             case DOOR_CALL: //门口机
-                text = rnb + "门口机呼叫";
+                text = rnb + "房门口机呼叫";
                 break;
             case Constants.MAIN_CALL://主机
                 text = rnb + "主机呼叫";
@@ -1937,22 +1937,22 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                 if ("0".equals(tag)) {
                     text = bnb + "床呼叫";
                 } else if ("1".equals(tag)) {
-                    text = rnb + bnb + "床呼叫";
+                    text = rnb + "房" + bnb + "床呼叫";
                 } else if ("2".equals(tag)) {
-                    text = rnb + "呼叫";
+                    text = rnb + "房呼叫";
                 }
                 break;
             case Constants.ROOMHELP_CALL://请求增援
                 if ("0".equals(tag)) {
                     text = bnb + "床请求增援";
                 } else if ("1".equals(tag)) {
-                    text = rnb + bnb + "床请求增援";
+                    text = rnb + "房" + bnb + "床请求增援";
                 } else if ("2".equals(tag)) {
-                    text = rnb + "请求增援";
+                    text = rnb + "房请求增援";
                 }
                 break;
             case Constants.WSHROOM_CALL://卫生间
-                text = rnb + "卫生间紧急呼叫";
+                text = rnb + "房卫生间紧急呼叫";
                 break;
             case Constants.MANAGER_CALL://总控机
                 text = "总控制室呼叫";
@@ -1987,13 +1987,13 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
             case Constants.SON_CALL://床位
             case Constants.TRADITION_CALL://传统床位
                 if ("1".equals(tag)) {
-                    ledStr = rnb + bnb + "床呼叫";
+                    ledStr = rnb + "房" + bnb + "床呼叫";
                 } else {
                     ledStr = bnb + "床呼叫";
                 }
                 break;
             case Constants.WSHROOM_CALL://卫生间
-                ledStr = rnb + "卫生间紧急呼叫";
+                ledStr = rnb + "房卫生间紧急呼叫";
                 break;
         }
 
@@ -2452,10 +2452,10 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         }
         switch (udpEntity.getType()) {
             case Constants.ROOMHELP_CALL:
-                urgentPopupwindow.setWindowContentText(udpEntity.getRoomNumber() + "-" + udpEntity.getBedNumber() + "床请求增援!!!").setWindowLogoImg(R.mipmap.ic_support).setOnClickListener(this).show();
+                urgentPopupwindow.setWindowContentText(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床请求增援!!!").setWindowLogoImg(R.mipmap.ic_support).setOnClickListener(this).show();
                 break;
             case Constants.WSHROOM_CALL:
-                urgentPopupwindow.setWindowContentText(udpEntity.getRoomNumber() + "卫生间紧急呼叫!!!").setWindowLogoImg(R.mipmap.ic_wc).setOnClickListener(this).show();
+                urgentPopupwindow.setWindowContentText(udpEntity.getRoomNumber() + "房卫生间紧急呼叫!!!").setWindowLogoImg(R.mipmap.ic_wc).setOnClickListener(this).show();
                 break;
         }
     }
@@ -2602,7 +2602,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                 ivCallListPic.setVisibility(View.VISIBLE);
                 vRightPatientInfo.setVisibility(View.GONE);
                 vRightCallInfo.setVisibility(View.GONE);
-                tvCallListRoomMsg.setText(callingEntity.getRoomNumber() + "门口机呼叫...");
+                tvCallListRoomMsg.setText(callingEntity.getRoomNumber() + "房门口机呼叫...");
             }
             return;
         }
@@ -2645,7 +2645,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
     private void setCallListMsg(UdpEntity udpEntity) {
         LogUtil.d(CallingBedFragment.class, "udpEntitytostring==" + udpEntity.toString());
         if (null != udpEntity) {
-            tvCallListRoomMsg.setText(udpEntity.getRoomNumber() + "-" + udpEntity.getBedNumber() + "床");
+            tvCallListRoomMsg.setText(udpEntity.getRoomNumber() + "房" + udpEntity.getBedNumber() + "床");
             rightCallInfomationTwo.setText("护理等级：" + udpEntity.getLevel() + "级");
             getPatientData(udpEntity.getHeadMachineID());
         }

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/TrusteeshipFragment.java

@@ -449,7 +449,7 @@ public class TrusteeshipFragment extends BaseFragment implements TrusteeshipAdap
 //                serialPortUtil.closeSerialPort();
 //                Toast.makeText(getActivity(), "主机一请求主机二托管", Toast.LENGTH_SHORT).show();
                 if (mCountDownAutoTimer == null) {
-                    mCountDownAutoTimer = new CountDownTimer(30000, 1000) {
+                    mCountDownAutoTimer = new CountDownTimer(60000, 1000) {
                         @Override
                         public void onTick(long l) {
                             tvStatus.setText("托管状态：" + "本机请求" + trusteeshipEntityList.get(position).getDeviceName() + "托管" + "正在连接中：" + l / 1000 + "秒");