@ray-js/ipc-player-integration 0.0.1-beta-58 → 0.0.1-beta-60

package/lib/ctx/ctx.composition.d.ts

@@ -1,4 +1,4 @@
-import { FullScreen } from '../plugins';
+import { FullScreen } from '../widgets';
 import { ComponentConfig } from '../interface';
 export declare const defaultTopLeftContent: ComponentConfig[];
 export declare const defaultTopRightContent: ComponentConfig[];

package/lib/ctx/ctx.composition.js

@@ -4,7 +4,7 @@ const _excluded = ["title", "duration"];
 import IPCUtils 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, RecordVideo, FullScreen, VideoBitKBP, Muted, Resolution, Ptz } from '../plugins';
+import { FullSmallIntercom, VerticalSmallIntercom, BatteryFull, Battery, Screenshot, TempHumidity, RecordVideo, FullScreen, VideoBitKBP, Muted, Resolution, Ptz } from '../widgets';
 import { authorizeStatus } from '../utils/authorize';
 const createPlayContext = ty.createIpcPlayerContext;
 // const createPlayContext = () => null;
@@ -113,7 +113,6 @@ const setResolutionMemoryState = (devId, value) => {
   const newData = originStorage ? _objectSpread({}, originStorage) : null;
   if (newData) {
     newData.cachedResolution = value;
-    console.log(newData, 'newData');
     // @ts-ignore
     ty.setStorageSync({
       key: storageKey,

package/lib/ctx/ctx.js

@@ -32,7 +32,8 @@ export const createUseCtx = _ref => {
       initBottomLeftContent,
       initBottomRightContent,
       initAbsoluteContent,
-      saveToAlbum = SAVE_TO_ALBUM
+      saveToAlbum = SAVE_TO_ALBUM,
+      showPtzControlTip = false
     } = _ref2;
     const streamStatus = useRef();
     // 全屏、竖屏
@@ -43,7 +44,8 @@ export const createUseCtx = _ref => {
 
     // 录像是否不可点击
     const [recordingDisabled, setRecordingDisabled] = useAtom(false);
-
+    // 是否展示ptz player控制提示框
+    const [ptzControlTipDisabled, setPtzControlTipDisabled] = useAtom(showPtzControlTip);
     // 静音 true 代表静音 false 代表不静音
     const [mute] = useAtom(true);
 
@@ -89,7 +91,6 @@ export const createUseCtx = _ref => {
         if (!devId) return;
         try {
           const res = await getMemoryState(devId);
-          console.log('==== getMemoryState ====xghazh', res);
           setResolutionList(res.resolutionList);
           _setResolution(res.resolution, true);
           _setMute(res.mute, true);
@@ -104,7 +105,6 @@ export const createUseCtx = _ref => {
       if (devId && _playState === PlayState.PLAYING) {
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
-          console.log('PlayingMemoryState', res);
           setResolutionList(res.resolutionList);
           // 传true表示值即可,会取播放器的值
           _setResolution(res.resolution, true);
@@ -194,7 +194,6 @@ export const createUseCtx = _ref => {
           clarity: target === ClarityType.HD ? 'hd' : 'normal',
           success: () => {
             setResolutionMemoryState(devId, target);
-            console.log('setClarity success', target);
             updateAtom(resolution, target);
             resolve(true);
           },
@@ -214,6 +213,7 @@ export const createUseCtx = _ref => {
       screenType,
       recording,
       recordingDisabled,
+      ptzControlTipDisabled,
       mute,
       resolution,
       resolutionList,
@@ -222,6 +222,7 @@ export const createUseCtx = _ref => {
       intercomSupported,
       playState,
       setPlayState,
+      setPtzControlTipDisabled,
       setBrandColor,
       setVerticalMic,
       setIntercom: async target => {
@@ -286,9 +287,7 @@ export const createUseCtx = _ref => {
                           const {
                             platform
                           } = getSystemInfoSync();
-                          console.log(platform, 'platform');
                           openAppSystemSettingPage({
-                            // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
                             scope: 'App-Settings',
                             success: () => {
                               console.log('跳转成功');
@@ -370,12 +369,7 @@ export const createUseCtx = _ref => {
                       isShowGlobal: true,
                       success: res => {
                         if (res.confirm) {
-                          const {
-                            platform
-                          } = getSystemInfoSync();
-                          console.log(platform, 'platform');
                           openAppSystemSettingPage({
-                            // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
                             scope: 'App-Settings',
                             success: () => {
                               console.log('跳转成功');

package/lib/features/index.d.ts

@@ -0,0 +1 @@
+export * from './initPlayerWidgets';

package/lib/features/index.js

@@ -0,0 +1 @@
+export * from './initPlayerWidgets';

package/lib/{utils/plugins → features/initPlayerWidgets}/index.d.ts

@@ -1,6 +1,6 @@
 import { UseCtx } from '../../interface';
 type Ctx = ReturnType<UseCtx>;
-export declare function initPlayerPlugins(ctx: Ctx, options: {
+export declare function initPlayerWidgets(ctx: Ctx, options: {
     verticalResolutionCustomClick?: boolean;
     hideHorizontalMenu?: boolean;
     throttleTime?: number;

package/lib/{utils/plugins → features/initPlayerWidgets}/index.js

@@ -1,14 +1,15 @@
 import _cloneDeep from 'lodash/cloneDeep';
 import { defaultTopLeftContent, defaultTopRightContent, defaultBottomLeftContent, defaultBottomRightContent } from '../../ctx';
 import { hasDpCode } from '../../utils/device';
-import { MoveInteractiveControlButton } from '../../plugins/moveInteractiveControl';
+import { MoveInteractiveControlButton } from '../../widgets/moveInteractiveControl';
 // 根据当前 dp 信息决定设置哪些 plugin
-export async function initPlayerPlugins(ctx, options) {
+export async function initPlayerWidgets(ctx, options) {
   ctx.addContent('topLeft', defaultTopLeftContent);
   ctx.addContent('topRight', defaultTopRightContent);
   const newDefaultBottomLeftContent = _cloneDeep(defaultBottomLeftContent);
   const resolutionIndex = newDefaultBottomLeftContent.findIndex(item => item.id === 'Resolution');
   if (resolutionIndex !== -1) {
+    // @ts-ignore
     newDefaultBottomLeftContent[resolutionIndex].initProps = {
       verticalResolutionCustomClick: options.verticalResolutionCustomClick
     };
@@ -17,6 +18,7 @@ export async function initPlayerPlugins(ctx, options) {
   const newDefaultBottomRightContent = _cloneDeep(defaultBottomRightContent);
   const fullScreenIndex = newDefaultBottomRightContent.findIndex(item => item.id === 'FullScreen');
   if (fullScreenIndex !== -1) {
+    // @ts-ignore
     newDefaultBottomRightContent[fullScreenIndex].initProps = {
       hideHorizontalMenu: options.hideHorizontalMenu,
       throttleTime: options.throttleTime

package/lib/i18n/index.d.ts

@@ -20,6 +20,8 @@ declare const Strings: kit.I18N<{
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
         ipc_player_change_resolution_success: string;
+        ipc_player_ptz_control_tip: string;
+        ipc_player_ptz_close_control_tip: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -41,6 +43,8 @@ declare const Strings: kit.I18N<{
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
         ipc_player_change_resolution_success: string;
+        ipc_player_ptz_control_tip: string;
+        ipc_player_ptz_close_control_tip: string;
     };
 }, {
     ipc_player_resolution_HD: string;
@@ -62,6 +66,8 @@ declare const Strings: kit.I18N<{
     ipc_player_authorize_confirm_text: string;
     ipc_player_error_record_tip: string;
     ipc_player_change_resolution_success: string;
+    ipc_player_ptz_control_tip: string;
+    ipc_player_ptz_close_control_tip: string;
 } | {
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
@@ -82,5 +88,7 @@ declare const Strings: kit.I18N<{
     ipc_player_authorize_confirm_text: string;
     ipc_player_error_record_tip: string;
     ipc_player_change_resolution_success: string;
+    ipc_player_ptz_control_tip: string;
+    ipc_player_ptz_close_control_tip: string;
 }>;
 export default Strings;

package/lib/i18n/strings.d.ts

@@ -19,6 +19,8 @@ declare const _default: {
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
         ipc_player_change_resolution_success: string;
+        ipc_player_ptz_control_tip: string;
+        ipc_player_ptz_close_control_tip: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -40,6 +42,8 @@ declare const _default: {
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
         ipc_player_change_resolution_success: string;
+        ipc_player_ptz_control_tip: string;
+        ipc_player_ptz_close_control_tip: string;
     };
 };
 export default _default;

package/lib/i18n/strings.js

@@ -18,7 +18,9 @@ export default {
     ipc_player_authorize_cancel_text: 'Cancel',
     ipc_player_authorize_confirm_text: 'Go to Settings',
     ipc_player_error_record_tip: 'The recording has failed, please try again later.',
-    ipc_player_change_resolution_success: '切换成功'
+    ipc_player_change_resolution_success: 'Switch successful',
+    ipc_player_ptz_control_tip: 'Swipe up, down, left, or right to control the PTZ direction.',
+    ipc_player_ptz_close_control_tip: 'Close'
   },
   zh: {
     ipc_player_resolution_HD: '高清',
@@ -39,6 +41,8 @@ export default {
     ipc_player_authorize_cancel_text: '取消',
     ipc_player_authorize_confirm_text: '去设置',
     ipc_player_error_record_tip: '录制出错了，请稍后再试',
-    ipc_player_change_resolution_success: '切换成功'
+    ipc_player_change_resolution_success: '切换成功',
+    ipc_player_ptz_control_tip: '上下左右滑动，控制云台方向',
+    ipc_player_ptz_close_control_tip: '关闭'
   }
 };

package/lib/index.d.ts

@@ -1,4 +1,6 @@
 export * from './ui';
 export * from './ctx';
-export * from './plugins';
 export * from './interface';
+import * as Widgets from './widgets';
+import * as Features from './features';
+export { Widgets, Features };

package/lib/index.js

@@ -1,4 +1,6 @@
 export * from './ui';
 export * from './ctx';
-export * from './plugins';
-export * from './interface';
+export * from './interface';
+import * as Widgets from './widgets';
+import * as Features from './features';
+export { Widgets, Features };

package/lib/interface.d.ts

@@ -42,11 +42,13 @@ export type UseCtx = (options: {
     initBottomRightContent?: ComponentConfig[];
     initAbsoluteContent?: ComponentConfig[];
     saveToAlbum?: 0 | 1;
+    showPtzControlTip?: boolean;
 }) => {
     devId: string;
     brandColor: RetAtom<string>;
     verticalMic: RetAtom<boolean>;
     saveToAlbum: 0 | 1;
+    showPtzControlTip: boolean;
     screenType: RetAtom<ScreenType>;
     recording: RetAtom<boolean>;
     recordingDisabled: RetAtom<boolean>;
@@ -63,8 +65,10 @@ export type UseCtx = (options: {
     bottomLeftContent: RetAtom<ComponentConfig[]>;
     bottomRightContent: RetAtom<ComponentConfig[]>;
     absoluteContent: RetAtom<ComponentConfig[]>;
+    showPtzControlTip: RetAtom<boolean>;
+    setShowPtzControlTip: (value: boolean) => void;
     setBrandColor: (color: string) => void;
-    setVerticalMic: (color: boolean) => void;
+    setVerticalMic: (value: boolean) => void;
     setScreenType: (type: ScreenType) => void;
     setRecordingDisabled: (type: boolean) => void;
     setResolution: (type: string) => void;

package/lib/res/index.d.ts

@@ -0,0 +1,2 @@
+import playerPtzControlTip from './player_ptz_control_tip.png';
+export { playerPtzControlTip };

package/lib/res/index.js

@@ -0,0 +1,2 @@
+import playerPtzControlTip from './player_ptz_control_tip.png';
+export { playerPtzControlTip };

package/lib/ui/constant.d.ts

@@ -7,6 +7,7 @@ export declare const voiceIntercomId = "voiceIntercomId";
 export declare const fullTravelRouteControlId = "fullTravelRouteControl";
 export declare const verticalScreenId = "verticalScreenId";
 export declare const ptzControlId = "ptzControlId";
+export declare const ptzControlTipId = "ptzControlTipId";
 export declare const fullResolutionId = "fullResolutionId";
 export declare const batteryId = "Battery";
 export declare const fullSmallIntercomId = "FullSmallIntercom";

package/lib/ui/constant.js

@@ -7,6 +7,7 @@ export const voiceIntercomId = 'voiceIntercomId';
 export const fullTravelRouteControlId = 'fullTravelRouteControl';
 export const verticalScreenId = 'verticalScreenId';
 export const ptzControlId = 'ptzControlId';
+export const ptzControlTipId = 'ptzControlTipId';
 export const fullResolutionId = 'fullResolutionId';
 export const batteryId = 'Battery';
 export const fullSmallIntercomId = 'FullSmallIntercom';

package/lib/ui/ui.js

@@ -86,7 +86,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setVerticalMic(verticalMic);
   }, []);
   const refreshBottomLeft = value => {
-    console.log(value, '++++++++++++++----sadbjasbdjbsj');
     event.current.emit(startTimeToHideAllComponent);
     event.current.emit(showAllComponent);
     event.current.emit(playerTap);
@@ -274,7 +273,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       height: screenType === 'vertical' ? (style === null || style === void 0 ? void 0 : style.height) || '100%' : '100vh'
     })
   }, /*#__PURE__*/React.createElement(IPCPlayer, _extends({
-    objectFit: "",
     defaultMute: mute,
     devId: devId,
     onlineStatus: deviceOnline,

package/lib/{plugins → widgets}/battery/battery.composition.d.ts

@@ -6,6 +6,7 @@ export declare const Battery: import("react").FunctionComponent<{
     brandColor: import("../..").RetAtom<string>;
     verticalMic: import("../..").RetAtom<boolean>;
     saveToAlbum: 0 | 1;
+    showPtzControlTip: boolean;
     screenType: import("../..").RetAtom<import("../..").ScreenType>;
     recording: import("../..").RetAtom<boolean>;
     recordingDisabled: import("../..").RetAtom<boolean>;
@@ -22,8 +23,9 @@ export declare const Battery: import("react").FunctionComponent<{
     bottomLeftContent: import("../..").RetAtom<import("../..").ComponentConfig<any & Record<string, any>>[]>;
     bottomRightContent: import("../..").RetAtom<import("../..").ComponentConfig<any & Record<string, any>>[]>;
     absoluteContent: import("../..").RetAtom<import("../..").ComponentConfig<any & Record<string, any>>[]>;
+    setShowPtzControlTip: (value: boolean) => void;
     setBrandColor: (color: string) => void;
-    setVerticalMic: (color: boolean) => void;
+    setVerticalMic: (value: boolean) => void;
     setScreenType: (type: import("../..").ScreenType) => void;
     setRecordingDisabled: (type: boolean) => void;
     setResolution: (type: string) => void;
@@ -51,6 +53,7 @@ export declare const BatteryFull: import("react").FunctionComponent<{
     brandColor: import("../..").RetAtom<string>;
     verticalMic: import("../..").RetAtom<boolean>;
     saveToAlbum: 0 | 1;
+    showPtzControlTip: boolean;
     screenType: import("../..").RetAtom<import("../..").ScreenType>;
     recording: import("../..").RetAtom<boolean>;
     recordingDisabled: import("../..").RetAtom<boolean>;
@@ -67,8 +70,9 @@ export declare const BatteryFull: import("react").FunctionComponent<{
     bottomLeftContent: import("../..").RetAtom<import("../..").ComponentConfig<any & Record<string, any>>[]>;
     bottomRightContent: import("../..").RetAtom<import("../..").ComponentConfig<any & Record<string, any>>[]>;
     absoluteContent: import("../..").RetAtom<import("../..").ComponentConfig<any & Record<string, any>>[]>;
+    setShowPtzControlTip: (value: boolean) => void;
     setBrandColor: (color: string) => void;
-    setVerticalMic: (color: boolean) => void;
+    setVerticalMic: (value: boolean) => void;
     setScreenType: (type: import("../..").ScreenType) => void;
     setRecordingDisabled: (type: boolean) => void;
     setResolution: (type: string) => void;

package/lib/{plugins → widgets}/fullScreen/fullVoiceIntercom.js

@@ -43,7 +43,7 @@ export function FullVoiceIntercom(props) {
   }
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-full-screen-voice', {
-      'ipc-player-plugin-full-screen-voice-hide': shouldHide || isPtzActive,
+      'ipc-player-plugin-full-screen-voice-hide': isPtzActive || shouldHide,
       'ipc-player-plugin-full-screen-voice-disappear': screenType === 'vertical'
     })
   }, /*#__PURE__*/React.createElement(VoiceIntercom, _extends({}, props, {

package/lib/{plugins/index.js → widgets/index.d.ts}

@@ -1,6 +1,4 @@
-// 非全屏电池插件
 export * from './battery';
-// 全屏电池插件
 export * from './battery/batteryFull';
 export * from './screenshot';
 export * from './tempHumidity';
@@ -13,4 +11,5 @@ export * from './ptz';
 export * from './resolution';
 export * from './fullSmallIntercom';
 export * from './verticalSmallIntercom';
-export * from './moveInteractiveControl';
+export * from './moveInteractiveControl';
+export * from './ptzControlTip';

package/lib/{plugins/index.d.ts → widgets/index.js}

@@ -12,3 +12,4 @@ export * from './resolution';
 export * from './fullSmallIntercom';
 export * from './verticalSmallIntercom';
 export * from './moveInteractiveControl';
+export * from './ptzControlTip';

package/lib/{plugins → widgets}/moveInteractiveControl/moveInteractiveControl.js

@@ -31,7 +31,6 @@ export function MoveInteractiveControl(props) {
     dpCodes: [TYPE_CODE, STATE_CODE],
     listenDpChange: false
   });
-  console.log('state', state);
   const [schemaInfo] = useSchemaInfo(devId, [TYPE_CODE]);
   const menu = useMemo(() => {
     if (!schemaInfo || !(schemaInfo !== null && schemaInfo !== void 0 && schemaInfo[TYPE_CODE])) {

package/lib/{plugins → widgets}/ptz/ptz.js

@@ -40,8 +40,6 @@ export const Ptz = props => {
     }
   }, [screenType]);
   const onPtz = useMemoizedFn(() => {
-    console.log(isPtzActive, 'isPtzActive');
-    console.log(hasContent('absolute', ptzControlId), 'hasContent');
     if (!isPtzActive) {
       showContent('bottomLeft', 'FullSmallIntercom');
       if (!hasContent('absolute', ptzControlId)) {
@@ -54,10 +52,9 @@ export const Ptz = props => {
           absoluteContentClassName: 'ipc-player-plugin-full-screen-ptz-control-wrap',
           initProps: _objectSpread({}, props)
         });
-      } else {
-        console.log('ptzControlShow ===========');
-        event.emit('ptzControlShow');
+        // event.emit('ptzControlShow');
       }
+      event.emit('ptzControlShow');
     } else {
       // deleteContent('absolute', ptzControlId);
       hideContent('bottomLeft', 'FullSmallIntercom');

package/lib/{plugins → widgets}/ptz/ptz.less

@@ -60,4 +60,13 @@
   color: #707070;
 }
 
+.ipc-player-plugin-ptz-control-tip-wrap {
+  position: absolute;
+  z-index: 1000;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
 

package/lib/{plugins → widgets}/ptz/ptzControl.js

@@ -1,5 +1,6 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useContext, useEffect, useRef, useState } from 'react';
-import { CoverView } from '@ray-js/ray';
+import { CoverView, getStorage } from '@ray-js/ray';
 import clsx from 'clsx';
 import _find from 'lodash/find';
 import _get from 'lodash/get';
@@ -8,9 +9,10 @@ import IpcUtils from '@ray-js/ray-ipc-utils';
 import { useMemoizedFn } from '../../hooks';
 import { useComponentHideState } from '../../ui/hooks';
 import { UIEventContext } from '../../ui/context';
+import { PtzControlTip } from '../ptzControlTip';
+import { ptzControlTipId, pauseTimeToHideAllComponent } from '../../ui/constant';
 import { useStore } from '../../ctx/store';
 import { getEnumRangeIsValid } from '../../utils/device';
-import { pauseTimeToHideAllComponent } from '../../ui/constant';
 import Styles from './ptz.less';
 const getPtzData = devId => {
   return [{
@@ -37,7 +39,8 @@ const getPtzData = devId => {
 };
 export const PtzControl = props => {
   const {
-    devId
+    devId,
+    addContent
   } = props;
   const {
     screenType,
@@ -48,6 +51,7 @@ export const PtzControl = props => {
   });
   const [shouldHide] = useComponentHideState();
   const [isPtzActive, setIsPtzActive] = useState(true);
+  const [showPtzControlTip, setShowPtzControlTip] = useState(false);
   const {
     event
   } = useContext(UIEventContext);
@@ -59,6 +63,18 @@ export const PtzControl = props => {
   const onPtzControlShow = useMemoizedFn(() => {
     setIsPtzActive(true);
   });
+
+  // 获取是否有ptz控制tip
+  useEffect(() => {
+    getStorage({
+      key: `${devId}_ptzControlTip}`,
+      success: res => {
+        if (!res.data) {
+          setShowPtzControlTip(true);
+        }
+      }
+    });
+  }, []);
   useEffect(() => {
     event.on('ptzControlHide', onPtzControlHide);
     event.on('ptzControlShow', onPtzControlShow);
@@ -86,6 +102,7 @@ export const PtzControl = props => {
     ptzData: ptzData.current,
     onTouchPtzStart: async data => {
       event.emit(pauseTimeToHideAllComponent);
+      // event.emit('ptzControlTipShow', true);
       const {
         type
       } = data;
@@ -104,6 +121,16 @@ 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)
+        });
+      }
     },
     onTouchPtzEnd: async () => {
       const ptzStopData = await IpcUtils.getDpIdByCode(devId, 'ptz_stop');

package/lib/widgets/ptzControlTip/index.d.ts

@@ -0,0 +1 @@
+export * from './ptzControlTip';

package/lib/widgets/ptzControlTip/index.js

@@ -0,0 +1 @@
+export * from './ptzControlTip';

package/lib/widgets/ptzControlTip/ptzControlTip.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import { ComponentConfigProps } from '../../interface';
+import './ptzControlTip.less';
+type Props = ComponentConfigProps;
+export declare const PtzControlTip: (props: Props) => React.JSX.Element | null;
+export {};

package/lib/widgets/ptzControlTip/ptzControlTip.js

@@ -0,0 +1,45 @@
+import React, { useState } from 'react';
+import { View, Image, CoverView, Text, setStorage } from '@ray-js/ray';
+import clsx from 'clsx';
+import { useStore } from '../../ctx/store';
+import { ptzControlTipId } from '../../ui/constant';
+import { PlayState } from '../../interface';
+import './ptzControlTip.less';
+import { playerPtzControlTip } from '../../res';
+import Strings from '../../i18n';
+export const PtzControlTip = props => {
+  const {
+    devId,
+    deleteContent
+  } = props;
+  const [showTipModal, setShowTipModal] = useState(true);
+  const {
+    playState
+  } = useStore({
+    playState: props.playState
+  });
+  // 获取缓存状态
+  const changeShowTipModal = () => {
+    setShowTipModal(false);
+    deleteContent('absolute', ptzControlTipId);
+    setStorage({
+      key: `${devId}_ptzControlTip}`,
+      data: 'true'
+    });
+  };
+  if (showTipModal && playState === PlayState.PLAYING) {
+    return /*#__PURE__*/React.createElement(CoverView, {
+      className: clsx('playerControlTipContainer')
+    }, /*#__PURE__*/React.createElement(Image, {
+      mode: "widthFix",
+      src: playerPtzControlTip,
+      className: clsx('controlTipImage')
+    }), /*#__PURE__*/React.createElement(Text, {
+      className: clsx('controlTipText')
+    }, Strings.getLang('ipc_player_ptz_control_tip')), /*#__PURE__*/React.createElement(View, {
+      className: clsx('controlTipCloseButton'),
+      onClick: changeShowTipModal
+    }, Strings.getLang('ipc_player_ptz_close_control_tip')));
+  }
+  return null;
+};

package/lib/widgets/ptzControlTip/ptzControlTip.less

@@ -0,0 +1,42 @@
+.playerControlTipContainer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 999;
+    background-color: rgba(0,0,0,0.5);
+    flex-direction: column;
+    padding: 0 calc(50px * var(--ipc-player-size-scale, 1));;
+    transition: all 0.3 ease;
+    .controlTipImage {
+      width: calc(170px * var(--ipc-player-size-scale, 1));;
+    }
+    .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;
+    }
+    .controlTipCloseButton {
+        border-radius: calc(4px * var(--ipc-player-size-scale, 1));
+        background-color: rgba(255, 255, 255, 0.3);
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+        margin-top: 20rpx;
+        text-align: center;
+        height: calc(32px * var(--ipc-player-size-scale, 1));
+        padding: 0 calc(24px * var(--ipc-player-size-scale, 1));
+        overflow: hidden;
+        border-radius: calc(32px * var(--ipc-player-size-scale, 1));
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: calc(12px * var(--ipc-player-size-scale, 1));;
+        color: #ffffff;
+    }
+  }

package/lib/{plugins → widgets}/recordVideo/recordVideo.js

@@ -243,7 +243,6 @@ export function RecordVideo(props) {
     }
     try {
       const recordInfo = await setRecording(target);
-      console.log(recordInfo, 'recordInfo====');
       if (target) {
         setRecordingDisabled(true);
         setState({

package/lib/{plugins → widgets}/screenshot/screenshot.js

@@ -1,5 +1,5 @@
 import React, { useContext, useRef } from 'react';
-import { View, Image, Text, showModal, openAppSystemSettingPage, getSystemInfoSync } from '@ray-js/ray';
+import { View, Image, Text, showModal, openAppSystemSettingPage } from '@ray-js/ray';
 import { useSetState, useUpdateEffect, useMemoizedFn } from 'ahooks';
 import clsx from 'clsx';
 import IpcUtils from '@ray-js/ray-ipc-utils';
@@ -163,10 +163,6 @@ export function Screenshot(props) {
               isShowGlobal: true,
               success: res => {
                 if (res.confirm) {
-                  const {
-                    platform
-                  } = getSystemInfoSync();
-                  console.log(platform, 'platform');
                   openAppSystemSettingPage({
                     scope: 'App-Settings',
                     success: () => {

package/lib/{plugins → widgets}/tempHumidity/tempHumidity.js

@@ -36,8 +36,6 @@ export const TempHumidity = props => {
       className: "tempHumidity"
     }, `${humidity}`));
   };
-  console.log(tempC, tempF, humidity);
-
   // 当无值时返回null
   if (!tempC && !tempF && !humidity) {
     return null;

package/lib/{plugins → widgets}/videoBitKBP/videoBitKBP.js

@@ -39,7 +39,10 @@ export const VideoBitKBP = props => {
     return null;
   }
   return /*#__PURE__*/React.createElement(View, {
-    className: clsx(className)
+    className: clsx({
+      'ipc-player-plugin-videoBitKBP-container': true,
+      [className]: !!className
+    })
   }, /*#__PURE__*/React.createElement(View, {
     className: "ipc-player-plugin-videoBitKBP"
   }, bitKBP));

package/lib/{plugins → widgets}/videoBitKBP/videoBitKBP.less

@@ -1,6 +1,14 @@
+.ipc-player-plugin-videoBitKBP-container {
+    min-width: calc(100px * var(--ipc-player-size-scale, 1));
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
 .ipc-player-plugin-videoBitKBP {
     display: flex;
     align-items: center;
+    justify-content: center;
+    width: 100%;
     height: calc(24px * var(--ipc-player-size-scale, 1));
     padding: 0 calc(9px * var(--ipc-player-size-scale, 1));
     border-radius: calc(24px * var(--ipc-player-size-scale, 1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-58",
+  "version": "0.0.1-beta-60",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [
@@ -38,7 +38,7 @@
   "dependencies": {
     "@ray-js/ipc-ptz-zoom": "0.0.2-beta-7",
     "@ray-js/panel-sdk": "^1.13.1",
-    "@ray-js/ray-ipc-player": "2.0.20-beta-12",
+    "@ray-js/ray-ipc-player": "2.0.20-beta-13",
     "@ray-js/ray-ipc-utils": "1.1.0-beta-16",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",