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

package/lib/ctx/ctx.composition.js

@@ -68,7 +68,8 @@ const getMemoryState = devId => {
     mute: true,
     intercomMode: IntercomMode.TwoWay,
     resolution: ClarityType.HD,
-    resolutionList: [ClarityType.HD, ClarityType.SD]
+    resolutionList: [ClarityType.HD, ClarityType.SD],
+    isIntercomSupported: false
   };
   return new Promise(resolve => {
     IPCUtils.getCameraConfigInfo(devId).then(res => {
@@ -79,6 +80,7 @@ const getMemoryState = devId => {
       return resolve({
         mute: muteValue,
         intercomMode: res.data.intercomInfo.cachedIntercomMode,
+        isIntercomSupported: res.data.intercomInfo.isIntercomSupported,
         resolution: res.data.videoResolution.cachedResolution,
         resolutionList: res.data.videoResolution.availableResolutions
       });

package/lib/ctx/ctx.js

@@ -59,6 +59,8 @@ export const createUseCtx = _ref => {
 
     // 单向对讲还是双向对讲
     const [intercomMode, setIntercomMode] = useAtom(IntercomMode.TwoWay);
+    // 摄像头配置是否支持对讲
+    const [intercomSupported, setIntercomSupported] = useAtom(false);
 
     // 对讲中
     const [intercom] = useAtom(false);
@@ -92,6 +94,7 @@ export const createUseCtx = _ref => {
           _setResolution(res.resolution, true);
           _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
+          setIntercomSupported(res.isIntercomSupported);
         } catch (error) {
           console.error('获取 getMemoryState 失败:', error);
         }
@@ -107,6 +110,7 @@ export const createUseCtx = _ref => {
           _setResolution(res.resolution, true);
           _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
+          setIntercomSupported(res.isIntercomSupported);
         });
       }
     }, [devId, _playState]);
@@ -215,6 +219,7 @@ export const createUseCtx = _ref => {
       resolutionList,
       intercom,
       intercomMode,
+      intercomSupported,
       playState,
       setPlayState,
       setBrandColor,

package/lib/interface.d.ts

@@ -53,6 +53,7 @@ export type UseCtx = (options: {
     mute: RetAtom<boolean>;
     intercom: RetAtom<boolean>;
     intercomMode: RetAtom<IntercomMode>;
+    intercomSupported: RetAtom<boolean>;
     resolution: RetAtom<string>;
     resolutionList: RetAtom<string[]>;
     playState: RetAtom<PlayState>;

package/lib/plugins/battery/battery.composition.d.ts

@@ -12,6 +12,7 @@ export declare const Battery: import("react").FunctionComponent<{
     mute: import("../..").RetAtom<boolean>;
     intercom: import("../..").RetAtom<boolean>;
     intercomMode: import("../..").RetAtom<import("@ray-js/ray-ipc-utils/lib/interface").IntercomMode>;
+    intercomSupported: import("../..").RetAtom<boolean>;
     resolution: import("../..").RetAtom<string>;
     resolutionList: import("../..").RetAtom<string[]>;
     playState: import("../..").RetAtom<import("../..").PlayState>;
@@ -56,6 +57,7 @@ export declare const BatteryFull: import("react").FunctionComponent<{
     mute: import("../..").RetAtom<boolean>;
     intercom: import("../..").RetAtom<boolean>;
     intercomMode: import("../..").RetAtom<import("@ray-js/ray-ipc-utils/lib/interface").IntercomMode>;
+    intercomSupported: import("../..").RetAtom<boolean>;
     resolution: import("../..").RetAtom<string>;
     resolutionList: import("../..").RetAtom<string[]>;
     playState: import("../..").RetAtom<import("../..").PlayState>;

package/lib/plugins/fullScreen/fullScreen.js

@@ -5,7 +5,7 @@ import { useUpdateEffect } from 'ahooks';
 import clsx from 'clsx';
 import { unstable_batchedUpdates as batchedUpdates } from '@ray-core/ray';
 import { UIEventContext } from '../../ui/context';
-import { showAllComponent, voiceIntercomId, verticalScreenId, fullTravelRouteControlId, ptzControlId, fullResolutionId, pauseTimeToHideAllComponent } from '../../ui/constant';
+import { showAllComponent, voiceIntercomId, verticalScreenId, fullTravelRouteControlId, ptzControlId, fullResolutionId, fullSmallIntercomId, pauseTimeToHideAllComponent } from '../../ui/constant';
 import { useStore } from '../../ctx/store';
 import { VerticalScreen } from './verticalScreen';
 import { FullVoiceIntercom } from './fullVoiceIntercom';
@@ -19,6 +19,7 @@ export function FullScreen(props) {
     setScreenType,
     addContent,
     deleteContent,
+    hideContent,
     className,
     showContent,
     devId,
@@ -57,6 +58,7 @@ export function FullScreen(props) {
             onClick: () => {
               // 点击返回时提前调用一波
               deleteContent('topLeft', verticalScreenId);
+              hideContent('bottomLeft', fullSmallIntercomId);
               deleteContent('absolute', voiceIntercomId);
               deleteContent('absolute', ptzControlId);
               deleteContent('absolute', fullResolutionId);
@@ -107,6 +109,7 @@ export function FullScreen(props) {
       showMenuButton();
       showStatusBar();
       deleteContent('topLeft', verticalScreenId);
+      hideContent('bottomLeft', fullSmallIntercomId);
       deleteContent('absolute', voiceIntercomId);
       deleteContent('absolute', ptzControlId);
       deleteContent('absolute', fullResolutionId);

package/lib/plugins/fullScreen/fullVoiceIntercom.d.ts

@@ -4,5 +4,5 @@
 import React from 'react';
 import type { ComponentConfigProps } from '../../interface';
 type Props = ComponentConfigProps;
-export declare function FullVoiceIntercom(props: Props): React.JSX.Element;
+export declare function FullVoiceIntercom(props: Props): React.JSX.Element | null;
 export {};

package/lib/plugins/fullScreen/fullVoiceIntercom.js

@@ -18,9 +18,11 @@ export function FullVoiceIntercom(props) {
     event
   } = useContext(UIEventContext);
   const {
-    screenType
+    screenType,
+    intercomSupported
   } = useStore({
-    screenType: props.screenType
+    screenType: props.screenType,
+    intercomSupported: props.intercomSupported
   });
   const onPtzControlShow = useMemoizedFn(() => {
     setIsPtzActive(true);
@@ -36,6 +38,9 @@ export function FullVoiceIntercom(props) {
       event.off('ptzControlHide', onPtzControlHide);
     };
   }, []);
+  if (!intercomSupported) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-full-screen-voice', {
       'ipc-player-plugin-full-screen-voice-hide': shouldHide || isPtzActive,

package/lib/plugins/fullSmallIntercom/fullSmallIntercom.js

@@ -13,10 +13,12 @@ export function FullSmallIntercom(props) {
   } = props;
   const {
     screenType,
-    brandColor
+    brandColor,
+    intercomSupported
   } = useStore({
     screenType: props.screenType,
-    brandColor: props.brandColor
+    brandColor: props.brandColor,
+    intercomSupported: props.intercomSupported
   });
   const {
     event
@@ -30,7 +32,7 @@ export function FullSmallIntercom(props) {
   const onTouchEnd = () => {
     // event.emit(startTimeToHideAllComponent);
   };
-  if (screenType === 'full') {
+  if (screenType === 'full' && intercomSupported) {
     return /*#__PURE__*/React.createElement(View, {
       className: clsx(className)
     }, /*#__PURE__*/React.createElement(VoiceIntercom, _extends({}, props, {

package/lib/plugins/verticalSmallIntercom/verticalSmallIntercom.js

@@ -14,12 +14,14 @@ export function VerticalSmallIntercom(props) {
   const {
     screenType,
     verticalMic,
-    brandColor
+    brandColor,
+    intercomSupported
   } = useStore({
     screenType: props.screenType,
     verticalMic: props.verticalMic,
     intercomMode: props.intercomMode,
-    brandColor: props.brandColor
+    brandColor: props.brandColor,
+    intercomSupported: props.intercomSupported
   });
   const {
     event
@@ -30,7 +32,7 @@ export function VerticalSmallIntercom(props) {
   const onTouchEnd = () => {
     // event.emit(startTimeToHideAllComponent);
   };
-  if (screenType === 'vertical' && verticalMic) {
+  if (screenType === 'vertical' && verticalMic && intercomSupported) {
     return /*#__PURE__*/React.createElement(View, {
       className: clsx(className)
     }, /*#__PURE__*/React.createElement(VoiceIntercom, _extends({}, props, {

package/lib/ui/constant.d.ts

@@ -9,6 +9,7 @@ export declare const verticalScreenId = "verticalScreenId";
 export declare const ptzControlId = "ptzControlId";
 export declare const fullResolutionId = "fullResolutionId";
 export declare const batteryId = "Battery";
+export declare const fullSmallIntercomId = "FullSmallIntercom";
 export declare const decodeClarityDic: {
     SS: string;
     SD: string;

package/lib/ui/constant.js

@@ -9,6 +9,7 @@ export const verticalScreenId = 'verticalScreenId';
 export const ptzControlId = 'ptzControlId';
 export const fullResolutionId = 'fullResolutionId';
 export const batteryId = 'Battery';
+export const fullSmallIntercomId = 'FullSmallIntercom';
 export const decodeClarityDic = {
   SS: 'ss',
   // 省流量

package/package.json

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