@ray-js/ipc-player-integration 0.0.1-beta-43 → 0.0.1-beta-45

package/lib/ctx/ctx.js

@@ -3,6 +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 Strings from '../i18n';
 import { useAtom, updateAtom, getDefaultStore, useStore } from './store';
 import { PlayState, IntercomMode } from '../interface';
@@ -202,18 +203,49 @@ export const createUseCtx = _ref => {
         if (!target && target === _intercom) return true;
         return new Promise((resolve, reject) => {
           if (target) {
-            IPCPlayerInstance.current.startTalk({
-              success: () => {
-                updateAtom(intercom, true);
-                resolve(true);
+            ty.authorizeStatus({
+              // 麦克风权限
+              scope: 'scope.record',
+              success: success => {
+                console.log(success, 'success');
+                IPCPlayerInstance.current.startTalk({
+                  success: () => {
+                    updateAtom(intercom, true);
+                    resolve(true);
+                  },
+                  fail: err => {
+                    const errObj = err.innerError || err || {};
+                    const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_intercom');
+                    toast({
+                      title: errMsg
+                    });
+                    reject(err);
+                  }
+                });
               },
               fail: err => {
-                reject(err);
-                const errObj = err.innerError || err || {};
-                const errMsg = errObj.errorMsg || I18n.t('error_intercom');
-                toast({
-                  title: errMsg
+                showModal({
+                  title: '',
+                  content: Strings.getLang('ipc_player_no_record_permission'),
+                  cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
+                  confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
+                  isShowGlobal: true,
+                  success: res => {
+                    if (res.confirm) {
+                      const {
+                        platform
+                      } = getSystemInfoSync();
+                      console.log(platform, 'platform');
+                      openSystemSettingPage({
+                        scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                        success: () => {
+                          console.log('跳转成功');
+                        }
+                      });
+                    }
+                  }
                 });
+                reject(err);
               }
             });
           } else {
@@ -244,13 +276,43 @@ export const createUseCtx = _ref => {
         }
         return new Promise((resolve, reject) => {
           if (target) {
-            IPCPlayerInstance.current.startRecord({
-              saveToAlbum,
+            // 麦克风权限
+            ty.authorizeStatus({
+              scope: 'scope.writePhotosAlbum',
               success: () => {
-                updateAtom(recording, true);
-                resolve(true);
+                IPCPlayerInstance.current.startRecord({
+                  saveToAlbum,
+                  success: () => {
+                    updateAtom(recording, true);
+                    resolve(true);
+                  },
+                  fail: err => {
+                    reject(err);
+                  }
+                });
               },
               fail: err => {
+                showModal({
+                  title: '',
+                  content: Strings.getLang('ipc_player_no_album_permission'),
+                  cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
+                  confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
+                  isShowGlobal: true,
+                  success: res => {
+                    if (res.confirm) {
+                      const {
+                        platform
+                      } = getSystemInfoSync();
+                      console.log(platform, 'platform');
+                      openSystemSettingPage({
+                        scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                        success: () => {
+                          console.log('跳转成功');
+                        }
+                      });
+                    }
+                  }
+                });
                 reject(err);
               }
             });

package/lib/i18n/index.d.ts

@@ -12,6 +12,12 @@ declare const Strings: kit.I18N<{
         ipc_player_recording_now_tip: string;
         ipc_player_stop_recording_err: string;
         ipc_player_resolution_change_error: string;
+        ipc_player_require_record_permission: string;
+        ipc_player_error_intercom: string;
+        ipc_player_no_record_permission: string;
+        ipc_player_no_album_permission: string;
+        ipc_player_authorize_cancel_text: string;
+        ipc_player_authorize_confirm_text: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -25,6 +31,12 @@ declare const Strings: kit.I18N<{
         ipc_player_recording_now_tip: string;
         ipc_player_stop_recording_err: string;
         ipc_player_resolution_change_error: string;
+        ipc_player_require_record_permission: string;
+        ipc_player_error_intercom: string;
+        ipc_player_no_record_permission: string;
+        ipc_player_no_album_permission: string;
+        ipc_player_authorize_cancel_text: string;
+        ipc_player_authorize_confirm_text: string;
     };
 }, {
     ipc_player_resolution_HD: string;
@@ -38,6 +50,12 @@ declare const Strings: kit.I18N<{
     ipc_player_recording_now_tip: string;
     ipc_player_stop_recording_err: string;
     ipc_player_resolution_change_error: string;
+    ipc_player_require_record_permission: string;
+    ipc_player_error_intercom: string;
+    ipc_player_no_record_permission: string;
+    ipc_player_no_album_permission: string;
+    ipc_player_authorize_cancel_text: string;
+    ipc_player_authorize_confirm_text: string;
 } | {
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
@@ -50,5 +68,11 @@ declare const Strings: kit.I18N<{
     ipc_player_recording_now_tip: string;
     ipc_player_stop_recording_err: string;
     ipc_player_resolution_change_error: string;
+    ipc_player_require_record_permission: string;
+    ipc_player_error_intercom: string;
+    ipc_player_no_record_permission: string;
+    ipc_player_no_album_permission: string;
+    ipc_player_authorize_cancel_text: string;
+    ipc_player_authorize_confirm_text: string;
 }>;
 export default Strings;

package/lib/i18n/strings.d.ts

@@ -11,6 +11,12 @@ declare const _default: {
         ipc_player_recording_now_tip: string;
         ipc_player_stop_recording_err: string;
         ipc_player_resolution_change_error: string;
+        ipc_player_require_record_permission: string;
+        ipc_player_error_intercom: string;
+        ipc_player_no_record_permission: string;
+        ipc_player_no_album_permission: string;
+        ipc_player_authorize_cancel_text: string;
+        ipc_player_authorize_confirm_text: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -24,6 +30,12 @@ declare const _default: {
         ipc_player_recording_now_tip: string;
         ipc_player_stop_recording_err: string;
         ipc_player_resolution_change_error: string;
+        ipc_player_require_record_permission: string;
+        ipc_player_error_intercom: string;
+        ipc_player_no_record_permission: string;
+        ipc_player_no_album_permission: string;
+        ipc_player_authorize_cancel_text: string;
+        ipc_player_authorize_confirm_text: string;
     };
 };
 export default _default;

package/lib/i18n/strings.js

@@ -10,7 +10,13 @@ export default {
     ipc_player_record_success_check: 'View',
     ipc_player_recording_now_tip: 'Recording in progress...',
     ipc_player_stop_recording_err: 'Failed to stop recording. Please exit and try again.',
-    ipc_player_resolution_change_error: 'Switch failed, check device and network.'
+    ipc_player_resolution_change_error: 'Switch failed, check device and network.',
+    ipc_player_require_record_permission: 'Recording permission is not enabled. Please go to the app settings to enable it.',
+    ipc_player_error_intercom: 'Intercom activation failed.',
+    ipc_player_no_record_permission: 'The microphone permission is not enabled. Please go to the app settings to enable it first.',
+    ipc_player_no_album_permission: 'You currently do not have access to the album. Please enable this permission in the settings.',
+    ipc_player_authorize_cancel_text: 'Cancel',
+    ipc_player_authorize_confirm_text: 'Go to Settings'
   },
   zh: {
     ipc_player_resolution_HD: '高清',
@@ -23,6 +29,12 @@ export default {
     ipc_player_record_success_check: '查看',
     ipc_player_recording_now_tip: '正在录像中...',
     ipc_player_stop_recording_err: '结束录像失败，请退出重试',
-    ipc_player_resolution_change_error: '切换失败,请检查设备及网络状态'
+    ipc_player_resolution_change_error: '切换失败,请检查设备及网络状态',
+    ipc_player_require_record_permission: '录制权限未开启，请先前往应用设置进行开启',
+    ipc_player_error_intercom: '对讲开启失败',
+    ipc_player_no_record_permission: '您当前没有 麦克风 的访问权限, 请在设置中打开此权限',
+    ipc_player_no_album_permission: '您当前没有 相册 的访问权限, 请在设置中打开此权限',
+    ipc_player_authorize_cancel_text: '取消',
+    ipc_player_authorize_confirm_text: '去设置'
   }
 };

package/lib/plugins/recordVideo/recordVideo.js

@@ -221,20 +221,33 @@ export function RecordVideo(props) {
         showShot: false
       });
     }
-    const recordInfo = await setRecording(target);
-    console.log(recordInfo, 'recordInfo====');
-    if (target) {
-      setRecordingDisabled(true);
-      setState({
-        showTimer: true
-      });
-      /** 录制开始后3秒后才可结束 */
-      timeToResetRecordDisabled();
-    } else {
+    try {
+      const recordInfo = await setRecording(target);
+      console.log(recordInfo, 'recordInfo====');
+      if (target) {
+        setRecordingDisabled(true);
+        setState({
+          showTimer: true
+        });
+        /** 录制开始后3秒后才可结束 */
+        timeToResetRecordDisabled();
+      } else {
+        setState({
+          showTimer: false,
+          showShot: true,
+          shotUrl: recordInfo.tempImagePath
+        });
+      }
+    } catch (err) {
+      console.log('录制失败', err);
+      if ((err === null || err === void 0 ? void 0 : err.errorCode) === 7) {
+        ty.showToast({
+          icon: 'none',
+          title: Strings.getLang('ipc_player_require_record_permission')
+        });
+      }
       setState({
-        showTimer: false,
-        showShot: true,
-        shotUrl: recordInfo.tempImagePath
+        showTimer: false
       });
     }
     return true;

package/lib/plugins/screenshot/screenshot.js

@@ -1,5 +1,5 @@
 import React, { useContext, useRef } from 'react';
-import { View, Image, Text } from '@ray-js/ray';
+import { View, Image, Text, showModal, openSystemSettingPage, getSystemInfoSync } from '@ray-js/ray';
 import { useSetState, useUpdateEffect, useMemoizedFn } from 'ahooks';
 import clsx from 'clsx';
 import IpcUtils from '@ray-js/ray-ipc-utils';
@@ -106,21 +106,51 @@ export function Screenshot(props) {
       showShot: false
     });
     event.emit(pauseTimeToHideAllComponent);
-    IPCPlayerContext.snapshot({
-      saveToAlbum,
-      // 保存到 IPC 相册
-      success: res => {
-        console.log(res, 'res');
-        setState({
-          showShot: true,
-          shotUrl: res.tempImagePath
+    ty.authorizeStatus({
+      // 相册写入权限
+      scope: 'scope.writePhotosAlbum',
+      success: () => {
+        IPCPlayerContext.snapshot({
+          saveToAlbum,
+          // 保存到 IPC 相册
+          success: res => {
+            console.log(res, 'res');
+            setState({
+              showShot: true,
+              shotUrl: res.tempImagePath
+            });
+          },
+          fail: err => {
+            console.log(err, 'err');
+            const errObj = err.innerError || err || {};
+            const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
+            toast({
+              title: errMsg
+            });
+          }
         });
       },
-      fail: err => {
-        const errObj = err.innerError || err || {};
-        const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
-        toast({
-          title: errMsg
+      fail: () => {
+        showModal({
+          title: '',
+          content: Strings.getLang('ipc_player_no_album_permission'),
+          cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
+          confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
+          isShowGlobal: true,
+          success: res => {
+            if (res.confirm) {
+              const {
+                platform
+              } = getSystemInfoSync();
+              console.log(platform, 'platform');
+              openSystemSettingPage({
+                scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                success: () => {
+                  console.log('跳转成功');
+                }
+              });
+            }
+          }
         });
       }
     });

package/lib/plugins/voiceIntercom/voiceIntercom.js

@@ -59,14 +59,14 @@ export const VoiceIntercom = props => {
     }
     console.log('==== 开始对讲 =====');
     originMuteStatusBeforeVoice.current = _mute;
-    // 单路对讲，开始对讲前需要静音
-    // 双路对讲，开始对讲前需要打开拾音器
+    await setIntercom(true);
+    // 确定对讲有成功回调后，单向对讲判断开始对讲前需要静音
+    // 确定对讲有成功回调后, 双路对讲开始对讲前需要打开拾音器
     const muteTarget = intercomMode === IntercomMode.OneWay;
     if (_mute !== muteTarget) {
       console.log(`=== 切换静音状态： ${_mute}`, `${intercomMode}`);
       await setMute(muteTarget);
     }
-    await setIntercom(true);
     event.emit(pauseTimeToHideAllComponent);
   };
   const endVoice = async () => {

package/lib/ui/ui.js

@@ -92,8 +92,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
         platform,
         deviceType
       } = systemInfo.current;
-      // ios pad 暂不支持横屏，且在pad模式下 会触发onResize事件, 待解决
-      if (platform === 'ios' && deviceType === 'pad') {
+      //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
+      if (deviceType === 'pad') {
         setScreenType('vertical');
       } else {
         setScreenType(type === 'landscape' ? 'full' : 'vertical');

package/package.json

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