panlinlin
|
5db39a2265
|
1078-完善接入国标通道页面以及属性
|
2024-06-20 06:21:20 +08:00 |
|
panlinlin
|
edeea61318
|
1078-完善接入国标通道页面以及属性
|
2024-06-19 00:02:08 +08:00 |
|
panlinlin
|
a94b18bde9
|
1078-添加接入国标通道页面以及属性
|
2024-06-18 20:42:09 +08:00 |
|
648540858
|
5846a4ed5b
|
丰富表单内容
|
2024-06-18 12:50:54 +08:00 |
|
panlinlin
|
358799a391
|
1078-添加接入国标通道页面以及属性
|
2024-06-18 05:55:42 +08:00 |
|
panlinlin
|
36e15c80b0
|
1078-增加位置信息并发处理能力
|
2024-06-16 06:41:57 +08:00 |
|
648540858
|
e0adc7306b
|
Merge branch 'refs/heads/master' into 1078
|
2024-06-12 12:49:47 +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 |
|
panlinlin
|
824690a37f
|
1078-终端参数回显
|
2024-06-10 15:20:48 +08:00 |
|
panlinlin
|
3410fae879
|
1078-添加终端参数的前端UI
|
2024-06-10 08:30:22 +08:00 |
|
panlinlin
|
c0dea69839
|
1078-添加接口的前端UI
|
2024-06-10 00:48:18 +08:00 |
|
panlinlin
|
f564ff0aba
|
1078-支持设备录像FTP方式下载
|
2024-06-10 00:33:55 +08:00 |
|
panlinlin
|
a030c15c8f
|
1078-支持设备录像播放以及播放控制
|
2024-06-09 22:09:04 +08:00 |
|
panlinlin
|
4b90298c99
|
1078-支持设备录像检索播放
|
2024-06-09 20:50:59 +08:00 |
|
panlinlin
|
b4dddb0b08
|
1078-支持云台控制
|
2024-06-08 23:55:06 +08:00 |
|
panlinlin
|
9c2c4a92b1
|
1078-支持编辑通道
|
2024-06-08 23:11:56 +08:00 |
|
panlinlin
|
18cfba612b
|
1078-支持快照的展示
|
2024-06-08 22:58:23 +08:00 |
|
panlinlin
|
dbb2492640
|
1078-修复断开连接时设备未下线的BUG
|
2024-06-08 21:54:58 +08:00 |
|
648540858
|
595d9be283
|
1078-优化点播以及通道表结构
|
2024-06-08 00:46:08 +08:00 |
|
648540858
|
6ae623d639
|
1078-临时提交
|
2024-06-07 14:35:07 +08:00 |
|
648540858
|
0103d5819b
|
1078-调整页面
|
2024-06-07 14:03:41 +08:00 |
|
648540858
|
913d358a11
|
1078-部标通道添加音频控制
|
2024-06-07 00:20:52 +08:00 |
|
648540858
|
5d5d654410
|
1078-添加部标通道页面
|
2024-06-07 00:10:36 +08:00 |
|
648540858
|
37b79633f0
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-28 18:40:44 +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 |
|
648540858
|
db4ba4035f
|
Merge branch 'refs/heads/master' into 1078
|
2024-05-12 06:53:53 +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
|
05c83cf6ef
|
Merge branch 'master' into 1078
|
2024-04-11 09:39:04 +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
|
ae239c8848
|
Merge branch 'master' into 1078
|
2024-04-08 18:15:06 +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
|
6acc395ad2
|
Merge branch 'master' into 1078
|
2024-04-02 18:33:53 +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 |
|