@ray-js/ipc-player-integration 0.0.1-beta-57 → 0.0.1-beta-59

package/lib/plugins/fullScreen/fullVoiceIntercom.js

@@ -43,7 +43,7 @@ export function FullVoiceIntercom(props) {
   }
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-full-screen-voice', {
-      'ipc-player-plugin-full-screen-voice-hide': shouldHide || isPtzActive,
+      'ipc-player-plugin-full-screen-voice-hide': isPtzActive || shouldHide,
       'ipc-player-plugin-full-screen-voice-disappear': screenType === 'vertical'
     })
   }, /*#__PURE__*/React.createElement(VoiceIntercom, _extends({}, props, {

package/lib/plugins/ptz/ptz.js

@@ -2,6 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
 import React, { useEffect, useState, useContext } from 'react';
+import { useMemoizedFn } from 'ahooks';
 import { UIEventContext } from '../../ui/context';
 import { usePtz } from '../../hooks';
 import { useStore } from '../../ctx/store';
@@ -14,6 +15,7 @@ export const Ptz = props => {
     screenType: screenTypeAtom,
     addContent,
     deleteContent,
+    hasContent,
     showContent,
     hideContent,
     className,
@@ -37,14 +39,12 @@ export const Ptz = props => {
       setIsPtzActive(false);
     }
   }, [screenType]);
-  if (screenType === 'vertical' || !supportPtz) {
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(View, {
-    className: clsx(className),
-    onClick: () => {
-      if (!isPtzActive) {
-        showContent('bottomLeft', 'FullSmallIntercom');
+  const onPtz = useMemoizedFn(() => {
+    console.log(isPtzActive, 'isPtzActive');
+    console.log(hasContent('absolute', ptzControlId), 'hasContent');
+    if (!isPtzActive) {
+      showContent('bottomLeft', 'FullSmallIntercom');
+      if (!hasContent('absolute', ptzControlId)) {
         // 添加ptz空间
         addContent('absolute', {
           id: ptzControlId,
@@ -54,14 +54,22 @@ export const Ptz = props => {
           absoluteContentClassName: 'ipc-player-plugin-full-screen-ptz-control-wrap',
           initProps: _objectSpread({}, props)
         });
-        event.emit('ptzControlShow');
-      } else {
-        // deleteContent('absolute', ptzControlId);
-        hideContent('bottomLeft', 'FullSmallIntercom');
-        event.emit('ptzControlHide');
+        // event.emit('ptzControlShow');
       }
-      setIsPtzActive(!isPtzActive);
+      event.emit('ptzControlShow');
+    } else {
+      // deleteContent('absolute', ptzControlId);
+      hideContent('bottomLeft', 'FullSmallIntercom');
+      event.emit('ptzControlHide');
     }
+    setIsPtzActive(!isPtzActive);
+  });
+  if (screenType === 'vertical' || !supportPtz) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(View, {
+    className: clsx(className),
+    onClick: onPtz
   }, /*#__PURE__*/React.createElement(Text, {
     className: clsx('icon-panel', 'icon-panel-ptz', 'ipc-player-plugin-ptz-text-icon'),
     style: _objectSpread({}, isPtzActive && {

package/lib/plugins/ptz/ptz.less

@@ -18,7 +18,7 @@
   bottom: 32px;
   // transform: translate(0, -20%);
   right: calc(32px * var(--ipc-player-size-scale, 1));;
-  z-index: 200;
+  z-index: 348;
 }
 
 

package/lib/plugins/ptz/ptzControl.js

@@ -56,10 +56,15 @@ export const PtzControl = props => {
   const onPtzControlHide = useMemoizedFn(() => {
     setIsPtzActive(false);
   });
+  const onPtzControlShow = useMemoizedFn(() => {
+    setIsPtzActive(true);
+  });
   useEffect(() => {
     event.on('ptzControlHide', onPtzControlHide);
+    event.on('ptzControlShow', onPtzControlShow);
     return () => {
       event.off('ptzControlHide', onPtzControlHide);
+      event.off('ptzControlShow', onPtzControlShow);
     };
   }, []);
   useEffect(() => {
@@ -72,7 +77,7 @@ export const PtzControl = props => {
   }, []);
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-plugin-full-screen-ptz-control', {
-      'ipc-player-plugin-full-screen-ptz-control-hide': shouldHide || !isPtzActive,
+      'ipc-player-plugin-full-screen-ptz-control-hide': !isPtzActive || shouldHide,
       'ipc-player-plugin-full-screen-ptz-disappear': screenType === 'vertical'
     })
   }, /*#__PURE__*/React.createElement(IpcPtzZoom, {

package/lib/plugins/resolution/resolution.less

@@ -48,7 +48,7 @@
   justify-content: center;
   align-items: center;
   background-color: transparent;
-  z-index: 345;
+  z-index: 349;
 }
 
 @keyframes ipc-player-plugin-full-resolution-control-move-in {

package/lib/plugins/videoBitKBP/videoBitKBP.js

@@ -21,7 +21,9 @@ export const VideoBitKBP = props => {
       init();
       timer = setInterval(() => {
         init();
-      }, 5000);
+      }, 3000);
+    } else {
+      clearInterval(timer);
     }
     return () => {
       clearInterval(timer);
@@ -33,11 +35,14 @@ export const VideoBitKBP = props => {
       setBitKBP(`${res.data.kbps}KB/S`);
     }
   };
-  if (bitKBP === '') {
+  if (bitKBP === '' || bitKBP === '0KB/S' || store.playState !== PlayState.PLAYING) {
     return null;
   }
   return /*#__PURE__*/React.createElement(View, {
-    className: clsx(className)
+    className: clsx({
+      'ipc-player-plugin-videoBitKBP-container': true,
+      [className]: !!className
+    })
   }, /*#__PURE__*/React.createElement(View, {
     className: "ipc-player-plugin-videoBitKBP"
   }, bitKBP));

package/lib/plugins/videoBitKBP/videoBitKBP.less

@@ -1,6 +1,14 @@
+.ipc-player-plugin-videoBitKBP-container {
+    min-width: calc(100px * var(--ipc-player-size-scale, 1));
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
 .ipc-player-plugin-videoBitKBP {
     display: flex;
     align-items: center;
+    justify-content: center;
+    width: 100%;
     height: calc(24px * var(--ipc-player-size-scale, 1));
     padding: 0 calc(9px * var(--ipc-player-size-scale, 1));
     border-radius: calc(24px * var(--ipc-player-size-scale, 1));

package/lib/plugins/voiceIntercom/voiceIntercom.js

@@ -77,7 +77,6 @@ export const VoiceIntercom = props => {
    */
   useEffect(() => {
     (async () => {
-      console.log('=== 开始结束对讲 ====', intercom);
       if (playState !== PlayState.PLAYING) {
         if (intercom) {
           updateAtom(props.intercom, false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-57",
+  "version": "0.0.1-beta-59",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [