anytrek-front-public-component 1.13.13 → 1.13.14

package/README.md

@@ -786,16 +786,15 @@ const showImageDisplay = () => {
 }
 /* 2310图片轮播，triggerType为CargoHandling或者eventType为9且uuid，index相同归为一项，新增 imageList 字段存，按 takeTime 最新排序 */
 // 2310视频，uuid一样，含有media字段
-const groupCargoHandlingImages = (list: any[]): any[] => {
+export const groupCargoHandlingImages = (list: any[]): any[] => {
   const groupMap = new Map<string, any[]>();
-  const needMergeVideo = true;//
   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 && needMergeVideo) {
+    if (item.media && item.uuid) {
       const key = `media-${item.uuid}`;
       if (!groupMap.has(key)) groupMap.set(key, []);
       groupMap.get(key)!.push(item);
@@ -839,15 +838,19 @@ const groupCargoHandlingImages = (list: any[]): any[] => {
     }
     
   });
+  
   list.forEach((item: any) => {
-    // if (!(item.triggerType === 'CargoHandling' && item.uuid && groupedUuids.has(`picture-${item.uuid}-${item.index}`))) {
-    //   result.push(item);
-    // }
-    const isNotMutiplePicture = item.triggerType !== 'CargoHandling' && item.eventType !== 9;
-    const isNotMedia = !needMergeVideo || !item.media;
-    if (isNotMutiplePicture && isNotMedia) {
+    const isNotMutiplePicture = !item.media && (!item.uuid || (item.triggerType !== 'CargoHandling' && item.eventType !== 9));
+    const isNotMergeMedia = item.media && !item.uuid;
+    if (isNotMutiplePicture) {
       result.push(item);
     }
+    if (isNotMergeMedia) {
+      let timeStampGap = 0;
+      timeStampGap = new Date(item.endTime).getTime() - new Date(item.startTime).getTime();
+      let timeGap = formatDuration(timeStampGap, { d: true, h: true, m: true, s: true });
+      result.push({ ...item, videoList: [item], timeGap });
+    }
   });
   result.sort((a, b) => new Date(b.takeTime).getTime() - new Date(a.takeTime).getTime());
   return result;