Commit Graph

3584 Commits

Author SHA1 Message Date
648540858
4a5de5a2db 1078-设置矩形区域+删除矩形区域 2024-05-04 14:35:45 +08:00
648540858
faa0a01b9f 1078-设置圆形区域 2024-05-04 00:09:12 +08:00
648540858
5dd49b3d44 1078-设置圆形区域... 2024-05-03 18:58:49 +08:00
648540858
4011e54dd8 1078-设置圆形区域... 2024-05-03 01:02:00 +08:00
648540858
738b3b6a8e 1078-车辆控制应答 2024-05-02 07:35:44 +08:00
648540858
a5bfe5049d 1078-车辆控制 2024-05-02 07:29:00 +08:00
648540858
c946b97514 1078-优化消息汇报消息体的解析 2024-05-02 06:43:59 +08:00
648540858
0fc0cd6e41 1078-优化编码 2024-05-02 06:25:09 +08:00
648540858
734f0c7e04 1078-设置电话本+电话回拨 2024-05-02 05:21:50 +08:00
648540858
16bc3dabd6 1078-修改文本信息下发标记类型注释 2024-05-02 04:46:34 +08:00
648540858
7c833f3d12 1078-文本信息下发 2024-05-01 15:07:38 +08:00
648540858
e5acf7f1e4 1078-人工确认报警消息+链路检测 2024-05-01 10:05:33 +08:00
648540858
eb43ffd98f 1078-临时提交 2024-05-01 00:01:55 +08:00
648540858
e45b2479d3 1078-临时位置跟踪控制+位置信息查询 2024-04-30 23:37:44 +08:00
648540858
fa8ff09b42 新功能-云端录像列表支持下载 2024-04-30 17:53:31 +08:00
648540858
69185d3db8 修复云端录像下载 2024-04-30 17:51:15 +08:00
648540858
2ae4226e89 修复云端录像按年月查询时时间条件错误的BUG 2024-04-30 15:45:39 +08:00
648540858
78c2b5a63d 修复云端录像详情页时间显示错误 2024-04-30 15:36:32 +08:00
648540858
b6e604f244 修改云端录像详情页使用直接访问zlm的方式播放录像 2024-04-30 15:20:03 +08:00
648540858
edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
648540858
d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
648540858
7bdde6907a 1078-添加设备属性查询接口 2024-04-30 12:13:49 +08:00
648540858
5be7c7636e 1078-查询终端属性完成 2024-04-30 00:42:22 +08:00
648540858
76580d8fdc 1078-查询终端属性... 2024-04-30 00:28:40 +08:00
648540858
5b489d7c26 1078-设置终端参数-添加接口 2024-04-29 23:06:15 +08:00
648540858
5a392372cb 1078-添加设备控制 2024-04-29 22:15:21 +08:00
648540858
8aa97ba695 1078-添加设备控制 2024-04-29 22:12:27 +08:00
648540858
516c5ce3d1 1078-添加设备控制 2024-04-29 22:01:26 +08:00
648540858
9facff13b1 1078-添加发送分包支持 2024-04-29 21:24:08 +08:00
648540858
91b81ceb7a 1078-添加发送分包支持 2024-04-29 16:27:01 +08:00
648540858
06b27beedc 1078-设置终端参数... 2024-04-29 07:00:00 +08:00
648540858
bc356849c7 1078-设置终端参数... 2024-04-29 00:05:04 +08:00
648540858
1fc2916c2b Merge pull request #1432 from AlphaWu/Zafu-Dev-20240428
修改on_stream_none_reader返回值
2024-04-28 22:25:58 +08:00
WuPeng
424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858
8ade012a6e 合并分支 2024-04-26 17:49:28 +08:00
648540858
5e359b64d6 合并分支 2024-04-26 17:41:00 +08:00
648540858
6bd3a187a0 合并分支 2024-04-26 15:42:31 +08:00
648540858
3f6ef955f5 修复空指针异常 2024-04-26 15:02:49 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858
225940825b 1078-设置终端参数... 2024-04-24 23:34:21 +08:00
648540858
62122f95f0 1078-完善查询终端参数接口 2024-04-24 23:15:07 +08:00
648540858
67b846fe2f 1078-支持8103 修改注释错误 2024-04-24 22:21:47 +08:00
648540858
b89af9a693 Merge branch 'refs/heads/2.7.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2024-04-24 20:51:28 +08:00
648540858
2113e8cf27 优化notify消息中目录的处理 2024-04-24 20:33:52 +08:00
648540858
44aa37ad6e 优化notify消息中目录的处理 2024-04-24 16:12:42 +08:00
648540858
c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00
648540858
1a30992985 合并270 2024-04-24 09:11:53 +08:00
648540858
d41d6b34af Merge branch 'refs/heads/2.7.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.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/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-04-23 20:59:20 +08:00
648540858
66a681d679 优化notify消息中目录和移动位置的处理 2024-04-23 20:45:12 +08:00
648540858
901dee2bf4 修复转发国标notify-update时信息错误的问题 2024-04-23 10:12:00 +08:00