@ray-js/ray-ipc-player 2.1.0-beta.1 → 2.1.0-beta.2

package/lib/hooks/usePlayerConnection.js

@@ -137,6 +137,7 @@ export const usePlayerConnection = _ref => {
         d.errorState = false;
         d.loadingState = true;
       });
+      handleReWakeCamera();
       // 如果值为false, 表示设备为睡眠状态，需要唤醒设备
       setMqttPrivateFlag(true);
       setEnableWakeUpInterval(true);

package/lib/index.js

@@ -101,6 +101,9 @@ const Player = props => {
   useRef(null);
   const firstPreviewTimeRef = useRef(false);
 
+  // 标记是否进入内存缓存/后台（onPause、onHide 设为 true，onShow 还原为 false），拉流时若为 true 则拦截
+  const isInBackgroundRef = useRef(false);
+
   // 自定义计时老低功耗方案设备在线状态, 用于短暂时间报上下线的UI展示兼容 待实现
   const [lowPowerDeviceOnlineState, setLowPowerDeviceOnlineState] = useState(onlineStatus);
   // 用于记录低功耗设备上报离线，延迟5秒展示，避免因设备频繁上下线 导致显示杂乱
@@ -169,6 +172,7 @@ const Player = props => {
     }
   });
   usePageEvent('onShow', useMemoizedFn(async () => {
+    isInBackgroundRef.current = false;
     getNetworkType({
       success: res => {
         console.log('网络类型', res);
@@ -251,6 +255,7 @@ const Player = props => {
     onDpDataChange(handleDpDataChange);
   }, []);
   usePageEvent('onHide', useMemoizedFn(async () => {
+    isInBackgroundRef.current = true;
     ipcTTTOperatorLog('VID: onHide event will go to stopPreview');
     if (ignoreHideStopPreview) {
       return;
@@ -263,6 +268,7 @@ const Player = props => {
     // await getCurMute();
   }));
   useAppEvent('onPause', useMemoizedFn(async () => {
+    isInBackgroundRef.current = true;
     console.log('onPause, 重新拉流');
     ipcTTTOperatorLog('VID: onPause stopPreview');
     stopPreview();
@@ -383,7 +389,7 @@ const Player = props => {
    * 当检测到设备上报休眠后，触发重新连接
    */
   useEffect(() => {
-    if (wirelessFlag) {
+    if (wirelessFlag && !isInBackgroundRef.current) {
       // 进入面板后，若监听到设备上报休眠后, 需进行重新连接
       setWirelessFlag(false);
       _reConnect();
@@ -425,7 +431,7 @@ const Player = props => {
    * 当接收到外部重连指令且设备在线时，触发重新连接
    */
   useEffect(() => {
-    if (reConnect && devId && onlineStatus) {
+    if (reConnect && devId && onlineStatus && !isInBackgroundRef.current) {
       _reConnect();
     }
   }, [reConnect, devId, onlineStatus, _reConnect]);
@@ -490,6 +496,11 @@ const Player = props => {
       console.log('不在播放器路由内, 不进行拉流');
       return;
     }
+    if (isInBackgroundRef.current) {
+      console.log('处于后台/内存缓存，拦截拉流');
+      ipcTTTOperatorLog('VID: isInBackground, block retry');
+      return;
+    }
     phoneNetworkConnect && onlineStatus && privateState && (!isLowPowerDevice || isVirtualDevice) && handleReWakeCamera();
 
     // 低功耗设备隐私模式需单独处理，先进行下发唤醒, 唤醒后再进行下发DP

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.1.0-beta.1",
+  "version": "2.1.0-beta.2",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-miniapp",