Commit 01cfd0a1692026e92b266cbbcc7867399ae24cb3
Committed by
 xp.Huang
 xp.Huang
1 parent
05158aa5
perf: 优化GBT设备播放协议取值判断
Showing
6 changed files
with
2 additions
and
16 deletions
| ... | ... | @@ -11,7 +11,6 @@ export const useGlobSetting = (): Readonly<GlobConfig> => { | 
| 11 | 11 | VITE_GLOB_WEB_SOCKET, | 
| 12 | 12 | VITE_GLOB_CONTENT_SECURITY_POLICY, | 
| 13 | 13 | VITE_GLOB_PUBLIC_PATH, | 
| 14 | - VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL | |
| 15 | 14 | } = getAppEnvConfig(); | 
| 16 | 15 | |
| 17 | 16 | if (!/[a-zA-Z_]*/.test(VITE_GLOB_APP_SHORT_NAME)) { | 
| ... | ... | @@ -30,7 +29,6 @@ export const useGlobSetting = (): Readonly<GlobConfig> => { | 
| 30 | 29 | socketUrl: VITE_GLOB_WEB_SOCKET, | 
| 31 | 30 | securityPolicy: VITE_GLOB_CONTENT_SECURITY_POLICY, | 
| 32 | 31 | publicPath: VITE_GLOB_PUBLIC_PATH, | 
| 33 | - streamMediaContentSecurityProtocol: VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL | |
| 34 | 32 | }; | 
| 35 | 33 | |
| 36 | 34 | return glob as Readonly<GlobConfig>; | ... | ... | 
| ... | ... | @@ -107,11 +107,11 @@ export async function getPlayUrl( | 
| 107 | 107 | } | 
| 108 | 108 | } | 
| 109 | 109 | } else if (accessMode === AccessMode.GBT28181) { | 
| 110 | - const { streamMediaContentSecurityProtocol } = useGlobSetting() | |
| 110 | + const { securityPolicy } = useGlobSetting() | |
| 111 | 111 | console.log(useGlobSetting()) | 
| 112 | 112 | const { deviceId, channelNo } = params?.params || {}; | 
| 113 | 113 | const result = await getVideoControlStart({ channelId: channelNo!, deviceId: deviceId! }); | 
| 114 | - return { url: streamMediaContentSecurityProtocol ? result.data.https_flv : result.data.flv, type: 'flv' }; | |
| 114 | + return { url: securityPolicy ? result.data.https_flv : result.data.flv, type: 'flv' }; | |
| 115 | 115 | } else { | 
| 116 | 116 | const { id, playProtocol } = params; | 
| 117 | 117 | const result = await getVideoUrl(id); | ... | ... | 
| ... | ... | @@ -60,7 +60,6 @@ export function getAppEnvConfig() { | 
| 60 | 60 | VITE_GLOB_ALARM_NOTIFY_DURATION, | 
| 61 | 61 | VITE_GLOB_CONTENT_SECURITY_POLICY, | 
| 62 | 62 | VITE_GLOB_PUBLIC_PATH, | 
| 63 | - VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL | |
| 64 | 63 | } = ENV; | 
| 65 | 64 | |
| 66 | 65 | if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) { | 
| ... | ... | @@ -79,7 +78,6 @@ export function getAppEnvConfig() { | 
| 79 | 78 | VITE_GLOB_ALARM_NOTIFY_DURATION, | 
| 80 | 79 | VITE_GLOB_CONTENT_SECURITY_POLICY, | 
| 81 | 80 | VITE_GLOB_PUBLIC_PATH, | 
| 82 | - VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL | |
| 83 | 81 | }; | 
| 84 | 82 | } | 
| 85 | 83 | ... | ... | 
| ... | ... | @@ -152,8 +152,6 @@ export interface GlobConfig { | 
| 152 | 152 | securityPolicy: string; | 
| 153 | 153 | // assets file prefix | 
| 154 | 154 | publicPath: string | 
| 155 | - // Streaming media content security protocol | |
| 156 | - streamMediaContentSecurityProtocol: boolean | |
| 157 | 155 | } | 
| 158 | 156 | export interface GlobEnvConfig { | 
| 159 | 157 | // Site title | 
| ... | ... | @@ -174,6 +172,4 @@ export interface GlobEnvConfig { | 
| 174 | 172 | VITE_GLOB_CONTENT_SECURITY_POLICY: string | 
| 175 | 173 | // public assets file prefix | 
| 176 | 174 | VITE_GLOB_PUBLIC_PATH: string | 
| 177 | - // Streaming media content security protocol | |
| 178 | - VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL: boolean | |
| 179 | 175 | } | ... | ... |