648540858
|
c96c29776d
|
临时提交
|
2024-07-22 14:20:40 +08:00 |
|
648540858
|
2f4d983f9f
|
修复拉流看方式回显
|
2024-07-22 11:07:58 +08:00 |
|
panlinlin
|
0b7d55ed74
|
修复拉流代理相关问题
|
2024-07-20 23:31:38 +08:00 |
|
panlinlin
|
80ac701748
|
临时提交
|
2024-07-20 06:44:53 +08:00 |
|
648540858
|
9f4e66a38b
|
优化拉流代理
|
2024-07-19 17:54:14 +08:00 |
|
648540858
|
e46ad4e66a
|
临时提交
|
2024-07-17 17:56:26 +08:00 |
|
648540858
|
15f44b0d23
|
修改拉流代理表单
|
2024-07-16 18:01:16 +08:00 |
|
648540858
|
8c95485504
|
修复推流信息播放
|
2024-07-16 17:44:27 +08:00 |
|
648540858
|
d7abe7fb75
|
适配推流列表信息
|
2024-07-16 17:33:18 +08:00 |
|
648540858
|
1dcb912910
|
调整推流导入的数据格式
|
2024-07-15 17:52:27 +08:00 |
|
648540858
|
d9c0d0637c
|
增加通道编辑以及通道重置功能
|
2024-07-15 17:39:47 +08:00 |
|
648540858
|
92c6a10083
|
临时提交
|
2024-07-15 15:42:15 +08:00 |
|
648540858
|
4467684370
|
临时提交
|
2024-07-12 18:00:02 +08:00 |
|
648540858
|
cb403689b4
|
添加通道编号构建页面
|
2024-07-12 17:52:05 +08:00 |
|
panlinlin
|
0853d7e842
|
临时提交
|
2024-07-11 23:52:34 +08:00 |
|
648540858
|
6619c5c53d
|
临时提交
|
2024-07-11 18:25:16 +08:00 |
|
panlinlin
|
84dcd4d8b8
|
临时提交
|
2024-07-10 23:25:54 +08:00 |
|
648540858
|
bec52f687e
|
临时提交
|
2024-07-10 17:53:15 +08:00 |
|
648540858
|
a084fac7cd
|
优化通道数据显示
|
2024-07-10 17:33:04 +08:00 |
|
648540858
|
b843958ed7
|
临时提交
|
2024-07-10 14:43:22 +08:00 |
|
648540858
|
57a230afb3
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2024-06-25 09:45:34 +08:00 |
|
648540858
|
107caf1171
|
调整前端使用转码后的流
|
2024-06-14 17:24:57 +08:00 |
|
panlinlin
|
317c5455c6
|
修复位置信息保存失败的BUG
|
2024-06-13 23:19:26 +08:00 |
|
648540858
|
2cf7178cb7
|
Merge branch 'refs/heads/2.7.1'
|
2024-06-11 10:14:14 +08:00 |
|
648540858
|
f8ef14bfea
|
修复移动位置位置订阅上报间隔为0的bug
|
2024-06-11 10:08:13 +08:00 |
hexq
|
09efdef4ce
|
解决MacOS 14寸 M2：最新Chrome国标设备通道“直播”Jessibuca播放下方出现黑屏的兼容BUG
|
2024-05-16 13:25:06 +08:00 |
BradyXu
|
7565b2ea77
|
fix 优化及联本地IP选择
|
2024-05-15 23:28:38 +08:00 |
|
BradyXu
|
a8c424e49d
|
修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择
|
2024-05-12 02:00:55 +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
|
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
|
313243195e
|
修复通道位置的展示
|
2024-04-17 17:56:36 +08:00 |
|
648540858
|
0f4b5eed7d
|
优化apikey列表样式
|
2024-04-10 23:09:28 +08:00 |
|
648540858
|
b45d71ba6d
|
Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
|
2024-04-10 22:56:14 +08:00 |
|
648540858
|
31be0a3874
|
更新webrtc调用
|
2024-04-10 22:44:19 +08:00 |
leesam
|
16b7e4a7ef
|
Merge branch 'refs/heads/master' into develop-add-api-key
|
2024-04-10 20:49:44 +08:00 |
|
648540858
|
b1b6fae22c
|
Merge branch 'master' into dev/zlm
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.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/vmanager/cloudRecord/CloudRecordController.java
|
2024-04-09 10:35:11 +08:00 |
ancienter
|
25ff2fc4ef
|
Merge branch '648540858:master' into develop-add-api-key
|
2024-04-09 09:52:23 +08:00 |
|
648540858
|
a890b62fa1
|
Merge branch '2.7.0'
|
2024-04-08 18:13:33 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
b7b950ec8b
|
支持展示abl-logo
|
2024-04-01 16:47:45 +08:00 |
|
648540858
|
0324855190
|
Merge branch 'master' into dev/abl支持
|
2024-03-29 22:55:09 +08:00 |
|
648540858
|
d34371a9f9
|
优化通道列表按钮排列
|
2024-03-28 23:06:27 +08:00 |
|
648540858
|
7dda1f6a2e
|
Merge branch 'master' into dev/abl支持
|
2024-03-27 17:18:35 +08:00 |
|
648540858
|
e886aa4833
|
修复PTZType导致声音开关失效的问题
|
2024-03-27 11:15:35 +08:00 |
|
648540858
|
08696a57d3
|
Merge branch 'master' into dev/abl支持
|
2024-03-22 14:28:24 +08:00 |
Kairlec
|
afed8161b1
|
fix webrtc player assert failed because media empty
|
2024-03-21 14:25:45 +08:00 |