Merge branch 'cherry-pick-c8fb7e56' into 'main'

Merge branch 'fix/video-stream-url' into 'main_dev'

See merge request yunteng/thingskit-front!1332

@@ -24,6 +24,9 @@ import { isRtspProtocol } from '/@/components/Video/src/utils';
 import { useFingerprint } from '/@/utils/useFingerprint';
 import { useFingerprint } from '/@/utils/useFingerprint';
 import { getVideoControlStart } from '/@/api/device/videoChannel';
 import { getVideoControlStart } from '/@/api/device/videoChannel';
 import { StreamType as PlayerStreamType } from '/@/components/Video/src/types';
 import { StreamType as PlayerStreamType } from '/@/components/Video/src/types';
+import { useGlobSetting } from '/@/hooks/setting';
+import { BooleanStringEnum } from '/@/enums/toolEnum';
+import { isBoolean } from '/@/utils/is';
 
 
 interface FileItem {
 interface FileItem {
   uid: string;
   uid: string;
@@ -642,7 +645,13 @@ export async function getPlayUrl(
   } else if (accessMode === AccessMode.GBT28181) {
   } else if (accessMode === AccessMode.GBT28181) {
     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: result.data.flv, type: 'flv' };
+    const { securityPolicy } = useGlobSetting();
+    return {
+      url: (isBoolean(securityPolicy) ? securityPolicy : securityPolicy === BooleanStringEnum.TRUE)
+        ? result.data.https_flv
+        : result.data.flv,
+      type: 'flv',
+    };
   } else {
   } else {
     const { id, playProtocol } = params;
     const { id, playProtocol } = params;
     const result = await getStreamingPlayUrl(id);
     const result = await getStreamingPlayUrl(id);

@@ -58,6 +58,9 @@
   import { stopOnDemandVideoApiGet, syncVideoApiGet } from '/@/api/camera/cameraManager';
   import { stopOnDemandVideoApiGet, syncVideoApiGet } from '/@/api/camera/cameraManager';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { VideoChannelItemType } from '/@/api/device/model/videoChannelModel';
   import { VideoChannelItemType } from '/@/api/device/model/videoChannelModel';
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { BooleanStringEnum } from '/@/enums/toolEnum';
+  import { isBoolean } from '/@/utils/is';
 
 
   const props = defineProps<{ deviceDetail: DeviceRecord }>();
   const props = defineProps<{ deviceDetail: DeviceRecord }>();
 
 
@@ -109,7 +112,15 @@
         getPlayUrl: async () => {
         getPlayUrl: async () => {
           const { deviceId, channelId } = record;
           const { deviceId, channelId } = record;
           const result = await getVideoControlStart({ deviceId, channelId });
           const result = await getVideoControlStart({ deviceId, channelId });
-          return { type: 'flv', url: result.data.flv };
+          const { securityPolicy } = useGlobSetting();
+          return {
+            type: 'flv',
+            url: (
+              isBoolean(securityPolicy) ? securityPolicy : securityPolicy === BooleanStringEnum.TRUE
+            )
+              ? result.data.https_flv
+              : result.data.flv,
+          };
         },
         },
       } as VideoCancelModalParamsType,
       } as VideoCancelModalParamsType,
     });
     });