@ray-js/ipc-player-integration 0.0.15 → 0.0.16-beta-2

package/lib/ctx/ctx.js

@@ -114,6 +114,11 @@ export const createUseCtx = _ref => {
         });
       }
     }, [devId, _playState]);
+
+    // 获取content数据
+
+    // 根据类型更新content数据
+
     const changeContentHiddenData = (type, id, hidden) => {
       const store = getDefaultStore();
       let targetStore;
@@ -150,7 +155,6 @@ export const createUseCtx = _ref => {
     }
     const _setMute = async function (target) {
       let onlyUpdateAtom = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      console.log(target, '_setMute====');
       if (onlyUpdateAtom) {
         updateAtom(mute, target);
         return false;
@@ -159,7 +163,6 @@ export const createUseCtx = _ref => {
         IPCPlayerInstance.current.setMuted({
           mute: target,
           success: () => {
-            console.log('=== set mute success ===', target);
             setMuteMemoryState(devId, target);
             updateAtom(mute, target);
             resolve(true);
@@ -452,6 +455,29 @@ export const createUseCtx = _ref => {
           updateAtom(absoluteContent, prevValue => prevValue.filter(item => item.id !== id));
         }
       },
+      getContent: () => {
+        const store = getDefaultStore();
+        return {
+          topLeft: store.get(topLeftContent),
+          topRight: store.get(topRightContent),
+          bottomLeft: store.get(bottomLeftContent),
+          bottomRight: store.get(bottomRightContent),
+          absolute: store.get(absoluteContent)
+        };
+      },
+      updateContent: (type, data) => {
+        if (type === 'topLeft') {
+          updateAtom(topLeftContent, data);
+        } else if (type === 'topRight') {
+          updateAtom(topRightContent, data);
+        } else if (type === 'bottomLeft') {
+          updateAtom(bottomLeftContent, data);
+        } else if (type === 'bottomRight') {
+          updateAtom(bottomRightContent, data);
+        } else {
+          updateAtom(absoluteContent, data);
+        }
+      },
       hideContent: (type, id) => {
         changeContentHiddenData(type, id, true);
       },

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { UseCtx } from '../../interface';
+import { UseCtx, WidgetId } from '../../interface';
 import { FullScreen } from '../../widgets/fullScreen';
 type Ctx = ReturnType<UseCtx>;
 export declare function initPlayerWidgets(ctx: Ctx, options: {
@@ -10,4 +10,5 @@ export declare function initPlayerWidgets(ctx: Ctx, options: {
     hideKbsMenu?: boolean;
     directionControlProps?: Partial<React.ComponentProps<typeof FullScreen>['directionControlProps']>;
 }): Promise<void>;
+export declare function updatePlayerWidgetProps(ctx: Ctx, area: 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight', widgetId: WidgetId, newProps: Record<string, any>): Promise<void>;
 export {};

package/lib/features/initPlayerWidgets/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _cloneDeep from 'lodash/cloneDeep';
 import { defaultTopLeftContent, defaultTopRightContent, defaultBottomLeftContent, defaultBottomRightContent } from '../../ctx';
 import { hasDpCode } from '../../utils/device';
@@ -56,4 +57,20 @@ export async function initPlayerWidgets(ctx, options) {
       }, -1);
     }
   });
+}
+export async function updatePlayerWidgetProps(ctx, area, widgetId, newProps) {
+  const areaContent = ctx.getContent();
+  const targetArea = areaContent[area];
+  if (targetArea && Array.isArray(targetArea)) {
+    const widgetIndex = targetArea.findIndex(item => item.id === widgetId);
+    if (widgetIndex === -1) return;
+    const widget = targetArea[widgetIndex];
+    const mergedProps = _objectSpread(_objectSpread({}, widget.initProps), newProps);
+    const updatedWidget = _objectSpread(_objectSpread({}, widget), {}, {
+      initProps: mergedProps
+    });
+    const newAreaContent = [...targetArea];
+    newAreaContent[widgetIndex] = updatedWidget;
+    ctx.updateContent(area, newAreaContent);
+  }
 }

package/lib/interface.d.ts

@@ -10,6 +10,7 @@ export type IpcContext = {
 };
 export type RetAtom<T> = PrimitiveAtom<T> & WithInitialValue<T>;
 export type ScreenType = 'full' | 'vertical';
+export type WidgetId = 'BatteryFull' | 'TempHumidity' | 'VideoBitKBP' | 'FullSmallIntercom' | 'Screenshot' | 'RecordVideo' | 'Muted' | 'VerticalSmallIntercom' | 'Ptz' | 'Resolution' | 'FullScreen';
 export declare const enum PlayerStreamStatus {
     UnknownException = -1000,
     ConnectSuccess = 1001,
@@ -81,6 +82,8 @@ export type UseCtx = (options: {
     setPlayState: (value: PlayState) => void;
     addContent: <T>(type: ContentPlaceType, config: ComponentConfig<T> | ComponentConfig<T>[], position?: number) => void;
     deleteContent: (type: ContentPlaceType, id: string) => void;
+    getContent: () => ComponentConfig[];
+    updateContent: (type: ContentPlaceType, data: ComponentConfig[]) => void;
     hasContent: (type: ContentPlaceType, id: string) => boolean;
     hideContent: (type: ContentPlaceType, id: string) => void;
     showContent: (type: ContentPlaceType, id: string) => void;

package/lib/widgets/battery/battery.composition.d.ts

@@ -38,6 +38,8 @@ export declare const Battery: import("react").FunctionComponent<{
     setPlayState: (value: import("../..").PlayState) => void;
     addContent: <T>(type: import("../..").ContentPlaceType, config: import("../..").ComponentConfig<T> | import("../..").ComponentConfig<T>[], position?: number | undefined) => void;
     deleteContent: (type: import("../..").ContentPlaceType, id: string) => void;
+    getContent: () => import("../..").ComponentConfig<any & Record<string, any>>[];
+    updateContent: (type: import("../..").ContentPlaceType, data: import("../..").ComponentConfig<any & Record<string, any>>[]) => void;
     hasContent: (type: import("../..").ContentPlaceType, id: string) => boolean;
     hideContent: (type: import("../..").ContentPlaceType, id: string) => void;
     showContent: (type: import("../..").ContentPlaceType, id: string) => void;
@@ -85,6 +87,8 @@ export declare const BatteryFull: import("react").FunctionComponent<{
     setPlayState: (value: import("../..").PlayState) => void;
     addContent: <T>(type: import("../..").ContentPlaceType, config: import("../..").ComponentConfig<T> | import("../..").ComponentConfig<T>[], position?: number | undefined) => void;
     deleteContent: (type: import("../..").ContentPlaceType, id: string) => void;
+    getContent: () => import("../..").ComponentConfig<any & Record<string, any>>[];
+    updateContent: (type: import("../..").ContentPlaceType, data: import("../..").ComponentConfig<any & Record<string, any>>[]) => void;
     hasContent: (type: import("../..").ContentPlaceType, id: string) => boolean;
     hideContent: (type: import("../..").ContentPlaceType, id: string) => void;
     showContent: (type: import("../..").ContentPlaceType, id: string) => void;

package/lib/widgets/ptzControlTip/ptzControlTip.less

@@ -18,7 +18,6 @@
     .controlTipText {
       margin-top: calc(10px * var(--ipc-player-size-scale, 1));
       color: rgba(255,255,255,0.7);
-      word-break: break-all;
       text-align: center;
       font-size: calc(12px * var(--ipc-player-size-scale, 1));
       font-weight: 400;
@@ -39,4 +38,4 @@
         font-size: calc(12px * var(--ipc-player-size-scale, 1));;
         color: #ffffff;
     }
-  }
+  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.15",
+  "version": "0.0.16-beta-2",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -38,7 +38,7 @@
     "@ray-js/ipc-ptz-zoom": "^0.0.2",
     "@ray-js/panel-sdk": "^1.13.1",
     "@ray-js/direction-control": "^0.0.8",
-    "@ray-js/ray-ipc-player": "2.0.23",
+    "@ray-js/ray-ipc-player": "^2.0.24",
     "@ray-js/ray-ipc-utils": "^1.1.10",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",