@ray-js/ray-ipc-player 2.0.24 → 2.0.26-beta-1

package/lib/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 /* eslint-disable no-unneeded-ternary */
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { useImmer } from 'use-immer';
 import _isEmpty from 'lodash/isEmpty';
 import { IpcPlayer, View, CoverView } from '@ray-js/components';
@@ -118,13 +118,13 @@ const Player = props => {
   const retryCount = useRef(0); // 重试次数
   const muteRef = useRef(defaultMute); // 静音
 
-  usePageEvent('onShow', useCallback(async () => {
+  usePageEvent('onShow', useMemoizedFn(async () => {
     // 视图准备就绪
     if (phoneNetworkConnect && playState.initLy && ipcCtx.current && onlineStatus && !privateState) {
       ipcTTTOperatorLog('VID: onShow_event_to_retry');
       retry();
     }
-  }, [phoneNetworkConnect, onlineStatus && playState.connectState, privateState, playState.initLy]));
+  }));
   usePageEvent('onShow', () => {
     getNetworkType({
       success: res => {
@@ -188,7 +188,14 @@ const Player = props => {
   }));
   useMount(() => {
     onNetworkStatusChange(res => {
+      console.log(res, 'res==========onNetworkStatusChange');
       setPhoneNetworkConnect(res.isConnected);
+      if (!res.isConnected) {
+        // 断网，需要主动调用断流以及断开P2P
+        ipcTTTOperatorLog('VID: network is not connected, need stop preview and disconnect');
+        stopPreview();
+        disconnect();
+      }
     });
   });
   useUnmount(() => {
@@ -324,6 +331,7 @@ const Player = props => {
           d.errorMsg = Strings.getLang('ipc_player_device_offline');
         });
       } else if (playState.initLy && !privateState) {
+        console.log('sdhjsahdjshajdh');
         ipcTTTOperatorLog("VID: privateState_status_change: ".concat(privateState));
         retry();
       } else if (playState.initLy && privateState) {
@@ -336,8 +344,11 @@ const Player = props => {
 
   // 重试
   const _retry = async () => {
+    console.log('调用了重试');
     const connectState = await getIsConnected(ipcCtx.current);
+    console.log('调用了重试--connectState');
     const isOnPreview = await getIsOnPreview(ipcCtx.current);
+    console.log('调用了重试--isOnPreview');
     setPlayState(d => {
       d.connectState = connectState ? true : false;
       d.errorMsg = '';
@@ -449,8 +460,7 @@ const Player = props => {
       }, 15000);
     }
   });
-  const retry = useCallback(() => {
-    // console.log('retry:', muteRef.current);
+  const retry = useMemoizedFn(() => {
     console.log('重新拉流启动');
     // 任何重试拉流时, 将播放器状态还原为loading状态
     setVideoErrCode('');
@@ -464,7 +474,8 @@ const Player = props => {
     // 低功耗设备隐私模式需单独处理，先进行下发唤醒, 唤醒后再进行下发DP
     phoneNetworkConnect && onlineStatus && privateState && isLowPowerDevice && !isVirtualDevice && handleReWakeCameraLowPowerDevice();
     phoneNetworkConnect && onlineStatus && !privateState && _retry();
-  }, [isLowPowerDevice, phoneNetworkConnect && playState.connectState, privateState, onlineStatus]);
+    // }, [isLowPowerDevice, phoneNetworkConnect && playState.connectState, privateState, onlineStatus]);
+  });
 
   // 创建ipc实例
   const createIpcCtx = () => {
@@ -619,7 +630,7 @@ const Player = props => {
    */
 
   // 异常事件
-  const onError = useCallback(e => {
+  const onError = useMemoizedFn(e => {
     ipcTTTOperatorLog("VID: player_event_on_error: ".concat(JSON.stringify(e)));
     if (playState.errorState) {
       return;
@@ -638,7 +649,7 @@ const Player = props => {
         d.connectState = false;
       });
     }
-  }, [playState.errorState]);
+  });
 
   // 连接状态发生变化
   const connectChange = useMemoizedFn(e => {
@@ -711,14 +722,14 @@ const Player = props => {
   /**
    * 播放器画面点击事件
    */
-  const handleVideoTap = useCallback(() => {
+  const handleVideoTap = useMemoizedFn(() => {
     if (!playState.loadingState && !playState.errorState && onlineStatus && !privateState) {
       ipcTTTOperatorLog('VID: onVideoTap_event_send');
       onPlayerTap && onPlayerTap(devId);
     } else {
       ipcTTTOperatorLog('VID: onVideoTap_event_trigger_not_send');
     }
-  }, [onPlayerTap, playState.loadingState, playState.errorState, onlineStatus, privateState]);
+  });
 
   /**
    * 退出横屏
@@ -751,7 +762,7 @@ const Player = props => {
   /**
    * 获取错误展示内容
    */
-  const getErrorContent = useCallback(() => {
+  const getErrorContent = useMemoizedFn(() => {
     if (!phoneNetworkConnect) {
       return Strings.getLang('ipc_player_network_fail');
     }
@@ -795,12 +806,12 @@ const Player = props => {
       return "".concat(Strings.getLang("ipc_player_error_common"), "(").concat(videoErrCode, ")");
     }
     return playState.errorMsg;
-  }, [phoneNetworkConnect, playState, videoErrCode, privateState, onlineStatus, isLowPowerDevice, lowPowerDeviceOnlineState, device4GIsFreeze, deviceFreezeReason, lowPrivateOutTimeFlag]);
+  });
 
   /**
    * 根据自定义类型获取错误码展示内容
    */
-  const getErrorContentByType = useCallback((errCode, type) => {
+  const getErrorContentByType = useMemoizedFn((errCode, type) => {
     const errContent = getErrCodeDetailDataByCode(String(errCode));
     const contentEmpty = _isEmpty(errContent);
     switch (type) {
@@ -887,12 +898,12 @@ const Player = props => {
       default:
         return false;
     }
-  }, [phoneNetworkConnect, privateState, onlineStatus, isLowPowerDevice, lowPowerDeviceOnlineState, device4GIsFreeze, deviceFreezeReason]);
+  });
 
   /**
    * 跳转帮助小程序
    */
-  const handleGotoHelpMini = useCallback(async () => {
+  const handleGotoHelpMini = useMemoizedFn(async () => {
     if (isLowPowerDevice && !lowPowerDeviceOnlineState || !onlineStatus) {
       const realLanguage = await getLanguage();
       const url = "godzilla://".concat(miniIdLabs.helpMini, "/pages/commonDetails/index?answer=/app-helpcenter/").concat(realLanguage, "/K94ow0gwu9bg2");
@@ -906,7 +917,7 @@ const Player = props => {
     const url = "godzilla://".concat(miniIdLabs.ipcHelpMini, "?errCode=").concat(videoErrCode, "&deviceId=").concat(devId, "&homeId=").concat(homeInfo === null || homeInfo === void 0 ? void 0 : homeInfo.homeId, "&instanceId=").concat(devInfo === null || devInfo === void 0 ? void 0 : devInfo.uuid, "&helpNum=").concat(helpNum, "&helpFeedBack=").concat(helpFeedBack, "&themeColor=").concat(brandColor);
     openTargetMinByShortLink(url);
     return false;
-  }, [onlineStatus, isLowPowerDevice, lowPowerDeviceOnlineState]);
+  });
 
   /**
    * 跳转反馈小程序

package/lib/index.module.less

@@ -154,7 +154,6 @@
   text-align: center;
   font-size: 12px;
   padding: 0 16px;
-  word-break: break-all;
 
   .errIconContainer {
     .errIcon {
@@ -179,14 +178,12 @@
       color: #ffffff;
       font-size: 12px;
       font-weight: 400;
-      word-break: break-word;
     }
     .errDesc {
       margin-top: 5px;
       color: rgba(255, 255, 255, 0.7);
       font-size: 12px;
       font-weight: 400;
-      word-break: break-word;
     }
   }
 
@@ -211,7 +208,6 @@
       margin: 0 4px;
       text-overflow: ellipsis;
       padding: 8px 16px;
-      word-break: break-word;
     }
     .operatorBtn:hover {
       opacity: 0.9;

package/package.json

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