XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,843 Commits 2 Branches 0 Tags
32c73ff595c9939b342017ffbd8c86bc16877ba6
Commit Graph

699 Commits

Author SHA1 Message Date
648540858
7a120c6da4 优化日志 2023-07-17 16:54:00 +08:00
朱俊杰
4f2cd41134 修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突 2023-07-17 10:54:34 +08:00
648540858
4162706ec4 修复因为心跳重发导致的心跳间隔异常 2023-07-14 09:10:59 +08:00
648540858
ef5018de2d 修复合并错误 2023-07-13 14:57:30 +08:00
che_shuai
c27e345edc 修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914 2023-07-13 10:22:42 +08:00
648540858
ff1e9f79c2 优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920 2023-07-07 14:51:41 +08:00
648540858
9fc9a29811 优化海康发送长度与实际长度不一致的情况，导致无法识别消息内容的问题 2023-07-06 18:01:16 +08:00
648540858
e4754af417 修复数据错误导致无法转成JSON返回 #919 2023-07-06 15:35:59 +08:00
648540858
e163cf4d20 兼容海康平台在address字段使用错误的<或>破坏xml结构的情况， #903 2023-07-06 15:18:10 +08:00
648540858
deeff5533b 添加兼容目录同步兼容性 2023-07-05 17:20:20 +08:00
648540858
457c5e3821 修复拉流代理无人观看自动停用失败 2023-07-04 11:10:17 +08:00
648540858
e4622d17a6 优化字段名称 2023-07-03 10:36:02 +08:00
648540858
b64f320805 优化发流逻辑 2023-07-01 18:10:33 +08:00
648540858
c916433042 优化更新通道中父结点的判断 2023-06-30 10:34:02 +08:00
648540858
18ad50222f 优化更新通道中父结点的判断 2023-06-30 10:01:21 +08:00
648540858
2d4bbbea8e 优化更新通道的civicode判断 2023-06-29 17:10:14 +08:00
648540858
e8b766172e 合并268优化内容 2023-06-29 10:37:20 +08:00
648540858
f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
 2023-06-29 09:52:05 +08:00
648540858
bfae9780f7 增加流关闭时的处理 2023-06-28 20:32:48 +08:00
648540858
def56793ba 增加上级推流和停止推流的通知 2023-06-28 16:52:27 +08:00
648540858
a77628e875 优化端口预占用，防止占用无法释放 2023-06-28 14:50:46 +08:00
648540858
724963324a 修复上级点播时如果推流信息中mediaServerID错误的情况 2023-06-26 19:06:14 +08:00
648540858
fec69c714c 优化国标信令 2023-06-25 22:40:26 +08:00
648540858
155838ce2e 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 2023-06-22 22:35:35 +08:00
648540858
7b24d51db9 优化国标级联的端口保持 2023-06-21 14:03:31 +08:00
648540858
9e28923b8c Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +08:00
648540858
d310204d00 去除多余字段 2023-06-20 09:57:28 +08:00
648540858
0532363192 优化国标级联注册机制 2023-06-20 09:29:12 +08:00
648540858
6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json
 2023-06-19 20:19:31 +08:00
648540858
8942ab0112 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 2023-06-19 18:42:36 +08:00
‘sxh’
652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2023-06-15 11:10:20 +08:00
‘sxh’
15df08964b 新增设备主子码流选择，默认为不开启 2023-06-15 11:00:29 +08:00
648540858
319cdd2151 优化移动位置的时间 2023-06-14 20:39:10 +08:00
648540858
138216c395 Merge pull request #876 from criver31/wvp-28181-2.0 
移动设备实时位置兼容ISO8601格式
 2023-06-14 20:14:31 +08:00
648540858
f4960b2618 修复移动位置获取接口超时 #857 2023-06-14 17:04:41 +08:00
648540858
fa80ba6f2b 修复sdp解析错误 2023-06-12 22:54:40 +08:00
648540858
446f729e55 优化sdp解析，兼容带有f=的设备 2023-06-10 00:32:42 +08:00
648540858
ca715e0234 优化via的branch生成规则 2023-06-07 21:45:15 +08:00
648540858
0c14970ab8 增加收到notify增加或移除通道时发送redis消息 2023-06-07 21:11:39 +08:00
648540858
e272fa26e1 合并分支 2023-06-07 20:27:57 +08:00
648540858
b7f2a6b25b Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-07 20:21:10 +08:00
648540858
97b04c4dba 修复录像下载，优化拉流代理接口 2023-06-07 20:15:08 +08:00
648540858
8d6de72429 优化日志 2023-06-02 16:40:19 +08:00
648540858
74431b1e98 优化点播流程中ssrc的释放 2023-06-02 15:46:07 +08:00
fine
c2ef001546 Update MobilePositionResponseMessageHandler.java 2023-05-31 09:35:08 +08:00
648540858
5a152791c0 添加获取截图接口 2023-05-29 23:28:06 +08:00
648540858
5639719879 Merge branch 'postgresql' into wvp-28181-2.0 2023-05-29 09:25:45 +08:00
shanyuanzz
5ebd788cef 优化低倍速下zoom变倍速率 
1.优化zoom缩放在1-FH低倍速下的变倍速率。
避免变倍速率过大或者某些相机无法变倍的问题。
 2023-05-28 14:01:51 +08:00
shanyuanzz
6d52e1539f 优化zoom低倍速下的变倍速率 
优化zoom低倍速下的变倍速率
 2023-05-28 13:48:55 +08:00
shanyuanzz
31c2f52e48 Update SIPCommander.java 
Add by 白米粥
1.修正云台控制的zoom的speedbug。
解决当zoom时speed为1-FH时速度变化为1-FH，而10H~FFH以上时是以首位速度进行变化，变化速率过于不一致。
修改后1-FH的速度均以1的速率进行缩放变倍。
 2023-05-28 13:39:16 +08:00