@ray-js/ipc-player-integration 0.0.1-beta-29 → 0.0.1-beta-31

package/lib/plugins/fullScreen/fullScreen.js

@@ -85,6 +85,7 @@ export function FullScreen(props) {
       deleteContent('absolute', fullResolutionId);
       // 还原Ptz点击状态值
       setPtzActive(false);
+      console.log('_________dshadhsah');
       // 还原全屏清晰度状态值
       setFullResolutionActive(false);
     }

package/lib/plugins/fullScreen/verticalScreen.js

@@ -8,10 +8,12 @@ export function VerticalScreen(_ref) {
     onClick = NILL,
     className
   } = _ref;
-  console.log(className, 'className');
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(className),
-    onClick: onClick
+    onClick: onClick,
+    style: {
+      paddingRight: '10px'
+    }
   }, /*#__PURE__*/React.createElement(Text, {
     className: clsx('icon-panel', 'icon-panel-left-arrow', 'ipc-player-plugin-vertical-screen-icon')
   }));

package/lib/plugins/resolution/fullResolutionControl.js

@@ -1,18 +1,15 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import { Text, View } from '@ray-js/ray';
 import clsx from 'clsx';
 import Strings from '../../i18n';
 import { useComponentHideState } from '../../ui/hooks';
-import { UIEventContext } from '../../ui/context';
 import { useStore } from '../../ctx/store';
-import { startTimeToHideAllComponent, pauseTimeToHideAllComponent } from '../../ui/constant';
 import './resolution.less';
 export const FullResolutionControl = props => {
   const {
     setResolution,
     setFullResolutionActive
   } = props;
-  console.log(props, 'props========');
   const {
     screenType,
     fullResolutionActive,
@@ -27,10 +24,8 @@ export const FullResolutionControl = props => {
     resolution: props.resolution
   });
   const [shouldHide] = useComponentHideState(screenType);
-  const {
-    event
-  } = useContext(UIEventContext);
   const changeResolution = value => {
+    console.log('________', value);
     if (value === resolution) {
       ty.showToast({
         icon: 'none',

package/lib/plugins/resolution/resolution.js

@@ -31,6 +31,9 @@ export const Resolution = props => {
   return /*#__PURE__*/React.createElement(View, {
     onClick: () => {
       if (screenType === 'full') {
+        console.log('dsakdhjksahdhsadsahdkhskahdkshk');
+        // 更改全屏清晰度展开状态
+        setFullResolutionActive(true);
         // 移除全屏清晰度空间
         deleteContent('absolute', fullResolutionId);
         // 添加全屏清晰度空间
@@ -42,7 +45,6 @@ export const Resolution = props => {
           absoluteContentClassName: 'ipc-player-plugin-full-resolution-control-wrap',
           initProps: _objectSpread({}, props)
         });
-        setFullResolutionActive(true);
         event.emit(pauseTimeToHideAllComponent);
         return false;
       }

package/lib/plugins/voiceIntercom/voiceIntercom.less

@@ -2,9 +2,9 @@
 
 .ipc-player-plugin-voice-intercom {
   background: var(--ipc-player-plugin-voice-bg, radial-gradient(77% 77% at 34% 28%, #FF997C 0%, #FF592A 99%));
-  width: 100%;
-  height: 100%;
-  border-radius:50%;
+  width: calc(72px * var(--ipc-player-size-scale, 1));
+  height: calc(72px * var(--ipc-player-size-scale, 1));
+  border-radius: 50%;
   display: flex;
   justify-content: center;
   align-items: center;

package/lib/ui/ui.js

@@ -36,7 +36,7 @@ const defaultCSSVariable = {
   '--fontColor': '#fff',
   '--fontSize': '12px'
 };
-const HIDE_COMPONENT_TIME = 5000;
+const HIDE_COMPONENT_TIME = 10000;
 export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   const {
     className,
@@ -172,31 +172,11 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 视频流加载状态封装
    */
 
-  const handPlayerTap = useCallback(data => {
-    console.log('res===on onVideoTap', data);
-    const store = getDefaultStore();
-    const _screenType = store.get(instance.screenType);
-    eventRef.current.emit(playerTap);
-    // if (_screenType === 'full') {
-    // 如果全屏清晰度展开, 则点击关闭全屏清晰度, 展示所有组件
-    if (fullResolutionActive && _screenType === 'full') {
-      setFullResolutionActive(false);
-      // 展示相应菜单启动自动隐藏定时
-      triggerEvent(showAllComponent);
-      // event.emit(startTimeToHideAllComponent);
-      return false;
-    }
-    console.log(prevTriggerEvent.current, 'prevTriggerEvent.current');
-    if (prevTriggerEvent.current === hideAllComponent) {
-      triggerEvent(showAllComponent);
-    } else {
-      triggerEvent(hideAllComponent);
-    }
-    return false;
-  }, [fullResolutionActive]);
   const triggerEvent = type => {
-    const store = getDefaultStore();
-    store.get(instance.screenType); // if (prevTriggerEvent.current === type || _screenType === 'vertical') return;
+    getDefaultStore();
+    console.log('_______Dsahdjashjdhsjah');
+    // const _screenType = store.get(instance.screenType);
+    // if (prevTriggerEvent.current === type || _screenType === 'vertical') return;
     if (prevTriggerEvent.current === type) return;
     if (timer.current) {
       clearTimeout(timer.current);
@@ -212,6 +192,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     prevTriggerEvent.current = type;
   };
   const listenStart = useCallback(() => {
+    timer.current && clearTimeout(timer.current);
+    // 重新开始计时
     if (!timer.current) {
       // @ts-ignore
       timer.current = setTimeout(() => {
@@ -220,7 +202,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     }
   }, []);
   const listenPause = useCallback(() => {
-    clearTimeout(timer.current);
+    timer.current && clearTimeout(timer.current);
     timer.current = null;
   }, []);
   useEffect(() => {
@@ -290,7 +272,28 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     },
     clarity: resolution === 'HD' ? 'hd' : 'normal',
     privateState: privateState,
-    onPlayerTap: handPlayerTap // 对应原来的onVideoTap
+    onPlayerTap: data => {
+      console.log('res===on onVideoTap', data);
+      const store = getDefaultStore();
+      const _screenType = store.get(instance.screenType);
+      const _fullResolutionActive = store.get(instance.fullResolutionActive);
+      eventRef.current.emit(playerTap);
+      // 如果全屏清晰度展开, 则点击关闭全屏清晰度, 展示所有组件
+      if (_fullResolutionActive && _screenType === 'full') {
+        setFullResolutionActive(false);
+        // 展示相应菜单启动自动隐藏定时
+        triggerEvent(showAllComponent);
+        event.emit(startTimeToHideAllComponent);
+        return false;
+      }
+      console.log(prevTriggerEvent.current, 'prevTriggerEvent.current');
+      if (prevTriggerEvent.current === hideAllComponent) {
+        triggerEvent(showAllComponent);
+      } else {
+        triggerEvent(hideAllComponent);
+      }
+      return false;
+    } // 对应原来的onVideoTap
   }), /*#__PURE__*/React.createElement(TopLeftContent, {
     ctx: instance
   }, renderTopLeftContent), /*#__PURE__*/React.createElement(TopRightContent, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-29",
+  "version": "0.0.1-beta-31",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [
@@ -35,8 +35,8 @@
   "dependencies": {
     "@ray-js/ipc-ptz-zoom": "0.0.2-beta-4",
     "@ray-js/panel-sdk": "^1.13.1",
-    "@ray-js/ray-ipc-player": "2.0.20-beta-4",
-    "@ray-js/ray-ipc-utils": "1.1.0-beta-12",
+    "@ray-js/ray-ipc-player": "2.0.20-beta-5",
+    "@ray-js/ray-ipc-utils": "1.1.0-beta-13",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
     "jotai": "^2.10.2"