<增加床位显示>

app/build.gradle

@@ -26,7 +26,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.63"
+        versionName "1.64"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

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

@@ -206,6 +206,8 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
     @Bind(R.id.textview_switcher_bed_num)
     TextViewSwitcher tvsBedNum;
 
+    @Bind(R.id.tv_bed_numbers)
+    TextView tvBedNums;
 
     /**
      * The Tv four space.
@@ -757,6 +759,13 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                                         tvRoomNum.setText(doorDataEntity.getWardNum() + "房");
                                         tvBedNumList.setText(doorDataEntity.getWardNum());  //房间号
 
+                                        //床位号
+                                        if (mBedDataList.size() > 1) {
+                                            tvBedNums.setText(mBedDataList.get(0).getBedNum() + "-" + mBedDataList.get(mBedDataList.size() - 1).getBedNum() + "床");
+                                        } else {
+                                            tvBedNums.setText(mBedDataList.get(0).getBedNum() + "床");
+                                        }
+
                                         /*if (mBedDataList.size() > 1) {//20191030 change by waderson
                                             tvBedNum.setText(mBedDataList.get(0).getBedNum() + "-" + mBedDataList.get(mBedDataList.size() - 1).getBedNum() + "床");
                                             tvBedNumList.setText(doorDataEntity.getWardNum());
@@ -953,6 +962,12 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
                                     tvHospital.setText(doorDataEntity.getHospital() + doorDataEntity.getDepartments());
                                     tvRoomNum.setText(doorDataEntity.getWardNum() + "房");
                                     tvBedNumList.setText(doorDataEntity.getWardNum());  //房间号
+                                    //床位号
+                                    if (mBedDataList.size() > 1) {
+                                        tvBedNums.setText(mBedDataList.get(0).getBedNum() + "-" + mBedDataList.get(mBedDataList.size() - 1).getBedNum() + "床");
+                                    } else {
+                                        tvBedNums.setText(mBedDataList.get(0).getBedNum() + "床");
+                                    }
 
                                     /*if (mBedDataList.size() > 1) {//20191030 change by waderson
                                         tvBedNum.setText(mBedDataList.get(0).getBedNum() + "-" + mBedDataList.get(mBedDataList.size() - 1).getBedNum() + "床");

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

@@ -216,6 +216,16 @@
 
                     </com.wdkl.callingdoor.util.AutoPollRecyclerView>
 
+                    <TextView
+                        android:id="@+id/tv_bed_numbers"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:paddingLeft="20dp"
+                        android:textSize="64sp"
+                        android:textStyle="bold"
+                        android:textColor="@color/white"
+                        android:text="--床"/>
 
                 </FrameLayout>