@ray-js/ipc-player-integration 0.0.53-beta.1 → 0.0.53-beta.3

package/lib/i18n/index.d.ts

@@ -1,9 +1,13 @@
 import { kit } from '@ray-js/panel-sdk';
 declare const Strings: kit.I18N<{
     en: {
+        ipc_player_resolution_SS: string;
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_UD: string;
+        ipc_player_resolution_SSP: string;
         ipc_player_resolution_AUTO: string;
+        ipc_player_resolution_AUDIO: string;
         ipc_player_current_resolution_is_equal: string;
         ipc_player_screenshot_success_tip: string;
         ipc_player_screenshot_multi_success_tip: string;
@@ -42,9 +46,13 @@ declare const Strings: kit.I18N<{
         ipc_player_low_phone_not_support: string;
     };
     zh: {
+        ipc_player_resolution_SS: string;
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_UD: string;
+        ipc_player_resolution_SSP: string;
         ipc_player_resolution_AUTO: string;
+        ipc_player_resolution_AUDIO: string;
         ipc_player_current_resolution_is_equal: string;
         ipc_player_screenshot_success_tip: string;
         ipc_player_screenshot_multi_success_tip: string;
@@ -83,9 +91,13 @@ declare const Strings: kit.I18N<{
         ipc_player_low_phone_not_support: string;
     };
 }, {
+    ipc_player_resolution_SS: string;
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
+    ipc_player_resolution_UD: string;
+    ipc_player_resolution_SSP: string;
     ipc_player_resolution_AUTO: string;
+    ipc_player_resolution_AUDIO: string;
     ipc_player_current_resolution_is_equal: string;
     ipc_player_screenshot_success_tip: string;
     ipc_player_screenshot_multi_success_tip: string;
@@ -123,9 +135,13 @@ declare const Strings: kit.I18N<{
     ipc_player_fetch_error: string;
     ipc_player_low_phone_not_support: string;
 } | {
+    ipc_player_resolution_SS: string;
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
+    ipc_player_resolution_UD: string;
+    ipc_player_resolution_SSP: string;
     ipc_player_resolution_AUTO: string;
+    ipc_player_resolution_AUDIO: string;
     ipc_player_current_resolution_is_equal: string;
     ipc_player_screenshot_success_tip: string;
     ipc_player_screenshot_multi_success_tip: string;

package/lib/i18n/strings.d.ts

@@ -1,8 +1,12 @@
 declare const _default: {
     en: {
+        ipc_player_resolution_SS: string;
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_UD: string;
+        ipc_player_resolution_SSP: string;
         ipc_player_resolution_AUTO: string;
+        ipc_player_resolution_AUDIO: string;
         ipc_player_current_resolution_is_equal: string;
         ipc_player_screenshot_success_tip: string;
         ipc_player_screenshot_multi_success_tip: string;
@@ -41,9 +45,13 @@ declare const _default: {
         ipc_player_low_phone_not_support: string;
     };
     zh: {
+        ipc_player_resolution_SS: string;
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_UD: string;
+        ipc_player_resolution_SSP: string;
         ipc_player_resolution_AUTO: string;
+        ipc_player_resolution_AUDIO: string;
         ipc_player_current_resolution_is_equal: string;
         ipc_player_screenshot_success_tip: string;
         ipc_player_screenshot_multi_success_tip: string;

package/lib/i18n/strings.js

@@ -1,8 +1,12 @@
 export default {
   en: {
+    ipc_player_resolution_SS: 'Data Saver',
     ipc_player_resolution_HD: 'HD',
     ipc_player_resolution_SD: 'SD',
+    ipc_player_resolution_UD: 'Ultra HD',
+    ipc_player_resolution_SSP: 'Super Ultra HD',
     ipc_player_resolution_AUTO: 'Auto',
+    ipc_player_resolution_AUDIO: 'Audio Mode',
     ipc_player_current_resolution_is_equal: 'Already at current clarity',
     ipc_player_screenshot_success_tip: 'Screenshot saved to album',
     ipc_player_screenshot_multi_success_tip: 'Screenshots saved to album',
@@ -41,9 +45,13 @@ export default {
     ipc_player_low_phone_not_support: 'This feature is not supported on this device'
   },
   zh: {
+    ipc_player_resolution_SS: '省流量',
     ipc_player_resolution_HD: '高清',
     ipc_player_resolution_SD: '标清',
+    ipc_player_resolution_UD: '超清',
+    ipc_player_resolution_SSP: '超超清',
     ipc_player_resolution_AUTO: '自动',
+    ipc_player_resolution_AUDIO: '音频模式',
     ipc_player_current_resolution_is_equal: '已是当前清晰度',
     ipc_player_screenshot_success_tip: '截图已保存在APP相册',
     ipc_player_screenshot_multi_success_tip: '图片已保存至相册',

package/lib/interface.d.ts

@@ -143,12 +143,7 @@ export type CaptureFileInfo = {
     height?: number;
     data?: string;
 };
-export type MultiCaptureFileInfo = CaptureFileInfo & {
-    index: number;
-};
-export type CaptureResult = boolean | CaptureFileInfo | {
-    items: MultiCaptureFileInfo[];
-};
+export type CaptureResult = boolean | CaptureFileInfo;
 export type RecordInfoData = CaptureResult;
 /**
  * 多目屏幕模式

package/lib/ui/constant.d.ts

@@ -62,7 +62,7 @@ export declare const bottomLeftContentResize = "bottomLeftContentResize";
 export declare const zoomLevelChange = "zoomLevelChange";
 /**
  * 自动清晰度状态变化事件：Resolution 控件检测到清晰度进入/退出自动模式或收到
- * clarityChanged 回调结果时触发，携带 { enabled, clarity }（clarity 为 'HD' | 'SD' | null）。
+ * onClarityChanged 事件时触发，携带 { enabled, clarity }（clarity 为 ClarityType | null）。
  * VideoBitKBP 监听此事件，在码率前展示当前高清/标清文案。
  */
 export declare const autoClarityChange = "autoClarityChange";

package/lib/ui/constant.js

@@ -66,7 +66,7 @@ export const zoomLevelChange = 'zoomLevelChange';
 
 /**
  * 自动清晰度状态变化事件：Resolution 控件检测到清晰度进入/退出自动模式或收到
- * clarityChanged 回调结果时触发，携带 { enabled, clarity }（clarity 为 'HD' | 'SD' | null）。
+ * onClarityChanged 事件时触发，携带 { enabled, clarity }（clarity 为 ClarityType | null）。
  * VideoBitKBP 监听此事件，在码率前展示当前高清/标清文案。
  */
 export const autoClarityChange = 'autoClarityChange';

package/lib/ui/ui.js

@@ -661,8 +661,12 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setRecording(false, true);
     setIntercom(false, true);
     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);
+      var _instance$multiLens, _instance$multiCamera;
+      const summary = await getCaptureResultSummary(result, {
+        multiLens: (_instance$multiLens = instance === null || instance === void 0 ? void 0 : instance.multiLens) !== null && _instance$multiLens !== void 0 ? _instance$multiLens : false,
+        protocolCount: 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

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

package/lib/utils/captureResult.js

@@ -33,36 +33,38 @@ const extractPath = item => {
   if (typeof (item === null || item === void 0 ? void 0 : item.value) === 'string') return item.value;
   return '';
 };
-export async function getCaptureResultSummary(result, fallbackCount, devId) {
+export async function getCaptureResultSummary(result, _ref) {
+  let {
+    multiLens,
+    protocolCount,
+    devId
+  } = _ref;
   if (!result || typeof result === 'boolean') return null;
-  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];
-    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;
+  const thumbnailPath = extractPath(result.tempImagePath) || extractPath(result.thumbPath) || extractPath(result.filePath) || '';
+  if (!multiLens) {
     return {
-      count: result.items.length,
-      isMultiLens: true,
-      thumbnailPath: firstThumb
+      count: 1,
+      isMultiLens: false,
+      thumbnailPath
     };
   }
-  const legacySplitCount = fallbackCount && fallbackCount > 1 ? fallbackCount : 0;
+  const splitCount = Number(protocolCount) > 1 ? Number(protocolCount) : 0;
   const multiLensAbilityCount = await getMultiLensCountFromAbility(devId);
 
   // 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;
+  const multiCount = splitCount || multiLensAbilityCount;
   if (multiCount > 1) {
     return {
       count: multiCount,
       isMultiLens: true,
-      thumbnailPath: multiLensAbilityCount > 1 ? normalizeMultiLensThumbnailPath(singleThumb) : singleThumb
+      thumbnailPath: multiLensAbilityCount > 1 ? normalizeMultiLensThumbnailPath(thumbnailPath) : thumbnailPath
     };
   }
   return {
     count: 1,
     isMultiLens: false,
-    thumbnailPath: singleThumb
+    thumbnailPath
   };
 }

package/lib/utils/captureResult.test.js

@@ -24,14 +24,33 @@ describe('getCaptureResultSummary', () => {
         }
       }
     });
-    await expect(getCaptureResultSummary(createCaptureResult(basePath), undefined, 'dev-1')).resolves.toEqual({
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), {
+      multiLens: true,
+      devId: '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({
+  it('keeps the single-lens result for a legacy multi-camera device', async () => {
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), {
+      multiLens: false,
+      protocolCount: 4,
+      devId: 'dev-1'
+    })).resolves.toEqual({
+      count: 1,
+      isMultiLens: false,
+      thumbnailPath: basePath
+    });
+    expect(mockGetDeviceInfo).not.toHaveBeenCalled();
+  });
+  it('uses the protocol count when the multi-lens mode is enabled', async () => {
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), {
+      multiLens: true,
+      protocolCount: 4,
+      devId: 'dev-1'
+    })).resolves.toEqual({
       count: 4,
       isMultiLens: true,
       thumbnailPath: basePath
@@ -46,7 +65,11 @@ describe('getCaptureResultSummary', () => {
         }
       }
     });
-    await expect(getCaptureResultSummary(createCaptureResult(basePath), 4, 'dev-1')).resolves.toEqual({
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), {
+      multiLens: true,
+      protocolCount: 4,
+      devId: 'dev-1'
+    })).resolves.toEqual({
       count: 4,
       isMultiLens: true,
       thumbnailPath: 'thingfile://tmp/capture_123_lens1.jpg'
@@ -61,29 +84,33 @@ describe('getCaptureResultSummary', () => {
       }
     });
     const path = 'thingfile://tmp/capture_123_lens1.jpg';
-    await expect(getCaptureResultSummary(createCaptureResult(path), undefined, 'dev-1')).resolves.toEqual({
+    await expect(getCaptureResultSummary(createCaptureResult(path), {
+      multiLens: true,
+      devId: '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({
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), {
+      multiLens: false,
+      devId: '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({
+  it('keeps a single-lens result when multi-lens mode has one lens', async () => {
+    await expect(getCaptureResultSummary(createCaptureResult(basePath), {
+      multiLens: true,
+      protocolCount: 1,
+      devId: 'dev-1'
+    })).resolves.toEqual({
       count: 1,
-      isMultiLens: true,
+      isMultiLens: false,
       thumbnailPath: basePath
     });
   });

package/lib/utils/ttt.d.ts

@@ -1,3 +1,4 @@
+import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 export type SmartImageQualityResult = {
     isPurchase: boolean;
     buttonState: number;
@@ -48,6 +49,17 @@ export declare function notifyOfflineShown(deviceId: string): boolean;
 export declare function getNgRawData(): Promise<unknown>;
 export declare function isClarityChangedSupported(): boolean;
 export type ClarityChangedResult = {
-    clarity: 'HD' | 'SD';
+    deviceId?: string;
+    clarity: ClarityType;
 };
-export declare function clarityChanged(devId: string): Promise<ClarityChangedResult | null>;
+export type ClarityChangedHandler = (result: ClarityChangedResult) => void;
+type ClarityChangedListener = (payload: ClarityChangedResult) => void;
+export declare function offClarityChanged(listener: ClarityChangedListener): void;
+/**
+ * 监听自动清晰度变化，返回取消监听函数。
+ *
+ * onClarityChanged / offClarityChanged 均使用同一个 listener 引用，
+ * 否则宿主无法正确移除监听。
+ */
+export declare function subscribeClarityChanged(devId: string, handler: ClarityChangedHandler): () => void;
+export {};

package/lib/utils/ttt.js

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 export function getSmartImageQualityState(devId) {
   return new Promise(resolve => {
     var _ty$ipc;
@@ -165,35 +166,63 @@ export function getNgRawData() {
   });
 }
 
-// 是否支持自动清晰度（ttt 方法 clarityChanged 存在即支持）
+// 是否支持自动清晰度（ttt 方法 onClarityChanged 存在即支持）
 export function isClarityChangedSupported() {
-  var _ty$ipc6;
-  return typeof ((_ty$ipc6 = ty.ipc) === null || _ty$ipc6 === void 0 ? void 0 : _ty$ipc6.clarityChanged) === 'function';
+  var _ty5;
+  return typeof ty !== 'undefined' && typeof ((_ty5 = ty) === null || _ty5 === void 0 || (_ty5 = _ty5.ipc) === null || _ty5 === void 0 ? void 0 : _ty5.onClarityChanged) === 'function';
 }
-export function clarityChanged(devId) {
-  return new Promise(resolve => {
-    var _ty$ipc7;
-    if (typeof ((_ty$ipc7 = ty.ipc) === null || _ty$ipc7 === void 0 ? void 0 : _ty$ipc7.clarityChanged) !== 'function') {
-      resolve(null);
+export function offClarityChanged(listener) {
+  var _ty6;
+  const ipc = typeof ty !== 'undefined' ? (_ty6 = ty) === null || _ty6 === void 0 ? void 0 : _ty6.ipc : undefined;
+  if (!ipc || typeof ipc.offClarityChanged !== 'function') {
+    return;
+  }
+  try {
+    ipc.offClarityChanged(listener);
+  } catch (error) {
+    console.warn('res===offClarityChanged fail', error);
+  }
+}
+
+/**
+ * 监听自动清晰度变化，返回取消监听函数。
+ *
+ * onClarityChanged / offClarityChanged 均使用同一个 listener 引用，
+ * 否则宿主无法正确移除监听。
+ */
+export function subscribeClarityChanged(devId, handler) {
+  var _ty7;
+  const ipc = typeof ty !== 'undefined' ? (_ty7 = ty) === null || _ty7 === void 0 ? void 0 : _ty7.ipc : undefined;
+  if (!ipc || typeof ipc.onClarityChanged !== 'function') {
+    return () => undefined;
+  }
+  const listener = payload => {
+    console.log('[resolution] onClarityChanged 事件到达', JSON.stringify(payload !== null && payload !== void 0 ? payload : null));
+    const {
+      deviceId,
+      clarity
+    } = payload || {};
+    if (!Object.values(ClarityType).includes(clarity)) {
+      console.warn('[resolution] onClarityChanged 缺少 clarity');
       return;
     }
-    if (!isClarityChangedSupported()) {
-      resolve(null);
+    // 一页多设备时只认自己的；宿主没带 deviceId 就不过滤
+    if (deviceId && deviceId !== devId) {
+      console.warn('[resolution] onClarityChanged 非本设备，已忽略', `${deviceId} != ${devId}`);
       return;
     }
-    try {
-      ty.ipc.clarityChanged({
-        devId,
-        success: res => {
-          resolve(res !== null && res !== void 0 ? res : null);
-        },
-        fail: e => {
-          console.warn('res===clarityChanged fail', e);
-          resolve(null);
-        }
-      });
-    } catch (e) {
-      resolve(null);
-    }
-  });
+    handler({
+      deviceId,
+      clarity
+    });
+  };
+  try {
+    ipc.onClarityChanged(listener);
+  } catch (error) {
+    console.warn('res===onClarityChanged fail', error);
+    return () => undefined;
+  }
+  return () => {
+    offClarityChanged(listener);
+  };
 }

package/lib/widgets/captureResult/captureResult.js

@@ -5,7 +5,7 @@ import { Image, Text, View } from '@ray-js/ray';
 import clsx from 'clsx';
 import Strings from '../../i18n';
 import './captureResult.less';
-const THUMBNAIL_LAYERS = ['back', 'middle', 'front'];
+const BACKDROP_LAYERS = ['back', 'middle'];
 const TEXT_KEYS = {
   record: {
     check: 'ipc_player_record_success_check',
@@ -55,18 +55,17 @@ export function CaptureResultToast(_ref) {
   const textKeys = TEXT_KEYS[kind];
   const legacyCls = LEGACY_CLASS_MAP[kind];
   const imageClassName = clsx('ipc-player-plugin-capture-result-image', legacyCls.image);
+  const backdropLayers = BACKDROP_LAYERS.slice(-Math.min(count - 1, BACKDROP_LAYERS.length));
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-capture-result-toast', legacyCls.toast, className)
   }, /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-capture-result-image-box', legacyCls.imageBox, isMultiLens && ['ipc-player-plugin-capture-result-image-box-multi', legacyCls.imageBoxMulti])
-  }, isMultiLens ? THUMBNAIL_LAYERS.slice(0, count).map((layer, index) => /*#__PURE__*/React.createElement(Image, {
+  }, isMultiLens ? /*#__PURE__*/React.createElement(React.Fragment, null, backdropLayers.map(layer => /*#__PURE__*/React.createElement(View, {
     key: layer,
-    className: imageClassName,
-    src: thumbnailPath,
-    style: {
-      left: `${index * 5}px`,
-      zIndex: index + 1
-    }
+    className: clsx('ipc-player-plugin-capture-result-backdrop', `ipc-player-plugin-capture-result-image-${layer}`)
+  })), /*#__PURE__*/React.createElement(Image, {
+    className: clsx(imageClassName, 'ipc-player-plugin-capture-result-image-front'),
+    src: thumbnailPath
   })) : /*#__PURE__*/React.createElement(Image, {
     className: imageClassName,
     src: thumbnailPath

package/lib/widgets/captureResult/captureResult.less

@@ -29,17 +29,47 @@
   object-fit: cover;
 }
 
-.ipc-player-plugin-capture-result-image-box-multi .ipc-player-plugin-capture-result-image,
-.ipc-player-plugin-record-success-toast-image-box-multi .ipc-player-plugin-record-success-toast-image,
-.ipc-player-plugin-screenshot-toast-image-box-multi .ipc-player-plugin-screenshot-toast-image {
+.ipc-player-plugin-capture-result-image-box-multi,
+.ipc-player-plugin-record-success-toast-image-box-multi,
+.ipc-player-plugin-screenshot-toast-image-box-multi {
+  height: calc(39px * var(--ipc-player-size-scale, 1));
+}
+
+.ipc-player-plugin-capture-result-backdrop,
+.ipc-player-plugin-capture-result-image-front {
   position: absolute;
-  top: 0;
-  width: calc(56px * var(--ipc-player-size-scale, 1));
   box-sizing: border-box;
-  border: 1px solid var(--shot-card-bg-color);
   border-radius: calc(4px * var(--ipc-player-size-scale, 1));
 }
 
+.ipc-player-plugin-capture-result-backdrop {
+  background: rgba(255, 255, 255, 0.2);
+}
+
+.ipc-player-plugin-capture-result-image-back {
+  top: 0;
+  left: calc(7px * var(--ipc-player-size-scale, 1));
+  z-index: 1;
+  width: calc(52px * var(--ipc-player-size-scale, 1));
+  height: calc(28px * var(--ipc-player-size-scale, 1));
+}
+
+.ipc-player-plugin-capture-result-image-middle {
+  top: calc(3px * var(--ipc-player-size-scale, 1));
+  left: calc(2.5px * var(--ipc-player-size-scale, 1));
+  z-index: 2;
+  width: calc(61px * var(--ipc-player-size-scale, 1));
+  height: calc(30.5px * var(--ipc-player-size-scale, 1));
+}
+
+.ipc-player-plugin-capture-result-image-front {
+  top: calc(6px * var(--ipc-player-size-scale, 1));
+  left: 0;
+  z-index: 3;
+  width: calc(66px * var(--ipc-player-size-scale, 1));
+  height: calc(33px * var(--ipc-player-size-scale, 1));
+}
+
 .ipc-player-plugin-capture-result-play-icon-box,
 .ipc-player-plugin-record-success-play-icon-box {
   position: absolute;

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

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

package/lib/widgets/captureResult/captureResult.test.js

@@ -0,0 +1,79 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+jest.mock('@ray-js/ray', () => {
+  const React = require('react');
+  return {
+    Image: _ref => {
+      let {
+        className,
+        src
+      } = _ref;
+      return /*#__PURE__*/React.createElement("img", {
+        alt: "",
+        className: className,
+        src: src
+      });
+    },
+    Text: _ref2 => {
+      let {
+        children,
+        className
+      } = _ref2;
+      return /*#__PURE__*/React.createElement("span", {
+        className: className
+      }, children);
+    },
+    View: _ref3 => {
+      let {
+        children,
+        className
+      } = _ref3;
+      return /*#__PURE__*/React.createElement("div", {
+        className: className
+      }, children);
+    }
+  };
+});
+jest.mock('../../i18n', () => ({
+  __esModule: true,
+  default: {
+    getLang: key => key,
+    formatString: (template, count) => `${template}:${count}`
+  }
+}));
+jest.mock('./captureResult.less', () => ({}));
+const {
+  CaptureResultToast
+} = require('./captureResult');
+const renderToast = count => renderToStaticMarkup(/*#__PURE__*/React.createElement(CaptureResultToast, {
+  brandColor: "#ff592a",
+  count: count,
+  kind: "screenshot",
+  onCheck: () => undefined,
+  thumbnailPath: "thingfile://capture.jpg"
+}));
+const countClass = (markup, className) => [...markup.matchAll(/class="([^"]*)"/g)].filter(_ref4 => {
+  let [, names] = _ref4;
+  return names.split(/\s+/).includes(className);
+}).length;
+describe('CaptureResultToast', () => {
+  it('keeps the single-item thumbnail unchanged', () => {
+    const markup = renderToast(1);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-backdrop')).toBe(0);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-image-front')).toBe(0);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-image')).toBe(1);
+  });
+  it('renders one backdrop for two captured items', () => {
+    const markup = renderToast(2);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-backdrop')).toBe(1);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-image-middle')).toBe(1);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-image-front')).toBe(1);
+  });
+  it('caps the backdrop count at two', () => {
+    const markup = renderToast(4);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-backdrop')).toBe(2);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-image-back')).toBe(1);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-image-middle')).toBe(1);
+    expect(countClass(markup, 'ipc-player-plugin-capture-result-image-front')).toBe(1);
+  });
+});

package/lib/widgets/recordVideo/recordVideo.js

@@ -117,7 +117,11 @@ export function RecordVideo(props) {
     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);
+    const summary = await getCaptureResultSummary(recordInfo, {
+      multiLens: props.multiLens,
+      protocolCount: splitNum,
+      devId
+    });
     if (requestId !== recordResultRequestIdRef.current) return;
     if (!summary) return;
     setState({

package/lib/widgets/resolution/resolution.js

@@ -9,7 +9,7 @@ import { FullResolutionControl } from './fullResolutionControl';
 import { fullResolutionId, pauseTimeToHideAllComponent, hideAllComponent, widgetLabs, widgetClick, autoClarityChange } from '../../ui/constant';
 import { UIEventContext } from '../../ui/context';
 import { useStore } from '../../ctx/store';
-import { clarityChanged } from '../../utils/ttt';
+import { subscribeClarityChanged } from '../../utils/ttt';
 import './resolution.less';
 export const Resolution = props => {
   const {
@@ -33,7 +33,7 @@ export const Resolution = props => {
   } = useContext(UIEventContext);
 
   // 广播自动清晰度状态给 VideoBitKBP 等监听方；
-  // 自动模式下读取一次当前实际清晰度，仅用于码率区域展示。
+  // 自动模式下监听当前实际清晰度，仅用于码率区域展示。
   useEffect(() => {
     const emitClarity = (enabled, clarity) => {
       event.emit(autoClarityChange, {
@@ -43,18 +43,14 @@ export const Resolution = props => {
     };
     if (resolution !== ClarityType.AUTO) {
       emitClarity(false, null);
-      return;
+      return undefined;
     }
     emitClarity(true, null);
-    if (devId) {
-      clarityChanged(devId).then(res => {
-        if (res !== null && res !== void 0 && res.clarity) {
-          emitClarity(true, res.clarity);
-        }
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [devId, resolution]);
+    if (!devId) return undefined;
+    return subscribeClarityChanged(devId, res => {
+      emitClarity(true, res.clarity);
+    });
+  }, [devId, event, resolution]);
   const onResolution = useMemoizedFn(() => {
     event.emit(widgetClick, {
       widgetId: widgetLabs.RESOLUTION

package/lib/widgets/screenshot/screenshot.js

@@ -139,7 +139,11 @@ export function Screenshot(props) {
           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 = await getCaptureResultSummary(res, splitNum, devId);
+          const summary = await getCaptureResultSummary(res, {
+            multiLens: props.multiLens,
+            protocolCount: splitNum,
+            devId
+          });
           if (requestId !== snapshotRequestIdRef.current) return;
           if (!summary) {
             handleSnapshotFail({});

package/lib/widgets/videoBitKBP/videoBitKBP.js

@@ -29,7 +29,6 @@ export const VideoBitKBP = props => {
     event
   } = useContext(UIEventContext);
   const timerRef = useRef();
-
   // 监听 Resolution 控件广播的自动清晰度状态
   useEffect(() => {
     const onAutoClarityChange = payload => {
@@ -103,7 +102,26 @@ export const VideoBitKBP = props => {
     className: "ipc-player-plugin-videoBitKBP-kbps"
   }, autoClarity && /*#__PURE__*/React.createElement(Text, {
     className: "ipc-player-plugin-videoBitKBP-clarity"
-  }, autoClarity === 'HD' ? Strings.getLang('ipc_player_resolution_HD') : Strings.getLang('ipc_player_resolution_SD')), /*#__PURE__*/React.createElement(Text, null, bitKBP), /*#__PURE__*/React.createElement(Text, {
+  }, (clarity => {
+    switch (clarity) {
+      case ClarityType.SS:
+        return Strings.getLang('ipc_player_resolution_SS');
+      case ClarityType.SD:
+        return Strings.getLang('ipc_player_resolution_SD');
+      case ClarityType.HD:
+        return Strings.getLang('ipc_player_resolution_HD');
+      case ClarityType.UD:
+        return Strings.getLang('ipc_player_resolution_UD');
+      case ClarityType.SSP:
+        return Strings.getLang('ipc_player_resolution_SSP');
+      case ClarityType.AUTO:
+        return Strings.getLang('ipc_player_resolution_AUTO');
+      case ClarityType.AUDIO:
+        return Strings.getLang('ipc_player_resolution_AUDIO');
+      default:
+        return clarity;
+    }
+  })(autoClarity)), /*#__PURE__*/React.createElement(Text, null, bitKBP), /*#__PURE__*/React.createElement(Text, {
     className: "ipc-player-plugin-videoBitKBP-unit-kbs"
   }, "KB/S"))));
 };

package/package.json

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