@ray-js/ipc-player-integration 0.0.1-beta-54 → 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/plugins/fullScreen/fullScreen.js

@@ -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');
             }
           })
         });

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/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/ui.js

@@ -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';
@@ -271,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({
@@ -302,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'}
     ,

package/package.json

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