@ray-js/ipc-player-integration 0.0.8-beta-2 → 0.0.8-beta-3

package/lib/ui/ui.d.ts

@@ -15,6 +15,8 @@ type CSSVariable = {
 };
 type Props = {
     devId: string;
+    isShare?: boolean;
+    ignoreHideStopPreview?: boolean;
     instance?: CtxInstance;
     className?: string;
     onPlayStatus?: (data: PlayStatusData) => void;

package/lib/ui/ui.js

@@ -45,6 +45,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     className,
     devId,
     style,
+    isShare = false,
+    ignoreHideStopPreview = false,
     CSSVariable = defaultCSSVariable,
     privateState = false,
     deviceOnline = true,
@@ -433,6 +435,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     defaultMute: mute,
     devId: devId,
     onlineStatus: deviceOnline,
+    isShare: isShare,
+    ignoreHideStopPreview: ignoreHideStopPreview,
     ipcPlayerContext: instance.IPCPlayerInstance,
     onChangeStreamStatus: onChangeStreamStatus
     // onCtx={getIpcPlayerCtx}

package/lib/utils/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jest" />
 /**
  * 麦克风对讲按钮径向渐变
  */
@@ -7,3 +8,8 @@ export declare const adjustBrightness: (hex: any, factor: any) => string;
  *  前置补零
  */
 export declare const addZero: (num: string, length: number) => string;
+export declare const promisify: <TParams extends Record<string, any>, TSuccessResult = any>(apiFunction: (params: TParams & {
+    success?: ((result: TSuccessResult) => void) | undefined;
+    fail?: ((error: any) => void) | undefined;
+    complete?: (() => void) | undefined;
+}) => void) => (params: Omit<TParams, "complete" | "success" | "fail">) => Promise<TSuccessResult>;

package/lib/utils/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /**
  * 麦克风对讲按钮径向渐变
  */
@@ -25,4 +26,14 @@ export const addZero = (num, length) => {
     return numStr;
   }
   return addZero(`0${numStr}`, length);
+};
+export const promisify = apiFunction => {
+  return params => {
+    return new Promise((resolve, reject) => {
+      apiFunction(_objectSpread(_objectSpread({}, params), {}, {
+        success: result => resolve(result),
+        fail: error => reject(error)
+      }));
+    });
+  };
 };

package/lib/utils/storage/index.d.ts

@@ -0,0 +1,9 @@
+export declare class Storage {
+    private prefix;
+    constructor(prefix: string);
+    get(key: string): Promise<any>;
+    set(key: string, value: any): Promise<null>;
+    remove(key: string): Promise<null>;
+    private getFullKey;
+}
+export declare const storage: Storage;

package/lib/utils/storage/index.js

@@ -0,0 +1,29 @@
+import { getStorage, setStorage, removeStorage, getLaunchOptionsSync } from '@ray-js/ray';
+import { promisify } from '..';
+export class Storage {
+  constructor(prefix) {
+    this.prefix = prefix;
+  }
+  async get(key) {
+    var _res$data;
+    const res = await promisify(getStorage)({
+      key: this.getFullKey(key)
+    });
+    return JSON.parse((_res$data = res.data) !== null && _res$data !== void 0 ? _res$data : 'null');
+  }
+  set(key, value) {
+    return promisify(setStorage)({
+      key: this.getFullKey(key),
+      data: JSON.stringify(value)
+    });
+  }
+  remove(key) {
+    return promisify(removeStorage)({
+      key: this.getFullKey(key)
+    });
+  }
+  getFullKey(key) {
+    return `${this.prefix}_${key}`;
+  }
+}
+export const storage = new Storage(getLaunchOptionsSync().query.deviceId);

package/lib/widgets/ptz/ptzControl.js

@@ -1,11 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useContext, useEffect, useRef, useState } from 'react';
-import { CoverView, getStorage } from '@ray-js/ray';
+import { CoverView } from '@ray-js/ray';
 import clsx from 'clsx';
 import _find from 'lodash/find';
 import _get from 'lodash/get';
 import IpcPtzZoom from '@ray-js/ipc-ptz-zoom';
 import { getDpIdByCode, publishDps } from '@ray-js/ray-ipc-utils';
+import { Storage } from '../../utils/storage';
 import { useMemoizedFn } from '../../hooks';
 import { useComponentHideState } from '../../ui/hooks';
 import { UIEventContext } from '../../ui/context';
@@ -51,31 +52,18 @@ export const PtzControl = props => {
   });
   const [shouldHide] = useComponentHideState();
   const [isPtzActive, setIsPtzActive] = useState(true);
-  const [showPtzControlTip, setShowPtzControlTip] = useState(false);
   const {
     event
   } = useContext(UIEventContext);
   const ptzTimeId = useRef(null);
   const ptzData = useRef(getPtzData(devId));
+  const showPtzControlTip = useRef(true);
   const onPtzControlHide = useMemoizedFn(() => {
     setIsPtzActive(false);
   });
   const onPtzControlShow = useMemoizedFn(() => {
     setIsPtzActive(true);
   });
-
-  // 获取是否有ptz控制tip
-  useEffect(() => {
-    getStorage({
-      key: `${devId}_ptzControlTip}`,
-      success: res => {
-        console.log(res, 'ptzControlTip');
-        if (!res.data) {
-          setShowPtzControlTip(true);
-        }
-      }
-    });
-  }, []);
   useEffect(() => {
     event.on('ptzControlHide', onPtzControlHide);
     event.on('ptzControlShow', onPtzControlShow);
@@ -113,15 +101,22 @@ export const PtzControl = props => {
         });
       }, 1000);
     }
-    if (showPtzControlTip) {
-      addContent('absolute', {
-        id: ptzControlTipId,
-        content: props => {
-          return /*#__PURE__*/React.createElement(PtzControlTip, props);
-        },
-        absoluteContentClassName: 'ipc-player-plugin-ptz-control-tip-wrap',
-        initProps: _objectSpread({}, props)
-      });
+
+    // ptz 操作提示
+    if (showPtzControlTip.current) {
+      const storage = new Storage(devId);
+      const res = await storage.get('ptzControlTip');
+      if (!res) {
+        showPtzControlTip.current = false;
+        addContent('absolute', {
+          id: ptzControlTipId,
+          content: props => {
+            return /*#__PURE__*/React.createElement(PtzControlTip, props);
+          },
+          absoluteContentClassName: 'ipc-player-plugin-ptz-control-tip-wrap',
+          initProps: _objectSpread({}, props)
+        });
+      }
     }
   });
   return /*#__PURE__*/React.createElement(CoverView, {

package/lib/widgets/ptzControlTip/ptzControlTip.js

@@ -23,7 +23,7 @@ export const PtzControlTip = props => {
     setShowTipModal(false);
     deleteContent('absolute', ptzControlTipId);
     setStorage({
-      key: `${devId}_ptzControlTip}`,
+      key: `${devId}_ptzControlTip`,
       data: 'true'
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.8-beta-2",
+  "version": "0.0.8-beta-3",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -38,8 +38,8 @@
     "@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.21-beta-2",
-    "@ray-js/ray-ipc-utils": "1.1.6-beta-1",
+    "@ray-js/ray-ipc-player": "2.0.21-beta-4",
+    "@ray-js/ray-ipc-utils": "1.1.8-beta-1",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
     "jotai": "^2.10.2"