@ray-js/ipc-player-integration 0.0.1-beta-53 → 0.0.1-beta-55

package/lib/ctx/ctx.js

@@ -80,14 +80,32 @@ export const createUseCtx = _ref => {
     if (!eventRef.current) {
       eventRef.current = getEventInstance();
     }
+    useEffect(() => {
+      // 初始化获取缓存值
+
+      (async () => {
+        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);
+          setIntercomMode(res.intercomMode);
+        } catch (error) {
+          console.error('获取 getMemoryState 失败:', error);
+        }
+      })();
+    }, [devId]);
     useEffect(() => {
       if (devId && _playState === PlayState.PLAYING) {
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
-          console.log('==== getMemoryState ====', res);
+          console.log('PlayingMemoryState', res);
           setResolutionList(res.resolutionList);
-          _setResolution(res.resolution);
-          _setMute(res.mute);
+          // 传true表示值即可,会取播放器的值
+          _setResolution(res.resolution, true);
+          _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
         });
       }
@@ -126,8 +144,13 @@ export const createUseCtx = _ref => {
     if (!IPCPlayerInstance.current) {
       IPCPlayerInstance.current = createPlayContext(devId);
     }
-    const _setMute = async target => {
+    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;
+      }
       return new Promise((resolve, reject) => {
         IPCPlayerInstance.current.setMuted({
           mute: target,
@@ -155,8 +178,13 @@ export const createUseCtx = _ref => {
      * 设置清晰度
      *
      */
-    const _setResolution = async target => {
+    const _setResolution = async function (target) {
+      let onlyUpdateAtom = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       // target 为需要切换的清晰度
+      if (onlyUpdateAtom) {
+        updateAtom(resolution, target);
+        return false;
+      }
       return new Promise((resolve, reject) => {
         IPCPlayerInstance.current.setClarity({
           clarity: target === ClarityType.HD ? 'hd' : 'normal',

package/lib/hooks/useBattery/index.js

@@ -44,7 +44,7 @@ export const useBattery = devId => {
   const batteryInfo = useMemo(() => {
     return {
       batteryValue: getEleValue(dpState[POWER_VALUE_DP_CODE], dpState[POWER_CALC_METHOD_DP_CODE]),
-      batteryCharging: dpState[POWER_MODE_DP_CODE]
+      batteryCharging: dpState[POWER_MODE_DP_CODE] === '1'
     };
   }, [dpState]);
   return batteryInfo;

package/lib/hooks/useDpState/useDpState.js

@@ -77,8 +77,9 @@ export function useDpState(options) {
           codeMapToIdRef.current = codeMapToId;
           dpCodeSchemaMapsRef.current = dpCodeSchemaMaps;
           const initValue = options.dpCodes.reduce((ret, key) => {
+            const currentId = codeMapToIdRef.current[key];
             return _objectSpread(_objectSpread({}, ret), {}, {
-              [key]: res.dpCodes[key]
+              [key]: res.dps[currentId]
             });
           }, {});
           setValues(initValue);

package/lib/i18n/index.d.ts

@@ -19,6 +19,7 @@ declare const Strings: kit.I18N<{
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -39,6 +40,7 @@ declare const Strings: kit.I18N<{
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
 }, {
     ipc_player_resolution_HD: string;
@@ -59,6 +61,7 @@ declare const Strings: kit.I18N<{
     ipc_player_authorize_cancel_text: string;
     ipc_player_authorize_confirm_text: string;
     ipc_player_error_record_tip: string;
+    ipc_player_change_resolution_success: string;
 } | {
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
@@ -78,5 +81,6 @@ declare const Strings: kit.I18N<{
     ipc_player_authorize_cancel_text: string;
     ipc_player_authorize_confirm_text: string;
     ipc_player_error_record_tip: string;
+    ipc_player_change_resolution_success: string;
 }>;
 export default Strings;

package/lib/i18n/strings.d.ts

@@ -18,6 +18,7 @@ declare const _default: {
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -38,6 +39,7 @@ declare const _default: {
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
         ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
 };
 export default _default;

package/lib/i18n/strings.js

@@ -17,7 +17,8 @@ export default {
     ipc_player_no_album_permission: 'You currently do not have access to the album or storage. Please enable this permission in the settings.',
     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_error_record_tip: 'The recording has failed, please try again later.',
+    ipc_player_change_resolution_success: '切换成功'
   },
   zh: {
     ipc_player_resolution_HD: '高清',
@@ -37,6 +38,7 @@ export default {
     ipc_player_no_album_permission: '您当前没有 相册/存储 的访问权限, 请在设置中打开此权限',
     ipc_player_authorize_cancel_text: '取消',
     ipc_player_authorize_confirm_text: '去设置',
-    ipc_player_error_record_tip: '录制出错了，请稍后再试'
+    ipc_player_error_record_tip: '录制出错了，请稍后再试',
+    ipc_player_change_resolution_success: '切换成功'
   }
 };

package/lib/plugins/fullScreen/fullScreen.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useContext } from 'react';
-import { View, setPageOrientation, Text } from '@ray-js/ray';
+import { View, setPageOrientation, Text, hideMenuButton, showMenuButton, showStatusBar, hideStatusBar, setNavigationBarBack } from '@ray-js/ray';
 import { useUpdateEffect } from 'ahooks';
 import clsx from 'clsx';
 import { unstable_batchedUpdates as batchedUpdates } from '@ray-core/ray';
@@ -42,9 +42,9 @@ export function FullScreen(props) {
    */
   const handleFull = () => {
     hasDpCode(devId, DIRECTION_CONTROL_DP_CODE).then(hasDirectionControlDpCode => {
-      ty.hideMenuButton();
-      ty.hideStatusBar();
-      ty.setNavigationBarBack({
+      hideMenuButton();
+      hideStatusBar();
+      setNavigationBarBack({
         type: 'custom'
       });
       batchedUpdates(() => {
@@ -55,9 +55,15 @@ export function FullScreen(props) {
           absoluteContentClassName: 'ipc-player-plugin-vertical-screen-wrap',
           initProps: _objectSpread(_objectSpread({}, props), {}, {
             onClick: () => {
+              // 点击返回时提前调用一波
+              deleteContent('topLeft', verticalScreenId);
+              deleteContent('absolute', voiceIntercomId);
+              deleteContent('absolute', ptzControlId);
+              deleteContent('absolute', fullResolutionId);
+              deleteContent('absolute', fullTravelRouteControlId);
+              handClick('vertical');
               event.emit(pauseTimeToHideAllComponent);
               event.emit(showAllComponent);
-              handClick('vertical');
             }
           })
         });
@@ -95,11 +101,11 @@ export function FullScreen(props) {
     },
     vertical: () => {
       event.emit(pauseTimeToHideAllComponent);
-      ty.setNavigationBarBack({
+      setNavigationBarBack({
         type: 'system'
       });
-      ty.showMenuButton();
-      ty.showStatusBar();
+      showMenuButton();
+      showStatusBar();
       deleteContent('topLeft', verticalScreenId);
       deleteContent('absolute', voiceIntercomId);
       deleteContent('absolute', ptzControlId);
@@ -111,13 +117,21 @@ export function FullScreen(props) {
     var _handlers$screenType;
     (_handlers$screenType = handlers[screenType]) === null || _handlers$screenType === void 0 || _handlers$screenType.call(handlers);
   }, [screenType]);
+
+  // 点击事件处理函数
   const handClick = target => {
+    // 根据target的值设置pageOrientation的值
     const pageOrientation = target === 'vertical' ? 'portrait' : 'landscape';
+    // 发射事件
     event.emit(pauseTimeToHideAllComponent);
+    // 设置screenType的值
+    setScreenType(target);
+    // 设置pageOrientation的值
     setPageOrientation({
       pageOrientation,
       success: () => {
-        setScreenType(target);
+        // 忽略横屏
+        // setScreenType(target);
       }
     });
   };

package/lib/plugins/fullScreen/fullScreen.less

@@ -12,7 +12,7 @@
   top: 50%;
   transform: translate(0, -50%);
   // transform: translate(180%, 0);
-  right: calc(36px * var(--ipc-player-size-scale, 1));
+  right: calc(50px * var(--ipc-player-size-scale, 1));
   z-index: 340;
 }
 

package/lib/plugins/recordVideo/recordVideo.js

@@ -260,17 +260,11 @@ export function RecordVideo(props) {
       }
     } catch (err) {
       console.log('录制失败', err);
-      if ((err === null || err === void 0 ? void 0 : err.errorCode) === 7) {
-        toast({
-          title: Strings.getLang('ipc_player_require_record_permission')
-        });
-      } else {
-        const errObj = err.innerError || err || {};
-        const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_record_tip');
-        toast({
-          title: errMsg
-        });
-      }
+      const errObj = err.innerError || err || {};
+      const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_record_tip');
+      toast({
+        title: errMsg
+      });
       setState({
         showTimer: false
       });

package/lib/plugins/resolution/fullResolutionControl.js

@@ -1,7 +1,7 @@
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import React, { useCallback, useState, useContext, useEffect } from 'react';
-import { Text, View } from '@ray-js/ray';
+import { Text, View, showToast } from '@ray-js/ray';
 import clsx from 'clsx';
 import Strings from '../../i18n';
 import { useMemoizedFn } from '../../hooks';
@@ -44,15 +44,19 @@ export const FullResolutionControl = props => {
   }, []);
   const changeResolution = useCallback(value => {
     if (value === resolution) {
-      ty.showToast({
+      showToast({
         icon: 'none',
         title: Strings.getLang('ipc_player_current_resolution_is_equal')
       });
     } else {
       setResolution(value).then(() => {
+        showToast({
+          icon: 'none',
+          title: Strings.getLang('ipc_player_change_resolution_success')
+        });
         setHide(true);
       }).catch(() => {
-        ty.showToast({
+        showToast({
           icon: 'error',
           title: Strings.getLang('ipc_player_resolution_change_error')
         });

package/lib/ui/constant.d.ts

@@ -9,3 +9,12 @@ export declare const verticalScreenId = "verticalScreenId";
 export declare const ptzControlId = "ptzControlId";
 export declare const fullResolutionId = "fullResolutionId";
 export declare const batteryId = "Battery";
+export declare const decodeClarityDic: {
+    SS: string;
+    SD: string;
+    HD: string;
+    UD: string;
+    SSP: string;
+    AUTO: string;
+    AUDIO: string;
+};

package/lib/ui/constant.js

@@ -8,4 +8,19 @@ export const fullTravelRouteControlId = 'fullTravelRouteControl';
 export const verticalScreenId = 'verticalScreenId';
 export const ptzControlId = 'ptzControlId';
 export const fullResolutionId = 'fullResolutionId';
-export const batteryId = 'Battery';
+export const batteryId = 'Battery';
+export const decodeClarityDic = {
+  SS: 'ss',
+  // 省流量
+  SD: 'normal',
+  // 标清
+  HD: 'hd',
+  // 高清
+  UD: 'ud',
+  // 超清
+  SSP: 'ssp',
+  // 超超清
+  AUTO: 'auto',
+  // 自动
+  AUDIO: 'audio' // 音频模式
+};

package/lib/ui/topLeftContent.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { CoverView, View } from '@ray-js/ray';
 import clsx from 'clsx';
 import { useStore } from '../ctx/store';
-import { useComponentHideState } from './hooks';
 const TopLeftContent = _ref => {
   let {
     ctx,
@@ -14,7 +13,6 @@ const TopLeftContent = _ref => {
     screenType: ctx.screenType,
     playState: ctx.playState
   });
-  const [shouldHide] = useComponentHideState();
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-top-left-content-wrap'),
     style: {
@@ -25,10 +23,7 @@ const TopLeftContent = _ref => {
       paddingTop: screenType === 'vertical' ? '12px' : '16px',
       paddingLeft: screenType === 'vertical' ? 0 : '25px'
     },
-    className: clsx('ipc-player-top-left-content-container', {
-      // 'ipc-player-top-left-content-hide': shouldHide,
-      // 'ipc-player-top-left-content-show': !shouldHide,
-    })
+    className: clsx('ipc-player-top-left-content-container')
   }, children));
 };
 export default /*#__PURE__*/React.memo(TopLeftContent);

package/lib/ui/ui.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
-import React, { useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
+import React, { useContext, useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
 import { View, CoverView, getSystemInfoSync, usePageEvent } from '@ray-js/ray';
 import clsx from 'clsx';
 import IPCPlayer from '@ray-js/ray-ipc-player';
@@ -10,7 +10,7 @@ import { PlayState, PlayerStreamStatus } from '../interface';
 import { useCtx } from '../ctx/ctx.composition';
 import { useStore } from '../ctx/store';
 import { UIEventContext } from './context';
-import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent } from './constant';
+import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent, decodeClarityDic } from './constant';
 import BottomLeftContent from './bottomLeftContent';
 import BottomRightContent from './bottomRightContent';
 import TopLeftContent from './topLeftContent';
@@ -54,6 +54,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     onPlayerTap,
     extend = {}
   } = props;
+  const {
+    event
+  } = useContext(UIEventContext);
   const instance = getCtxInstance(props.instance, devId);
   const {
     setPlayState,
@@ -70,6 +73,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     这里用一个统一的状态标志期望控件是否展示
   */
   const [componentHideState, setComponentHideState] = useState(false);
+  const [showRightContent, setShowRightContent] = useState(true);
   prevTriggerEvent.current = componentHideState ? hideAllComponent : showAllComponent;
   const eventRef = useRef(instance.event);
   if (eventRef.current !== instance.event) {
@@ -81,6 +85,13 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setBrandColor(brandColor);
     setVerticalMic(verticalMic);
   }, []);
+  const refreshBottomLeft = value => {
+    console.log(value, '++++++++++++++----sadbjasbdjbsj');
+    event.current.emit(startTimeToHideAllComponent);
+    event.current.emit(showAllComponent);
+    event.current.emit(playerTap);
+    setShowRightContent(value);
+  };
 
   /**
    * 监听屏幕布局变化
@@ -241,15 +252,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     eventRef.current.on(showAllComponent, listenShowEvent);
     eventRef.current.on(hideAllComponent, listenHideEvent);
     eventRef.current.on('disablePlayerTap', handDisablePlayerTap);
+    eventRef.current.on('refreshBottomLeft', refreshBottomLeft);
     return () => {
       eventRef.current.off(startTimeToHideAllComponent, listenStart);
       eventRef.current.off(pauseTimeToHideAllComponent, listenPause);
       eventRef.current.off(showAllComponent, listenShowEvent);
       eventRef.current.off(hideAllComponent, listenHideEvent);
       eventRef.current.off('disablePlayerTap', handDisablePlayerTap);
+      eventRef.current.off('refreshBottomLeft', refreshBottomLeft);
     };
   }, []);
-  const playerReady = playState === PlayState.PLAYING;
+  playState === PlayState.PLAYING;
   return /*#__PURE__*/React.createElement(UIEventContext.Provider, {
     value: {
       event: eventRef.current,
@@ -258,7 +271,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   }, /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-content', className),
     style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultCSSVariable), CSSVariable), style), {}, {
-      // backgroundColor: 'rgba(0,0,0,0.2)',
       height: screenType === 'vertical' ? (style === null || style === void 0 ? void 0 : style.height) || '100%' : '100vh'
     })
   }, /*#__PURE__*/React.createElement(IPCPlayer, _extends({
@@ -289,7 +301,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     onCameraNotifyWeakNetwork: data => {
       console.log(`onCameraNotifyWeakNetwork: ${JSON.stringify(data)}`);
     },
-    clarity: resolution === 'HD' ? 'hd' : 'normal'
+    clarity: decodeClarityDic[resolution]
     // 安卓横屏问题
     // ptzControllable={screenType === 'vertical'}
     ,
@@ -336,7 +348,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ctx: instance
   }, renderBottomLeftContent), /*#__PURE__*/React.createElement(BottomRightContent, {
     ctx: instance
-  }, renderBottomRightContent)), playerReady && (() => {
+  }, renderBottomRightContent)), (() => {
     if (!absoluteContent || !(absoluteContent !== null && absoluteContent !== void 0 && absoluteContent.length)) return null;
     return absoluteContent.map(item => {
       if (item.hidden) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-53",
+  "version": "0.0.1-beta-55",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [
@@ -38,8 +38,8 @@
   "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-10",
-    "@ray-js/ray-ipc-utils": "1.1.0-beta-15",
+    "@ray-js/ray-ipc-player": "2.0.20-beta-12",
+    "@ray-js/ray-ipc-utils": "1.1.0-beta-16",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
     "jotai": "^2.10.2"