@ray-js/ipc-player-integration 0.0.24-beta-1 → 0.0.24-beta-3

package/lib/ui/ui.js

@@ -612,7 +612,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       return false; // eslint-disable-line
     } // 对应原来的onVideoTap
     ,
-    brandColor: brandColor
+    brandColor: brandColor,
+    playerRoute: playerRoute
   }, extend)), /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-top-content', {
       'ipc-player-top-content-hide': componentHideState,

package/lib/widgets/voiceIntercom/voiceIntercom.d.ts

@@ -1,18 +1,62 @@
 import React from 'react';
 import { TouchEventHandler } from '@ray-js/components/lib/types';
 import './voiceIntercom.less';
-import { ComponentConfigProps } from '../../interface';
-type Props = ComponentConfigProps & {
-    style?: React.CSSProperties;
-    intercomClassName?: string;
-    iconClassName?: string;
-    widthScale?: number;
-    heightScale?: number;
+import { PlayerStreamStatus, IntercomMode, PlayState } from '../../interface';
+export declare const VoiceIntercom: React.ForwardRefExoticComponent<{
+    IPCPlayerContext: import("../../interface").IpcContext;
+} & {
+    devId: string;
+    brandColor: import("../../interface").RetAtom<string>;
+    verticalMic: import("../../interface").RetAtom<boolean>;
+    saveToAlbum: 0 | 1;
+    showPtzControlTip: boolean;
+    screenType: import("../../interface").RetAtom<import("../../interface").ScreenType>;
+    recording: import("../../interface").RetAtom<boolean>;
+    recordingDisabled: import("../../interface").RetAtom<boolean>;
+    mute: import("../../interface").RetAtom<boolean>;
+    intercom: import("../../interface").RetAtom<boolean>;
+    intercomMode: import("../../interface").RetAtom<IntercomMode>;
+    intercomSupported: import("../../interface").RetAtom<boolean>;
+    resolution: import("../../interface").RetAtom<string>;
+    resolutionList: import("../../interface").RetAtom<string[]>;
+    playState: import("../../interface").RetAtom<PlayState>;
+    IPCPlayerInstance: import("../../interface").IpcContext;
+    topLeftContent: import("../../interface").RetAtom<import("../../interface").ComponentConfig<any & Record<string, any>>[]>;
+    topRightContent: import("../../interface").RetAtom<import("../../interface").ComponentConfig<any & Record<string, any>>[]>;
+    bottomLeftContent: import("../../interface").RetAtom<import("../../interface").ComponentConfig<any & Record<string, any>>[]>;
+    bottomRightContent: import("../../interface").RetAtom<import("../../interface").ComponentConfig<any & Record<string, any>>[]>;
+    absoluteContent: import("../../interface").RetAtom<import("../../interface").ComponentConfig<any & Record<string, any>>[]>;
+    setShowPtzControlTip: (value: boolean) => void;
+    setBrandColor: (color: string) => void;
+    setVerticalMic: (value: boolean) => void;
+    setScreenType: (type: import("../../interface").ScreenType) => void;
+    setRecordingDisabled: (type: boolean) => void;
+    setResolution: (type: string) => void;
+    setResolutionList: (type: string[]) => void;
+    setRecording: (value: boolean, onlyUpdateAtom?: boolean | undefined) => Promise<import("../../interface").RecordInfoData>;
+    setIntercom: (value: boolean, onlyUpdateAtom?: boolean | undefined) => Promise<boolean>;
+    setMute: (value: boolean) => Promise<boolean>;
+    changeStreamStatus: (value: PlayerStreamStatus) => void;
+    getStreamStatus: () => PlayerStreamStatus;
+    setPlayState: (value: PlayState) => void;
+    addContent: <T>(type: import("../../interface").ContentPlaceType, config: import("../../interface").ComponentConfig<T> | import("../../interface").ComponentConfig<T>[], position?: number | undefined) => void;
+    deleteContent: (type: import("../../interface").ContentPlaceType, id: string) => void;
+    getContent: () => import("../../interface").ComponentConfig<any & Record<string, any>>[];
+    updateContent: (type: import("../../interface").ContentPlaceType, data: import("../../interface").ComponentConfig<any & Record<string, any>>[]) => void;
+    hasContent: (type: import("../../interface").ContentPlaceType, id: string) => boolean;
+    hideContent: (type: import("../../interface").ContentPlaceType, id: string) => void;
+    showContent: (type: import("../../interface").ContentPlaceType, id: string) => void;
+    toast: import("../../ports.output").Toast;
+    event: import("../../interface").EventInstance;
+} & {
+    style?: React.CSSProperties | undefined;
+    intercomClassName?: string | undefined;
+    iconClassName?: string | undefined;
+    widthScale?: number | undefined;
+    heightScale?: number | undefined;
     onTouchStart?: TouchEventHandler['onTouchStart'];
     onTouchEnd?: TouchEventHandler['onTouchEnd'];
-    talkingColor?: string;
-    mode?: 'verticalSmall' | 'fullSmall' | 'circle';
-    disabled?: boolean;
-};
-export declare const VoiceIntercom: (props: Props) => React.JSX.Element;
-export {};
+    talkingColor?: string | undefined;
+    mode?: "circle" | "verticalSmall" | "fullSmall" | undefined;
+    disabled?: boolean | undefined;
+} & React.RefAttributes<unknown>>;

package/lib/widgets/voiceIntercom/voiceIntercom.js

@@ -1,5 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React, { useRef, useContext, useState, useEffect } from 'react';
+import React, { useRef, useContext, useState, useEffect, forwardRef, useImperativeHandle } from 'react';
 import { View, getSystemInfoSync } from '@ray-js/ray';
 import clsx from 'clsx';
 import Svg from '@ray-js/svg';
@@ -10,7 +10,7 @@ import { UIEventContext } from '../../ui/context';
 import { radialGradient } from '../../utils';
 import { startTimeToHideAllComponent, pauseTimeToHideAllComponent, changeIgnoreHideStopPreview } from '../../ui/constant';
 const NILL = () => null;
-export const VoiceIntercom = props => {
+export const VoiceIntercom = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     style,
     intercomClassName,
@@ -102,6 +102,38 @@ export const VoiceIntercom = props => {
     await setIntercom(false);
     event.emit(startTimeToHideAllComponent);
   };
+  const handTouchStart = async e => {
+    if (disabled) return;
+    onTouchStart(e);
+    getDefaultStore();
+    if (loading.current) return;
+    loading.current = true;
+    // const _intercom = store.get(intercomAtom);
+    // const _recording = store.get(recordingAtom);
+    const target = !intercom;
+    if (target && recording) {
+      console.log('录制中，无法对讲');
+      loading.current = false;
+      return;
+    }
+    try {
+      if (target) {
+        await startVoice(mute);
+      } else {
+        await endVoice();
+      }
+    } catch (err) {
+      loading.current = false;
+    } finally {
+      loading.current = false;
+    }
+  };
+
+  // 暴露给父组件的接口
+  useImperativeHandle(ref, () => ({
+    triggerIntercom: e => handTouchStart(e)
+  }));
+
   // 获取 requestAnimationFrame 和兼容性回退
   const requestFrame = callback => {
     if (typeof requestAnimationFrame !== 'undefined') {
@@ -154,32 +186,7 @@ export const VoiceIntercom = props => {
       'ipc-player-plugin-voice-intercom': mode === 'circle',
       'ipc-player-plugin-voice-small-intercom': mode !== 'circle'
     }, intercomClassName),
-    onTouchStart: async e => {
-      if (disabled) return;
-      onTouchStart(e);
-      getDefaultStore();
-      if (loading.current) return;
-      loading.current = true;
-      // const _intercom = store.get(intercomAtom);
-      // const _recording = store.get(recordingAtom);
-      const target = !intercom;
-      if (target && recording) {
-        console.log('录制中，无法对讲');
-        loading.current = false;
-        return;
-      }
-      try {
-        if (target) {
-          await startVoice(mute);
-        } else {
-          await endVoice();
-        }
-      } catch (err) {
-        loading.current = false;
-      } finally {
-        loading.current = false;
-      }
-    },
+    onTouchStart: handTouchStart,
     onTouchEnd: onTouchEnd
   }, intercom ? /*#__PURE__*/React.createElement(View, {
     className: clsx({
@@ -202,4 +209,4 @@ export const VoiceIntercom = props => {
   })))) : /*#__PURE__*/React.createElement(View, {
     className: clsx('icon-panel', 'icon-panel-one-way-intercom', mode === 'circle' && 'intercom-default-size', mode !== 'circle' && 'ipc-player-plugin-voice-small-intercom', iconClassName)
   }));
-};
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.24-beta-1",
+  "version": "0.0.24-beta-3",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -38,7 +38,7 @@
     "@ray-js/ipc-ptz-zoom": "^0.0.2",
     "@ray-js/panel-sdk": "^1.13.1",
     "@ray-js/direction-control": "^0.0.8",
-    "@ray-js/ray-ipc-player": "2.0.29-beta-1",
+    "@ray-js/ray-ipc-player": "2.0.29-beta-2",
     "@ray-js/ray-ipc-utils": "^1.1.10",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",