@ray-js/ipc-player-integration 0.0.1-beta-52 → 0.0.1-beta-54

package/lib/ctx/ctx.js

@@ -81,9 +81,7 @@ export const createUseCtx = _ref => {
       eventRef.current = getEventInstance();
     }
     useEffect(() => {
-      console.log('========================+++++');
       if (devId && _playState === PlayState.PLAYING) {
-        console.log('===================');
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
           console.log('==== getMemoryState ====', res);
@@ -223,30 +221,52 @@ export const createUseCtx = _ref => {
                   }
                 });
               },
-              fail: err => {
-                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');
-                      openAppSystemSettingPage({
-                        // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
-                        scope: 'App-Settings',
-                        success: () => {
-                          console.log('跳转成功');
+              fail: () => {
+                ty.authorize({
+                  // 麦克风权限
+                  scope: 'scope.record',
+                  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 => {
+                    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');
+                          openAppSystemSettingPage({
+                            // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                            scope: 'App-Settings',
+                            success: () => {
+                              console.log('跳转成功');
+                            }
+                          });
                         }
-                      });
-                    }
+                      }
+                    });
+                    reject(err);
                   }
                 });
-                reject(err);
               }
             });
           } else {
@@ -278,7 +298,7 @@ export const createUseCtx = _ref => {
         }
         return new Promise((resolve, reject) => {
           if (target) {
-            // 麦克风权限
+            // 写入相册
             ty.authorizeStatus({
               scope: 'scope.writePhotosAlbum',
               success: () => {
@@ -293,30 +313,46 @@ export const createUseCtx = _ref => {
                   }
                 });
               },
-              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');
-                      openAppSystemSettingPage({
-                        // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
-                        scope: 'App-Settings',
-                        success: () => {
-                          console.log('跳转成功');
+              fail: () => {
+                ty.authorize({
+                  scope: 'scope.writePhotosAlbum',
+                  success: () => {
+                    IPCPlayerInstance.current.startRecord({
+                      saveToAlbum,
+                      success: () => {
+                        updateAtom(recording, true);
+                        resolve(true);
+                      },
+                      fail: err => {
+                        reject(err);
+                      }
+                    });
+                  },
+                  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');
+                          openAppSystemSettingPage({
+                            // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                            scope: 'App-Settings',
+                            success: () => {
+                              console.log('跳转成功');
+                            }
+                          });
                         }
-                      });
-                    }
+                      }
+                    });
                   }
                 });
-                reject(err);
               }
             });
           } else {

package/lib/i18n/index.d.ts

@@ -18,6 +18,8 @@ declare const Strings: kit.I18N<{
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -37,6 +39,8 @@ declare const Strings: kit.I18N<{
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
 }, {
     ipc_player_resolution_HD: string;
@@ -56,6 +60,8 @@ declare const Strings: kit.I18N<{
     ipc_player_no_album_permission: string;
     ipc_player_authorize_cancel_text: string;
     ipc_player_authorize_confirm_text: string;
+    ipc_player_error_record_tip: string;
+    ipc_player_change_resolution_success: string;
 } | {
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
@@ -74,5 +80,7 @@ declare const Strings: kit.I18N<{
     ipc_player_no_album_permission: string;
     ipc_player_authorize_cancel_text: string;
     ipc_player_authorize_confirm_text: string;
+    ipc_player_error_record_tip: string;
+    ipc_player_change_resolution_success: string;
 }>;
 export default Strings;

package/lib/i18n/strings.d.ts

@@ -17,6 +17,8 @@ declare const _default: {
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -36,6 +38,8 @@ declare const _default: {
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
+        ipc_player_change_resolution_success: string;
     };
 };
 export default _default;

package/lib/i18n/strings.js

@@ -16,7 +16,9 @@ export default {
     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 or storage. Please enable this permission in the settings.',
     ipc_player_authorize_cancel_text: 'Cancel',
-    ipc_player_authorize_confirm_text: 'Go to Settings'
+    ipc_player_authorize_confirm_text: 'Go to Settings',
+    ipc_player_error_record_tip: 'The recording has failed, please try again later.',
+    ipc_player_change_resolution_success: '切换成功'
   },
   zh: {
     ipc_player_resolution_HD: '高清',
@@ -35,6 +37,8 @@ export default {
     ipc_player_no_record_permission: '您当前没有 麦克风 的访问权限, 请在设置中打开此权限',
     ipc_player_no_album_permission: '您当前没有 相册/存储 的访问权限, 请在设置中打开此权限',
     ipc_player_authorize_cancel_text: '取消',
-    ipc_player_authorize_confirm_text: '去设置'
+    ipc_player_authorize_confirm_text: '去设置',
+    ipc_player_error_record_tip: '录制出错了，请稍后再试',
+    ipc_player_change_resolution_success: '切换成功'
   }
 };

package/lib/plugins/fullScreen/fullScreen.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useContext } from 'react';
-import { View, setPageOrientation, Text } from '@ray-js/ray';
+import { View, setPageOrientation, Text, hideMenuButton, showMenuButton, showStatusBar, hideStatusBar, setNavigationBarBack } from '@ray-js/ray';
 import { useUpdateEffect } from 'ahooks';
 import clsx from 'clsx';
 import { unstable_batchedUpdates as batchedUpdates } from '@ray-core/ray';
@@ -42,9 +42,9 @@ export function FullScreen(props) {
    */
   const handleFull = () => {
     hasDpCode(devId, DIRECTION_CONTROL_DP_CODE).then(hasDirectionControlDpCode => {
-      ty.hideMenuButton();
-      ty.hideStatusBar();
-      ty.setNavigationBarBack({
+      hideMenuButton();
+      hideStatusBar();
+      setNavigationBarBack({
         type: 'custom'
       });
       batchedUpdates(() => {
@@ -95,11 +95,11 @@ export function FullScreen(props) {
     },
     vertical: () => {
       event.emit(pauseTimeToHideAllComponent);
-      ty.setNavigationBarBack({
+      setNavigationBarBack({
         type: 'system'
       });
-      ty.showMenuButton();
-      ty.showStatusBar();
+      showMenuButton();
+      showStatusBar();
       deleteContent('topLeft', verticalScreenId);
       deleteContent('absolute', voiceIntercomId);
       deleteContent('absolute', ptzControlId);
@@ -111,13 +111,21 @@ export function FullScreen(props) {
     var _handlers$screenType;
     (_handlers$screenType = handlers[screenType]) === null || _handlers$screenType === void 0 || _handlers$screenType.call(handlers);
   }, [screenType]);
+
+  // 点击事件处理函数
   const handClick = target => {
+    // 根据target的值设置pageOrientation的值
     const pageOrientation = target === 'vertical' ? 'portrait' : 'landscape';
+    // 发射事件
     event.emit(pauseTimeToHideAllComponent);
+    // 设置screenType的值
+    setScreenType(target);
+    // 设置pageOrientation的值
     setPageOrientation({
       pageOrientation,
       success: () => {
-        setScreenType(target);
+        // 忽略横屏
+        // setScreenType(target);
       }
     });
   };

package/lib/plugins/fullScreen/fullScreen.less

@@ -12,7 +12,7 @@
   top: 50%;
   transform: translate(0, -50%);
   // transform: translate(180%, 0);
-  right: calc(36px * var(--ipc-player-size-scale, 1));
+  right: calc(50px * var(--ipc-player-size-scale, 1));
   z-index: 340;
 }
 

package/lib/plugins/recordVideo/recordVideo.js

@@ -82,7 +82,8 @@ export function RecordVideo(props) {
     setRecording,
     setRecordingDisabled,
     devId,
-    className
+    className,
+    toast
   } = props;
   const {
     recording,
@@ -260,10 +261,15 @@ export function RecordVideo(props) {
     } catch (err) {
       console.log('录制失败', err);
       if ((err === null || err === void 0 ? void 0 : err.errorCode) === 7) {
-        ty.showToast({
-          icon: 'none',
+        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
+        });
       }
       setState({
         showTimer: false

package/lib/plugins/resolution/fullResolutionControl.js

@@ -1,7 +1,7 @@
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import React, { useCallback, useState, useContext, useEffect } from 'react';
-import { Text, View } from '@ray-js/ray';
+import { Text, View, showToast } from '@ray-js/ray';
 import clsx from 'clsx';
 import Strings from '../../i18n';
 import { useMemoizedFn } from '../../hooks';
@@ -44,15 +44,19 @@ export const FullResolutionControl = props => {
   }, []);
   const changeResolution = useCallback(value => {
     if (value === resolution) {
-      ty.showToast({
+      showToast({
         icon: 'none',
         title: Strings.getLang('ipc_player_current_resolution_is_equal')
       });
     } else {
       setResolution(value).then(() => {
+        showToast({
+          icon: 'none',
+          title: Strings.getLang('ipc_player_change_resolution_success')
+        });
         setHide(true);
       }).catch(() => {
-        ty.showToast({
+        showToast({
           icon: 'error',
           title: Strings.getLang('ipc_player_resolution_change_error')
         });

package/lib/plugins/screenshot/screenshot.js

@@ -131,25 +131,51 @@ export function Screenshot(props) {
         });
       },
       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');
-              openAppSystemSettingPage({
-                scope: 'App-Settings',
-                success: () => {
-                  console.log('跳转成功');
+        ty.authorize({
+          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: () => {
+            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');
+                  openAppSystemSettingPage({
+                    scope: 'App-Settings',
+                    success: () => {
+                      console.log('跳转成功');
+                    }
+                  });
                 }
-              });
-            }
+              }
+            });
           }
         });
       }

package/lib/ui/topLeftContent.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { CoverView, View } from '@ray-js/ray';
 import clsx from 'clsx';
 import { useStore } from '../ctx/store';
-import { useComponentHideState } from './hooks';
 const TopLeftContent = _ref => {
   let {
     ctx,
@@ -14,7 +13,6 @@ const TopLeftContent = _ref => {
     screenType: ctx.screenType,
     playState: ctx.playState
   });
-  const [shouldHide] = useComponentHideState();
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-top-left-content-wrap'),
     style: {
@@ -25,10 +23,7 @@ const TopLeftContent = _ref => {
       paddingTop: screenType === 'vertical' ? '12px' : '16px',
       paddingLeft: screenType === 'vertical' ? 0 : '25px'
     },
-    className: clsx('ipc-player-top-left-content-container', {
-      // 'ipc-player-top-left-content-hide': shouldHide,
-      // 'ipc-player-top-left-content-show': !shouldHide,
-    })
+    className: clsx('ipc-player-top-left-content-container')
   }, children));
 };
 export default /*#__PURE__*/React.memo(TopLeftContent);

package/lib/ui/ui.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
-import React, { useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
+import React, { useContext, useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
 import { View, CoverView, getSystemInfoSync, usePageEvent } from '@ray-js/ray';
 import clsx from 'clsx';
 import IPCPlayer from '@ray-js/ray-ipc-player';
@@ -54,6 +54,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     onPlayerTap,
     extend = {}
   } = props;
+  const {
+    event
+  } = useContext(UIEventContext);
   const instance = getCtxInstance(props.instance, devId);
   const {
     setPlayState,
@@ -70,6 +73,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     这里用一个统一的状态标志期望控件是否展示
   */
   const [componentHideState, setComponentHideState] = useState(false);
+  const [showRightContent, setShowRightContent] = useState(true);
   prevTriggerEvent.current = componentHideState ? hideAllComponent : showAllComponent;
   const eventRef = useRef(instance.event);
   if (eventRef.current !== instance.event) {
@@ -81,6 +85,13 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setBrandColor(brandColor);
     setVerticalMic(verticalMic);
   }, []);
+  const refreshBottomLeft = value => {
+    console.log(value, '++++++++++++++----sadbjasbdjbsj');
+    event.current.emit(startTimeToHideAllComponent);
+    event.current.emit(showAllComponent);
+    event.current.emit(playerTap);
+    setShowRightContent(value);
+  };
 
   /**
    * 监听屏幕布局变化
@@ -241,15 +252,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     eventRef.current.on(showAllComponent, listenShowEvent);
     eventRef.current.on(hideAllComponent, listenHideEvent);
     eventRef.current.on('disablePlayerTap', handDisablePlayerTap);
+    eventRef.current.on('refreshBottomLeft', refreshBottomLeft);
     return () => {
       eventRef.current.off(startTimeToHideAllComponent, listenStart);
       eventRef.current.off(pauseTimeToHideAllComponent, listenPause);
       eventRef.current.off(showAllComponent, listenShowEvent);
       eventRef.current.off(hideAllComponent, listenHideEvent);
       eventRef.current.off('disablePlayerTap', handDisablePlayerTap);
+      eventRef.current.off('refreshBottomLeft', refreshBottomLeft);
     };
   }, []);
-  const playerReady = playState === PlayState.PLAYING;
+  playState === PlayState.PLAYING;
   return /*#__PURE__*/React.createElement(UIEventContext.Provider, {
     value: {
       event: eventRef.current,
@@ -336,7 +349,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ctx: instance
   }, renderBottomLeftContent), /*#__PURE__*/React.createElement(BottomRightContent, {
     ctx: instance
-  }, renderBottomRightContent)), playerReady && (() => {
+  }, renderBottomRightContent)), (() => {
     if (!absoluteContent || !(absoluteContent !== null && absoluteContent !== void 0 && absoluteContent.length)) return null;
     return absoluteContent.map(item => {
       if (item.hidden) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-52",
+  "version": "0.0.1-beta-54",
   "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-10",
+    "@ray-js/ray-ipc-player": "2.0.20-beta-12",
     "@ray-js/ray-ipc-utils": "1.1.0-beta-15",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",