@ray-js/ray-ipc-player 2.0.29-beta-1 → 2.0.29-beta-2

package/lib/index.js

@@ -7,7 +7,7 @@ import { useImmer } from 'use-immer';
 import _isEmpty from 'lodash/isEmpty';
 import { IpcPlayer, View, CoverView } from '@ray-js/components';
 import { useMount, useUnmount, useMemoizedFn } from 'ahooks';
-import { setPageOrientation, usePageEvent, getNetworkType, offNetworkStatusChange, onNetworkStatusChange, publishDps, showToast, getSystemInfoSync, onMqttMessageReceived, registerMQTTProtocolListener, offMqttMessageReceived, unregisterMQTTProtocolListener, registerDeviceListListener, onDpDataChange, onDeviceOnlineStatusUpdate, performanceEvent } from '@ray-js/ray';
+import { setPageOrientation, usePageEvent, getNetworkType, offNetworkStatusChange, onNetworkStatusChange, publishDps, showToast, getSystemInfoSync, onMqttMessageReceived, registerMQTTProtocolListener, offMqttMessageReceived, unregisterMQTTProtocolListener, registerDeviceListListener, onDpDataChange, onDeviceOnlineStatusUpdate, performanceEvent, getCurrentPages } from '@ray-js/ray';
 import clsx from 'clsx';
 import Strings from './i18n';
 import { IpcFailCode } from './constant';
@@ -60,7 +60,8 @@ const Player = props => {
     onChangeIgnoreHideStopPreview,
     hideSuggestedText = false,
     hideHelpButton = false,
-    hideFeedBackButton = false
+    hideFeedBackButton = false,
+    playerRoute = ''
   } = props;
   const {
     borderRadius,
@@ -379,6 +380,11 @@ const Player = props => {
 
   // 无需关心连接状态直接发起重新连接
   const _reConnect = () => {
+    console.log('不在播放器路由内, 不进行标记');
+    //  排除默认值为"",不等于播放器路由时, 不进行连接操作
+    if (playerRoute !== '' && playerRoute !== getPlayerRoute()) {
+      return;
+    }
     setPlayState(d => {
       d.connectState = true;
       d.loadingText = Strings.getLang('ipc_player_get_video_stream');
@@ -475,8 +481,14 @@ const Player = props => {
       }, 15000);
     }
   });
+  const getPlayerRoute = () => {
+    const pages = getCurrentPages(); // 获取当前页面栈
+    const currentPage = pages[pages.length - 1]; // 获取当前页面实例
+    return currentPage.route;
+  };
   const retry = useMemoizedFn(() => {
     console.log('重新拉流启动');
+
     // 任何重试拉流时, 将播放器状态还原为loading状态
     setVideoErrCode('');
     setPlayState(d => {
@@ -484,6 +496,12 @@ const Player = props => {
       d.errorState = false;
       d.errorMsg = '';
     });
+    //  排除默认值为"",不等于播放器路由时, 不进行重试拉流
+
+    if (playerRoute !== '' && playerRoute !== getPlayerRoute()) {
+      console.log('不在播放器路由内, 不进行拉流');
+      return;
+    }
     phoneNetworkConnect && onlineStatus && privateState && (!isLowPowerDevice || isVirtualDevice) && handleReWakeCamera();
 
     // 低功耗设备隐私模式需单独处理，先进行下发唤醒, 唤醒后再进行下发DP
@@ -504,6 +522,10 @@ const Player = props => {
   // 建立连接
   const createConnect = useMemoizedFn(async params => {
     var _ipcCtx$current;
+    if (playerRoute !== '' && playerRoute !== getPlayerRoute()) {
+      console.log('不在播放器路由内, 不进行连接操作');
+      return;
+    }
     // console.log('建立连接前:', devId, Date.now());
     // 若走到连接状态，需清除低功耗15秒超时定时
     privateLowPowerDeviceTimeOutRef.current && clearTimeout(privateWakeOutTimeRef.current);

package/lib/typings/index.d.ts

@@ -195,19 +195,25 @@ export type IProps = {
   /**
    * @description.en hide suggested text
    * @description.zh 隐藏建议文案
-   * @default (data) => void
+   * @default false
    */
   hideSuggestedText?: boolean;
   /**
    * @description.en hide help button
    * @description.zh 隐藏反馈帮助按钮
-   * @default (data) => void
+   * @default false
    */
   hideHelpButton?: boolean;
   /**
    * @description.en hide feedback button
    * @description.zh 隐藏反馈按钮
-   * @default (data) => void
+   * @default false
    */
   hideFeedBackButton?: boolean;
+  /**
+   * @description.en Route where the player is located
+   * @description.zh 播放器所在路由
+   * @default '
+   */
+  playerRoute?: string;
 };

package/package.json

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