Browse Source

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

weizhengliang 4 years ago
parent
commit
244e68fb7e

+ 0 - 1
app/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     // wuyq add for sign begin
-    //A20平台测试用
     signingConfigs {
         release {
             storeFile file("keystore_wuyuqing_3128/rk3128.jks")

+ 15 - 1
app/src/main/java/com/wdkl/callingdoor/ui/CallingDoorActivity.java

@@ -1124,7 +1124,21 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
 
                     case "back_1": //呼叫回复
                         break;
-
+                    case "call_host_exception":
+                        if (Constants.CALLMAIN_ID.equals(udpEntity.getNurseHostID())) {
+                            if (!CALL_STATUS.equals(Constants.STANDBY)) {
+                                CALL_STATUS = Constants.STANDBY;
+                                SipHelperUtil.getInstance(this).endCall();
+                                onOffBroadcastVolume(1.0f);
+                                if (null != callNurseWindow) {
+                                    callNurseWindow.dismissPopWindow();
+                                }
+                                if (null != loopVoice) { //呼叫结束了;将播报音量为1;
+                                    loopVoice.setVolume(1.0f);
+                                }
+                            }
+                        }
+                        break;
                     case "end_1": //挂断
 //                        if (!controlSingleLight(udpEntity.getDoorwayMachineID())) {
 //                            return;

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

@@ -197,6 +197,20 @@ public class AnalysisUdpUtil {
                         transfer_bedtobed.setName(data[9]);
                         EventBus.getDefault().post(new MessageEvent(transfer_bedtobed, 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;