anytrek-front-public-component 1.13.16 → 1.13.18

package/README.md

@@ -757,6 +757,7 @@ const saveFunctionLandmark = async (
   :on-get-history-trail="fetchHistoryTrail"
   :on-get-history-trail-point="fetchHistoryTrailPoint"
   :get-img-list="fetchImgList"
+  :getImageVideo="getImageVideo"
   @handle-close="onClose"
   @handle-download="onDownload"
   @update-cur-img="onUpdateCurImg"
@@ -788,24 +789,41 @@ const showImageDisplay = () => {
 // 2310视频，uuid一样，含有media字段
 export const groupCargoHandlingImages = (list: any[]): any[] => {
   const groupMap = new Map<string, any[]>();
+  const mergedSet = new Set<any>();
+  // 第1步：先合并 triggerType 为 CargoHandling 或 eventType 为 9 且 uuid 相同的图片组
   list.forEach((item: any) => {
     if ((item.triggerType === 'CargoHandling' || item.eventType === 9) && item.uuid) {
       const key = `picture-${item.uuid}-${item.index}`;
       if (!groupMap.has(key)) groupMap.set(key, []);
       groupMap.get(key)!.push(item);
     }
-    if (item.media && item.uuid) {
+  });
+  // 第2步：处理带 media 的项，uuid + index 匹配到图片组则并入该组并记录为已合并，否则走 videoList 分组
+  list.forEach((item: any) => {
+    if (!item.media || !item.uuid) return;
+    if (item.triggerType === 'CargoHandling' || item.eventType === 9) {
+      // 自身既是 CargoHandling 又带 media：按 CargoHandling 算，已在图片组中，不重复处理
+      mergedSet.add(item);
+      return;
+    }
+    const pictureKey = `picture-${item.uuid}-${item.index}`;
+    if (groupMap.has(pictureKey)) {
+      groupMap.get(pictureKey)!.push(item);
+      mergedSet.add(item);
+    } else {
       const key = `media-${item.uuid}`;
       if (!groupMap.has(key)) groupMap.set(key, []);
       groupMap.get(key)!.push(item);
     }
   });
-  const groupedUuids = new Set(groupMap.keys());
   const result: any[] = [];
   groupMap.forEach((items) => {
     items.sort((a: any, b: any) => new Date(a.takeTime).getTime() - new Date(b.takeTime).getTime());
+    const mediaItems = items.filter((i: any) => i.media);
+    const imageItems = items.filter((i: any) => !i.media);
+    const isPureMediaGroup = !!mediaItems.length && !imageItems.length;
     let timeStampGap = 0;
-    if (items[0].media) {
+    if (isPureMediaGroup) {
       timeStampGap = new Date(items[items.length - 1].endTime).getTime() - new Date(items[0].startTime).getTime();
     } else {
       timeStampGap = new Date(items[items.length - 1].takeTime).getTime() - new Date(items[0].takeTime).getTime();
@@ -818,28 +836,32 @@ export const groupCargoHandlingImages = (list: any[]): any[] => {
         const obj: any =  {
           ...l,
         }
-        if (l.media) {
-          obj.media = obj.media.replace('https://oss.anytrek.app', '/oss-anytrek-app');
-          obj.media = obj.media.replace('https://oss.anytrek.com', '/oss-anytrek-com');
-        } else {
-          obj.url = obj.url.replace('https://oss.anytrek.app', '/oss-anytrek-app');
-          obj.url = obj.url.replace('https://oss.anytrek.com', '/oss-anytrek-com');
-        }
+        obj.media && (obj.media = obj.media.replace('https://oss.anytrek.app', '/oss-anytrek-app'));
+        obj.media && (obj.media = obj.media.replace('https://oss.anytrek.com', '/oss-anytrek-com'));
+        obj.url && (obj.url = obj.url.replace('https://oss.anytrek.app', '/oss-anytrek-app'));
+        obj.url && (obj.url = obj.url.replace('https://oss.anytrek.com', '/oss-anytrek-com'));
         return {
           ...obj,
         }
       })
     }
-    if (items[0].media) {
+    if (isPureMediaGroup) {
       result.push({ ...items[0], videoList: [...list], timeGap });
     } else {
-      timeGap = timeGap === '0s' ? `${list.length}s` : timeGap;
-      result.push({ ...items[0], imageList: [...list], timeGap });
+      const merged = list.find((i: any) => i.media);
+      const hasMethodType = list.find((i: any) => i.methodType === 'final');
+      const imageList = list.filter((i: any) => !i.media);
+      timeGap = timeGap === '0s' ? `${imageList.length}s` : timeGap;
+      const obj: any = { ...items[0], imageList: [...imageList], timeGap };
+      if (merged) obj.media = merged.media;
+      if (hasMethodType) obj.isCarousel = true;
+      result.push(obj);
     }
-    
   });
   
   list.forEach((item: any) => {
+    // 已并入图片组的 media 项不再重复添加
+    if (mergedSet.has(item)) return;
     const isNotMutiplePicture = !item.media && (!item.uuid || (item.triggerType !== 'CargoHandling' && item.eventType !== 9));
     const isNotMergeMedia = item.media && !item.uuid;
     if (isNotMutiplePicture) {
@@ -905,6 +927,24 @@ const fetchImgList = async (successFun: Function) => {
   successFun();
 }
 
+const getImageVideo = async(item: any) => {
+  const params = `userPackageId=${item.deviceId}&uuid=${item.uuid}`;
+  const res = await Api.getCargoHandlingVideo(params);
+  const index = curImgList.value.findIndex((l: any) => l.url === curImg.value.url);
+  if (index === -1) return;
+  let url = '';
+  if (!res || res.errorCode || !res.list?.[0]?.media) {
+    url = '';
+  } else {
+    url = res.list[0].media;
+  }
+  if (import.meta.env.MODE === 'development') {
+    url = url.replace('https://oss.anytrek.app', '/oss-anytrek-app');
+    url = url.replace('https://oss.anytrek.com', '/oss-anytrek-com');
+  }
+  curImg.value.media = url;
+}
+
 const onDownload = async(data: any) => {
   imageDisplayRef.value?.changeDownloadImageLoading(true);
 
@@ -980,7 +1020,7 @@ const onToHistory = (data: any) => {
 | `onGetHistoryTrail` | 获取历史轨迹 | `Function` | — |
 | `onGetHistoryTrailPoint` | 获取轨迹点详情 | `Function` | — |
 | `getImgList` | 获取图片列表（弹窗打开且列表为空时调用） | `Function` | — |
-
+| `getImageVideo` | 获取视频列表 | `Function` | — |
 
 
 ### 📋 Events Reference