Merge branch 'wvp-28181-2.0'

648540858

2022-09-24 d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4

 src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeTask.java

@@ -4,6 +4,8 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
import gov.nist.javax.sip.message.SIPRequest;
import gov.nist.javax.sip.message.SIPResponse;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -12,6 +14,8 @@
import javax.sip.Dialog;
import javax.sip.DialogState;
import javax.sip.ResponseEvent;
import javax.sip.header.ToHeader;
import java.text.ParseException;
import java.util.Timer;
import java.util.TimerTask;

@@ -23,7 +27,8 @@
    private final Logger logger = LoggerFactory.getLogger(MobilePositionSubscribeTask.class);
    private  Device device;
    private  ISIPCommander sipCommander;
    private Dialog dialog;

    private SIPRequest request;
    private DynamicTask dynamicTask;
    private String taskKey = "mobile-position-subscribe-timeout";

@@ -38,24 +43,26 @@
        if (dynamicTask.get(taskKey) != null) {
            dynamicTask.stop(taskKey);
        }
        sipCommander.mobilePositionSubscribe(device, dialog, eventResult -> {
            if (eventResult.dialog != null || eventResult.dialog.getState().equals(DialogState.CONFIRMED)) {
                dialog = eventResult.dialog;
            }
        SIPRequest sipRequest = sipCommander.mobilePositionSubscribe(device, request, eventResult -> {
            // 成功
            logger.info("[移动位置订阅]成功： {}", device.getDeviceId());
            ResponseEvent event = (ResponseEvent) eventResult.event;
            if (event.getResponse().getRawContent() != null) {
                // 成功
                logger.info("[移动位置订阅]成功： {}", device.getDeviceId());
            }else {
                // 成功
                logger.info("[移动位置订阅]成功： {}", device.getDeviceId());
            ToHeader toHeader = (ToHeader)event.getResponse().getHeader(ToHeader.NAME);
            try {
                this.request.getToHeader().setTag(toHeader.getTag());
            } catch (ParseException e) {
                logger.info("[移动位置订阅]成功： 为request设置ToTag失败");
                this.request = null;
            }
        },eventResult -> {
            dialog = null;
            this.request = null;
            // 失败
            logger.warn("[移动位置订阅]失败，信令发送失败： {}-{} ", device.getDeviceId(), eventResult.msg);
            dynamicTask.startDelay(taskKey, MobilePositionSubscribeTask.this, 2000);
        });
        if (sipRequest != null) {
            this.request = sipRequest;
        }

    }

@@ -71,10 +78,8 @@
        if (dynamicTask.get(taskKey) != null) {
            dynamicTask.stop(taskKey);
        }
        if (dialog != null && dialog.getState().equals(DialogState.CONFIRMED)) {
            logger.info("取消移动订阅时dialog状态为{}", dialog.getState());
            device.setSubscribeCycleForMobilePosition(0);
            sipCommander.mobilePositionSubscribe(device, dialog, eventResult -> {
        sipCommander.mobilePositionSubscribe(device, request, eventResult -> {
                ResponseEvent event = (ResponseEvent) eventResult.event;
                if (event.getResponse().getRawContent() != null) {
                    // 成功
@@ -87,13 +92,5 @@
                // 失败
                logger.warn("[取消移动位置订阅]失败，信令发送失败： {}-{} ", device.getDeviceId(), eventResult.msg);
            });
        }
    }
    @Override
    public DialogState getDialogState() {
        if (dialog == null) {
            return null;
        }
        return dialog.getState();
    }
}