@ray-js/ipc-player-integration 0.0.1-beta-46 → 0.0.1-beta-47

package/lib/ctx/ctx.js

@@ -80,7 +80,9 @@ 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);

package/lib/plugins/fullScreen/fullScreen.js

@@ -124,7 +124,7 @@ export function FullScreen(props) {
   if (screenType === 'full' || hideHorizontalMenu) return null;
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(className),
-    onClick: () => handClick('full')
+    onTouchStart: () => handClick('full')
   }, /*#__PURE__*/React.createElement(Text, {
     className: clsx('icon-panel', 'icon-panel-landscape', 'ipc-player-plugin-full-screen')
   }));

package/lib/plugins/resolution/resolution.js

@@ -29,7 +29,9 @@ export const Resolution = props => {
     event
   } = useContext(UIEventContext);
   const onResolution = useMemoizedFn(() => {
+    console.log('你触发了高标清点击了吗');
     event.emit('resolutionBtnControlClick');
+    console.log(`screenType: ${screenType}`);
     if (screenType === 'full') {
       event.emit(hideAllComponent);
       if (hasContent('absolute', fullResolutionId)) {
@@ -55,11 +57,12 @@ export const Resolution = props => {
   });
   return /*#__PURE__*/React.createElement(View, {
     onClick: onResolution,
-    className: clsx(className, screenType === 'vertical' ? 'ipc-player-plugin-resolution-vertical' : 'ipc-player-plugin-resolution-full')
+    className: clsx(className)
   }, /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-resolution', {
       'ipc-player-plugin-resolution-full': screenType === 'full'
-    })
+    }),
+    onClick: onResolution
   }, /*#__PURE__*/React.createElement(Text, {
     className: "resolutionText"
   }, Strings.getLang(`ipc_player_resolution_${resolution}`))));

package/lib/plugins/voiceIntercom/voiceIntercom.js

@@ -71,14 +71,8 @@ export const VoiceIntercom = props => {
   };
   const endVoice = async () => {
     console.log('=== 结束对讲 ====');
-    // 单向对讲，结束对讲之后，强制关闭静态状态
-    if (intercomMode === IntercomMode.OneWay) {
-      console.log('=== 单向对讲，强制关闭静音状态 ===');
-      await setMute(false);
-    } else {
-      console.log(`=== 双向对讲，恢复对讲之前的静音状态 ${originMuteStatusBeforeVoice.current}===`);
-      await setMute(originMuteStatusBeforeVoice.current);
-    }
+    // 对讲结束之后，统一关闭静态状态
+    await setMute(false);
     await setIntercom(false);
     event.emit(startTimeToHideAllComponent);
   };

package/lib/ui/ui.d.ts

@@ -25,6 +25,8 @@ type Props = {
     brandColor?: string;
     verticalMic?: boolean;
     eventRef?: React.RefObject<EventInstance>;
+    onPlayerTap?: (data: any) => void;
+    extend?: Record<string, any>;
 };
 export declare const IPCPlayerIntegration: React.MemoExoticComponent<(props: Props) => React.JSX.Element>;
 export {};

package/lib/ui/ui.js

@@ -1,3 +1,4 @@
+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";
@@ -49,7 +50,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     deviceOnline = true,
     brandColor = '#FF592A',
     verticalMic = true,
-    eventRef: eventRefProp
+    eventRef: eventRefProp,
+    onPlayerTap,
+    extend = {}
   } = props;
   const instance = getCtxInstance(props.instance, devId);
   const {
@@ -258,7 +261,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       // backgroundColor: 'rgba(0,0,0,0.2)',
       height: screenType === 'vertical' ? (style === null || style === void 0 ? void 0 : style.height) || '100%' : '100vh'
     })
-  }, /*#__PURE__*/React.createElement(IPCPlayer, {
+  }, /*#__PURE__*/React.createElement(IPCPlayer, _extends({
     objectFit: "",
     defaultMute: mute,
     devId: devId,
@@ -266,16 +269,14 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ipcPlayerContext: instance.IPCPlayerInstance,
     onChangeStreamStatus: code => {
       var _props$onPlayStatus;
-      console.log(code, 'code');
       const playStateMap = {
         [PlayerStreamStatus.PreviewSuccess]: PlayState.PLAYING,
         // 播放中
         [PlayerStreamStatus.PAUSE]: PlayState.PAUSE // 暂停
       };
-      const playState = playStateMap[code];
-      if (typeof playState !== 'undefined') {
-        setPlayState(playState);
-      }
+      // 合并为三种状态 连接中 暂停 播放中
+      const playState = playStateMap[code] || PlayState.CONNECTING;
+      setPlayState(playState);
       (_props$onPlayStatus = props.onPlayStatus) === null || _props$onPlayStatus === void 0 || _props$onPlayStatus.call(props, {
         playState,
         playCode: code
@@ -285,18 +286,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     // onCtx={getIpcPlayer}
     // onPlayerTap={handlePlayerClick}
     ,
-    onZoomChange: data => {
-      console.log(`zoomChange事件: ${JSON.stringify(data)}`);
-    },
-    onCameraPreviewFailure: data => {
-      console.log(`onCameraPreviewFailure事件: ${JSON.stringify(data)}`);
-      // ty.showToast({
-      //   title: `onCameraPreviewFailure事件: ${JSON.stringify(data)}`,
-      // });
-      // setTimeout(() => {
-      //   ty.hideToast();
-      // }, 3000);
-    },
     onCameraNotifyWeakNetwork: data => {
       console.log(`onCameraNotifyWeakNetwork: ${JSON.stringify(data)}`);
     },
@@ -306,10 +295,11 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ptzControllable: screenType === 'vertical',
     privateState: privateState,
     onPlayerTap: data => {
-      if (disablePlayerTap.current) {
-        console.log('playerTap 事件已禁止');
-        return;
-      }
+      onPlayerTap(data);
+      // if (disablePlayerTap.current) {
+      //   console.log('playerTap 事件已禁止');
+      //   return;
+      // }
       console.log('res===on onVideoTap', data);
       eventRef.current.emit(playerTap);
       console.log(prevTriggerEvent.current, 'prevTriggerEvent.current');
@@ -318,11 +308,12 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       } else {
         triggerEvent(hideAllComponent);
       }
+      // onPlayerTap(data);
       return false; // eslint-disable-line
     } // 对应原来的onVideoTap
     ,
     brandColor: brandColor
-  }), /*#__PURE__*/React.createElement(View, {
+  }, extend)), /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-top-content', {
       'ipc-player-top-content-hide': componentHideState,
       'ipc-player-top-content-show': !componentHideState

package/package.json

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