@ray-js/ray-ipc-player 2.0.29 → 2.0.31

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, getCurrentPages } from '@ray-js/ray';
+import { setPageOrientation, usePageEvent, useAppEvent, 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';
@@ -128,15 +128,20 @@ const Player = props => {
   const muteRef = useRef(defaultMute); // 静音
 
   usePageEvent('onShow', useMemoizedFn(async () => {
-    if (ignoreHideStopPreview) {
-      onChangeIgnoreHideStopPreview && onChangeIgnoreHideStopPreview(false);
-      return;
-    }
     getNetworkType({
       success: res => {
+        console.log('网络类型', res);
         setPhoneNetworkConnect(res.networkType !== 'none');
+      },
+      fail: err => {
+        console.log('网络类型获取失败', err);
+        setPhoneNetworkConnect(false);
       }
     });
+    if (ignoreHideStopPreview) {
+      onChangeIgnoreHideStopPreview && onChangeIgnoreHideStopPreview(false);
+      return;
+    }
     // 视图准备就绪
     if (phoneNetworkConnect && playState.initLy && ipcCtx.current && onlineStatus && !privateState) {
       ipcTTTOperatorLog('VID: onShow_event_to_retry');
@@ -197,9 +202,9 @@ const Player = props => {
     stopPreview();
     // await getCurMute();
   }));
-  usePageEvent('onPause', useMemoizedFn(async () => {
-    console.log('onResume, 重新拉流');
-    ipcTTTOperatorLog('VID: onResume stopPreview');
+  useAppEvent('onPause', useMemoizedFn(async () => {
+    console.log('onPause, 重新拉流');
+    ipcTTTOperatorLog('VID: onPause stopPreview');
     stopPreview();
     disconnect();
   }));
@@ -309,6 +314,18 @@ const Player = props => {
       _reConnect();
     }
   }, [wirelessFlag]);
+  useEffect(() => {
+    getNetworkType({
+      success: res => {
+        console.log('首次获取网络类型', res);
+        setPhoneNetworkConnect(res.networkType !== 'none');
+      },
+      fail: err => {
+        console.log('首次网络类型获取失败', err);
+        setPhoneNetworkConnect(false);
+      }
+    });
+  }, []);
   useEffect(() => {
     onlineStatus && createIpcCtx();
     return () => {
@@ -512,7 +529,6 @@ const Player = props => {
 
   // 创建ipc实例
   const createIpcCtx = () => {
-    console.log('创建ipc实例');
     onCtx && onCtx({
       ctx: ipcCtx.current,
       retry

package/package.json

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