@ray-js/ipc-player-integration 0.0.21 → 0.0.22

package/lib/ctx/ctx.js

@@ -7,6 +7,7 @@ import { getSystemInfoSync, showModal, openAppSystemSettingPage } from '@ray-js/
 import Strings from '../i18n';
 import { useAtom, updateAtom, getDefaultStore, useStore } from './store';
 import { PlayState, IntercomMode } from '../interface';
+import { changeIgnoreHideStopPreview } from '../ui/constant';
 import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 import { getEventInstance } from './event';
 const SAVE_TO_ALBUM = 1;
@@ -237,10 +238,14 @@ export const createUseCtx = _ref => {
         const store = getDefaultStore();
         const _intercom = store.get(intercom);
         if (target && target === _intercom) {
+          eventRef.current.emit(changeIgnoreHideStopPreview, false);
           console.log('Cannot intercom during video _intercom');
           return false;
         }
-        if (!target && target === _intercom) return true;
+        if (!target && target === _intercom) {
+          eventRef.current.emit(changeIgnoreHideStopPreview, false);
+          return true;
+        }
         return new Promise((resolve, reject) => {
           if (target) {
             ty.authorizeStatus({
@@ -248,12 +253,14 @@ export const createUseCtx = _ref => {
               scope: 'scope.record',
               success: success => {
                 console.log(success, 'success');
+                eventRef.current.emit(changeIgnoreHideStopPreview, false);
                 IPCPlayerInstance.current.startTalk({
                   success: () => {
                     updateAtom(intercom, true);
                     resolve(true);
                   },
                   fail: err => {
+                    eventRef.current.emit(changeIgnoreHideStopPreview, false);
                     const errObj = err.innerError || err || {};
                     const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_intercom');
                     toast({
@@ -264,16 +271,20 @@ export const createUseCtx = _ref => {
                 });
               },
               fail: () => {
+                console.log('失败回调');
                 ty.authorize({
                   // 麦克风权限
                   scope: 'scope.record',
                   success: () => {
+                    console.log('我不知道你是个什么玩意');
                     IPCPlayerInstance.current.startTalk({
                       success: () => {
+                        // eventRef.current.emit(changeIgnoreHideStopPreview, false);
                         updateAtom(intercom, true);
                         resolve(true);
                       },
                       fail: err => {
+                        // eventRef.current.emit(changeIgnoreHideStopPreview, false);
                         const errObj = err.innerError || err || {};
                         const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_intercom');
                         toast({
@@ -284,6 +295,8 @@ export const createUseCtx = _ref => {
                     });
                   },
                   fail: err => {
+                    console.log('我不知道你是说什么');
+                    // eventRef.current.emit(changeIgnoreHideStopPreview, false);
                     showModal({
                       title: '',
                       content: Strings.getLang('ipc_player_no_record_permission'),

package/lib/ui/constant.d.ts

@@ -11,6 +11,7 @@ export declare const ptzControlTipId = "ptzControlTipId";
 export declare const fullResolutionId = "fullResolutionId";
 export declare const batteryId = "Battery";
 export declare const fullSmallIntercomId = "FullSmallIntercom";
+export declare const changeIgnoreHideStopPreview = "changeIgnoreHideStopPreview";
 export declare const decodeClarityDic: {
     SS: string;
     SD: string;

package/lib/ui/constant.js

@@ -11,6 +11,7 @@ export const ptzControlTipId = 'ptzControlTipId';
 export const fullResolutionId = 'fullResolutionId';
 export const batteryId = 'Battery';
 export const fullSmallIntercomId = 'FullSmallIntercom';
+export const changeIgnoreHideStopPreview = 'changeIgnoreHideStopPreview';
 export const decodeClarityDic = {
   SS: 'ss',
   // 省流量

package/lib/ui/ui.js

@@ -11,7 +11,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, decodeClarityDic } from './constant';
+import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent, decodeClarityDic, changeIgnoreHideStopPreview } from './constant';
 import BottomLeftContent from './bottomLeftContent';
 import BottomRightContent from './bottomRightContent';
 import TopLeftContent from './topLeftContent';
@@ -94,10 +94,16 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   const [scaleMultiple, setScaleMultiple] = useState(playerFit === 'contain' ? 1 : -2);
   const [currentZoomLevel, setCurrentZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
   const [createCtx, setCreateCtx] = useState(false);
+  // 是否需要忽略进入后台停止预览
+  const [ignoreStopOnHide, setIgnoreStopOnHide] = useState(ignoreHideStopPreview);
   const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
   // const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
   // const [verticalZoomLevel, setVerticalZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
 
+  // 外部传入的ignoreHideStopPreview变化时，同步更新
+  useEffect(() => {
+    setIgnoreStopOnHide(ignoreHideStopPreview);
+  }, [ignoreHideStopPreview]);
   const handleOrientationChange = useMemoizedFn(data => {
     console.log(data, 'data=============');
     const {
@@ -466,6 +472,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   const listenShowEvent = useMemoizedFn(() => {
     setComponentHideState(false);
   });
+  const onChangeIgnoreHideStopPreview = state => {
+    setIgnoreStopOnHide(state);
+  };
   useEffect(() => {
     eventRef.current.on(startTimeToHideAllComponent, listenStart);
     eventRef.current.on(pauseTimeToHideAllComponent, listenPause);
@@ -473,6 +482,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     eventRef.current.on(hideAllComponent, listenHideEvent);
     eventRef.current.on('disablePlayerTap', handDisablePlayerTap);
     eventRef.current.on('refreshBottomLeft', refreshBottomLeft);
+    eventRef.current.on(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
     return () => {
       eventRef.current.off(startTimeToHideAllComponent, listenStart);
       eventRef.current.off(pauseTimeToHideAllComponent, listenPause);
@@ -480,6 +490,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       eventRef.current.off(hideAllComponent, listenHideEvent);
       eventRef.current.off('disablePlayerTap', handDisablePlayerTap);
       eventRef.current.off('refreshBottomLeft', refreshBottomLeft);
+      eventRef.current.off(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
       if (reGetOrientationTimer.current) {
         clearTimeout(reGetOrientationTimer.current);
         reGetOrientationTimer.current = null;
@@ -550,7 +561,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     devId: devId,
     onlineStatus: deviceOnline,
     isShare: isShare,
-    ignoreHideStopPreview: ignoreHideStopPreview,
+    ignoreHideStopPreview: ignoreStopOnHide,
+    onChangeIgnoreHideStopPreview: onChangeIgnoreHideStopPreview,
     ipcPlayerContext: instance.IPCPlayerInstance,
     onChangeStreamStatus: onChangeStreamStatus,
     onCtx: res => {

package/lib/widgets/voiceIntercom/voiceIntercom.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useRef, useContext, useState, useEffect } from 'react';
-import { View } from '@ray-js/ray';
+import { View, getSystemInfoSync } from '@ray-js/ray';
 import clsx from 'clsx';
 import Svg from '@ray-js/svg';
 import { useStore, getDefaultStore, updateAtom } from '../../ctx/store';
@@ -8,7 +8,7 @@ import './voiceIntercom.less';
 import { PlayerStreamStatus, IntercomMode, PlayState } from '../../interface';
 import { UIEventContext } from '../../ui/context';
 import { radialGradient } from '../../utils';
-import { startTimeToHideAllComponent, pauseTimeToHideAllComponent } from '../../ui/constant';
+import { startTimeToHideAllComponent, pauseTimeToHideAllComponent, changeIgnoreHideStopPreview } from '../../ui/constant';
 const NILL = () => null;
 export const VoiceIntercom = props => {
   const {
@@ -33,7 +33,6 @@ export const VoiceIntercom = props => {
   const [frame, setFrame] = useState(0);
   const talkingInterval = useRef(null);
   // 每帧间隔（ms）
-
   const {
     event
   } = useContext(UIEventContext);
@@ -60,9 +59,23 @@ export const VoiceIntercom = props => {
       console.log('PlayerStreamStatus not 1002');
       return;
     }
+    // 发送忽略进入后台停止预览的标记
+    const {
+      platform
+    } = getSystemInfoSync();
+    if (platform === 'ios') {
+      event.emit(changeIgnoreHideStopPreview, true);
+    }
     console.log('==== 开始对讲 =====');
     originMuteStatusBeforeVoice.current = _mute;
-    await setIntercom(true);
+    try {
+      await setIntercom(true);
+    } catch (e) {
+      console.error('setIntercom failed:', e);
+    } finally {
+      // 无论对讲成功与否，都取消忽略进入后台停止预览的标记, 但是会
+      // event.emit(changeIgnoreHideStopPreview, false);
+    }
     // 确定对讲有成功回调后，单向对讲判断开始对讲前需要静音
     // 确定对讲有成功回调后, 双路对讲开始对讲前需要打开拾音器
     const muteTarget = intercomMode === IntercomMode.OneWay;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -38,7 +38,7 @@
     "@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.26",
+    "@ray-js/ray-ipc-player": "^2.0.27",
     "@ray-js/ray-ipc-utils": "^1.1.10",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",