Commit f9daf1c29b120bef2bc677179c519ff5322e92a5
Merge branch 'fix/DEFECT-1837' into 'main_dev'
fix: 修复从流媒体平台配置的视频流无法播放 See merge request yunteng/thingskit-scada!202
Showing
2 changed files
with
1 additions
and
2 deletions
@@ -4351,7 +4351,7 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) { | @@ -4351,7 +4351,7 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) { | ||
4351 | if (success != null) | 4351 | if (success != null) |
4352 | success() | 4352 | success() |
4353 | // TODO Thingskkit socket连接 | 4353 | // TODO Thingskkit socket连接 |
4354 | - if (result?.templateId) { | 4354 | + if (!result?.isTemplate) { |
4355 | const lightboxWebsocketService = useLightboxModeService(this) | 4355 | const lightboxWebsocketService = useLightboxModeService(this) |
4356 | this.lightboxWebsocketService = lightboxWebsocketService | 4356 | this.lightboxWebsocketService = lightboxWebsocketService |
4357 | this.lightboxWebsocketService?.init?.() | 4357 | this.lightboxWebsocketService?.init?.() |
@@ -73,7 +73,6 @@ const handleGetVideoPlay = async () => { | @@ -73,7 +73,6 @@ const handleGetVideoPlay = async () => { | ||
73 | } | 73 | } |
74 | 74 | ||
75 | const instance = unref(basicVideoPlayEl)?.customInit((options) => { | 75 | const instance = unref(basicVideoPlayEl)?.customInit((options) => { |
76 | - withToken.value = true | ||
77 | if (unref(withToken)) { | 76 | if (unref(withToken)) { |
78 | (options as any).flvjs.config.headers = { | 77 | (options as any).flvjs.config.headers = { |
79 | 'X-Authorization': `Bearer ${isShareMode() ? getShareJwtToken() : getJwtToken()}`, | 78 | 'X-Authorization': `Bearer ${isShareMode() ? getShareJwtToken() : getJwtToken()}`, |