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

package/lib/i18n/index.d.ts

@@ -19,6 +19,7 @@ declare const Strings: kit.I18N<{
         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;
@@ -39,6 +40,7 @@ declare const Strings: kit.I18N<{
         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;
@@ -59,6 +61,7 @@ declare const Strings: kit.I18N<{
     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;
@@ -78,5 +81,6 @@ declare const Strings: kit.I18N<{
     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

@@ -18,6 +18,7 @@ declare const _default: {
         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;
@@ -38,6 +39,7 @@ declare const _default: {
         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

@@ -17,7 +17,8 @@ export default {
     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_error_record_tip: 'The recording has failed, please try again later.'
+    ipc_player_error_record_tip: 'The recording has failed, please try again later.',
+    ipc_player_change_resolution_success: '切换成功'
   },
   zh: {
     ipc_player_resolution_HD: '高清',
@@ -37,6 +38,7 @@ export default {
     ipc_player_no_album_permission: '您当前没有 相册/存储 的访问权限, 请在设置中打开此权限',
     ipc_player_authorize_cancel_text: '取消',
     ipc_player_authorize_confirm_text: '去设置',
-    ipc_player_error_record_tip: '录制出错了，请稍后再试'
+    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/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/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-53",
+  "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",