@ray-js/ray-ipc-player 2.1.1-beta.2 → 2.1.1-beta.3

package/lib/components/ErrorOverlay.d.ts

@@ -22,7 +22,8 @@ interface ErrorOverlayProps {
     hideFeedBackButton: boolean;
     isShare: boolean;
     limitFlow: boolean;
-    autoPlay: boolean;
+    /** 是否开启预览拉流，与 Player 内 previewOn 一致（previewEnabled ?? true） */
+    previewOn: boolean;
 }
 declare const ErrorOverlay: React.FC<ErrorOverlayProps>;
 export default ErrorOverlay;

package/lib/components/ErrorOverlay.js

@@ -31,7 +31,7 @@ const ErrorOverlay = _ref => {
     hideFeedBackButton,
     isShare,
     limitFlow,
-    autoPlay
+    previewOn
   } = _ref;
   /**
    * 获取错误展示内容
@@ -54,8 +54,8 @@ const ErrorOverlay = _ref => {
       return Strings.getLang('ipc_player_traffic_load_online_zero_tip');
     }
 
-    // 未自动播放
-    if (!autoPlay) {
+    // 未开启预览拉流（休眠态提示）
+    if (!previewOn) {
       return Strings.getLang('ipc_player_sleep_tip');
     }
     if (!isLowPowerDevice && onlineStatus && privateState) {
@@ -83,7 +83,7 @@ const ErrorOverlay = _ref => {
       return "".concat(Strings.getLang("ipc_player_error_common"), "(").concat(videoErrCode, ")");
     }
     return playStateErrorMsg;
-  }, [phoneNetworkConnect, onlineStatus, privateState, isLowPowerDevice, lowPowerDeviceOnlineState, lowPrivateOutTimeFlag, device4GIsFreeze, deviceFreezeReason, limitFlow, autoPlay, videoErrCode, playStateErrorMsg]);
+  }, [phoneNetworkConnect, onlineStatus, privateState, isLowPowerDevice, lowPowerDeviceOnlineState, lowPrivateOutTimeFlag, device4GIsFreeze, deviceFreezeReason, limitFlow, previewOn, videoErrCode, playStateErrorMsg]);
 
   /**
    * 根据自定义类型获取错误码展示内容
@@ -142,7 +142,7 @@ const ErrorOverlay = _ref => {
         if (limitFlow) {
           return Strings.getLang('ipc_player_recharge_flow_btn');
         }
-        if (!autoPlay) {
+        if (!previewOn) {
           return Strings.getLang('ipc_player_open_sleep_mode');
         }
         if (privateState) {
@@ -194,7 +194,7 @@ const ErrorOverlay = _ref => {
       default:
         return false;
     }
-  }, [hideSuggestedText, privateState, limitFlow, phoneNetworkConnect, isLowPowerDevice, onlineStatus, lowPowerDeviceOnlineState, isShare, device4GIsFreeze, deviceFreezeReason, hideHelpButton, hideFeedBackButton]);
+  }, [hideSuggestedText, privateState, limitFlow, phoneNetworkConnect, isLowPowerDevice, onlineStatus, lowPowerDeviceOnlineState, isShare, device4GIsFreeze, deviceFreezeReason, hideHelpButton, hideFeedBackButton, previewOn]);
 
   /**
    * 跳转4G流量充值页面
@@ -248,11 +248,11 @@ const ErrorOverlay = _ref => {
     if (limitFlow && onlineStatus) {
       return 'err-icon-flow-limit';
     }
-    if (!autoPlay) {
+    if (!previewOn) {
       return 'err-icon-sleep';
     }
     return 'err-icon';
-  }, [autoPlay, limitFlow, onlineStatus]);
+  }, [previewOn, limitFlow, onlineStatus]);
   if (!isError) return null;
   return /*#__PURE__*/React.createElement(CoverView, {
     style: {

package/lib/index.js

@@ -99,15 +99,13 @@ const Player = props => {
   /** 传入 previewEnabled 为受控；未传时 previewOn 为 true（自动拉流） */
   const isPreviewControlled = previewEnabled !== undefined;
   const previewOn = previewEnabled !== null && previewEnabled !== void 0 ? previewEnabled : true;
-
-  // connectChangeRef
   useRef(null);
   const firstPreviewTimeRef = useRef(false);
 
   // 标记是否进入内存缓存/后台（onPause、onHide 设为 true，onShow 还原为 false），拉流时若为 true 则拦截
   const isInBackgroundRef = useRef(false);
-  /** 受控 previewEnabled：因 onHide/onPause 已通知父级 false，回到前台时需恢复 true 并拉流 */
-  const previewPausedByLifecycleRef = useRef(false);
+  /** 网络/在线等早于 onShow 触发拉流时 isInBackgroundRef 仍为 true，记一次待回到前台后补拉 */
+  const pendingForegroundPullRef = useRef(false);
 
   // 自定义计时老低功耗方案设备在线状态, 用于短暂时间报上下线的UI展示兼容 待实现
   const [lowPowerDeviceOnlineState, setLowPowerDeviceOnlineState] = useState(onlineStatus);
@@ -203,8 +201,10 @@ const Player = props => {
     if (isInBackgroundRef.current) {
       console.log('处于后台/内存缓存，拦截拉流');
       ipcTTTOperatorLog('VID: isInBackground, block retry');
+      pendingForegroundPullRef.current = true;
       return;
     }
+    pendingForegroundPullRef.current = false;
     if (isPreviewControlled) {
       onPreviewEnabledChange === null || onPreviewEnabledChange === void 0 || onPreviewEnabledChange(true);
       if (previewEnabled) {
@@ -215,6 +215,29 @@ const Player = props => {
     runPullStream();
   });
 
+  /** 回到前台后补拉：解决 onNetworkStatusChange 等早于 onShow 触发 retry 被拦的问题 */
+  const flushPendingForegroundPull = useMemoizedFn(() => {
+    if (!pendingForegroundPullRef.current) {
+      return;
+    }
+    if (!previewOn) {
+      pendingForegroundPullRef.current = false;
+      ipcTTTOperatorLog('VID: flush_pending_cleared_preview_off');
+      return;
+    }
+    if (!phoneNetworkConnect || !playState.initLy || !ipcCtx.current || !onlineStatus || privateState || limitFlow || !previewOn) {
+      ipcTTTOperatorLog('VID: flush_pending_skip_not_ready');
+      return;
+    }
+    pendingForegroundPullRef.current = false;
+    ipcTTTOperatorLog('VID: flush_pending_foreground_pull');
+    if (isPreviewControlled) {
+      runPullStream();
+    } else {
+      retry();
+    }
+  });
+
   /**
    * 命令式开关：受控走 onPreviewEnabledChange；未传 previewEnabled 时 previewOn 恒为 true，仅支持开启拉流（retry）
    */
@@ -237,7 +260,18 @@ const Player = props => {
     });
   };
   usePageEvent('onShow', useMemoizedFn(async () => {
+    const wasBackground = isInBackgroundRef.current;
     isInBackgroundRef.current = false;
+    if (wasBackground && !ignoreHideStopPreview) {
+      setVideoErrCode('');
+      if (previewOn) {
+        setPlayState(d => {
+          d.loadingState = true;
+          d.errorState = false;
+          d.errorMsg = '';
+        });
+      }
+    }
     getNetworkType({
       success: res => {
         console.log('网络类型', res);
@@ -252,21 +286,12 @@ const Player = props => {
       onChangeIgnoreHideStopPreview && onChangeIgnoreHideStopPreview(false);
       return;
     }
-    // 受控 preview：后台/隐藏时已把父级置为 false，前台先恢复意图再拉流（不依赖同一帧 previewOn）
-    if (previewPausedByLifecycleRef.current && isPreviewControlled) {
-      previewPausedByLifecycleRef.current = false;
-      onPreviewEnabledChange === null || onPreviewEnabledChange === void 0 || onPreviewEnabledChange(true);
-      if (phoneNetworkConnect && playState.initLy && ipcCtx.current && onlineStatus && !privateState && !limitFlow) {
-        ipcTTTOperatorLog('VID: onShow_resume_after_hide_pause');
-        runPullStream();
-      }
-      return;
-    }
     // 视图准备就绪
     if (phoneNetworkConnect && playState.initLy && ipcCtx.current && onlineStatus && !privateState && !limitFlow && previewOn) {
       ipcTTTOperatorLog('VID: onShow_event_to_retry');
       retry();
     }
+    flushPendingForegroundPull();
   }));
   usePageEvent('onResize', sizeData => {
     const {
@@ -283,21 +308,22 @@ const Player = props => {
     }
   });
 
-  // 针对limitFlow
+  // 针对limitFlow / 未拉流：休眠态 UI
   useEffect(() => {
-    if (limitFlow || !previewOn) {
-      setPlayState(d => {
-        return _objectSpread(_objectSpread({}, d), {}, {
-          loadingState: false,
-          errorState: true,
-          errorMessage: ''
-        });
+    if (!(limitFlow || !previewOn)) {
+      return;
+    }
+    setPlayState(d => {
+      return _objectSpread(_objectSpread({}, d), {}, {
+        loadingState: false,
+        errorState: true,
+        errorMessage: ''
       });
-      ipcTTTOperatorLog("limitFlow ~~~~ ".concat(limitFlow, " previewOn ~~~ ").concat(previewOn));
-      if (playState.initLy && ipcCtx.current) {
-        stopPreview();
-        disconnect();
-      }
+    });
+    ipcTTTOperatorLog("limitFlow ~~~~ ".concat(limitFlow, " previewOn ~~~ ").concat(previewOn));
+    if (playState.initLy && ipcCtx.current) {
+      stopPreview();
+      disconnect();
     }
   }, [limitFlow, previewOn, playState.initLy, ipcCtx.current]);
   useEffect(() => {
@@ -335,10 +361,6 @@ const Player = props => {
     if (ignoreHideStopPreview) {
       return;
     }
-    if (isPreviewControlled && previewOn) {
-      previewPausedByLifecycleRef.current = true;
-      onPreviewEnabledChange === null || onPreviewEnabledChange === void 0 || onPreviewEnabledChange(false);
-    }
     setPlayState(d => {
       d.loadingState = true;
     });
@@ -350,10 +372,6 @@ const Player = props => {
     isInBackgroundRef.current = true;
     console.log('onPause, 重新拉流');
     ipcTTTOperatorLog('VID: onPause stopPreview');
-    if (!ignoreHideStopPreview && isPreviewControlled && previewOn) {
-      previewPausedByLifecycleRef.current = true;
-      onPreviewEnabledChange === null || onPreviewEnabledChange === void 0 || onPreviewEnabledChange(false);
-    }
     stopPreview();
     disconnect();
   }));
@@ -578,6 +596,12 @@ const Player = props => {
         });
       } else if (playState.initLy && !privateState) {
         ipcTTTOperatorLog("VID: privateState_status_change: ".concat(privateState));
+        // 网络/在线等回调可能早于页面 onShow，此时 isInBackgroundRef 仍为 true，避免 retry 被误拦；等 onShow 再拉流
+        if (isInBackgroundRef.current) {
+          ipcTTTOperatorLog('VID: skip_pull_in_status_effect_while_background');
+          pendingForegroundPullRef.current = true;
+          return;
+        }
         if (isPreviewControlled) {
           runPullStream();
         } else {
@@ -767,7 +791,7 @@ const Player = props => {
     hideFeedBackButton: hideFeedBackButton,
     isShare: isShare,
     limitFlow: limitFlow,
-    autoPlay: previewOn
+    previewOn: previewOn
   }), /*#__PURE__*/React.createElement(FullScreenBackButton, {
     isVisible: screenType === 'landscape' && (playState.loadingState || playState.errorState),
     getClassName: getClassName,

package/package.json

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