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

package/lib/ctx/ctx.js

@@ -251,8 +251,7 @@ export const createUseCtx = _ref => {
             ty.authorizeStatus({
               // 麦克风权限
               scope: 'scope.record',
-              success: success => {
-                console.log(success, 'success');
+              success: () => {
                 eventRef.current.emit(changeIgnoreHideStopPreview, false);
                 IPCPlayerInstance.current.startTalk({
                   success: () => {
@@ -271,20 +270,18 @@ export const createUseCtx = _ref => {
                 });
               },
               fail: () => {
-                console.log('失败回调');
+                console.log('authorizeStatus失败回调');
                 ty.authorize({
                   // 麦克风权限
                   scope: 'scope.record',
                   success: () => {
-                    console.log('我不知道你是个什么玩意');
+                    console.log('authorize成功回调');
                     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({
@@ -295,8 +292,6 @@ export const createUseCtx = _ref => {
                     });
                   },
                   fail: err => {
-                    console.log('我不知道你是说什么');
-                    // eventRef.current.emit(changeIgnoreHideStopPreview, false);
                     showModal({
                       title: '',
                       content: Strings.getLang('ipc_player_no_record_permission'),
@@ -352,6 +347,7 @@ export const createUseCtx = _ref => {
           toast({
             title: Strings.getLang('ipc_player_recording_now_tip')
           });
+          eventRef.current.emit(changeIgnoreHideStopPreview, false);
           return false;
         }
         return new Promise((resolve, reject) => {
@@ -360,6 +356,7 @@ export const createUseCtx = _ref => {
             ty.authorizeStatus({
               scope: 'scope.writePhotosAlbum',
               success: () => {
+                eventRef.current.emit(changeIgnoreHideStopPreview, false);
                 IPCPlayerInstance.current.startRecord({
                   saveToAlbum,
                   success: () => {
@@ -367,6 +364,7 @@ export const createUseCtx = _ref => {
                     resolve(true);
                   },
                   fail: err => {
+                    eventRef.current.emit(changeIgnoreHideStopPreview, false);
                     reject(err);
                   }
                 });

package/lib/widgets/recordVideo/recordVideo.js

@@ -1,12 +1,12 @@
 import React, { useState, useEffect, useRef, useContext } from 'react';
-import { View, Text, Image } from '@ray-js/ray';
+import { View, Text, Image, getSystemInfoSync } from '@ray-js/ray';
 import { useSetState, useUpdateEffect } from 'ahooks';
 import clsx from 'clsx';
 import { goToIpcPageNativeRoute } 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 { pauseTimeToHideAllComponent, changeIgnoreHideStopPreview } from '../../ui/constant';
 import { useStore, getDefaultStore } from '../../ctx/store';
 import './recordVideo.less';
 const CLOSE_TIME = 5000;
@@ -242,6 +242,13 @@ export function RecordVideo(props) {
         showShot: false
       });
     }
+    // 发送忽略进入后台停止预览的标记
+    const {
+      platform
+    } = getSystemInfoSync();
+    if (platform === 'ios') {
+      props.event ? props === null || props === void 0 ? void 0 : props.event.emit(changeIgnoreHideStopPreview, true) : event === null || event === void 0 ? void 0 : event.emit(changeIgnoreHideStopPreview, true);
+    }
     try {
       const recordInfo = await setRecording(target);
       if (target) {

package/lib/widgets/screenshot/screenshot.js

@@ -1,12 +1,12 @@
 import React, { useContext, useRef } from 'react';
-import { View, Image, Text, showModal, openAppSystemSettingPage } from '@ray-js/ray';
+import { View, Image, Text, showModal, openAppSystemSettingPage, getSystemInfoSync } from '@ray-js/ray';
 import { useSetState, useUpdateEffect, useMemoizedFn } from 'ahooks';
 import clsx from 'clsx';
 import { goToIpcPageNativeRoute } from '@ray-js/ray-ipc-utils';
 import Strings from '../../i18n';
 import { useStore } from '../../ctx/store';
 import { UIEventContext } from '../../ui/context';
-import { pauseTimeToHideAllComponent } from '../../ui/constant';
+import { pauseTimeToHideAllComponent, changeIgnoreHideStopPreview } from '../../ui/constant';
 import './screenshot.less';
 const CLOSE_TIME = 5000;
 export function Screenshot(props) {
@@ -106,11 +106,18 @@ export function Screenshot(props) {
     setState({
       showShot: false
     });
+    const {
+      platform
+    } = getSystemInfoSync();
+    if (platform === 'ios') {
+      props.event ? props.event.emit(changeIgnoreHideStopPreview, true) : event.emit(changeIgnoreHideStopPreview, true);
+    }
     event.emit(pauseTimeToHideAllComponent);
     ty.authorizeStatus({
       // 相册写入权限
       scope: 'scope.writePhotosAlbum',
       success: () => {
+        props.event ? props.event.emit(changeIgnoreHideStopPreview, true) : event.emit(changeIgnoreHideStopPreview, false);
         IPCPlayerContext.snapshot({
           saveToAlbum,
           // 保存到 IPC 相册
@@ -122,6 +129,7 @@ export function Screenshot(props) {
             });
           },
           fail: err => {
+            props.event ? props.event.emit(changeIgnoreHideStopPreview, true) : event.emit(changeIgnoreHideStopPreview, false);
             console.log(err, 'err');
             const errObj = err.innerError || err || {};
             const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');

package/lib/widgets/voiceIntercom/voiceIntercom.js

@@ -64,7 +64,7 @@ export const VoiceIntercom = props => {
       platform
     } = getSystemInfoSync();
     if (platform === 'ios') {
-      event.emit(changeIgnoreHideStopPreview, true);
+      props.event ? props.event.emit(changeIgnoreHideStopPreview, true) : event.emit(changeIgnoreHideStopPreview, true);
     }
     console.log('==== 开始对讲 =====');
     originMuteStatusBeforeVoice.current = _mute;
@@ -72,9 +72,6 @@ export const VoiceIntercom = props => {
       await setIntercom(true);
     } catch (e) {
       console.error('setIntercom failed:', e);
-    } finally {
-      // 无论对讲成功与否，都取消忽略进入后台停止预览的标记, 但是会
-      // event.emit(changeIgnoreHideStopPreview, false);
     }
     // 确定对讲有成功回调后，单向对讲判断开始对讲前需要静音
     // 确定对讲有成功回调后, 双路对讲开始对讲前需要打开拾音器

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [