@ray-js/ipc-player-integration 0.0.30 → 0.0.31-beta.2

package/lib/ctx/ctx.composition.js

@@ -4,7 +4,7 @@ const _excluded = ["title", "duration"];
 import { getCameraConfigInfo } from '@ray-js/ray-ipc-utils';
 import { IntercomMode, MuteMode, ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 import { createUseCtx } from './ctx';
-import { FullSmallIntercom, VerticalSmallIntercom, BatteryFull, Battery, Screenshot, TempHumidity, Signal4G, RecordVideo, FullScreen, VideoBitKBP, Muted, Resolution, Ptz, MultiPtz, TileTip, PtzMoveableTip, LandscapeTip, TileActions, MoveablePtzControl, SwitchLayout, ToggleVerticalFull } from '../widgets';
+import { FullSmallIntercom, VerticalSmallIntercom, BatteryFull, Battery, Screenshot, TempHumidity, Signal4G, RecordVideo, FullScreen, VideoBitKBP, Muted, Resolution, Ptz, MultiPtz, TileTip, PtzMoveableTip, LandscapeTip, TileActions, MoveablePtzControl, SwitchLayout, ToggleVerticalFull, RealTimeMagnification } from '../widgets';
 import { authorizeStatus } from '../utils/authorize';
 import { landscapeTipId, moveablePtzControlId, multiPtzId, ptzMoveableTipId, tileActionsId, tileTipId } from '../ui/constant';
 import { multiPrefix } from '../widgets/multiCamera/constants';
@@ -54,6 +54,10 @@ export const defaultBottomLeftContent = [{
 }, {
   id: 'Resolution',
   content: Resolution
+}, {
+  id: 'RealTimeMagnification',
+  content: RealTimeMagnification,
+  hidden: true
 }];
 export const defaultBottomRightContent = [{
   id: 'SwitchLayout',
@@ -111,10 +115,12 @@ const getMemoryState = devId => {
     intercomMode: IntercomMode.TwoWay,
     resolution: ClarityType.HD,
     resolutionList: [ClarityType.HD, ClarityType.SD],
-    isIntercomSupported: false
+    isIntercomSupported: false,
+    maxZoomSettings: 6
   };
   return new Promise(resolve => {
     getCameraConfigInfo(devId).then(res => {
+      var _res$data$maxZoomSett;
       if (res.code === -1) {
         return resolve(defaultValue);
       }
@@ -124,7 +130,8 @@ const getMemoryState = devId => {
         intercomMode: res.data.intercomInfo.cachedIntercomMode,
         isIntercomSupported: res.data.intercomInfo.isIntercomSupported,
         resolution: res.data.videoResolution.cachedResolution,
-        resolutionList: res.data.videoResolution.availableResolutions
+        resolutionList: res.data.videoResolution.availableResolutions,
+        maxZoomSettings: (_res$data$maxZoomSett = res.data.maxZoomSettings) !== null && _res$data$maxZoomSett !== void 0 ? _res$data$maxZoomSett : 6
       });
     }).catch(err => {
       console.error('获取 getMemoryState 失败:', err);

package/lib/ctx/ctx.js

@@ -71,6 +71,9 @@ export const createUseCtx = _ref => {
     // 摄像头配置是否支持对讲
     const [intercomSupported, setIntercomSupported] = useAtom(false);
 
+    // 最大缩放倍数
+    const [maxZoomSettings, setMaxZoomSettings] = useAtom(6);
+
     // 对讲中
     const [intercom] = useAtom(false);
     const [playState] = useAtom(PlayState.CONNECTING);
@@ -97,12 +100,14 @@ export const createUseCtx = _ref => {
       (async () => {
         if (!devId) return;
         try {
+          var _res$maxZoomSettings;
           const res = await getMemoryState(devId);
           setResolutionList(res.resolutionList);
           _setResolution(res.resolution, true);
           _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
           setIntercomSupported(res.isIntercomSupported);
+          setMaxZoomSettings((_res$maxZoomSettings = res.maxZoomSettings) !== null && _res$maxZoomSettings !== void 0 ? _res$maxZoomSettings : 6);
         } catch (error) {
           console.error('获取 getMemoryState 失败:', error);
         }
@@ -112,12 +117,14 @@ export const createUseCtx = _ref => {
       if (devId && _playState === PlayState.PLAYING) {
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
+          var _res$maxZoomSettings2;
           setResolutionList(res.resolutionList);
           // 传true表示值即可,会取播放器的值
           _setResolution(res.resolution, true);
           _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
           setIntercomSupported(res.isIntercomSupported);
+          setMaxZoomSettings((_res$maxZoomSettings2 = res.maxZoomSettings) !== null && _res$maxZoomSettings2 !== void 0 ? _res$maxZoomSettings2 : 6);
         });
       }
     }, [devId, _playState]);
@@ -258,6 +265,7 @@ export const createUseCtx = _ref => {
       intercom,
       intercomMode,
       intercomSupported,
+      maxZoomSettings,
       playState,
       setPlayState,
       setPtzControlTipDisabled,

package/lib/ctx/ports.output.d.ts

@@ -9,6 +9,7 @@ export type GetMemoryState = (devId: string) => Promise<{
     isIntercomSupported: boolean;
     resolution: ClarityType;
     resolutionList: [ClarityType.HD, ClarityType.SD];
+    maxZoomSettings?: number;
 }>;
 export type SetMuteMemoryState = (devId: string, value: boolean) => void;
 export type SetResolutionMemoryState = (devId: string, value: ClarityType) => void;

package/lib/features/initPlayerWidgets/index.d.ts

@@ -9,7 +9,9 @@ export type InitPlayerWidgetsOptions = {
     hideRecordVideoMenu?: boolean;
     hideResolutionMenu?: boolean;
     hideKbsMenu?: boolean;
+    hideSignalMenu?: boolean;
     showToggleVerticalFull?: boolean;
+    showRealTimeMagnification?: boolean;
     directionControlProps?: Partial<React.ComponentProps<typeof FullScreen>['directionControlProps']>;
     topLeftContent?: ComponentConfig[];
     topRightContent?: ComponentConfig[];

package/lib/features/initPlayerWidgets/index.js

@@ -11,7 +11,8 @@ export async function initPlayerWidgets(ctx, options) {
   const videoKbsIndex = newDefaultTopRightContent.findIndex(item => item.id === 'VideoBitKBP');
   if (videoKbsIndex !== -1) {
     newDefaultTopRightContent[videoKbsIndex].initProps = {
-      hideKbsMenu: options.hideKbsMenu
+      hideKbsMenu: options.hideKbsMenu,
+      hideSignalMenu: options.hideSignalMenu
     };
   }
   ctx.addContent('topRight', newDefaultTopRightContent);
@@ -37,6 +38,12 @@ export async function initPlayerWidgets(ctx, options) {
       hideRecordVideoMenu: options.hideRecordVideoMenu
     };
   }
+  if (options.showRealTimeMagnification) {
+    const magnificationIndex = newDefaultBottomLeftContent.findIndex(item => item.id === 'RealTimeMagnification');
+    if (magnificationIndex !== -1) {
+      newDefaultBottomLeftContent[magnificationIndex].hidden = false;
+    }
+  }
   ctx.addContent('bottomLeft', newDefaultBottomLeftContent);
   const newDefaultBottomRightContent = _cloneDeep(options.bottomRightContent || defaultBottomRightContent);
   const fullScreenIndex = newDefaultBottomRightContent.findIndex(item => item.id === 'FullScreen');

package/lib/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon-panel"; /* Project id 4727767 */
-  src: url('iconfont.woff2?t=1772529309738') format('woff2'),
-       url('iconfont.woff?t=1772529309738') format('woff'),
-       url('iconfont.ttf?t=1772529309738') format('truetype');
+  src: url('iconfont.woff2?t=1775036808306') format('woff2'),
+       url('iconfont.woff?t=1775036808306') format('woff'),
+       url('iconfont.ttf?t=1775036808306') format('truetype');
 }
 
 .icon-panel {
@@ -13,6 +13,206 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-panel-nightvision-mode-black-color:before {
+  content: "\e6a2";
+}
+
+.icon-panel-nightvision-mode-true-color:before {
+  content: "\e6a3";
+}
+
+.icon-panel-nightvision-mode-color:before {
+  content: "\e6bc";
+}
+
+.icon-panel-wi-Fi:before {
+  content: "\e6bb";
+}
+
+.icon-panel-motion-tracking:before {
+  content: "\e6ba";
+}
+
+.icon-panel-optical-zoom:before {
+  content: "\e6b8";
+}
+
+.icon-panel-pip-mode:before {
+  content: "\e6b9";
+}
+
+.icon-panel-basic-shimmer:before {
+  content: "\e6b5";
+}
+
+.icon-panel-basic-nightvision-close:before {
+  content: "\e6b6";
+}
+
+.icon-panel-basic-nightvision-open:before {
+  content: "\e6b7";
+}
+
+.icon-panel-nightvision-mode-ir:before {
+  content: "\e6b3";
+}
+
+.icon-panel-nightvision-mode-auto:before {
+  content: "\e6b4";
+}
+
+.icon-panel-suo:before {
+  content: "\e6b2";
+}
+
+.icon-panel-jingdi:before {
+  content: "\e6b0";
+}
+
+.icon-panel-deng:before {
+  content: "\e6b1";
+}
+
+.icon-panel-xiazai:before {
+  content: "\e6ae";
+}
+
+.icon-panel-fenxiang:before {
+  content: "\e6af";
+}
+
+.icon-panel-a-zu1032:before {
+  content: "\e6ad";
+}
+
+.icon-panel-jilu:before {
+  content: "\e6ac";
+}
+
+.icon-panel-a-dingweixiao:before {
+  content: "\e6ab";
+}
+
+.icon-panel-zujifenxiang:before {
+  content: "\e6aa";
+}
+
+.icon-panel-zuji:before {
+  content: "\e6a7";
+}
+
+.icon-panel-chongwudangan:before {
+  content: "\e6a8";
+}
+
+.icon-panel-liuchong:before {
+  content: "\e6a6";
+}
+
+.icon-panel-weilan:before {
+  content: "\e6a9";
+}
+
+.icon-panel-WER:before {
+  content: "\e6a5";
+}
+
+.icon-panel-infrared-night-vision:before {
+  content: "\e6a4";
+}
+
+.icon-panel-night-vision:before {
+  content: "\e6a1";
+}
+
+.icon-panel-Access-Key-Password:before {
+  content: "\e643";
+}
+
+.icon-panel-Access-Mobile1:before {
+  content: "\e638";
+}
+
+.icon-panel-Access-QuickReply:before {
+  content: "\e631";
+}
+
+.icon-panel-Access-Key-FaceID2:before {
+  content: "\e633";
+}
+
+.icon-panel-Access-NoBlock:before {
+  content: "\e632";
+}
+
+.icon-panel-Access-Password-View:before {
+  content: "\e61d";
+}
+
+.icon-panel-Access-Door:before {
+  content: "\e69e";
+}
+
+.icon-panel-Access-Camera:before {
+  content: "\e69a";
+}
+
+.icon-panel-Access-Member:before {
+  content: "\e69c";
+}
+
+.icon-panel-Access-Password-Hide:before {
+  content: "\e619";
+}
+
+.icon-panel-a-Access-AIGuardian:before {
+  content: "\e61b";
+}
+
+.icon-panel-Access-Key-Fingerprint:before {
+  content: "\e622";
+}
+
+.icon-panel-Access-Send:before {
+  content: "\e634";
+}
+
+.icon-panel-Access-Password-Clear:before {
+  content: "\e63d";
+}
+
+.icon-panel-Access-Notification-large:before {
+  content: "\e63e";
+}
+
+.icon-panel-Access-Intercom-large:before {
+  content: "\e63f";
+}
+
+.icon-panel-Access-Brightness:before {
+  content: "\e640";
+}
+
+.icon-panel-Access-TempAccess-large:before {
+  content: "\e641";
+}
+
+.icon-panel-Access-Undo:before {
+  content: "\e699";
+}
+
+.icon-panel-Access-Key-Card:before {
+  content: "\e615";
+}
+
+.icon-panel-Access-Replay:before {
+  content: "\e616";
+}
+
+.icon-panel-Access-Copy:before {
+  content: "\e613";
+}
+
 .icon-panel-tip-right-arrow:before {
   content: "\e697";
 }
@@ -33,7 +233,7 @@
   content: "\e611";
 }
 
-.icon-panel-door-close-small:before {
+.icon-panel-Access-door-close-small:before {
   content: "\e6671";
 }