guzijian / wvp-GB28181-pro · Commits

Commit 93c632f2082ba00feed0cba441dd73e8cdb26556

Authored by 648540858
1 parent 197f8058

合并主线

Inline Side-by-side
Showing 3 changed files with 5 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
  View file @93c632f
@@ -83,8 +83,7 @@ public interface ISIPCommanderForPlatform { @@ -83,8 +83,7 @@ public interface ISIPCommanderForPlatform {
83 * @param fromTag 83 * @param fromTag
84 * @return 84 * @return
85 */ 85 */
86 - void deviceStatusResponse(ParentPlatform parentPlatform, String sn, String fromTag)  
87 - throws SipException, InvalidArgumentException, ParseException; 86 + void deviceStatusResponse(ParentPlatform parentPlatform,String channelId, String sn, String fromTag,int status) throws SipException, InvalidArgumentException, ParseException ;
88 87
89 /** 88 /**
90 * 向上级回复移动位置订阅消息 89 * 向上级回复移动位置订阅消息
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
  View file @93c632f
@@ -363,11 +363,11 @@ public class SIPRequestHeaderPlarformProvider { @@ -363,11 +363,11 @@ public class SIPRequestHeaderPlarformProvider {
363 //from 363 //from
364 SipURI fromSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(),sipConfig.getDomain()); 364 SipURI fromSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(sipConfig.getId(),sipConfig.getDomain());
365 Address fromAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(fromSipURI); 365 Address fromAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(fromSipURI);
366 - FromHeader fromHeader = sipLayer.getSipFactory().createHeaderFactory().createFromHeader(fromAddress, transactionInfo.isFromServer()?transactionInfo.getFromTag():transactionInfo.getToTag()); 366 + FromHeader fromHeader = sipLayer.getSipFactory().createHeaderFactory().createFromHeader(fromAddress, transactionInfo.isAsSender()?transactionInfo.getFromTag():transactionInfo.getToTag());
367 //to 367 //to
368 SipURI toSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId, deviceHostAddress); 368 SipURI toSipURI = sipLayer.getSipFactory().createAddressFactory().createSipURI(channelId, deviceHostAddress);
369 Address toAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(toSipURI); 369 Address toAddress = sipLayer.getSipFactory().createAddressFactory().createAddress(toSipURI);
370 - ToHeader toHeader = sipLayer.getSipFactory().createHeaderFactory().createToHeader(toAddress,transactionInfo.isFromServer()?transactionInfo.getToTag():transactionInfo.getFromTag()); 370 + ToHeader toHeader = sipLayer.getSipFactory().createHeaderFactory().createToHeader(toAddress,transactionInfo.isAsSender()?transactionInfo.getToTag():transactionInfo.getFromTag());
371 371
372 //Forwards 372 //Forwards
373 MaxForwardsHeader maxForwards = sipLayer.getSipFactory().createHeaderFactory().createMaxForwardsHeader(70); 373 MaxForwardsHeader maxForwards = sipLayer.getSipFactory().createHeaderFactory().createMaxForwardsHeader(70);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @93c632f
@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl; @@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
2 2
3 import com.alibaba.fastjson2.JSON; 3 import com.alibaba.fastjson2.JSON;
4 import com.alibaba.fastjson2.JSONObject; 4 import com.alibaba.fastjson2.JSONObject;
  5 +import com.genersoft.iot.vmp.conf.DynamicTask;
5 import com.genersoft.iot.vmp.conf.UserSetting; 6 import com.genersoft.iot.vmp.conf.UserSetting;
6 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException; 7 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
7 import com.genersoft.iot.vmp.gb28181.SipLayer; 8 import com.genersoft.iot.vmp.gb28181.SipLayer;
@@ -336,6 +337,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -336,6 +337,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
336 sipSender.transmitRequest(parentPlatform.getDeviceIp(), request); 337 sipSender.transmitRequest(parentPlatform.getDeviceIp(), request);
337 } 338 }
338 339
  340 +
339 /** 341 /**
340 * 向上级回复DeviceStatus查询信息 342 * 向上级回复DeviceStatus查询信息
341 * @param parentPlatform 平台信息 343 * @param parentPlatform 平台信息