<修改界面显示>

app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -331,6 +331,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     //呼叫增援界面倒计时
     @Bind(R.id.view_support_layout_tv_call_timeout)
     TextView tvSupportTimeOut;
+    @Bind(R.id.view_support_layout_tv_call_end)
+    TextView tvSupportEnd;
 
 
     //呼叫护工界面
@@ -340,6 +342,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     //呼叫护工界面倒计时
     @Bind(R.id.view_call_layout_tv_call_timeout)
     TextView tvCallTextTimeOut;
+    @Bind(R.id.view_call_care_layout_tv_call_end)
+    TextView tvCallCareEnd;
 
 
     //呼叫护士页面
@@ -544,8 +548,6 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
 
     private void setListeners() {
         llMainItem.setOnClickListener(this);
-
-        llMainItem.setOnClickListener(this);
         llAdviceItem.setOnClickListener(this);
         llCostItem.setOnClickListener(this);
         llCallCareItem.setOnClickListener(this);
@@ -555,6 +557,9 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         llRightMain.setOnClickListener(this);
         rlViewDoctor.setOnClickListener(this);
         rlViewCost.setOnClickListener(this);
+
+        tvSupportEnd.setOnClickListener(this);
+        tvCallCareEnd.setOnClickListener(this);
     }
 
     @Override
@@ -1217,8 +1222,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
             doctorAdapter.upDateList(doctorChargeArrayList);
             rvDoctor.setAdapter(doctorAdapter);
 
-            tvDoctorPageName.setText("姓名：  " + doctorDataEntity.getName());
-            tvDoctorPageInpatientNum.setText("住院号：  " + doctorDataEntity.getInpatientNum());
+            tvDoctorPageName.setText("姓名: " + doctorDataEntity.getName());
+            tvDoctorPageInpatientNum.setText("住院号: " + doctorDataEntity.getInpatientNum());
         }
     }
 
@@ -1233,8 +1238,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
             costAdapter.upDateList(costArrayList);
             rvCost.setAdapter(costAdapter);
 
-            tvCostPageName.setText("姓名：  " + costDataEntity.getName());
-            tvCostPageInpatientNum.setText("住院号：  " + costDataEntity.getInpatientNum());
+            tvCostPageName.setText("姓名: " + costDataEntity.getName());
+            tvCostPageInpatientNum.setText("住院号: " + costDataEntity.getInpatientNum());
         }
     }
 
@@ -1607,7 +1612,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                             }
 
                             if (!udpEntity.getType().equals(Constants.WSHROOM_CALL)) {//排除卫生间；卫生间是不能呼叫的
-                                if (CALL_STATUS != STANDBY) {
+                                //护士主机消除请求增援
+                                if (CALL_STATUS.equals(Constants.SUPPORT_IN_CALL)) {
                                     CALL_STATUS = STANDBY;
                                     showThisView(vMain);
                                 }
@@ -2198,6 +2204,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
             case R.id.rl_view_cost_layout:
                 showHideRightView();
                 break;
+            case R.id.view_support_layout_tv_call_end:
+            case R.id.view_call_care_layout_tv_call_end:
+                showThisView(vMain);
+                break;
         }
     }
 

app/src/main/java/com/wdkl/callingbed2/ui/InitActivity.java

@@ -144,7 +144,6 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
             SharedPreferences sharedPreferences = getSharedPreferences(Constants.MSG_SP, Context.MODE_PRIVATE); //私有数据
             macAddress = sharedPreferences.getString("macAddress", null);
         }
-        macAddress = "4C:00:00:01:00:01"; //for test
         LogUtil.d("getMacAddress", "macAddress==" + macAddress);
         Constants.MAC_ADDRESS = macAddress;
     }

app/src/main/res/drawable/shape_call_end_bg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff"/>
+    <corners android:radius="80dp"/>
+</shape>

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

@@ -16,12 +16,12 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="2"
-            android:layout_marginLeft="@dimen/margin_to_side_20"
+            android:layout_marginLeft="40dp"
             android:gravity="center_vertical"
             android:lines="1"
             android:text="--"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_size_28" />
+            android:textSize="32sp" />
 
         <TextView
             android:id="@+id/item_cost_layout_tv_content"
@@ -33,7 +33,7 @@
             android:lines="1"
             android:text="--"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_size_28" />
+            android:textSize="32sp" />
 
 
         <TextView
@@ -47,5 +47,5 @@
             android:lines="1"
             android:text="--"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_size_28" />
+            android:textSize="32sp" />
 </LinearLayout>

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

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <RelativeLayout
-        android:layout_marginTop="@dimen/margin_to_side_10"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:padding="10dp">
         <TextView
             android:id="@+id/item_doctor_layout_num"
             android:background="@drawable/shape_item_bg"
             android:textColor="@color/white"
-
             android:layout_marginLeft="@dimen/margin_to_side_20"
             android:layout_marginTop="@dimen/margin_to_side_5"
-            android:textSize="@dimen/font_size_20"
+            android:textSize="@dimen/font_size_28"
             android:gravity="center"
             android:text=""
-            android:layout_width="35dp"
-            android:layout_height="35dp" />
+            android:layout_width="48dp"
+            android:layout_height="48dp" />
 
         <TextView
             android:layout_toRightOf="@+id/item_doctor_layout_num"
             android:id="@+id/item_doctor_layout_content"
             android:layout_marginLeft="@dimen/margin_to_side_20"
-            android:textSize="@dimen/font_size_30"
+            android:textSize="@dimen/font_size_40"
             android:text=""
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />

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

@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
+    android:background="#3CA2E0"
     android:orientation="vertical">
 
 
     <ImageView
         android:id="@+id/view_call_layout_iv_pic"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
+        android:layout_width="240dp"
+        android:layout_height="240dp"
         android:layout_gravity="center"
         android:layout_marginTop="80dp"
         android:gravity="center"
@@ -21,21 +21,32 @@
     <TextView
         android:id="@+id/view_call_layout_tv_call_text"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="80dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:text=""
         android:textColor="@color/white"
-        android:textSize="@dimen/font_size_30" />
+        android:textSize="40sp" />
 
     <TextView
         android:id="@+id/view_call_layout_tv_call_timeout"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="80dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:text=""
         android:textColor="@color/white"
-        android:textSize="@dimen/font_size_30" />
+        android:textSize="40sp" />
 
+    <TextView
+        android:id="@+id/view_call_care_layout_tv_call_end"
+        android:layout_width="420dp"
+        android:layout_height="120dp"
+        android:layout_marginTop="40dp"
+        android:background="@drawable/shape_call_end_bg"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="取消呼叫"
+        android:textColor="@color/red_color"
+        android:textSize="48sp" />
 </LinearLayout>

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

@@ -18,7 +18,7 @@
         <RelativeLayout
             android:id="@+id/view_cost_layout_rl_title"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="80dp"
             android:background="@drawable/shape_cost_list_title_bg">
 
             <TextView
@@ -29,7 +29,7 @@
                 android:layout_marginLeft="20dp"
                 android:text="--"
                 android:textColor="#3A92D1"
-                android:textSize="@dimen/font_size_25"
+                android:textSize="40sp"
                 android:textStyle="bold" />
 
             <TextView
@@ -42,8 +42,7 @@
                 android:layout_marginRight="50dp"
                 android:text="--"
                 android:textColor="#3A92D1"
-                android:textSize="@dimen/font_size_25"
-                android:textStyle="bold" />
+                android:textSize="40sp" />
         </RelativeLayout>
 
         <android.support.v7.widget.RecyclerView
@@ -51,10 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/view_cost_layout_tv_text"
-            android:layout_below="@+id/view_cost_layout_rl_title"
-            android:paddingLeft="@dimen/font_size_20"
-            android:paddingRight="@dimen/font_size_20"
-            android:paddingTop="@dimen/font_size_20"/>
+            android:layout_below="@+id/view_cost_layout_rl_title" />
 
         <TextView
             android:id="@+id/view_cost_layout_tv_text"
@@ -70,6 +66,6 @@
             android:paddingRight="80dp"
             android:text="更多信息请扫描首页二维码"
             android:textColor="#3A92D1"
-            android:textSize="@dimen/font_size_20" />
+            android:textSize="32sp" />
     </RelativeLayout>
 </RelativeLayout>

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

@@ -19,7 +19,7 @@
         <RelativeLayout
             android:id="@+id/view_doctor_layout_rl_title"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="80dp"
             android:background="@drawable/shape_cost_list_title_bg">
 
             <TextView
@@ -30,7 +30,7 @@
                 android:layout_marginLeft="20dp"
                 android:text="--"
                 android:textColor="#3A92D1"
-                android:textSize="@dimen/font_size_25"
+                android:textSize="40sp"
                 android:textStyle="bold" />
 
             <TextView
@@ -43,8 +43,7 @@
                 android:layout_marginRight="50dp"
                 android:text="--"
                 android:textColor="#3A92D1"
-                android:textSize="@dimen/font_size_25"
-                android:textStyle="bold" />
+                android:textSize="40sp" />
         </RelativeLayout>
 
         <android.support.v7.widget.RecyclerView
@@ -68,6 +67,6 @@
             android:paddingRight="80dp"
             android:text="更多信息请扫描首页二维码"
             android:textColor="#3A92D1"
-            android:textSize="@dimen/font_size_20" />
+            android:textSize="32sp" />
     </RelativeLayout>
 </RelativeLayout>

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

@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
+    android:background="#3CA2E0"
     android:orientation="vertical">
 
 
     <ImageView
         android:id="@+id/view_support_layout_iv_pic"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
+        android:layout_width="240dp"
+        android:layout_height="240dp"
         android:layout_gravity="center"
         android:layout_marginTop="80dp"
         android:gravity="center"
@@ -21,21 +21,32 @@
     <TextView
         android:id="@+id/view_support_layout_tv_call_text"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="80dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:text=""
         android:textColor="@color/white"
-        android:textSize="@dimen/font_size_30" />
+        android:textSize="40sp" />
 
     <TextView
         android:id="@+id/view_support_layout_tv_call_timeout"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="80dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:text=""
         android:textColor="@color/white"
-        android:textSize="@dimen/font_size_30" />
+        android:textSize="40sp" />
 
+    <TextView
+        android:id="@+id/view_support_layout_tv_call_end"
+        android:layout_width="420dp"
+        android:layout_height="120dp"
+        android:layout_marginTop="40dp"
+        android:background="@drawable/shape_call_end_bg"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="取消呼叫"
+        android:textColor="@color/red_color"
+        android:textSize="48sp"/>
 </LinearLayout>

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="42dp"
-    android:background="#3CA7E3"
+    android:background="#3B97D6"
     android:orientation="vertical">
 
     <TextView