@ray-js/ipc-player-integration 0.0.52-beta.2 → 0.0.52-beta.4

package/lib/ctx/ctx.js

@@ -254,13 +254,9 @@ export const createUseCtx = _ref => {
       });
     };
     const stopRecording = showError => {
-      const sessionMultiLens = recordingMultiLensRef.current;
       return new Promise((resolve, reject) => {
-        IPCPlayerInstance.current.stopRecord(_objectSpread(_objectSpread({
-          saveToAlbum
-        }, sessionMultiLens ? {
-          multiLens: true
-        } : {}), {}, {
+        IPCPlayerInstance.current.stopRecord({
+          saveToAlbum,
           success: res => {
             recordingMultiLensRef.current = false;
             updateAtom(recording, false);
@@ -278,7 +274,7 @@ export const createUseCtx = _ref => {
               });
             }
           }
-        }));
+        });
       });
     };
     const multiCameraCtx = useMultiCameraCtx({
@@ -437,15 +433,10 @@ export const createUseCtx = _ref => {
         }
         if (!target) return stopRecording(true);
         return new Promise((resolve, reject) => {
-          const sessionMultiLens = multiLens;
           const startRecord = () => {
-            IPCPlayerInstance.current.startRecord(_objectSpread(_objectSpread({
-              saveToAlbum
-            }, sessionMultiLens ? {
-              multiLens: true
-            } : {}), {}, {
+            IPCPlayerInstance.current.startRecord({
+              saveToAlbum,
               success: () => {
-                recordingMultiLensRef.current = sessionMultiLens;
                 updateAtom(recording, true);
                 resolve(true);
               },
@@ -453,7 +444,7 @@ export const createUseCtx = _ref => {
                 eventRef.current.emit(changeIgnoreHideStopPreview, false);
                 reject(err);
               }
-            }));
+            });
           };
           // 写入相册
           ty.authorizeStatus({

package/lib/ui/ui.js

@@ -653,8 +653,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ipcTTTOperatorLog('hide: 调用停止录制方法');
     setRecording(false, true);
     setIntercom(false, true);
-    instance === null || instance === void 0 || instance.stopRecordingOnUnload().then(result => {
-      const summary = getCaptureResultSummary(result);
+    instance === null || instance === void 0 || instance.stopRecordingOnUnload().then(async result => {
+      var _instance$multiCamera;
+      const summary = await getCaptureResultSummary(result, instance === null || instance === void 0 || (_instance$multiCamera = instance.multiCameraCtx) === null || _instance$multiCamera === void 0 || (_instance$multiCamera = _instance$multiCamera.protocol) === null || _instance$multiCamera === void 0 ? void 0 : _instance$multiCamera.total_split_num, devId);
       ipcTTTOperatorLog(summary !== null && summary !== void 0 && summary.isMultiLens ? `hide: stop recording succeeded with ${summary.count} files` : 'hide: 调用停止录制方法成功');
     }).catch(() => {
       ipcTTTOperatorLog('hide: 调用停止录制方法失败');
@@ -1118,17 +1119,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       // 这一下起，自动隐藏倒计时才开始生效
       hasUserTappedPlayerRef.current = true;
       if (instance.multiCameraCtx.isSupport) {
-        var _instance$multiCamera, _instance$multiCamera2;
-        const preTapIndex = (_instance$multiCamera = (_instance$multiCamera2 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera2 === void 0 ? void 0 : _instance$multiCamera2.index) !== null && _instance$multiCamera !== void 0 ? _instance$multiCamera : prevSelectedIndexRef.current;
+        var _instance$multiCamera2, _instance$multiCamera3;
+        const preTapIndex = (_instance$multiCamera2 = (_instance$multiCamera3 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera3 === void 0 ? void 0 : _instance$multiCamera3.index) !== null && _instance$multiCamera2 !== void 0 ? _instance$multiCamera2 : prevSelectedIndexRef.current;
         const wasHidden = componentHideState;
         instance.multiCameraCtx.selectVideoFiredRef.current = false;
         if (multiTapTimerRef.current) {
           clearTimeout(multiTapTimerRef.current);
         }
         multiTapTimerRef.current = setTimeout(() => {
-          var _instance$multiCamera3, _instance$multiCamera4;
+          var _instance$multiCamera4, _instance$multiCamera5;
           const selectFired = !!instance.multiCameraCtx.selectVideoFiredRef.current;
-          const currentIndex = (_instance$multiCamera3 = (_instance$multiCamera4 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera4 === void 0 ? void 0 : _instance$multiCamera4.index) !== null && _instance$multiCamera3 !== void 0 ? _instance$multiCamera3 : preTapIndex;
+          const currentIndex = (_instance$multiCamera4 = (_instance$multiCamera5 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera5 === void 0 ? void 0 : _instance$multiCamera5.index) !== null && _instance$multiCamera4 !== void 0 ? _instance$multiCamera4 : preTapIndex;
           if (selectFired && currentIndex === preTapIndex) {
             if (wasHidden) {
               showComponents();

package/lib/utils/captureResult.d.ts

@@ -4,4 +4,6 @@ export type CaptureResultSummary = {
     isMultiLens: boolean;
     thumbnailPath: string;
 };
-export declare function getCaptureResultSummary(result: CaptureResult): CaptureResultSummary | null;
+/** 从新多目高级能力配置获取当前设备的总镜头数 */
+export declare function getMultiLensCountFromAbility(devId: string): Promise<number>;
+export declare function getCaptureResultSummary(result: CaptureResult, fallbackCount: number | undefined, devId: string): Promise<CaptureResultSummary | null>;

package/lib/utils/captureResult.js

@@ -1,17 +1,67 @@
-export function getCaptureResultSummary(result) {
+/* eslint-disable camelcase */
+
+import { getDeviceInfo } from './device';
+const MULTI_LENS_ABILITY_CODE = 'tyabimr4v3';
+const LENS_SUFFIX_PATTERN = /_lens\d+(?=\.[^./?#]+(?:[?#].*)?$)/;
+const FILE_EXTENSION_PATTERN = /(\.[^./?#]+)([?#].*)?$/;
+/** 从新多目高级能力配置获取当前设备的总镜头数 */
+export async function getMultiLensCountFromAbility(devId) {
+  if (!devId) return 0;
+  try {
+    var _devInfo$configMetas;
+    const devInfo = await getDeviceInfo(devId);
+    const raw = devInfo === null || devInfo === void 0 || (_devInfo$configMetas = devInfo.configMetas) === null || _devInfo$configMetas === void 0 ? void 0 : _devInfo$configMetas[MULTI_LENS_ABILITY_CODE];
+    if (raw) {
+      const parsed = typeof raw === 'string' ? JSON.parse(raw) : raw;
+      const count = Number(parsed === null || parsed === void 0 ? void 0 : parsed.total_split_num) || (Array.isArray(parsed === null || parsed === void 0 ? void 0 : parsed.split_info) ? parsed.split_info.length : 0);
+      if (count > 1) {
+        return count;
+      }
+    }
+  } catch (e) {
+    // ignore
+  }
+  return 0;
+}
+const normalizeMultiLensThumbnailPath = path => {
+  if (!path || LENS_SUFFIX_PATTERN.test(path)) return path;
+  return path.replace(FILE_EXTENSION_PATTERN, '_lens1$1$2');
+};
+const extractPath = item => {
+  if (!item) return '';
+  if (typeof item === 'string') return item;
+  if (typeof (item === null || item === void 0 ? void 0 : item.value) === 'string') return item.value;
+  return '';
+};
+export async function getCaptureResultSummary(result, fallbackCount, devId) {
   if (!result || typeof result === 'boolean') return null;
-  if ('items' in result) {
+  const rawResult = result;
+  const singleThumb = extractPath(rawResult.tempImagePath) || extractPath(rawResult.thumbPath) || extractPath(rawResult.filePath) || '';
+  if ('items' in result && Array.isArray(result.items) && result.items.length > 0) {
     const firstItem = result.items[0];
-    if (!firstItem) return null;
+    const firstThumb = extractPath(firstItem === null || firstItem === void 0 ? void 0 : firstItem.tempImagePath) || extractPath(firstItem === null || firstItem === void 0 ? void 0 : firstItem.thumbPath) || extractPath(firstItem === null || firstItem === void 0 ? void 0 : firstItem.filePath) || singleThumb;
     return {
       count: result.items.length,
       isMultiLens: true,
-      thumbnailPath: firstItem.tempImagePath || firstItem.thumbPath || firstItem.filePath
+      thumbnailPath: firstThumb
+    };
+  }
+  const legacySplitCount = fallbackCount && fallbackCount > 1 ? fallbackCount : 0;
+  const multiLensAbilityCount = legacySplitCount ? 0 : await getMultiLensCountFromAbility(devId);
+
+  // Preserve the legacy split protocol as a count fallback without applying the
+  // new multi-lens file-name convention to it.
+  const multiCount = legacySplitCount || multiLensAbilityCount;
+  if (multiCount > 1) {
+    return {
+      count: multiCount,
+      isMultiLens: true,
+      thumbnailPath: multiLensAbilityCount > 1 ? normalizeMultiLensThumbnailPath(singleThumb) : singleThumb
     };
   }
   return {
     count: 1,
     isMultiLens: false,
-    thumbnailPath: result.tempImagePath || result.thumbPath || result.filePath
+    thumbnailPath: singleThumb
   };
 }

package/lib/utils/captureResult.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/captureResult.test.js

@@ -0,0 +1,90 @@
+import { getCaptureResultSummary } from './captureResult';
+import { getDeviceInfo } from './device';
+jest.mock('./device', () => ({
+  getDeviceInfo: jest.fn()
+}));
+const mockGetDeviceInfo = getDeviceInfo;
+const basePath = 'thingfile://tmp/capture_123.jpg';
+const createCaptureResult = tempImagePath => ({
+  tempImagePath,
+  filePath: tempImagePath
+});
+describe('getCaptureResultSummary', () => {
+  beforeEach(() => {
+    mockGetDeviceInfo.mockReset();
+    mockGetDeviceInfo.mockResolvedValue({
+      configMetas: {}
+    });
+  });
+  it('normalizes the thumbnail path for the new multi-lens ability', async () => {
+    mockGetDeviceInfo.mockResolvedValue({
+      configMetas: {
+        tyabimr4v3: {
+          total_split_num: 4
+        }
+      }
+    });
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), undefined, 'dev-1')).resolves.toEqual({
+      count: 4,
+      isMultiLens: true,
+      thumbnailPath: 'thingfile://tmp/capture_123_lens1.jpg'
+    });
+  });
+  it('does not apply the new file-name convention to the legacy split protocol', async () => {
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), 4, 'dev-1')).resolves.toEqual({
+      count: 4,
+      isMultiLens: true,
+      thumbnailPath: basePath
+    });
+    expect(mockGetDeviceInfo).not.toHaveBeenCalled();
+  });
+  it('keeps the legacy path when both multi-lens sources are present', async () => {
+    mockGetDeviceInfo.mockResolvedValue({
+      configMetas: {
+        tyabimr4v3: {
+          total_split_num: 4
+        }
+      }
+    });
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), 4, 'dev-1')).resolves.toEqual({
+      count: 4,
+      isMultiLens: true,
+      thumbnailPath: basePath
+    });
+  });
+  it('does not add a duplicate lens suffix', async () => {
+    mockGetDeviceInfo.mockResolvedValue({
+      configMetas: {
+        tyabimr4v3: JSON.stringify({
+          total_split_num: 4
+        })
+      }
+    });
+    const path = 'thingfile://tmp/capture_123_lens1.jpg';
+    await expect(getCaptureResultSummary(createCaptureResult(path), undefined, 'dev-1')).resolves.toEqual({
+      count: 4,
+      isMultiLens: true,
+      thumbnailPath: path
+    });
+  });
+  it('keeps a mono result unchanged', async () => {
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), undefined, 'dev-1')).resolves.toEqual({
+      count: 1,
+      isMultiLens: false,
+      thumbnailPath: basePath
+    });
+  });
+  it('keeps item paths unchanged', async () => {
+    await expect(getCaptureResultSummary({
+      items: [{
+        index: 1,
+        tempImagePath: basePath,
+        filePath: basePath
+      }]
+    }, undefined, 'dev-1')).resolves.toEqual({
+      count: 1,
+      isMultiLens: true,
+      thumbnailPath: basePath
+    });
+  });
+});

package/lib/widgets/recordVideo/recordVideo.js

@@ -107,8 +107,18 @@ export function RecordVideo(props) {
     shotUrl: '',
     shotCount: 0
   });
-  const showRecordResult = recordInfo => {
-    const summary = getCaptureResultSummary(recordInfo);
+  const recordResultRequestIdRef = useRef(0);
+  useEffect(() => {
+    return () => {
+      recordResultRequestIdRef.current += 1;
+    };
+  }, []);
+  const showRecordResult = async recordInfo => {
+    var _props$multiCameraCtx;
+    const requestId = ++recordResultRequestIdRef.current;
+    const splitNum = (_props$multiCameraCtx = props.multiCameraCtx) === null || _props$multiCameraCtx === void 0 || (_props$multiCameraCtx = _props$multiCameraCtx.protocol) === null || _props$multiCameraCtx === void 0 ? void 0 : _props$multiCameraCtx.total_split_num;
+    const summary = await getCaptureResultSummary(recordInfo, splitNum, devId);
+    if (requestId !== recordResultRequestIdRef.current) return;
     if (!summary) return;
     setState({
       showTimer: false,
@@ -129,7 +139,7 @@ export function RecordVideo(props) {
             showTimer: false
           });
           const recordInfo = await setRecording(false);
-          showRecordResult(recordInfo);
+          await showRecordResult(recordInfo);
         } catch {
           // setRecording reports the native failure through the configured toast.
         }
@@ -245,6 +255,7 @@ export function RecordVideo(props) {
     if (recordingDisabled) {
       return false;
     }
+    recordResultRequestIdRef.current += 1;
     if (state.showShot && _recording) {
       setState({
         showShot: false
@@ -268,7 +279,7 @@ export function RecordVideo(props) {
         timeToResetRecordDisabled();
       } else {
         props.event ? props.event.emit(changeIgnoreHideStopPreview, false) : event.emit(changeIgnoreHideStopPreview, false);
-        showRecordResult(recordInfo);
+        await showRecordResult(recordInfo);
       }
     } catch (err) {
       props.event ? props.event.emit(changeIgnoreHideStopPreview, false) : event.emit(changeIgnoreHideStopPreview, false);

package/lib/widgets/screenshot/screenshot.js

@@ -1,5 +1,4 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React, { useContext, useRef } from 'react';
+import React, { useContext, useEffect, useRef } from 'react';
 import { View, Text, showModal, openAppSystemSettingPage, getSystemInfoSync } from '@ray-js/ray';
 import { useSetState, useUpdateEffect, useMemoizedFn } from 'ahooks';
 import clsx from 'clsx';
@@ -40,6 +39,12 @@ export function Screenshot(props) {
     shotUrl: '',
     shotCount: 0
   });
+  const snapshotRequestIdRef = useRef(0);
+  useEffect(() => {
+    return () => {
+      snapshotRequestIdRef.current += 1;
+    };
+  }, []);
   useUpdateEffect(() => {
     if (state.showShot && screenType) {
       showShotToast();
@@ -127,14 +132,15 @@ export function Screenshot(props) {
       });
     };
     const takeSnapshot = () => {
-      IPCPlayerContext.snapshot(_objectSpread(_objectSpread({
-        saveToAlbum
-      }, props.multiLens ? {
-        multiLens: true
-      } : {}), {}, {
-        success: res => {
+      const requestId = ++snapshotRequestIdRef.current;
+      IPCPlayerContext.snapshot({
+        saveToAlbum,
+        success: async res => {
+          var _props$multiCameraCtx;
           setIgnoreHideStopPreview(false);
-          const summary = getCaptureResultSummary(res);
+          const splitNum = (_props$multiCameraCtx = props.multiCameraCtx) === null || _props$multiCameraCtx === void 0 || (_props$multiCameraCtx = _props$multiCameraCtx.protocol) === null || _props$multiCameraCtx === void 0 ? void 0 : _props$multiCameraCtx.total_split_num;
+          const summary = await getCaptureResultSummary(res, splitNum, devId);
+          if (requestId !== snapshotRequestIdRef.current) return;
           if (!summary) {
             handleSnapshotFail({});
             return;
@@ -146,7 +152,7 @@ export function Screenshot(props) {
           });
         },
         fail: handleSnapshotFail
-      }));
+      });
     };
     ty.authorizeStatus({
       // 相册写入权限

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.52-beta.2",
+  "version": "0.0.52-beta.4",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [