Merge branch 'perf/env-var-parse' into 'main_dev'

perf: 优化GBT设备播放协议取值判断

See merge request yunteng/thingskit-view!260

@@ -13,6 +13,3 @@ VITE_GLOB_CONTENT_SECURITY_POLICY = false
 # 公共路径
 # 公共路径
 VITE_GLOB_PUBLIC_PATH = /large-designer/
 VITE_GLOB_PUBLIC_PATH = /large-designer/
 
 
-# Streaming media content security protocol
-VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL = false
-

@@ -11,6 +11,3 @@ VITE_GLOB_CONTENT_SECURITY_POLICY = false
 
 
 # 公共路径
 # 公共路径
 VITE_GLOB_PUBLIC_PATH = /large-designer/
 VITE_GLOB_PUBLIC_PATH = /large-designer/
-
-# Streaming media content security protocol
-VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL = false

@@ -11,7 +11,6 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     VITE_GLOB_WEB_SOCKET,
     VITE_GLOB_WEB_SOCKET,
     VITE_GLOB_CONTENT_SECURITY_POLICY,
     VITE_GLOB_CONTENT_SECURITY_POLICY,
     VITE_GLOB_PUBLIC_PATH,
     VITE_GLOB_PUBLIC_PATH,
-    VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL
   } = getAppEnvConfig();
   } = getAppEnvConfig();
 
 
   if (!/[a-zA-Z_]*/.test(VITE_GLOB_APP_SHORT_NAME)) {
   if (!/[a-zA-Z_]*/.test(VITE_GLOB_APP_SHORT_NAME)) {
@@ -30,7 +29,6 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     socketUrl: VITE_GLOB_WEB_SOCKET,
     socketUrl: VITE_GLOB_WEB_SOCKET,
     securityPolicy: VITE_GLOB_CONTENT_SECURITY_POLICY,
     securityPolicy: VITE_GLOB_CONTENT_SECURITY_POLICY,
     publicPath: VITE_GLOB_PUBLIC_PATH,
     publicPath: VITE_GLOB_PUBLIC_PATH,
-    streamMediaContentSecurityProtocol: VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL
   };
   };
 
 
   return glob as Readonly<GlobConfig>;
   return glob as Readonly<GlobConfig>;

@@ -107,11 +107,11 @@ export async function getPlayUrl(
       }
       }
     }
     }
   } else if (accessMode === AccessMode.GBT28181) {
   } else if (accessMode === AccessMode.GBT28181) {
-    const { streamMediaContentSecurityProtocol } = useGlobSetting()
+    const { securityPolicy } = useGlobSetting()
     console.log(useGlobSetting())
     console.log(useGlobSetting())
     const { deviceId, channelNo } = params?.params || {};
     const { deviceId, channelNo } = params?.params || {};
     const result = await getVideoControlStart({ channelId: channelNo!, deviceId: deviceId! });
     const result = await getVideoControlStart({ channelId: channelNo!, deviceId: deviceId! });
-    return { url: streamMediaContentSecurityProtocol ? result.data.https_flv : result.data.flv, type: 'flv' };
+    return { url: securityPolicy ? result.data.https_flv : result.data.flv, type: 'flv' };
   } else {
   } else {
     const { id, playProtocol } = params;
     const { id, playProtocol } = params;
     const result = await getVideoUrl(id);
     const result = await getVideoUrl(id);

@@ -60,7 +60,6 @@ export function getAppEnvConfig() {
     VITE_GLOB_ALARM_NOTIFY_DURATION,
     VITE_GLOB_ALARM_NOTIFY_DURATION,
     VITE_GLOB_CONTENT_SECURITY_POLICY,
     VITE_GLOB_CONTENT_SECURITY_POLICY,
     VITE_GLOB_PUBLIC_PATH,
     VITE_GLOB_PUBLIC_PATH,
-    VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL
   } = ENV;
   } = ENV;
 
 
   if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
   if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
@@ -79,7 +78,6 @@ export function getAppEnvConfig() {
     VITE_GLOB_ALARM_NOTIFY_DURATION,
     VITE_GLOB_ALARM_NOTIFY_DURATION,
     VITE_GLOB_CONTENT_SECURITY_POLICY,
     VITE_GLOB_CONTENT_SECURITY_POLICY,
     VITE_GLOB_PUBLIC_PATH,
     VITE_GLOB_PUBLIC_PATH,
-    VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL
   };
   };
 }
 }
 
 

@@ -152,8 +152,6 @@ export interface GlobConfig {
   securityPolicy: string;
   securityPolicy: string;
   // assets file prefix
   // assets file prefix
   publicPath: string
   publicPath: string
-  // Streaming media content security protocol
-  streamMediaContentSecurityProtocol: boolean
 }
 }
 export interface GlobEnvConfig {
 export interface GlobEnvConfig {
   // Site title
   // Site title
@@ -174,6 +172,4 @@ export interface GlobEnvConfig {
   VITE_GLOB_CONTENT_SECURITY_POLICY: string
   VITE_GLOB_CONTENT_SECURITY_POLICY: string
   // public assets file prefix
   // public assets file prefix
   VITE_GLOB_PUBLIC_PATH: string
   VITE_GLOB_PUBLIC_PATH: string
-  // Streaming media content security protocol
-  VITE_GLOB_STREAM_MEDIA_CONTENT_SECURITY_PROTOCOL: boolean
 }
 }