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

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.autoClarity.test.d.ts

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

package/lib/utils/ttt.autoClarity.test.js

@@ -0,0 +1,75 @@
+import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
+import { getCachedAutoClarity, setCachedAutoClarity, subscribeClarityChanged } from './ttt';
+jest.mock('@ray-js/ray-ipc-utils/lib/interface', () => ({
+  ClarityType: {
+    SS: 'SS',
+    SD: 'SD',
+    HD: 'HD',
+    UD: 'UD',
+    SSP: 'SSP',
+    AUTO: 'AUTO',
+    AUDIO: 'AUDIO'
+  }
+}));
+describe('auto clarity cache and listener', () => {
+  const storage = new Map();
+  let listener;
+  beforeEach(() => {
+    storage.clear();
+    globalThis.ty = {
+      getStorageSync: jest.fn(_ref => {
+        let {
+          key
+        } = _ref;
+        return storage.get(key);
+      }),
+      setStorageSync: jest.fn(_ref2 => {
+        let {
+          key,
+          data
+        } = _ref2;
+        return storage.set(key, data);
+      }),
+      ipc: {
+        onClarityChanged: jest.fn(callback => {
+          listener = callback;
+        }),
+        offClarityChanged: jest.fn()
+      }
+    };
+  });
+  it('restores the last reported actual clarity only for its device', () => {
+    setCachedAutoClarity('camera-1', ClarityType.HD);
+    expect(getCachedAutoClarity('camera-1')).toBe(ClarityType.HD);
+    expect(getCachedAutoClarity('camera-2')).toBeNull();
+    setCachedAutoClarity('camera-1', ClarityType.AUTO);
+    expect(getCachedAutoClarity('camera-1')).toBe(ClarityType.HD);
+    globalThis.ty.getStorageSync = jest.fn(() => ({
+      data: ClarityType.SD
+    }));
+    expect(getCachedAutoClarity('camera-1')).toBe(ClarityType.SD);
+  });
+  it('accepts a new actual clarity report for the same device', () => {
+    const handler = jest.fn();
+    const unsubscribe = subscribeClarityChanged('camera-1', handler);
+    listener({
+      deviceId: 'camera-2',
+      clarity: ClarityType.SD
+    });
+    listener({
+      deviceId: 'camera-1',
+      clarity: ClarityType.AUTO
+    });
+    listener({
+      deviceId: 'camera-1',
+      clarity: ClarityType.SD
+    });
+    expect(handler).toHaveBeenCalledTimes(1);
+    expect(handler).toHaveBeenCalledWith({
+      deviceId: 'camera-1',
+      clarity: ClarityType.SD
+    });
+    unsubscribe();
+    expect(globalThis.ty.ipc.offClarityChanged).toHaveBeenCalledWith(listener);
+  });
+});

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,19 @@ 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 getCachedAutoClarity(devId: string): ClarityType | null;
+export declare function setCachedAutoClarity(devId: string, clarity: ClarityType): 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,87 @@ 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);
+const actualClarityTypes = [ClarityType.SS, ClarityType.SD, ClarityType.HD, ClarityType.UD, ClarityType.SSP];
+const autoClarityStorageKey = devId => `${devId}_auto_clarity`;
+export function getCachedAutoClarity(devId) {
+  try {
+    const stored = ty.getStorageSync({
+      key: autoClarityStorageKey(devId)
+    });
+    const clarity = typeof stored === 'string' ? stored : stored === null || stored === void 0 ? void 0 : stored.data;
+    return actualClarityTypes.includes(clarity) ? clarity : null;
+  } catch (error) {
+    return null;
+  }
+}
+export function setCachedAutoClarity(devId, clarity) {
+  if (!actualClarityTypes.includes(clarity)) return;
+  try {
+    ty.setStorageSync({
+      key: autoClarityStorageKey(devId),
+      data: clarity
+    });
+  } catch (error) {
+    console.warn('res===setCachedAutoClarity fail', error);
+  }
+}
+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 (!actualClarityTypes.includes(clarity)) {
+      console.warn('[resolution] onClarityChanged 未返回实际清晰度');
       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

@@ -1,11 +1,9 @@
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.map.js";
 import React from 'react';
 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',
@@ -59,14 +57,12 @@ export function CaptureResultToast(_ref) {
     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, BACKDROP_LAYERS.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

@@ -1,22 +1,36 @@
 .ipc-player-plugin-capture-result-toast,
 .ipc-player-plugin-record-success-toast,
 .ipc-player-plugin-screenshot-toast {
+  --capture-result-text-color: var(--fontColor, #fff);
+  --capture-result-near-backdrop-color: rgba(255, 255, 255, 0.2);
+  --capture-result-far-backdrop-color: rgba(255, 255, 255, 0.1);
+
   z-index: 100;
   display: flex;
   flex: 1;
   align-items: center;
-  padding: calc(8px * var(--ipc-player-size-scale, 1))
+  padding: calc(7px * var(--ipc-player-size-scale, 1))
+    calc(16px * var(--ipc-player-size-scale, 1))
+    calc(7px * var(--ipc-player-size-scale, 1))
     calc(12px * var(--ipc-player-size-scale, 1));
   background-color: var(--shot-card-bg-color);
   border-radius: calc(8px * var(--ipc-player-size-scale, 1));
 }
 
+:root[theme='light'] .ipc-player-plugin-capture-result-toast {
+  --capture-result-text-color: #1a1a1a;
+  --capture-result-near-backdrop-color: rgba(0, 0, 0, 0.1);
+  --capture-result-far-backdrop-color: rgba(0, 0, 0, 0.05);
+
+  background-color: #fff;
+}
+
 .ipc-player-plugin-capture-result-image-box,
 .ipc-player-plugin-record-success-toast-image-box,
 .ipc-player-plugin-screenshot-toast-image-box {
   position: relative;
   width: calc(66px * var(--ipc-player-size-scale, 1));
-  height: calc(66px * 0.57 * var(--ipc-player-size-scale, 1));
+  height: calc(39px * var(--ipc-player-size-scale, 1));
   overflow: hidden;
   border-radius: calc(4px * var(--ipc-player-size-scale, 1));
 }
@@ -29,17 +43,39 @@
   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-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-image-back {
+  top: calc(1px * var(--ipc-player-size-scale, 1));
+  left: calc(5px * var(--ipc-player-size-scale, 1));
+  z-index: 1;
+  width: calc(56px * var(--ipc-player-size-scale, 1));
+  height: calc(28px * var(--ipc-player-size-scale, 1));
+  background: var(--capture-result-far-backdrop-color);
+}
+
+.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));
+  background: var(--capture-result-near-backdrop-color);
+}
+
+.ipc-player-plugin-capture-result-image-front {
+  top: calc(5px * 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;
@@ -49,18 +85,23 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 30px;
-  height: 30px;
+  width: calc(16px * var(--ipc-player-size-scale, 1));
+  height: calc(16px * var(--ipc-player-size-scale, 1));
   overflow: hidden;
   background-color: rgba(0, 0, 0, 0.2);
   border-radius: 50%;
   transform: translate(-50%, -50%);
 }
 
+.ipc-player-plugin-capture-result-image-box-multi
+  .ipc-player-plugin-capture-result-play-icon-box {
+  top: calc(50% + 2px * var(--ipc-player-size-scale, 1));
+}
+
 .ipc-player-plugin-capture-result-play-icon,
 .ipc-player-plugin-record-success-play-icon {
   color: #ffffff;
-  font-size: calc(18px * var(--ipc-player-size-scale, 1)) !important;
+  font-size: calc(9px * var(--ipc-player-size-scale, 1)) !important;
 }
 
 .ipc-player-plugin-capture-result-title,
@@ -69,17 +110,20 @@
   display: flex;
   flex: 1;
   flex-direction: column;
+  min-width: 0;
   margin-right: calc(12px * var(--ipc-player-size-scale, 1));
-  margin-left: calc(12px * var(--ipc-player-size-scale, 1));
-  color: var(--fontColor);
+  margin-left: calc(8px * var(--ipc-player-size-scale, 1));
+  color: var(--capture-result-text-color, var(--fontColor));
   font-size: calc(14px * var(--ipc-player-size-scale, 1));
+  line-height: calc(20px * var(--ipc-player-size-scale, 1));
   word-break: break-word;
 }
 
 .ipc-player-plugin-capture-result-count {
   margin-top: calc(2px * var(--ipc-player-size-scale, 1));
-  color: var(--fontColor);
+  color: var(--capture-result-text-color, var(--fontColor));
   font-size: calc(12px * var(--ipc-player-size-scale, 1));
+  line-height: calc(17px * var(--ipc-player-size-scale, 1));
   opacity: 0.5;
 }
 
@@ -88,6 +132,7 @@
 .ipc-player-plugin-screenshot-toast-bottom {
   min-width: calc(52px * var(--ipc-player-size-scale, 1));
   max-width: calc(100px * var(--ipc-player-size-scale, 1));
+  flex-shrink: 0;
   padding: calc(5px * var(--ipc-player-size-scale, 1))
     calc(11px * var(--ipc-player-size-scale, 1));
   overflow: hidden;

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

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

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

@@ -0,0 +1,80 @@
+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 both backdrops for two captured items', () => {
+    const markup = renderToast(2);
+    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);
+  });
+  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

@@ -1,19 +1,16 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
-import React, { useContext, useEffect } from 'react';
+import React, { useContext } from 'react';
 import { useMemoizedFn } from 'ahooks';
-import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 import Strings from '../../i18n';
 import { FullResolutionControl } from './fullResolutionControl';
-import { fullResolutionId, pauseTimeToHideAllComponent, hideAllComponent, widgetLabs, widgetClick, autoClarityChange } from '../../ui/constant';
+import { fullResolutionId, pauseTimeToHideAllComponent, hideAllComponent, widgetLabs, widgetClick } from '../../ui/constant';
 import { UIEventContext } from '../../ui/context';
 import { useStore } from '../../ctx/store';
-import { clarityChanged } from '../../utils/ttt';
 import './resolution.less';
 export const Resolution = props => {
   const {
-    devId,
     setResolution,
     addContent,
     hasContent,
@@ -31,30 +28,6 @@ export const Resolution = props => {
   const {
     event
   } = useContext(UIEventContext);
-
-  // 广播自动清晰度状态给 VideoBitKBP 等监听方；
-  // 自动模式下读取一次当前实际清晰度，仅用于码率区域展示。
-  useEffect(() => {
-    const emitClarity = (enabled, clarity) => {
-      event.emit(autoClarityChange, {
-        enabled,
-        clarity
-      });
-    };
-    if (resolution !== ClarityType.AUTO) {
-      emitClarity(false, null);
-      return;
-    }
-    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]);
   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({});