Commit Graph

682 Commits

Author SHA1 Message Date
lin
ff0d54968d zlm适配新的云端录像播放界面 2025-09-19 22:55:44 +08:00
lin
af3a283b3d 适配abl新的端口命名 2025-09-19 20:48:41 +08:00
lin
fd306d8ede 云端录像回放使用单文件播放 2025-09-19 18:02:53 +08:00
lin
a064f27bf8 支持ABL风格地址 2025-09-18 18:53:12 +08:00
lin
fb9ff67701 支持ABL录像回放 2025-09-17 18:19:33 +08:00
lin
403e7648f9 优化ABL结果封装完成 2025-09-16 17:57:59 +08:00
lin
c1672728d3 优化zlm结果封装完成 2025-09-16 10:52:58 +08:00
lin
576feec514 临时提交 2025-09-15 18:01:00 +08:00
lin
5c83bf2a41 临时提交 2025-09-15 17:59:18 +08:00
lin
18be8aff6c abl 支持拉流代理 2025-09-08 16:09:01 +08:00
lin
6f577268ee 适配新版本zlm限流配置 2025-08-15 09:50:45 +08:00
lin
1da487f02a [1078] 优化鉴权码位置,支持1078国标级联 2025-08-06 15:17:44 +08:00
lin
4c97022c78 [1078] 支持语音对讲 中心广播模式 2025-07-28 17:50:03 +08:00
lin
c0ab010475 [1078] 增加音视频属性查询 2025-07-22 20:51:03 +08:00
lin
44ed06bcbe [1078] 支持无人观看自动停流 2025-07-15 18:11:23 +08:00
lin
b7a2b6816b [1078] 完善录像下载 2025-07-10 18:48:25 +08:00
lin
1655e5903b [1078] 完善录像回放 2025-07-09 16:44:54 +08:00
lin
3c6b715ce1 [1078] 临时提交 2025-07-09 16:16:04 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +08:00
lin
a424f270e8 [1078] 兼容abl流媒体 2025-07-03 17:30:59 +08:00
lin
1bfb51c90e Merge branch 'dev/abl支持' into 重构/1078
# Conflicts:
#	src/main/resources/application.yml
2025-07-03 15:29:13 +08:00
lin
5bcdf5dfb6 [abl] 合并主线 2025-07-03 15:28:47 +08:00
lin
bab5534134 Merge branch 'master' into dev/abl支持
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/resources/application.yml
2025-07-03 14:58:24 +08:00
lin
465e03d15d Merge branch 'master' into 重构/1078
# Conflicts:
#	web/src/router/index.js
#	web/src/views/common/channelPlayer/chooseChannelForJt.vue
#	web/src/views/common/channelPlayer/jtDeviceEdit.vue
#	web/src/views/common/channelPlayer/jtDevicePlayer.vue
#	web_src/src/layout/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js
2025-07-03 09:41:55 +08:00
lin
f8e5e8f057 优化拉流代理播放机制 2025-07-01 17:07:10 +08:00
lin
9e8fbea73b 支持zlm pro截图方式 2025-06-30 17:16:25 +08:00
lin
60e9fb3daa 修复推流列表和拉流代理的云端录像跳转错误 2025-06-05 09:40:43 +08:00
lin
1420fcfcd0 Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
#	src/main/resources/application.yml
2025-05-29 17:10:32 +08:00
lin
9da6e874fb 修复时间戳发送错误导致seek失败 2025-05-26 09:54:33 +08:00
648540858
3b7ba3eb46 Merge branch 'master' into dev/1078-newUI
# Conflicts:
#	src/main/resources/application.yml
2025-05-10 08:59:45 +08:00
lin
e2678f39e3 临时提交 2025-04-25 18:04:51 +08:00
lin
1dc65330fc 修复属性注释错误 2025-04-24 17:53:05 +08:00
lin
3b4a6018cb 修复云端录像seek问题 2025-04-16 18:07:04 +08:00
lin
1a9307003a Merge remote-tracking branch 'origin/dev/前端页面修改' into dev/前端页面修改 2025-04-15 09:03:24 +08:00
648540858
45b3d9322c 增加云端录像手动删除 2025-04-14 22:54:30 +08:00
lin
f2e3016a48 修复云端录像seek不准确的问题 2025-04-14 12:43:05 +08:00
648540858
c8822e2b86 优化云端录像播放逻辑 2025-04-13 20:14:48 +08:00
lin
eea367d6d7 增加录像seek和倍速播放接口 2025-04-12 21:24:02 +08:00
lin
e284c3857c Merge branch 'master' into 重构/1078 2025-04-09 12:17:22 +08:00
huangxiao
629a4dbea3 refactor: 优化zlm hook 推流鉴权事件找不到mediaServer的错误处理 2025-03-28 13:51:48 +08:00
lin
20135726eb Merge branch 'master' into 重构/1078 2025-03-24 15:19:07 +08:00
lin
a9cf5131e1 修复zlm普通版本接入异常 2025-03-21 11:30:05 +08:00
lin
06de25bb4d 修复转码时拉流代理无人观看无法移除的BUG, 修复根据请求IP返回流地址失败的BUG 2025-03-19 15:45:23 +08:00
lin
0329c8f5d1 Merge remote-tracking branch 'origin/master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	数据库/2.7.3/初始化-mysql-2.7.3.sql
#	数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
2025-03-18 15:30:35 +08:00
lin
0868219822 修复播放拉流代理时streamKey未写入的BUG 2025-03-14 15:49:29 +08:00
lin
298fb05378 优化录像下载。 支持八倍速(设备支持的最高速度)下载 2025-03-13 16:48:15 +08:00
lin
90ab396652 拉流代理返回的流地址增加流来源信息 2025-03-12 16:51:45 +08:00
lin
90d2843255 播放按钮添加loading, 修复拉流代理播放后再次点播失败 2025-03-12 16:43:47 +08:00
lin
e473ab185d 优化播放地址携带流来源信息参数添加算法 2025-03-12 16:18:19 +08:00
lin
e5c3f82d54 播放地址携带流来源信息 2025-03-12 16:09:54 +08:00