@ray-js/ipc-player-integration 0.0.12 → 0.0.13-beta-2

package/lib/ctx/ctx.js

@@ -225,7 +225,12 @@ export const createUseCtx = _ref => {
       setPtzControlTipDisabled,
       setBrandColor,
       setVerticalMic,
-      setIntercom: async target => {
+      setIntercom: async function (target) {
+        let onlyUpdateAtom = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+        if (onlyUpdateAtom) {
+          updateAtom(intercom, target);
+          return false;
+        }
         const store = getDefaultStore();
         const _intercom = store.get(intercom);
         if (target && target === _intercom) {
@@ -319,7 +324,12 @@ export const createUseCtx = _ref => {
       setMute: _setMute,
       setResolution: _setResolution,
       setResolutionList,
-      setRecording: async target => {
+      setRecording: async function (target) {
+        let onlyUpdateAtom = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+        if (onlyUpdateAtom) {
+          updateAtom(recording, target);
+          return false;
+        }
         const store = getDefaultStore();
         const _recording = store.get(recording);
         if (target && target === _recording) {

package/lib/interface.d.ts

@@ -73,8 +73,8 @@ export type UseCtx = (options: {
     setRecordingDisabled: (type: boolean) => void;
     setResolution: (type: string) => void;
     setResolutionList: (type: string[]) => void;
-    setRecording: (value: boolean) => Promise<RecordInfoData>;
-    setIntercom: (value: boolean) => Promise<boolean>;
+    setRecording: (value: boolean, onlyUpdateAtom?: boolean) => Promise<RecordInfoData>;
+    setIntercom: (value: boolean, onlyUpdateAtom?: boolean) => Promise<boolean>;
     setMute: (value: boolean) => Promise<boolean>;
     changeStreamStatus: (value: PlayerStreamStatus) => void;
     getStreamStatus: () => PlayerStreamStatus;

package/lib/ui/ui.js

@@ -6,6 +6,7 @@ import React, { useContext, useState, useRef, useMemo, useEffect, useImperativeH
 import { View, CoverView, getSystemInfoSync, usePageEvent, setNavigationBarBack, setPageOrientation } from '@ray-js/ray';
 import clsx from 'clsx';
 import IPCPlayer from '@ray-js/ray-ipc-player';
+import { ipcTTTOperatorLog } from '@ray-js/ray-ipc-utils';
 import { PlayState, PlayerStreamStatus } from '../interface';
 import { useCtx } from '../ctx/ctx.composition';
 import { useStore } from '../ctx/store';
@@ -19,8 +20,8 @@ import { useMemoizedFn } from '../hooks';
 import './ui.less';
 function getCtxInstance(instance, devId) {
   if (instance) return instance;
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   return useCtx({
-    // eslint-disable-line
     devId
   });
 }
@@ -67,7 +68,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setPlayState,
     setScreenType,
     setBrandColor,
-    setVerticalMic
+    setVerticalMic,
+    setIntercom
   } = instance;
   const prevTriggerEvent = useRef();
   /*
@@ -86,15 +88,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   const timer = useRef();
   const [scaleMultiple, setScaleMultiple] = useState(playerFit === 'contain' ? 1 : -2);
   const [currentZoomLevel, setCurrentZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
+  const [createCtx, setCreateCtx] = useState(false);
   const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
   // const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
   // const [verticalZoomLevel, setVerticalZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
 
   useEffect(() => {
-    setScaleMultiple(playerFit === 'contain' ? 1 : -2);
-    setCurrentZoomLevel(playerFit === 'contain' ? 1 : -2);
-    // setVerticalZoomLevel(playerFit === 'contain' ? 1 : -2);
-  }, [playerFit]);
+    if (createCtx) {
+      setScaleMultiple(playerFit === 'contain' ? 1 : -2);
+      setCurrentZoomLevel(playerFit === 'contain' ? 1 : -2);
+    }
+  }, [playerFit, createCtx]);
   useEffect(() => {
     setBrandColor(brandColor);
     setVerticalMic(verticalMic);
@@ -105,6 +109,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     event.current.emit(playerTap);
   };
 
+  /**
+   * 监听播放器实例创建完成
+   */
+
   /**
    * 监听屏幕布局变化
    */
@@ -160,6 +168,34 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       console.log(err, 'err');
     }
   }));
+
+  /**
+   * 监听退出此player
+   */
+  usePageEvent('onHide', () => {
+    console.log(instance === null || instance === void 0 ? void 0 : instance.IPCPlayerInstance, 'instance?.IPCPlayerInstance ===');
+    ipcTTTOperatorLog('hide: 调用停止录制方法');
+    setRecording(false, true);
+    setIntercom(false, true);
+    instance === null || instance === void 0 || instance.IPCPlayerInstance.stopRecord({
+      saveToAlbum: 1,
+      success: () => {
+        ipcTTTOperatorLog('hide: 调用停止录制方法成功');
+      },
+      fail: () => {
+        ipcTTTOperatorLog('hide: 调用停止录制方法失败');
+      }
+    });
+    ipcTTTOperatorLog('hide: 调用停止对讲方法');
+    instance === null || instance === void 0 || instance.IPCPlayerInstance.stopTalk({
+      success: () => {
+        ipcTTTOperatorLog('hide: 调用停止对讲成功');
+      },
+      fail: () => {
+        ipcTTTOperatorLog('hide: 调用停止对讲失败');
+      }
+    });
+  });
   const systemInfo = useRef(null);
   if (!systemInfo.current) {
     systemInfo.current = getSystemInfoSync();
@@ -438,8 +474,12 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     isShare: isShare,
     ignoreHideStopPreview: ignoreHideStopPreview,
     ipcPlayerContext: instance.IPCPlayerInstance,
-    onChangeStreamStatus: onChangeStreamStatus
-    // onCtx={getIpcPlayerCtx}
+    onChangeStreamStatus: onChangeStreamStatus,
+    onCtx: res => {
+      if (res) {
+        setCreateCtx(true);
+      }
+    }
     // onPlayerTap={handlePlayerClick}
     ,
     onCameraNotifyWeakNetwork: data => {

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

@@ -30,8 +30,8 @@ export declare const Battery: import("react").FunctionComponent<{
     setRecordingDisabled: (type: boolean) => void;
     setResolution: (type: string) => void;
     setResolutionList: (type: string[]) => void;
-    setRecording: (value: boolean) => Promise<import("../..").RecordInfoData>;
-    setIntercom: (value: boolean) => Promise<boolean>;
+    setRecording: (value: boolean, onlyUpdateAtom?: boolean | undefined) => Promise<import("../..").RecordInfoData>;
+    setIntercom: (value: boolean, onlyUpdateAtom?: boolean | undefined) => Promise<boolean>;
     setMute: (value: boolean) => Promise<boolean>;
     changeStreamStatus: (value: import("../..").PlayerStreamStatus) => void;
     getStreamStatus: () => import("../..").PlayerStreamStatus;
@@ -77,8 +77,8 @@ export declare const BatteryFull: import("react").FunctionComponent<{
     setRecordingDisabled: (type: boolean) => void;
     setResolution: (type: string) => void;
     setResolutionList: (type: string[]) => void;
-    setRecording: (value: boolean) => Promise<import("../..").RecordInfoData>;
-    setIntercom: (value: boolean) => Promise<boolean>;
+    setRecording: (value: boolean, onlyUpdateAtom?: boolean | undefined) => Promise<import("../..").RecordInfoData>;
+    setIntercom: (value: boolean, onlyUpdateAtom?: boolean | undefined) => Promise<boolean>;
     setMute: (value: boolean) => Promise<boolean>;
     changeStreamStatus: (value: import("../..").PlayerStreamStatus) => void;
     getStreamStatus: () => import("../..").PlayerStreamStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.12",
+  "version": "0.0.13-beta-2",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -39,7 +39,7 @@
     "@ray-js/panel-sdk": "^1.13.1",
     "@ray-js/direction-control": "^0.0.8",
     "@ray-js/ray-ipc-player": "2.0.23",
-    "@ray-js/ray-ipc-utils": "1.1.8",
+    "@ray-js/ray-ipc-utils": "^1.1.10",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
     "jotai": "^2.10.2"