@ray-js/ipc-player-integration 0.0.52-beta.3 → 0.0.52-beta.5

package/lib/ui/ui.js

@@ -653,9 +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 => {
+    instance === null || instance === void 0 || instance.stopRecordingOnUnload().then(async result => {
       var _instance$multiCamera;
-      const summary = 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);
+      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: 调用停止录制方法失败');

package/lib/utils/captureResult.d.ts

@@ -5,5 +5,5 @@ export type CaptureResultSummary = {
     thumbnailPath: string;
 };
 /** 从新多目高级能力配置获取当前设备的总镜头数 */
-export declare function getMultiLensCountFromAbility(): number;
-export declare function getCaptureResultSummary(result: CaptureResult, fallbackCount?: number): 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,10 +1,16 @@
-import { getDevInfo } from '@ray-js/ray-ipc-utils';
+/* eslint-disable camelcase */
+
+import { getDeviceInfo } from './device';
+const MULTI_LENS_ABILITY_CODE = 'tyabimr4v3';
+const LENS_SUFFIX_PATTERN = /_lens\d+(?=\.[^./?#]+(?:[?#].*)?$)/;
+const FILE_EXTENSION_PATTERN = /(\.[^./?#]+)([?#].*)?$/;
 /** 从新多目高级能力配置获取当前设备的总镜头数 */
-export function getMultiLensCountFromAbility() {
+export async function getMultiLensCountFromAbility(devId) {
+  if (!devId) return 0;
   try {
     var _devInfo$configMetas;
-    const devInfo = getDevInfo();
-    const raw = devInfo === null || devInfo === void 0 || (_devInfo$configMetas = devInfo.configMetas) === null || _devInfo$configMetas === void 0 ? void 0 : _devInfo$configMetas.tyabimr4v3;
+    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);
@@ -17,13 +23,17 @@ export function getMultiLensCountFromAbility() {
   }
   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 function getCaptureResultSummary(result, fallbackCount) {
+export async function getCaptureResultSummary(result, fallbackCount, devId) {
   if (!result || typeof result === 'boolean') return null;
   const rawResult = result;
   const singleThumb = extractPath(rawResult.tempImagePath) || extractPath(rawResult.thumbPath) || extractPath(rawResult.filePath) || '';
@@ -36,14 +46,18 @@ export function getCaptureResultSummary(result, fallbackCount) {
       thumbnailPath: firstThumb
     };
   }
+  const legacySplitCount = fallbackCount && fallbackCount > 1 ? fallbackCount : 0;
+  const multiLensAbilityCount = await getMultiLensCountFromAbility(devId);
 
-  // 根据新多目高级能力获取总镜头数（从协议传入的 fallbackCount 或从设备能力元数据获取）
-  const multiCount = fallbackCount && fallbackCount > 1 ? fallbackCount : getMultiLensCountFromAbility();
+  // The native multi-lens snapshot can return one object while writing lens-specific
+  // files. Use the ability result to distinguish that file-name convention from the
+  // legacy split protocol.
+  const multiCount = legacySplitCount || multiLensAbilityCount;
   if (multiCount > 1) {
     return {
       count: multiCount,
       isMultiLens: true,
-      thumbnailPath: singleThumb
+      thumbnailPath: multiLensAbilityCount > 1 ? normalizeMultiLensThumbnailPath(singleThumb) : singleThumb
     };
   }
   return {

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('keeps the legacy path when the ability is unavailable', async () => {
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), 4, 'dev-1')).resolves.toEqual({
+      count: 4,
+      isMultiLens: true,
+      thumbnailPath: basePath
+    });
+    expect(mockGetDeviceInfo).toHaveBeenCalledWith('dev-1');
+  });
+  it('uses the lens 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: 'thingfile://tmp/capture_123_lens1.jpg'
+    });
+  });
+  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,10 +107,18 @@ export function RecordVideo(props) {
     shotUrl: '',
     shotCount: 0
   });
-  const showRecordResult = 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 = getCaptureResultSummary(recordInfo, splitNum);
+    const summary = await getCaptureResultSummary(recordInfo, splitNum, devId);
+    if (requestId !== recordResultRequestIdRef.current) return;
     if (!summary) return;
     setState({
       showTimer: false,
@@ -131,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.
         }
@@ -247,6 +255,7 @@ export function RecordVideo(props) {
     if (recordingDisabled) {
       return false;
     }
+    recordResultRequestIdRef.current += 1;
     if (state.showShot && _recording) {
       setState({
         showShot: false
@@ -270,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,4 +1,4 @@
-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';
@@ -39,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();
@@ -126,13 +132,15 @@ export function Screenshot(props) {
       });
     };
     const takeSnapshot = () => {
+      const requestId = ++snapshotRequestIdRef.current;
       IPCPlayerContext.snapshot({
         saveToAlbum,
-        success: res => {
+        success: async res => {
           var _props$multiCameraCtx;
           setIgnoreHideStopPreview(false);
           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 = getCaptureResultSummary(res, splitNum);
+          const summary = await getCaptureResultSummary(res, splitNum, devId);
+          if (requestId !== snapshotRequestIdRef.current) return;
           if (!summary) {
             handleSnapshotFail({});
             return;

package/package.json

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