Commit ec8ac7446e70906353ae0dfa62843f21dc0b693e

Authored by ww
1 parent cf09a225

perf: 优化securityPolicy取值判断

@@ -26,6 +26,7 @@ import { getVideoControlStart } from '/@/api/device/videoChannel'; @@ -26,6 +26,7 @@ import { getVideoControlStart } from '/@/api/device/videoChannel';
26 import { StreamType as PlayerStreamType } from '/@/components/Video/src/types'; 26 import { StreamType as PlayerStreamType } from '/@/components/Video/src/types';
27 import { useGlobSetting } from '/@/hooks/setting'; 27 import { useGlobSetting } from '/@/hooks/setting';
28 import { BooleanStringEnum } from '/@/enums/toolEnum'; 28 import { BooleanStringEnum } from '/@/enums/toolEnum';
  29 +import { isBoolean } from '/@/utils/is';
29 30
30 interface FileItem { 31 interface FileItem {
31 uid: string; 32 uid: string;
@@ -646,7 +647,9 @@ export async function getPlayUrl( @@ -646,7 +647,9 @@ export async function getPlayUrl(
646 const result = await getVideoControlStart({ channelId: channelNo!, deviceId: deviceId! }); 647 const result = await getVideoControlStart({ channelId: channelNo!, deviceId: deviceId! });
647 const { securityPolicy } = useGlobSetting(); 648 const { securityPolicy } = useGlobSetting();
648 return { 649 return {
649 - url: securityPolicy === BooleanStringEnum.TRUE ? result.data.https_flv : result.data.flv, 650 + url: (isBoolean(securityPolicy) ? securityPolicy : securityPolicy === BooleanStringEnum.TRUE)
  651 + ? result.data.https_flv
  652 + : result.data.flv,
650 type: 'flv', 653 type: 'flv',
651 }; 654 };
652 } else { 655 } else {
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@
60 import { VideoChannelItemType } from '/@/api/device/model/videoChannelModel'; 60 import { VideoChannelItemType } from '/@/api/device/model/videoChannelModel';
61 import { useGlobSetting } from '/@/hooks/setting'; 61 import { useGlobSetting } from '/@/hooks/setting';
62 import { BooleanStringEnum } from '/@/enums/toolEnum'; 62 import { BooleanStringEnum } from '/@/enums/toolEnum';
  63 + import { isBoolean } from '/@/utils/is';
63 64
64 const props = defineProps<{ deviceDetail: DeviceRecord }>(); 65 const props = defineProps<{ deviceDetail: DeviceRecord }>();
65 66
@@ -114,8 +115,11 @@ @@ -114,8 +115,11 @@
114 const { securityPolicy } = useGlobSetting(); 115 const { securityPolicy } = useGlobSetting();
115 return { 116 return {
116 type: 'flv', 117 type: 'flv',
117 - url:  
118 - securityPolicy === BooleanStringEnum.TRUE ? result.data.https_flv : result.data.flv, 118 + url: (
  119 + isBoolean(securityPolicy) ? securityPolicy : securityPolicy === BooleanStringEnum.TRUE
  120 + )
  121 + ? result.data.https_flv
  122 + : result.data.flv,
119 }; 123 };
120 }, 124 },
121 } as VideoCancelModalParamsType, 125 } as VideoCancelModalParamsType,