@ray-js/ipc-player-integration 0.0.1-beta-13 → 0.0.1-beta-14

package/lib/ctx/ctx.composition.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 const _excluded = ["title", "duration"];
 import IPCUtils from '@ray-js/ray-ipc-utils';
-import { MuteMode } from '@ray-js/ray-ipc-utils/lib/interface';
+import { IntercomMode, MuteMode } from '@ray-js/ray-ipc-utils/lib/interface';
 import { createUseCtx } from './ctx';
 import { Battery, Screenshot, TempHumidity, RecordVideo, FullScreen, VideoBitKbps, Muted, Resolution, Ptz } from '../plugins';
 import { authorizeStatus } from '../utils/authorize';
@@ -52,21 +52,22 @@ const toast = _ref => {
   }, config));
 };
 const getMemoryState = devId => {
+  const defaultValue = {
+    mute: true,
+    intercomMode: IntercomMode.TwoWay
+  };
   return new Promise(resolve => {
     IPCUtils.getCameraConfigInfo(devId).then(res => {
       if (res.code === -1) {
-        return resolve({
-          mute: true
-        });
+        return resolve(defaultValue);
       }
       const value = res.data.microphoneSettings.cachedMuteMode === MuteMode.OFF;
       return resolve({
-        mute: value
+        mute: value,
+        intercomMode: res.data.intercomInfo.cachedIntercomMode
       });
     }).catch(() => {
-      resolve({
-        mute: true
-      });
+      resolve(defaultValue);
     });
   });
 };

package/lib/ctx/ctx.js

@@ -1,6 +1,6 @@
 import { useRef, useCallback, useEffect } from 'react';
 import { useAtom, updateAtom, getDefaultStore, useStore } from './store';
-import { PlayState } from '../interface';
+import { PlayState, IntercomMode } from '../interface';
 const SAVE_TO_ALBUM = 1;
 export const createUseCtx = _ref => {
   let {
@@ -23,29 +23,35 @@ export const createUseCtx = _ref => {
     } = _ref2;
     const streamStatus = useRef();
     // 全屏、竖屏
-    const screenType = useAtom('vertical');
+    const [screenType, setScreenType] = useAtom('vertical');
+
     // 录像中
-    const recording = useAtom(false);
+    const [recording] = useAtom(false);
 
     // 静音 true 代表静音 false 代表不静音
-    const mute = useAtom(false);
+    const [mute] = useAtom(false);
 
     // 清晰度
-    const resolution = useAtom('HD');
+    const [resolution] = useAtom('HD');
 
     // ptz 是否点击
-    const ptzActive = useAtom(false);
+    const [ptzActive, setPtzActive] = useAtom(false);
+
+    // 单向对讲还是双向对讲
+    const [intercomMode, setIntercomMode] = useAtom(IntercomMode.TwoWay);
+
     // 全屏清晰度UI切换是否展示
-    const fullResolutionActive = useAtom(false);
+    const [fullResolutionActive, setFullResolutionActive] = useAtom(false);
+
     // 对讲中
-    const intercom = useAtom(false);
-    const playState = useAtom(PlayState.CONNECTING);
+    const [intercom] = useAtom(false);
+    const [playState] = useAtom(PlayState.CONNECTING);
     const setPlayState = useCallback(value => {
       updateAtom(playState, value);
     }, [playState]);
-    const topContent = useAtom(initTopContent || defaultTopContent || []);
-    const bottomContent = useAtom(initBottomContent || defaultBottomContent || []);
-    const absoluteContent = useAtom(initAbsoluteContent || defaultAbsoluteContent || []);
+    const [topContent] = useAtom(initTopContent || defaultTopContent || []);
+    const [bottomContent] = useAtom(initBottomContent || defaultBottomContent || []);
+    const [absoluteContent] = useAtom(initAbsoluteContent || defaultAbsoluteContent || []);
     const {
       _playState
     } = useStore({
@@ -55,7 +61,9 @@ export const createUseCtx = _ref => {
       if (devId && _playState === PlayState.PLAYING) {
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
+          console.log('==== getMemoryState ====', res);
           _setMute(res.mute);
+          setIntercomMode(res.intercomMode);
         });
       }
     }, [devId, _playState]);
@@ -106,6 +114,7 @@ export const createUseCtx = _ref => {
       ptzActive,
       fullResolutionActive,
       intercom,
+      intercomMode,
       playState,
       setPlayState,
       setIntercom: async target => {
@@ -204,15 +213,9 @@ export const createUseCtx = _ref => {
           }
         });
       },
-      setPtzActive: value => {
-        updateAtom(ptzActive, value);
-      },
-      setFullResolutionActive: value => {
-        updateAtom(fullResolutionActive, value);
-      },
-      setScreenType: value => {
-        updateAtom(screenType, value);
-      },
+      setPtzActive,
+      setFullResolutionActive,
+      setScreenType,
       topContent,
       bottomContent,
       absoluteContent,

package/lib/ctx/ports.output.d.ts

@@ -1,7 +1,9 @@
-export type { Toast } from '../ports.output';
+import { IntercomMode } from '../ports.output';
+export type { Toast, IntercomMode } from '../ports.output';
 export type createPlayContext = (devId: string) => IpcContext;
 export type AuthorizeStatus = (type: string) => Promise<boolean>;
 export type GetMemoryState = (devId: string) => Promise<{
     mute: boolean;
+    intercomMode: IntercomMode;
 }>;
 export type SetMuteMemoryState = (devId: string, value: boolean) => void;

package/lib/ctx/store.d.ts

@@ -3,9 +3,10 @@ export { getDefaultStore } from 'jotai';
 export declare const topContent: import("jotai").PrimitiveAtom<never[]> & {
     init: never[];
 };
-export declare const useAtom: <T extends unknown>(defaultValue: T) => RetAtom<T>;
+type Action<T> = T | ((prevValue: T) => T);
+export declare const useAtom: <T extends unknown>(defaultValue: T) => [RetAtom<T>, (value: Action<T>) => void];
 type ExtractReturnType<T> = {
     [K in keyof T]: T[K] extends RetAtom<infer R> ? R : never;
 };
 export declare const useStore: <V, T extends Record<string, RetAtom<V>>>(options: T) => ExtractReturnType<T>;
-export declare const updateAtom: <T>(atom: RetAtom<T>, value: T | ((prevValue: T) => T)) => void;
+export declare const updateAtom: <T>(atom: RetAtom<T>, value: Action<T>) => void;

package/lib/ctx/store.js

@@ -8,7 +8,7 @@ export const useAtom = defaultValue => {
     // @ts-ignore
     ref.current = atom(defaultValue);
   }
-  return ref.current;
+  return [ref.current, value => updateAtom(ref.current, value)];
 };
 export const useStore = options => {
   const combinedAtomRef = useRef();

package/lib/interface.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { PrimitiveAtom } from 'jotai';
-import type { Toast } from './ports.output';
+import type { Toast, IntercomMode } from './ports.output';
+export { IntercomMode } from './ports.output';
 type WithInitialValue<Value> = {
     init: Value;
 };
@@ -36,6 +37,7 @@ export type UseCtx = (options: {
     recording: RetAtom<boolean>;
     mute: RetAtom<boolean>;
     intercom: RetAtom<boolean>;
+    intercomMode: RetAtom<IntercomMode>;
     ptzActive: RetAtom<boolean>;
     fullResolutionActive: RetAtom<boolean>;
     playState: RetAtom<PlayState>;
@@ -70,4 +72,3 @@ export type PlayStatusData = {
     playState: PlayState;
     playCode: number;
 };
-export {};

package/lib/interface.js

@@ -1,3 +1,4 @@
+export { IntercomMode } from './ports.output';
 export let PlayerStreamStatus = /*#__PURE__*/function (PlayerStreamStatus) {
   PlayerStreamStatus[PlayerStreamStatus["UnknownException"] = -1000] = "UnknownException";
   PlayerStreamStatus[PlayerStreamStatus["ConnectSuccess"] = 1001] = "ConnectSuccess";

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

@@ -8,6 +8,7 @@ export declare const Battery: import("react").FunctionComponent<{
     recording: import("../..").RetAtom<boolean>;
     mute: import("../..").RetAtom<boolean>;
     intercom: import("../..").RetAtom<boolean>;
+    intercomMode: import("../..").RetAtom<import("@ray-js/ray-ipc-utils/lib/interface").IntercomMode>;
     ptzActive: import("../..").RetAtom<boolean>;
     fullResolutionActive: import("../..").RetAtom<boolean>;
     playState: import("../..").RetAtom<import("../..").PlayState>;

package/lib/plugins/recordVideo/recordVideo.less

@@ -3,7 +3,7 @@
   color: var(--iconColor);
 }
 .ipc-player-plugin-record-video-toast-wrap {
-  z-index: 2;
+  z-index: 110;
   position: absolute;
   top: calc(7px * var(--ipc-player-size-scale, 1));
   left: 50%;
@@ -15,6 +15,8 @@
   align-items: center;
   background-color: var(--bg-color);
   border-radius: calc(8px * var(--ipc-player-size-scale, 1));
+  // background-color: #fff;
+  background: linear-gradient(0deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)), #000000;
   .ipc-player-plugin-record-video-toast-point {
     width: calc(6px * var(--ipc-player-size-scale, 1));
     height: calc(6px * var(--ipc-player-size-scale, 1));

package/lib/plugins/voiceIntercom/voiceIntercom.d.ts

@@ -9,5 +9,5 @@ type Props = ComponentConfigProps & {
     onTouchStart?: TouchEventHandler['onTouchStart'];
     onTouchEnd?: TouchEventHandler['onTouchEnd'];
 };
-export declare function VoiceIntercom({ style, className, iconClassName, recording: recordingAtom, intercom: intercomAtom, setIntercom, mute: muteAtom, setMute, getStreamStatus, onTouchStart, onTouchEnd, }: Props): React.JSX.Element;
+export declare function VoiceIntercom({ style, className, iconClassName, recording: recordingAtom, intercom: intercomAtom, intercomMode: intercomModeAtom, setIntercom, mute: muteAtom, setMute, getStreamStatus, onTouchStart, onTouchEnd, }: Props): React.JSX.Element;
 export {};

package/lib/plugins/voiceIntercom/voiceIntercom.js

@@ -5,7 +5,7 @@ import clsx from 'clsx';
 import Res from './voice.gif';
 import { useStore, getDefaultStore } from '../../ctx/store';
 import './voiceIntercom.less';
-import { PlayerStreamStatus } from '../../interface';
+import { PlayerStreamStatus, IntercomMode } from '../../interface';
 import { UIEventContext } from '../../ui/context';
 import { startTimeToHideAllComponent, pauseTimeToHideAllComponent } from '../../ui/constant';
 const NILL = () => null;
@@ -16,6 +16,7 @@ export function VoiceIntercom(_ref) {
     iconClassName,
     recording: recordingAtom,
     intercom: intercomAtom,
+    intercomMode: intercomModeAtom,
     setIntercom,
     mute: muteAtom,
     setMute,
@@ -28,10 +29,12 @@ export function VoiceIntercom(_ref) {
   } = useContext(UIEventContext);
   const {
     mute,
-    intercom
+    intercom,
+    intercomMode
   } = useStore({
     mute: muteAtom,
-    intercom: intercomAtom
+    intercom: intercomAtom,
+    intercomMode: intercomModeAtom
   });
   // 对讲开始之前的静音状态
   const originMuteStatusBeforeVoice = useRef(mute);
@@ -41,16 +44,28 @@ export function VoiceIntercom(_ref) {
       console.log('PlayerStreamStatus not 1002');
       return;
     }
+    console.log('==== 开始对讲 =====');
     originMuteStatusBeforeVoice.current = _mute;
-    // 如果对讲开始之前，是静音的，则需要关闭静音
-    if (_mute) {
-      await setMute(false);
+    // 单路对讲，开始对讲前需要静音
+    // 双路对讲，开始对讲前需要打开拾音器
+    const muteTarget = intercomMode === IntercomMode.OneWay;
+    if (_mute !== muteTarget) {
+      console.log(`=== 切换静音状态： ${_mute}`, `${intercomMode}`);
+      await setMute(muteTarget);
     }
     await setIntercom(true);
     event.emit(pauseTimeToHideAllComponent);
   };
   const endVoice = async () => {
-    await setMute(originMuteStatusBeforeVoice.current);
+    console.log('=== 结束对讲 ====');
+    // 单向对讲，结束对讲之后，强制关闭静态状态
+    if (intercomMode === IntercomMode.OneWay) {
+      console.log('=== 单向对讲，强制关闭静音状态 ===');
+      await setMute(false);
+    } else {
+      console.log(`=== 双向对讲，恢复对讲之前的静音状态 ${originMuteStatusBeforeVoice.current}===`);
+      await setMute(originMuteStatusBeforeVoice.current);
+    }
     await setIntercom(false);
     event.emit(startTimeToHideAllComponent);
   };
@@ -70,12 +85,17 @@ export function VoiceIntercom(_ref) {
         loading.current = false;
         return;
       }
-      if (target) {
-        await startVoice(mute);
-      } else {
-        await endVoice();
+      try {
+        if (target) {
+          await startVoice(mute);
+        } else {
+          await endVoice();
+        }
+      } catch (err) {
+        loading.current = false;
+      } finally {
+        loading.current = false;
       }
-      loading.current = false;
     },
     onTouchEnd: onTouchEnd
   }, intercom ? /*#__PURE__*/React.createElement(Image, {

package/lib/ports.output.d.ts

@@ -1,3 +1,4 @@
+export { IntercomMode } from '@ray-js/ray-ipc-utils/lib/interface';
 export type UseBattery = (devId: string) => {
     batteryValue: number;
     batteryCharging: boolean;

package/lib/ports.output.js

@@ -1 +1,7 @@
-export {};
+export { IntercomMode } from '@ray-js/ray-ipc-utils/lib/interface';
+
+// plugin 获取电池电量 todo
+
+// plugin 获取温度
+
+// plugin 获取湿度

package/package.json

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