Merge branch 'main_dev' into fix/edge/08-01

@@ -2,7 +2,7 @@
   <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`">
   <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
       <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />
       <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />
-      <span :class="`${prefixCls}__info hidden md:block`">
+      <span :class="`${prefixCls}__info hidden md:block w-30 truncate`">
         <span :class="`${prefixCls}__name  `" class="truncate">
         <span :class="`${prefixCls}__name  `" class="truncate">
           {{ getUserInfo.realName }}
           {{ getUserInfo.realName }}
         </span>
         </span>

@@ -92,10 +92,11 @@
   const { getResult } = useFingerprint();
   const { getResult } = useFingerprint();
   const beforeVideoPlay = async (record: CameraRecordItem) => {
   const beforeVideoPlay = async (record: CameraRecordItem) => {
     if (isNullOrUnDef(record.accessMode)) return;
     if (isNullOrUnDef(record.accessMode)) return;
-    const { url, type } = await getPlayUrl(record);
+    const { url, type, withToken } = (await getPlayUrl(record)) || {};
     record.playSourceUrl = url;
     record.playSourceUrl = url;
     record.streamType = type;
     record.streamType = type;
     record.isTransform = true;
     record.isTransform = true;
+    record.withToken = withToken;
   };
   };
 
 
   const gridLayout = ref({ gutter: 1, column: 2 });
   const gridLayout = ref({ gutter: 1, column: 2 });

@@ -632,9 +632,7 @@ export const formGBTSchema: QFormSchema[] = [
   },
   },
 ];
 ];
 
 
-export async function getPlayUrl(
-  params: CameraRecord
-): Promise<{ url: string; type: PlayerStreamType }> {
+export async function getPlayUrl(params: CameraRecord) {
   const { accessMode } = params;
   const { accessMode } = params;
   if (accessMode === AccessMode.ManuallyEnter) {
   if (accessMode === AccessMode.ManuallyEnter) {
     const { videoUrl } = params;
     const { videoUrl } = params;
@@ -644,7 +642,11 @@ export async function getPlayUrl(
       if (isRTSPPlay) {
       if (isRTSPPlay) {
         const { getResult } = useFingerprint();
         const { getResult } = useFingerprint();
         const fingerprint = await getResult();
         const fingerprint = await getResult();
-        return { url: getFlvPlayUrl(videoUrl, fingerprint.visitorId), type: 'flv' };
+        return {
+          url: getFlvPlayUrl(videoUrl, fingerprint.visitorId),
+          type: 'flv',
+          withToken: true,
+        };
       } else {
       } else {
         return { url: videoUrl, type: 'auto' };
         return { url: videoUrl, type: 'auto' };
       }
       }

@@ -8,7 +8,6 @@
   import { createOrEditEdgeInstance } from '/@/api/edgeManage/edgeInstance';
   import { createOrEditEdgeInstance } from '/@/api/edgeManage/edgeInstance';
   import { EdgeInstanceItemType } from '/@/api/edgeManage/model/edgeInstance';
   import { EdgeInstanceItemType } from '/@/api/edgeManage/model/edgeInstance';
   import { buildUUID, randomString } from '/@/utils/uuid';
   import { buildUUID, randomString } from '/@/utils/uuid';
-  import { CopyOutlined } from '@ant-design/icons-vue';
   import { handeleCopy } from '/@/views/device/profiles/step/topic';
   import { handeleCopy } from '/@/views/device/profiles/step/topic';
 
 
   const emits = defineEmits(['success', 'register']);
   const emits = defineEmits(['success', 'register']);
@@ -99,21 +98,17 @@
         <template #routingKey="{ model, field }">
         <template #routingKey="{ model, field }">
           <div class="!flex justify-between items-center gap-5">
           <div class="!flex justify-between items-center gap-5">
             <a-input disabled v-model:value="model[field]" />
             <a-input disabled v-model:value="model[field]" />
-            <CopyOutlined
-              @click="handleCopyRoutingKey(model[field])"
-              class="cursor-pointer"
-              style="font-size: 32px"
-            />
+            <a-button type="link" @click="handleCopyRoutingKey(model[field])" class="cursor-pointer"
+              >复制</a-button
+            >
           </div>
           </div>
         </template>
         </template>
         <template #secret="{ model, field }">
         <template #secret="{ model, field }">
           <div class="!flex justify-between items-center gap-5">
           <div class="!flex justify-between items-center gap-5">
             <a-input disabled v-model:value="model[field]" />
             <a-input disabled v-model:value="model[field]" />
-            <CopyOutlined
-              @click="handleCopySecret(model[field])"
-              class="cursor-pointer"
-              style="font-size: 32px"
-            />
+            <a-button type="link" @click="handleCopySecret(model[field])" class="cursor-pointer"
+              >复制</a-button
+            >
           </div>
           </div>
         </template>
         </template>
       </BasicForm>
       </BasicForm>

@@ -30,16 +30,17 @@
       const { config } = props;
       const { config } = props;
       const { option } = config;
       const { option } = config;
       const { videoConfig, uuid } = option || {};
       const { videoConfig, uuid } = option || {};
-      const { type, url } = await getPlayUrl({
-        id: videoConfig?.id,
-        accessMode: videoConfig?.accessMode,
-        playProtocol: videoConfig?.playProtocol,
-        videoUrl: videoConfig?.videoUrl,
-        params: {
-          deviceId: videoConfig?.deviceId,
-          channelNo: videoConfig?.channelId,
-        },
-      } as unknown as CameraRecord);
+      const { type, url } =
+        (await getPlayUrl({
+          id: videoConfig?.id,
+          accessMode: videoConfig?.accessMode,
+          playProtocol: videoConfig?.playProtocol,
+          videoUrl: videoConfig?.videoUrl,
+          params: {
+            deviceId: videoConfig?.deviceId,
+            channelNo: videoConfig?.channelId,
+          },
+        } as unknown as CameraRecord)) || {};
       playType.value = type;
       playType.value = type;
       playUrl.value = url;
       playUrl.value = url;
       if (!uuid) return;
       if (!uuid) return;