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

package/lib/ctx/ctx.js

@@ -109,6 +109,15 @@ export const createUseCtx = _ref => {
     if (!eventRef.current) {
       eventRef.current = getEventInstance();
     }
+
+    /**
+     * 自动清晰度作为独立档位并入清晰度列表：
+     * 竖屏宿主弹框（由 resolutionList 构建 actionData）与横屏 FullResolutionControl 共用。
+     */
+    const withAutoClarity = function () {
+      let list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      return list.includes(ClarityType.AUTO) ? list : [...list, ClarityType.AUTO];
+    };
     useEffect(() => {
       // 初始化获取缓存值
 
@@ -117,7 +126,7 @@ export const createUseCtx = _ref => {
         try {
           var _res$maxZoomSettings;
           const res = await getMemoryState(devId);
-          setResolutionList(res.resolutionList);
+          setResolutionList(withAutoClarity(res.resolutionList));
           _setResolution(res.resolution, true);
           _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
@@ -133,7 +142,7 @@ export const createUseCtx = _ref => {
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
           var _res$maxZoomSettings2;
-          setResolutionList(res.resolutionList);
+          setResolutionList(withAutoClarity(res.resolutionList));
           // 传true表示值即可,会取播放器的值
           _setResolution(res.resolution, true);
           _setMute(res.mute, true);
@@ -238,8 +247,17 @@ export const createUseCtx = _ref => {
         return false;
       }
       return new Promise((resolve, reject) => {
+        const clarityMap = {
+          [ClarityType.SS]: 'ss',
+          [ClarityType.SD]: 'normal',
+          [ClarityType.HD]: 'hd',
+          [ClarityType.UD]: 'ud',
+          [ClarityType.SSP]: 'ssp',
+          [ClarityType.AUTO]: 'auto',
+          [ClarityType.AUDIO]: 'audio'
+        };
         IPCPlayerInstance.current.setClarity({
-          clarity: target === ClarityType.HD ? 'hd' : 'normal',
+          clarity: clarityMap[target] || 'normal',
           success: () => {
             setResolutionMemoryState(devId, target);
             updateAtom(resolution, target);

package/lib/i18n/index.d.ts

@@ -3,6 +3,7 @@ declare const Strings: kit.I18N<{
     en: {
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_AUTO: string;
         ipc_player_current_resolution_is_equal: string;
         ipc_player_screenshot_success_tip: string;
         ipc_player_screenshot_multi_success_tip: string;
@@ -43,6 +44,7 @@ declare const Strings: kit.I18N<{
     zh: {
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_AUTO: string;
         ipc_player_current_resolution_is_equal: string;
         ipc_player_screenshot_success_tip: string;
         ipc_player_screenshot_multi_success_tip: string;
@@ -83,6 +85,7 @@ declare const Strings: kit.I18N<{
 }, {
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
+    ipc_player_resolution_AUTO: string;
     ipc_player_current_resolution_is_equal: string;
     ipc_player_screenshot_success_tip: string;
     ipc_player_screenshot_multi_success_tip: string;
@@ -122,6 +125,7 @@ declare const Strings: kit.I18N<{
 } | {
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
+    ipc_player_resolution_AUTO: 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

@@ -2,6 +2,7 @@ declare const _default: {
     en: {
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_AUTO: string;
         ipc_player_current_resolution_is_equal: string;
         ipc_player_screenshot_success_tip: string;
         ipc_player_screenshot_multi_success_tip: string;
@@ -42,6 +43,7 @@ declare const _default: {
     zh: {
         ipc_player_resolution_HD: string;
         ipc_player_resolution_SD: string;
+        ipc_player_resolution_AUTO: 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

@@ -2,6 +2,7 @@ export default {
   en: {
     ipc_player_resolution_HD: 'HD',
     ipc_player_resolution_SD: 'SD',
+    ipc_player_resolution_AUTO: 'Auto',
     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',
@@ -42,6 +43,7 @@ export default {
   zh: {
     ipc_player_resolution_HD: '高清',
     ipc_player_resolution_SD: '标清',
+    ipc_player_resolution_AUTO: '自动',
     ipc_player_current_resolution_is_equal: '已是当前清晰度',
     ipc_player_screenshot_success_tip: '截图已保存在APP相册',
     ipc_player_screenshot_multi_success_tip: '图片已保存至相册',

package/lib/interface.d.ts

@@ -87,7 +87,7 @@ export type UseCtx = (options: {
     setVerticalMic: (value: boolean) => void;
     setScreenType: (type: ScreenType) => void;
     setRecordingDisabled: (type: boolean) => void;
-    setResolution: (type: string) => void;
+    setResolution: (type: string) => Promise<boolean>;
     setResolutionList: (type: string[]) => void;
     setRecording: (value: boolean, onlyUpdateAtom?: boolean) => Promise<CaptureResult>;
     stopRecordingOnUnload: () => Promise<CaptureResult>;

package/lib/ui/constant.d.ts

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

package/lib/ui/constant.js

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

package/lib/ui/ui.js

@@ -23,7 +23,7 @@ import { useMemoizedFn } from '../hooks';
 import { Storage } from '../utils/storage';
 import './ui.less';
 import { updatePlayerWidgetProps } from '../features';
-import { getNgRawData, getSmartImageQualityState, isLowPhone } from '../utils/ttt';
+import { getNgRawData, getSmartImageQualityState, isLowPhone, notifyOfflineShown } from '../utils/ttt';
 import { getCaptureResultSummary } from '../utils/captureResult';
 import { lensCount } from '../widgets/zoomTurntable/lensSkill';
 import { shouldRenderContent } from './absoluteContent';
@@ -153,6 +153,13 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     });
   }, []);
 
+  // 监听设备在线状态，离线提示展示时通知宿主；notifyOfflineShown 内部兼容没有该 TTT 方法的宿主。
+  useEffect(() => {
+    if (!deviceOnline) {
+      notifyOfflineShown(devId);
+    }
+  }, [deviceOnline, devId]);
+
   // 展示顶部内容
   const [showTopContent, setShowTopContent] = useState(true);
 

package/lib/utils/ttt.d.ts

@@ -38,4 +38,16 @@ export declare function getAIFrameFeature(devId: string): Promise<GetAIFrameFeat
 export declare function setAIFrameFeature(params: SetAIFrameFeatureParams): Promise<any>;
 export declare function setTrailFinish(devId: string): Promise<unknown>;
 export declare function isLowPhone(): Promise<boolean>;
+/**
+ * 通知宿主离线提示已经展示。
+ *
+ * 这个 TTT 方法不是所有宿主都提供，因此调用前必须做能力判断；
+ * 老宿主或 Web 环境下直接跳过，不能影响播放器自身的离线处理。
+ */
+export declare function notifyOfflineShown(deviceId: string): boolean;
 export declare function getNgRawData(): Promise<unknown>;
+export declare function isClarityChangedSupported(): boolean;
+export type ClarityChangedResult = {
+    clarity: 'HD' | 'SD';
+};
+export declare function clarityChanged(devId: string): Promise<ClarityChangedResult | null>;

package/lib/utils/ttt.js

@@ -120,10 +120,31 @@ export function isLowPhone() {
     }
   });
 }
+
+/**
+ * 通知宿主离线提示已经展示。
+ *
+ * 这个 TTT 方法不是所有宿主都提供，因此调用前必须做能力判断；
+ * 老宿主或 Web 环境下直接跳过，不能影响播放器自身的离线处理。
+ */
+export function notifyOfflineShown(deviceId) {
+  var _ty3;
+  const method = typeof ty !== 'undefined' ? (_ty3 = ty) === null || _ty3 === void 0 || (_ty3 = _ty3.ipc) === null || _ty3 === void 0 ? void 0 : _ty3.notifyOfflineShown : undefined;
+  if (typeof method !== 'function') {
+    return false;
+  }
+  try {
+    console.warn('res===notifyOfflineShown');
+    method(deviceId, 'preview_mini');
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
 export function getNgRawData() {
   return new Promise(resolve => {
-    var _ty3;
-    const isSupport = typeof ((_ty3 = ty) === null || _ty3 === void 0 ? void 0 : _ty3.getNgRawData) === 'function';
+    var _ty4;
+    const isSupport = typeof ((_ty4 = ty) === null || _ty4 === void 0 ? void 0 : _ty4.getNgRawData) === 'function';
     if (!isSupport) {
       resolve(false);
       return;
@@ -142,4 +163,37 @@ export function getNgRawData() {
       resolve(false);
     }
   });
+}
+
+// 是否支持自动清晰度（ttt 方法 clarityChanged 存在即支持）
+export function isClarityChangedSupported() {
+  var _ty$ipc6;
+  return typeof ((_ty$ipc6 = ty.ipc) === null || _ty$ipc6 === void 0 ? void 0 : _ty$ipc6.clarityChanged) === '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);
+      return;
+    }
+    if (!isClarityChangedSupported()) {
+      resolve(null);
+      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);
+    }
+  });
 }

package/lib/widgets/resolution/resolution.js

@@ -1,17 +1,19 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } 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 } from '../../ui/constant';
+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 './resolution.less';
 export const Resolution = props => {
   const {
-    IPCPlayerContext,
+    devId,
     setResolution,
     addContent,
     hasContent,
@@ -29,6 +31,30 @@ 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/videoBitKBP/videoBitKBP.js

@@ -1,10 +1,14 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import { View, Text, usePageEvent } from '@ray-js/ray';
 import clsx from 'clsx';
 import { getVideoBitrateKbps, requestWifiSignal } from '@ray-js/ray-ipc-utils';
+import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 import { PlayState } from '../../interface';
 import './videoBitKBP.less';
 import { useStore } from '../../ctx/store';
+import Strings from '../../i18n';
+import { UIEventContext } from '../../ui/context';
+import { autoClarityChange } from '../../ui/constant';
 export const VideoBitKBP = props => {
   const {
     devId,
@@ -15,10 +19,32 @@ export const VideoBitKBP = props => {
   } = props;
   const [bitKBP, setBitKBP] = useState('');
   const [signalStrength, setSignalStrength] = useState(null);
+  // 自动清晰度当前实际档位：null 表示未开启自动模式，不展示
+  const [autoClarity, setAutoClarity] = useState(null);
   const store = useStore({
-    playState
+    playState,
+    resolution: props.resolution
   });
+  const {
+    event
+  } = useContext(UIEventContext);
   const timerRef = useRef();
+
+  // 监听 Resolution 控件广播的自动清晰度状态
+  useEffect(() => {
+    const onAutoClarityChange = payload => {
+      setAutoClarity(payload.enabled ? payload.clarity : null);
+    };
+    event.on(autoClarityChange, onAutoClarityChange);
+    return () => {
+      event.off(autoClarityChange, onAutoClarityChange);
+    };
+  }, [event]);
+  useEffect(() => {
+    if (store.resolution !== ClarityType.AUTO) {
+      setAutoClarity(null);
+    }
+  }, [store.resolution]);
   useEffect(() => {
     if (store.playState === PlayState.PLAYING && (!hideKbsMenu || !hideSignalMenu)) {
       init();
@@ -75,7 +101,9 @@ export const VideoBitKBP = props => {
     className: "ipc-player-plugin-videoBitKBP-divider"
   }), hasKbps && /*#__PURE__*/React.createElement(View, {
     className: "ipc-player-plugin-videoBitKBP-kbps"
-  }, /*#__PURE__*/React.createElement(Text, null, bitKBP), /*#__PURE__*/React.createElement(Text, {
+  }, 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, {
     className: "ipc-player-plugin-videoBitKBP-unit-kbs"
   }, "KB/S"))));
 };

package/lib/widgets/videoBitKBP/videoBitKBP.less

@@ -36,6 +36,9 @@
   display: flex;
   align-items: center;
 }
+.ipc-player-plugin-videoBitKBP-clarity {
+  margin-right: calc(4px * var(--ipc-player-size-scale, 1));
+}
 .ipc-player-plugin-videoBitKBP-unit-kbs {
   margin-left: calc(4px * var(--ipc-player-size-scale, 1));
 }

package/package.json

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