浏览代码

<主机发生异常时重置状态>

weizhengliang 4 年之前
父节点
当前提交
54958824fe

+ 12 - 1
app/src/main/java/com/wdkl/callingbed/ui/CallingBedActivity.java

@@ -1631,7 +1631,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                             }
 
                             if (!udpEntity.getType().equals(Constants.WSHROOM_CALL)) {//排除卫生间;卫生间是不能呼叫的
-                                if (CALL_STATUS != STANDBY) {
+                                if (!CALL_STATUS.equals(STANDBY)) {
                                     CALL_STATUS = STANDBY;
                                     showThisView(vMain);
                                 }
@@ -1669,6 +1669,17 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                             setDoorLight(serialPortUtil, "111");//白色
                         }
                         break;
+                    case "call_host_exception":
+                        if (Constants.CALLMAIN_ID.equals(udpEntity.getNurseHostID())) {
+                            Constants.IS_CALLED = 0;
+                            if (!CALL_STATUS.equals(STANDBY)) {
+                                CALL_STATUS = STANDBY;
+                                showThisView(vMain);
+                                SipHelperUtil.getInstance(this).getmSipCallBackI().endCall();
+                            }
+                            flickerStatus = setWSHLightFlicker(serialPortUtil, false);
+                        }
+                        break;
                 }
                 break;
             case Constants.EVENT_NOTICE:

+ 14 - 0
app/src/main/java/com/wdkl/callingbed/util/AnalysisUdpUtil.java

@@ -214,6 +214,20 @@ public class AnalysisUdpUtil {
                         noany_request.setRoomNumber(data[5]);
                         EventBus.getDefault().post(new MessageEvent(noany_request, Constants.EVENT_UDP));
                         break;
+                    case "call_host_exception": //主机发生异常
+                        UdpEntity call_host_exception = new UdpEntity();
+                        call_host_exception.setIndexes(data[0]);
+                        call_host_exception.setNurseHostID(data[1]);
+                        call_host_exception.setDoorwayMachineID(data[2]);
+                        call_host_exception.setHeadMachineID(data[3]);
+                        call_host_exception.setSipAddress(data[4]);
+                        call_host_exception.setRoomNumber(data[5]);
+                        call_host_exception.setBedNumber(data[6]);
+                        call_host_exception.setLevel(data[7]);
+                        call_host_exception.setType(data[8]);
+                        call_host_exception.setName(data[9]);
+                        EventBus.getDefault().post(new MessageEvent(call_host_exception, Constants.EVENT_UDP));
+                        break;
                     case "back_1":
                         //呼叫回复");
                         break;