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

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/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/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/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/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.2",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [