Commit Graph

2717 Commits (e55cd08b08947428167861f26b36fedfb334b1d9)

Author SHA1 Message Date
648540858 e55cd08b08 国标级联通道共享支持按照设备添加共享和移除共享 2024-08-29 11:08:42 +08:00
648540858 1efb5fca0f 临时提交 2024-08-28 18:00:42 +08:00
648540858 ddf917d127 临时提交 2024-08-28 17:10:53 +08:00
648540858 64e9b6674f 修复通道共享的BUG以及增加通道手动推送的功能 2024-08-28 16:04:48 +08:00
648540858 dd794d4868 临时提交 2024-08-27 17:56:49 +08:00
648540858 b2b7426871 临时提交 2024-08-26 17:59:29 +08:00
648540858 c45bf5d6af 国标级联通道共享重构完善 2024-08-26 17:16:04 +08:00
648540858 5216e9723c 临时提交 2024-08-24 21:54:59 +08:00
648540858 dddcff8fdb 临时提交 2024-08-24 00:29:40 +08:00
648540858 5a259aaa63 临时提交 2024-08-24 00:18:54 +08:00
648540858 d2654660cb 临时提交 2024-08-23 17:50:29 +08:00
648540858 5169eb66a3 临时提交 2024-08-23 11:25:45 +08:00
648540858 ae0235c0f8 临时提交 2024-08-22 18:07:42 +08:00
648540858 0722aa3aeb 临时提交 2024-08-22 18:05:57 +08:00
648540858 6fcf05e04b 临时提交 2024-08-21 17:59:58 +08:00
648540858 a18fba8495 临时提交 2024-08-21 17:40:01 +08:00
648540858 88abf36d6f 临时提交 2024-08-18 23:01:02 +08:00
648540858 160a5d84c3 修复目录推送的BUG 2024-08-17 22:49:40 +08:00
648540858 9247c7e805 完善国标级联点播推流,拉流代理,国标 2024-08-17 22:31:13 +08:00
648540858 20f93d52d7 临时提交 2024-08-17 20:49:07 +08:00
panlinlin 4dd656b29b 完善目录推送 2024-08-17 08:02:39 +08:00
panlinlin 635458d19a 临时提交 2024-08-17 07:01:40 +08:00
648540858 aeb3cd6a22 临时提交 2024-08-16 17:59:53 +08:00
648540858 326025ee85 完成通道共享 2024-08-16 16:23:54 +08:00
panlinlin 976c089b7f 临时提交 2024-08-15 23:45:00 +08:00
648540858 abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
panlinlin 1cbd8d677c 临时提交 2024-08-15 00:03:53 +08:00
648540858 a1e8a2e6ff 临时提交 2024-08-14 17:52:46 +08:00
648540858 cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858 d5621f9489 临时提交 2024-08-13 18:03:34 +08:00
648540858 ad240ba9a4 优化国标级联点播逻辑 2024-08-13 17:57:25 +08:00
648540858 213b218efa 临时提交 2024-08-12 18:00:06 +08:00
648540858 9a4a81a90e 临时提交 2024-08-12 15:30:01 +08:00
648540858 5ff232150d Merge remote-tracking branch 'origin/dev/master-通道结构重构' into dev/master-通道结构重构 2024-08-12 09:55:10 +08:00
648540858 bfa2c1b2e8 临时提交 2024-08-12 09:54:50 +08:00
panlinlin 0177831e86 临时提交 2024-08-11 23:20:42 +08:00
panlinlin 76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858 d8d9f76d89 支持多WVP的推流播放 2024-08-09 17:55:39 +08:00
648540858 16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858 7f8a15f017 优化收到目录时的分组信息处理 2024-08-09 11:08:40 +08:00
panlinlin a1671c3c3e 临时提交 2024-08-08 23:44:03 +08:00
648540858 8ab88c0f02 临时提交 2024-08-08 22:43:37 +08:00
648540858 9aad6ac719 临时提交 2024-08-08 17:47:08 +08:00
panlinlin 3e220a2c1e 临时提交 2024-08-07 23:45:29 +08:00
648540858 fbbb4cb704 临时提交 2024-08-07 18:01:28 +08:00
648540858 031a29b8a2 完善行政区划通道管理 2024-08-07 17:15:45 +08:00
648540858 5abf5012eb 完善分组通道管理 2024-08-07 17:12:39 +08:00
648540858 a3f7753b84 Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	web_src/src/components/PushVideoList.vue
2024-08-07 11:17:34 +08:00
648540858 a01d4fa74e 修复前端文件编译错误 2024-08-07 10:49:35 +08:00
648540858 c88681c7ad 合并分支 2024-08-07 10:41:54 +08:00