@ray-js/ipc-player-integration 0.0.1-beta-48 → 0.0.1-beta-49

package/lib/ctx/ctx.js

@@ -3,7 +3,7 @@ import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.map.js";
 import { useRef, useCallback, useEffect } from 'react';
-import { getSystemInfoSync, showModal, openSystemSettingPage } from '@ray-js/ray';
+import { getSystemInfoSync, showModal, openSystemSettingPage, openAppSystemSettingPage } from '@ray-js/ray';
 import Strings from '../i18n';
 import { useAtom, updateAtom, getDefaultStore, useStore } from './store';
 import { PlayState, IntercomMode } from '../interface';
@@ -147,10 +147,6 @@ export const createUseCtx = _ref => {
             });
             console.log('喇叭调用失败', JSON.stringify(err));
             reject(err);
-
-            // const errObj = err.innerError || err || {};
-            // const errMsg = errObj.errorMsg || I18n.t('error_setMute');
-            // toast({ title: errMsg });
           }
         });
       });
@@ -238,8 +234,9 @@ export const createUseCtx = _ref => {
                         platform
                       } = getSystemInfoSync();
                       console.log(platform, 'platform');
-                      openSystemSettingPage({
-                        scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                      openAppSystemSettingPage({
+                        // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                        scope: 'App-Settings',
                         success: () => {
                           console.log('跳转成功');
                         }
@@ -257,6 +254,7 @@ export const createUseCtx = _ref => {
                 resolve(true);
               },
               fail: err => {
+                console.log(err, '结束对讲失败');
                 updateAtom(intercom, true);
                 reject(err);
               }

package/lib/plugins/ptz/ptz.less

@@ -18,7 +18,7 @@
   bottom: 32px;
   // transform: translate(0, -20%);
   right: calc(32px * var(--ipc-player-size-scale, 1));;
-  z-index: 3;
+  z-index: 200;
 }
 
 

package/lib/plugins/recordVideo/recordVideo.js

@@ -4,6 +4,7 @@ import { useSetState, useUpdateEffect } from 'ahooks';
 import clsx from 'clsx';
 import IpcUtils from '@ray-js/ray-ipc-utils';
 import Strings from '../../i18n';
+import { PlayState } from '../../interface';
 import { UIEventContext } from '../../ui/context';
 import { pauseTimeToHideAllComponent } from '../../ui/constant';
 import { useStore, getDefaultStore } from '../../ctx/store';
@@ -87,12 +88,14 @@ export function RecordVideo(props) {
     recording,
     brandColor,
     screenType,
-    recordingDisabled
+    recordingDisabled,
+    playState
   } = useStore({
     recording: recordingAtom,
     brandColor: props.brandColor,
     screenType: props.screenType,
-    recordingDisabled: props.recordingDisabled
+    recordingDisabled: props.recordingDisabled,
+    playState: props.playState
   });
   const [state, setState] = useSetState({
     showTimer: false,
@@ -100,6 +103,22 @@ export function RecordVideo(props) {
     shotUrl: ''
   });
 
+  /**
+   * 针对 playState为非连接中状态时，如果处于录制中, 结束录制
+   */
+  useEffect(() => {
+    (async () => {
+      if (playState !== PlayState.PLAYING) {
+        if (recording) {
+          setState({
+            showTimer: false
+          });
+          await setRecording(false);
+        }
+      }
+    })();
+  }, [playState, recording]);
+
   /** 设置5秒后关闭录制成功弹窗 */
   const timer = useRef();
   const timeToCloseRecordToast = () => {

package/lib/plugins/resolution/resolution.js

@@ -29,7 +29,6 @@ export const Resolution = props => {
     event
   } = useContext(UIEventContext);
   const onResolution = useMemoizedFn(() => {
-    console.log('你触发了高标清点击了吗');
     event.emit('resolutionBtnControlClick');
     console.log(`screenType: ${screenType}`);
     if (screenType === 'full') {

package/lib/plugins/voiceIntercom/voiceIntercom.js

@@ -3,9 +3,9 @@ import React, { useRef, useContext, useState, useEffect } from 'react';
 import { View } from '@ray-js/ray';
 import clsx from 'clsx';
 import Svg from '@ray-js/svg';
-import { useStore, getDefaultStore } from '../../ctx/store';
+import { useStore, getDefaultStore, updateAtom } from '../../ctx/store';
 import './voiceIntercom.less';
-import { PlayerStreamStatus, IntercomMode } from '../../interface';
+import { PlayerStreamStatus, IntercomMode, PlayState } from '../../interface';
 import { UIEventContext } from '../../ui/context';
 import { radialGradient } from '../../utils';
 import { startTimeToHideAllComponent, pauseTimeToHideAllComponent } from '../../ui/constant';
@@ -41,13 +41,15 @@ export const VoiceIntercom = props => {
     mute,
     intercom,
     intercomMode,
-    brandColor
+    brandColor,
+    playState
   } = useStore({
     recording: props.recording,
     mute: props.mute,
     intercom: props.intercom,
     intercomMode: props.intercomMode,
-    brandColor: props.brandColor
+    brandColor: props.brandColor,
+    playState: props.playState
   });
   // 对讲开始之前的静音状态
   const originMuteStatusBeforeVoice = useRef(mute);
@@ -69,6 +71,20 @@ export const VoiceIntercom = props => {
     }
     event.emit(pauseTimeToHideAllComponent);
   };
+
+  /**
+   * 针对 playState为非连接中状态时，如果处于对讲中, 结束对讲
+   */
+  useEffect(() => {
+    (async () => {
+      console.log('=== 开始结束对讲 ====', intercom);
+      if (playState !== PlayState.PLAYING) {
+        if (intercom) {
+          updateAtom(props.intercom, false);
+        }
+      }
+    })();
+  }, [playState, intercom]);
   const endVoice = async () => {
     console.log('=== 结束对讲 ====');
     // 对讲结束之后，统一关闭静态状态

package/lib/ui/ui.js

@@ -295,11 +295,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ptzControllable: screenType === 'vertical',
     privateState: privateState,
     onPlayerTap: data => {
-      // if (disablePlayerTap.current) {
-      //   console.log('playerTap 事件已禁止');
-      //   return;
-      // }
-      console.log('res===on onVideoTap', data);
+      if (disablePlayerTap.current) {
+        console.log('playerTap 事件已禁止');
+        return;
+      }
       eventRef.current.emit(playerTap);
       console.log(prevTriggerEvent.current, 'prevTriggerEvent.current');
       if (prevTriggerEvent.current === hideAllComponent) {
@@ -307,7 +306,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       } else {
         triggerEvent(hideAllComponent);
       }
-      onPlayerTap(data);
+      onPlayerTap && onPlayerTap(data);
       return false; // eslint-disable-line
     } // 对应原来的onVideoTap
     ,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-48",
+  "version": "0.0.1-beta-49",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [