Browse Source

<在医嘱或费用界面点呼叫没有隐藏右侧侧边栏>

weizhengliang 5 years ago
parent
commit
dc0d2f229f
1 changed files with 6 additions and 1 deletions
  1. 6 1
      app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

+ 6 - 1
app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -1447,7 +1447,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
      *            呼叫护士超时
      */
     private void autoHangUpCallNurse(String sel) {
-        clickVNurse();
+        //clickVNurse();
         if (sel.equals("1")) {
             handsMICStatus = setHandsMIC(serialPortUtil, false);
         } else {
@@ -1940,6 +1940,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         } else {
             if (!isVisible(vCall) && !isVisible(vNurse)) {//排除呼叫状态
                 showThisView(vSupport);
+                goneLlRightView(true);
                 setDoorLight(serialPortUtil, "200");//门灯红色闪烁  add by waderson 20191119 后来加的门灯控制
                 UdpSendUtil.sendCall4(initDataEntity, mainDataEntity);
                 CALL_STATUS = Constants.SUPPORT_IN_CALL;
@@ -1969,6 +1970,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         } else {
             if (!isVisible(vSupport) && !isVisible(vNurse)) {//排除呼叫状态
                 showThisView(vCall);
+                goneLlRightView(true);
                 //sendProtectHelp();//呼叫护工还没有做;这个先预留
                 CALL_STATUS = Constants.WORK_IN_CALL;
                 if (null != initDataEntity) {
@@ -2024,6 +2026,9 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     }
 
     private void callNurse() {
+        if (isVisible(llRight)) {
+            goneLlRightView(false);
+        }
         if (isVisible(vNurse)) {
             //当前正在呼叫或通话中,直接返回
             return;