@ray-js/ray-ipc-player 2.0.20 → 2.0.21-beta-2

package/lib/constant.js

@@ -1,25 +1,44 @@
 export let IpcFailCode = /*#__PURE__*/function (IpcFailCode) {
+  // 未知异常
   IpcFailCode[IpcFailCode["ipc_player_unknown"] = -1000] = "ipc_player_unknown";
+  // 建立connect连接失败
   IpcFailCode[IpcFailCode["ipc_player_connect_fail"] = -1001] = "ipc_player_connect_fail";
+  // 开启预览失败
   IpcFailCode[IpcFailCode["ipc_player_preview_fail"] = -1002] = "ipc_player_preview_fail";
+  // 网络状态不可用
   IpcFailCode[IpcFailCode["ipc_player_network_fail"] = -1010] = "ipc_player_network_fail";
+  // 设备被移除
   IpcFailCode[IpcFailCode["ipc_player_device_removed"] = -1012] = "ipc_player_device_removed";
   return IpcFailCode;
 }({});
 export let TipsCode = /*#__PURE__*/function (TipsCode) {
+  // 设备离线
   TipsCode[TipsCode["ipc_player_no_line"] = -1011] = "ipc_player_no_line";
+  // disconnect失败
   TipsCode[TipsCode["ipc_player_disconnect_fail"] = -1009] = "ipc_player_disconnect_fail";
+  // 结束预览失败
   TipsCode[TipsCode["ipc_player_stop_preview_fail"] = -1003] = "ipc_player_stop_preview_fail";
+  // 设置静音失败
   TipsCode[TipsCode["ipc_player_mute_fail"] = -1004] = "ipc_player_mute_fail";
+  // 切换清晰度失败
   TipsCode[TipsCode["ipc_player_resolution_fail"] = -1005] = "ipc_player_resolution_fail";
+  // 截图失败
   TipsCode[TipsCode["ipc_player_capture_fail"] = -1006] = "ipc_player_capture_fail";
+  // 开启对讲失败
   TipsCode[TipsCode["ipc_player_start_talk_fail"] = -1013] = "ipc_player_start_talk_fail";
+  // 结束对讲失败
   TipsCode[TipsCode["ipc_player_stop_talk_fail"] = -1014] = "ipc_player_stop_talk_fail";
+  // 开启录屏失败
   TipsCode[TipsCode["ipc_player_start_record_fail"] = -1015] = "ipc_player_start_record_fail";
+  // 结束录屏失败
   TipsCode[TipsCode["ipc_player_stop_record_fail"] = -1016] = "ipc_player_stop_record_fail";
+  // 获取对讲状态失败
   TipsCode[TipsCode["ipc_player_is_talk_backing_fail"] = -1017] = "ipc_player_is_talk_backing_fail";
+  // 摇杆震动设置失败
   TipsCode[TipsCode["ipc_player_set_available_rocker_directions_fail"] = -1018] = "ipc_player_set_available_rocker_directions_fail";
+  // 开启特写追踪失败
   TipsCode[TipsCode["ipc_player_set_tracking_status_fail"] = -1020] = "ipc_player_set_tracking_status_fail";
+  // 获取视频信息失败
   TipsCode[TipsCode["ipc_player_get_video_info_fail"] = -1021] = "ipc_player_get_video_info_fail";
   return TipsCode;
 }({});

package/lib/hooks/index.d.ts

@@ -0,0 +1,7 @@
+interface UseWakeUpDeviceOptions {
+    deviceId: string;
+    enabled: boolean;
+    intervalTime?: number;
+}
+export declare const useWakeUpDevice: ({ deviceId, enabled, intervalTime, }: UseWakeUpDeviceOptions) => void;
+export {};

package/lib/hooks/index.js

@@ -0,0 +1,34 @@
+import { useEffect, useRef } from 'react';
+import { wakeUpDevice } from '../utils';
+export const useWakeUpDevice = _ref => {
+  let {
+    deviceId,
+    enabled,
+    intervalTime = 300
+  } = _ref;
+  const intervalRef = useRef(null);
+  useEffect(() => {
+    if (!enabled || !deviceId) {
+      if (intervalRef.current) {
+        clearInterval(intervalRef.current);
+        intervalRef.current = null;
+        console.log('唤醒定时器已清除');
+      }
+      return undefined;
+    }
+    const wakeUp = () => {
+      wakeUpDevice(deviceId);
+    };
+    // 立即唤醒一次
+    wakeUp();
+    // 设置定时器
+    intervalRef.current = setInterval(wakeUp, intervalTime);
+    // 清理函数：停止定时器
+    return () => {
+      if (intervalRef.current) {
+        clearInterval(intervalRef.current);
+        intervalRef.current = null;
+      }
+    };
+  }, [enabled, deviceId, intervalTime]);
+};

package/lib/i18n/index.d.ts

@@ -2,6 +2,9 @@ import { kit } from '@ray-js/panel-sdk';
 declare const _default: kit.I18N<{
     en: {
         ipc_player_get_video_stream: string;
+        ipc_player_private_open_stream: string;
+        ipc_player_private_open_low_stream: string;
+        ipc_player_private_open_low_stream_fail: string;
         ipc_player_preview_fail: string;
         ipc_player_stop_preview_fail: string;
         ipc_player_resolution_fail: string;
@@ -127,6 +130,9 @@ declare const _default: kit.I18N<{
     };
     zh: {
         ipc_player_get_video_stream: string;
+        ipc_player_private_open_stream: string;
+        ipc_player_private_open_low_stream: string;
+        ipc_player_private_open_low_stream_fail: string;
         ipc_player_preview_fail: string;
         ipc_player_stop_preview_fail: string;
         ipc_player_resolution_fail: string;
@@ -252,6 +258,9 @@ declare const _default: kit.I18N<{
     };
 }, {
     ipc_player_get_video_stream: string;
+    ipc_player_private_open_stream: string;
+    ipc_player_private_open_low_stream: string;
+    ipc_player_private_open_low_stream_fail: string;
     ipc_player_preview_fail: string;
     ipc_player_stop_preview_fail: string;
     ipc_player_resolution_fail: string;
@@ -376,6 +385,9 @@ declare const _default: kit.I18N<{
     ipc_player_traffic_load_online_zero_tip: string;
 } | {
     ipc_player_get_video_stream: string;
+    ipc_player_private_open_stream: string;
+    ipc_player_private_open_low_stream: string;
+    ipc_player_private_open_low_stream_fail: string;
     ipc_player_preview_fail: string;
     ipc_player_stop_preview_fail: string;
     ipc_player_resolution_fail: string;

package/lib/i18n/strings.d.ts

@@ -1,6 +1,9 @@
 declare const _default: {
     en: {
         ipc_player_get_video_stream: string;
+        ipc_player_private_open_stream: string;
+        ipc_player_private_open_low_stream: string;
+        ipc_player_private_open_low_stream_fail: string;
         ipc_player_preview_fail: string;
         ipc_player_stop_preview_fail: string;
         ipc_player_resolution_fail: string;
@@ -126,6 +129,9 @@ declare const _default: {
     };
     zh: {
         ipc_player_get_video_stream: string;
+        ipc_player_private_open_stream: string;
+        ipc_player_private_open_low_stream: string;
+        ipc_player_private_open_low_stream_fail: string;
         ipc_player_preview_fail: string;
         ipc_player_stop_preview_fail: string;
         ipc_player_resolution_fail: string;

package/lib/i18n/strings.js

@@ -1,6 +1,9 @@
 export default {
   en: {
     ipc_player_get_video_stream: 'Retrieving video stream...',
+    ipc_player_private_open_stream: 'Opening, please wait',
+    ipc_player_private_open_low_stream: 'Connecting, please wait',
+    ipc_player_private_open_low_stream_fail: 'Connection failed, tap below to retry',
     ipc_player_preview_fail: 'Failed to retrieve video stream',
     ipc_player_stop_preview_fail: 'Failed to end preview',
     ipc_player_resolution_fail: 'Failed to switch the video definition',
@@ -138,6 +141,9 @@ export default {
   },
   zh: {
     ipc_player_get_video_stream: '正在获取视频流',
+    ipc_player_private_open_stream: '正在开启中, 请稍等',
+    ipc_player_private_open_low_stream: '正在连接开启中, 请稍等',
+    ipc_player_private_open_low_stream_fail: '连接开启失败, 点击下方重新开启',
     ipc_player_preview_fail: '获取视频流失败',
     ipc_player_stop_preview_fail: '结束预览失败',
     ipc_player_resolution_fail: '切换清晰度失败',

package/lib/index.js

@@ -6,12 +6,13 @@ import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { useImmer } from 'use-immer';
 import _isEmpty from 'lodash/isEmpty';
 import { IpcPlayer, View, CoverView } from '@ray-js/components';
-import { useMount, useUnmount } from 'ahooks';
-import { setPageOrientation, usePageEvent, getNetworkType, offNetworkStatusChange, onNetworkStatusChange, publishDps, showToast, getSystemInfoSync } from '@ray-js/ray';
+import { useMount, useUnmount, useMemoizedFn } from 'ahooks';
+import { setPageOrientation, usePageEvent, getNetworkType, offNetworkStatusChange, onNetworkStatusChange, publishDps, showToast, getSystemInfoSync, onMqttMessageReceived, registerMQTTProtocolListener, offMqttMessageReceived, unregisterMQTTProtocolListener, registerDeviceListListener, onDpDataChange, onDeviceOnlineStatusUpdate } from '@ray-js/ray';
 import clsx from 'clsx';
 import Strings from './i18n';
 import Styles from './index.module.less';
 import { IpcFailCode } from './constant';
+import { useWakeUpDevice } from './hooks';
 import { getIsConnected, getIsOnPreview, openTargetMinByShortLink, getLanguage, getHomeInfo, getDeviceInfo, getDpIdByDpCode, ipcTTTOperatorLog } from './utils';
 import { getErrCodeDetailDataByCode, codeCoverToInt } from './config/errCodeConfig';
 import { deviceFreezeReasonStore, miniIdLabs } from './config';
@@ -49,7 +50,8 @@ const Player = props => {
     renderErrIcon,
     isShare = false,
     onPlayerContainerTap,
-    reConnect = false
+    reConnect = false,
+    awakeStatus = undefined
   } = props;
   const {
     borderRadius,
@@ -63,6 +65,8 @@ const Player = props => {
     // 连接状态
     loadingState: true,
     // 加载状态
+    loadingText: Strings.getLang('ipc_player_get_video_stream'),
+    // 正在获取视频流
     errorState: false,
     // 异常状态
     errorMsg: '',
@@ -74,10 +78,26 @@ const Player = props => {
   });
   const [screenType, setScreenType] = useState('portrait');
   const [videoErrCode, setVideoErrCode] = useState('');
-  // 标记是否为配置149的老方案低功耗设备 待实现
-  const [isLowPowerDevice, setIsLowPowerDevice] = useState(false);
+  // 是否启用下发唤醒指令定时
+  const [enableWakeUpInterval, setEnableWakeUpInterval] = useState(false);
+  // 标记进入面板后，设备是否有上报休眠的情况，若有上报休眠, 需在拉流错误时，重新连接
+  const [wirelessFlag, setWirelessFlag] = useState(false);
+  // 低功耗隐私模式
+  const [lowPrivateOutTimeFlag, setLowPrivateOutTimeFlag] = useState(false);
+  // 处于隐私模式中，且设备处于未唤醒状态, 需要进行唤醒, 在mqtt中做标记
+  const [mqttPrivateFlag, setMqttPrivateFlag] = useState(false);
+  // 低功耗开启隐私模式, 唤醒指令下发2秒即使
+  const privateLowPowerDeviceTimeOutRef = useRef(null);
+  const privateWakeOutTimeRef = useRef(null);
+  const privateDeviceWakeNeedPublishTimeRef = useRef(null);
+  // connectChangeRef
+  useRef(null);
+  const [isLowPowerDevice] = useState(awakeStatus !== undefined);
+
   // 自定义计时老低功耗方案设备在线状态, 用于短暂时间报上下线的UI展示兼容 待实现
-  const [lowPowerDeviceOnlineState, setLowPowerDeviceOnlineState] = useState(true);
+  const [lowPowerDeviceOnlineState, setLowPowerDeviceOnlineState] = useState(onlineStatus);
+  // 用于记录低功耗设备上报离线，延迟5秒展示，避免因设备频繁上下线 导致显示杂乱
+  const lowPowerDeviceOnlineStateTimeRef = useRef(null);
   // 4G设备是否被冻结, 待实现
   const [device4GIsFreeze, setDevice4GIsFreeze] = useState(false);
   // 4G设备冻结原因, 待实现
@@ -123,6 +143,43 @@ const Player = props => {
       setScreenType(type);
     }
   });
+  useEffect(() => {
+    registerDeviceListListener({
+      deviceIdList: [devId],
+      success: () => {
+        console.log('registerDeviceListListener success');
+      },
+      fail: error => {
+        console.log('registerDeviceListListener fail', error);
+      }
+    });
+    // 监听设备在线变化
+    onDeviceOnlineStatusUpdate(res => {
+      // 针对低功耗设备需要监听
+      console.log(res, 'onDeviceOnlineStatusUpdate=======');
+      if (res.deviceId === devId) {
+        if (res !== null && res !== void 0 && res.online) {
+          lowPowerDeviceOnlineStateTimeRef.current && clearTimeout(lowPowerDeviceOnlineStateTimeRef.current);
+          setLowPowerDeviceOnlineState(true);
+        }
+        if (isLowPowerDevice && !(res !== null && res !== void 0 && res.online)) {
+          // 如果设备不在线的情况, 针对低功耗设备，做延迟5秒的判断，部分低功耗设备启动时会有频繁上下线的状态
+          lowPowerDeviceOnlineStateTimeRef.current = setTimeout(() => {
+            setLowPowerDeviceOnlineState(false);
+          }, 5000);
+        }
+      }
+    });
+    onDpDataChange(handleDpDataChange);
+  }, []);
+  usePageEvent('onHide', async () => {
+    setPlayState(d => {
+      d.loadingState = true;
+    });
+    // 先停流
+    stopPreview();
+    // await getCurMute();
+  });
   useMount(() => {
     onNetworkStatusChange(res => {
       setPhoneNetworkConnect(res.isConnected);
@@ -133,14 +190,96 @@ const Player = props => {
       console.log(res);
     });
   });
-  usePageEvent('onHide', async () => {
-    setPlayState(d => {
-      d.loadingState = true;
+  const handleDpDataChange = useMemoizedFn(res => {
+    if (res.deviceId === devId) {
+      const dpsInfo = res.dps;
+      const arr = Object.keys(dpsInfo);
+      if (arr.length === 1) {
+        const dpId = +arr[0];
+        const dpValue = dpsInfo[arr[0]];
+        console.log(privateState, 'privateState');
+        // 这里的 149 为固定 dpId, 无需进行根据 code 获取
+        if (dpId === 149 && !dpValue && !privateState) {
+          // 进入到面板中,低功耗产品上报休眠, 进行标记
+          setWirelessFlag(true);
+        }
+      }
+    }
+  });
+  const handleMqttMessage = useMemoizedFn(event => {
+    var _event$messageData;
+    if ((event === null || event === void 0 ? void 0 : event.protocol) === 1 && event !== null && event !== void 0 && (_event$messageData = event.messageData) !== null && _event$messageData !== void 0 && _event$messageData.online) {
+      // 监听到设备唤醒, 当前为隐私模式时 延迟1s再进行下发，并且标记下发隐私模式时, 看日志有时用到唤醒DP会滞后
+      console.log('isLowPowerDevice', isLowPowerDevice);
+      console.log('privateState', privateState);
+      console.log('mqttPrivateFlag', mqttPrivateFlag);
+      if (isLowPowerDevice && privateState && mqttPrivateFlag) {
+        privateDeviceWakeNeedPublishTimeRef.current = setTimeout(async () => {
+          const sendDpId = await getDpIdByDpCode(devId, 'basic_private');
+          // 还原状态
+          setMqttPrivateFlag(false);
+          if (sendDpId === -1) {
+            showToast(Strings.getLang('ipc_player_basic_private_not_exist'));
+          } else {
+            publishDps({
+              deviceId: devId,
+              dps: {
+                [sendDpId]: false
+              },
+              mode: 1,
+              pipelines: [0, 1, 2, 3, 4, 5, 6],
+              options: {},
+              success: () => {
+                console.log('下发隐私模式成功');
+              }
+            });
+          }
+        }, 1000);
+        // 清理15秒超时定时器 以及还原超时状态
+        privateLowPowerDeviceTimeOutRef.current && clearTimeout(privateWakeOutTimeRef.current);
+        setLowPrivateOutTimeFlag(false);
+      }
+    }
+  });
+
+  /**
+   * 监听mqtt
+   */
+  useEffect(() => {
+    registerMQTTProtocolListener({
+      protocol: 1,
+      success: () => console.log('registerMQTTProtocolListener success'),
+      fail: err => console.log('registerMQTTProtocolListener fail', err)
     });
-    // 先停流
-    stopPreview();
-    // await getCurMute();
+    onMqttMessageReceived(handleMqttMessage);
+    return () => {
+      offMqttMessageReceived(handleMqttMessage);
+      unregisterMQTTProtocolListener({
+        protocol: 1,
+        success: () => console.log('unRegisterMQTTProtocolListener success'),
+        fail: err => console.log('unRegisterMQTTProtocolListener fail', err)
+      });
+      // 清理延迟下发定时器
+      privateDeviceWakeNeedPublishTimeRef.current && clearTimeout(privateDeviceWakeNeedPublishTimeRef.current);
+      lowPowerDeviceOnlineStateTimeRef.current && clearTimeout(lowPowerDeviceOnlineStateTimeRef.current);
+    };
+  }, []);
+
+  /**
+   *  唤醒设备TTT能力
+   */
+  useWakeUpDevice({
+    deviceId: devId,
+    enabled: enableWakeUpInterval,
+    intervalTime: 300
   });
+  useEffect(() => {
+    if (wirelessFlag) {
+      // 进入面板后，若监听到设备上报休眠后, 需进行重新连接
+      setWirelessFlag(false);
+      _reConnect();
+    }
+  }, [wirelessFlag]);
   useEffect(() => {
     onlineStatus && createIpcCtx();
     return () => {
@@ -206,6 +345,7 @@ const Player = props => {
   const _reConnect = () => {
     setPlayState(d => {
       d.connectState = true;
+      d.loadingText = Strings.getLang('ipc_player_get_video_stream');
       d.errorMsg = '';
       d.errorState = false;
       d.loadingState = true;
@@ -221,6 +361,14 @@ const Player = props => {
    * 关闭隐私模式，重新拉流
    */
   const handleReWakeCamera = async () => {
+    setPlayState(d => {
+      d.connectState = true;
+      d.errorMsg = '';
+      d.loadingText = Strings.getLang('ipc_player_private_open_stream');
+      d.errorState = false;
+      d.loadingState = true;
+    });
+    setVideoErrCode('');
     const sendDpId = await getDpIdByDpCode(devId, 'basic_private');
     if (sendDpId === -1) {
       showToast(Strings.getLang('ipc_player_basic_private_not_exist'));
@@ -239,10 +387,72 @@ const Player = props => {
       });
     }
   };
+
+  /**
+   *
+   * 低功耗设备关闭隐私模式，先判断设备是否唤醒，唤醒后才可下发隐私模式DP
+   */
+
+  const handleReWakeCameraLowPowerDevice = useMemoizedFn(() => {
+    setVideoErrCode('');
+    setLowPrivateOutTimeFlag(false);
+    if (awakeStatus) {
+      setPlayState(d => {
+        d.connectState = true;
+        d.errorMsg = '';
+        d.loadingText = Strings.getLang('ipc_player_private_open_stream');
+        d.errorState = false;
+        d.loadingState = true;
+      });
+      // 如果值为true, 表示设备为唤醒状态，直接下发隐私模式DP
+      handleReWakeCamera();
+    } else {
+      setPlayState(d => {
+        d.connectState = true;
+        d.errorMsg = '';
+        d.loadingText = Strings.getLang('ipc_player_private_open_low_stream');
+        d.errorState = false;
+        d.loadingState = true;
+      });
+      // 如果值为false, 表示设备为睡眠状态，需要唤醒设备
+      setMqttPrivateFlag(true);
+      setEnableWakeUpInterval(true);
+      // 2秒后停止下发唤醒, 防止频繁唤醒, 此时若Mqtt监听到1协议，也会停止下发唤醒
+      privateLowPowerDeviceTimeOutRef.current = setTimeout(() => {
+        setEnableWakeUpInterval(false);
+        // 清除定时器
+        privateLowPowerDeviceTimeOutRef.current && clearTimeout(privateLowPowerDeviceTimeOutRef.current);
+      }, 2000);
+
+      // 15 秒后若设备还是未唤醒，未监听到Mqtt消息以及唤醒Dp上报, 则提示报错
+      privateWakeOutTimeRef.current = setTimeout(() => {
+        // 清除定时器
+        privateLowPowerDeviceTimeOutRef.current && clearTimeout(privateWakeOutTimeRef.current);
+        setPlayState(d => {
+          d.connectState = false;
+          d.errorMsg = Strings.getLang('ipc_player_private_open_low_stream_fail');
+          d.errorState = true;
+          d.loadingState = false;
+        });
+        setMqttPrivateFlag(false);
+        setLowPrivateOutTimeFlag(true);
+      }, 15000);
+    }
+  });
   const retry = useCallback(() => {
     // console.log('retry:', muteRef.current);
     console.log('重新拉流启动');
+    // 任何重试拉流时, 将播放器状态还原为loading状态
+    setVideoErrCode('');
+    setPlayState(d => {
+      d.loadingState = true;
+      d.errorState = false;
+      d.errorMsg = '';
+    });
     phoneNetworkConnect && onlineStatus && privateState && !isLowPowerDevice && handleReWakeCamera();
+
+    // 低功耗设备隐私模式需单独处理，先进行下发唤醒, 唤醒后再进行下发DP
+    phoneNetworkConnect && onlineStatus && privateState && isLowPowerDevice && handleReWakeCameraLowPowerDevice();
     phoneNetworkConnect && onlineStatus && !privateState && _retry();
   }, [isLowPowerDevice, phoneNetworkConnect && playState.connectState, privateState, onlineStatus]);
 
@@ -256,14 +466,25 @@ const Player = props => {
   };
 
   // 建立连接
-  const createConnect = async params => {
+  const createConnect = useMemoizedFn(async params => {
     var _ipcCtx$current;
     // console.log('建立连接前:', devId, Date.now());
+    // 若走到连接状态，需清除低功耗15秒超时定时
+    privateLowPowerDeviceTimeOutRef.current && clearTimeout(privateWakeOutTimeRef.current);
+    setLowPrivateOutTimeFlag(false);
+    // 表示为 149 低功耗设备, 唤醒设备
+    if (isLowPowerDevice) {
+      // 下发唤醒
+      setEnableWakeUpInterval(true);
+    }
     (_ipcCtx$current = ipcCtx.current) === null || _ipcCtx$current === void 0 || _ipcCtx$current.connect({
       success: () => {
         ipcTTTOperatorLog("VID: create_p2p_connect_success");
+        // 清除唤醒定时器
+        setEnableWakeUpInterval(false);
         setPlayState(d => {
           d.connectState = true;
+          d.loadingText = Strings.getLang('ipc_player_get_video_stream');
           d.errorState = false;
           d.errorMsg = '';
         });
@@ -272,24 +493,29 @@ const Player = props => {
         startPreview(params);
       },
       fail: () => {
+        // 清除唤醒定时器
+        setEnableWakeUpInterval(false);
         ipcTTTOperatorLog("VID: create_p2p_connect_failure");
-        setPlayState(d => {
-          d.connectState = false;
-          d.errorState = true;
-          d.errorMsg = Strings.getLang('ipc_player_connect_fail');
-          d.loadingState = false;
-        });
-        onChangeStreamStatus && onChangeStreamStatus(-1001);
+        // 针对进入面板上报149状态的为true的设备直接忽略
+        if (!wirelessFlag) {
+          setPlayState(d => {
+            d.connectState = false;
+            d.errorState = true;
+            d.errorMsg = Strings.getLang('ipc_player_connect_fail');
+            d.loadingState = false;
+          });
+          onChangeStreamStatus && onChangeStreamStatus(-1001);
+        }
       }
     });
-  };
+  });
 
   // 视图层准备就绪，开始建立连接
 
   /*
    * 开启预览
    */
-  const startPreview = params => {
+  const startPreview = useMemoizedFn(params => {
     var _ipcCtx$current2;
     // console.log('开启预览前');
     (_ipcCtx$current2 = ipcCtx.current) === null || _ipcCtx$current2 === void 0 || _ipcCtx$current2.startPreview({
@@ -321,15 +547,18 @@ const Player = props => {
           onChangeStreamStatus && onChangeStreamStatus(1002);
           return;
         }
-        setPlayState(d => {
-          d.errorState = true;
-          d.loadingState = false;
-          d.errorMsg = Strings.getLang('ipc_player_preview_fail');
-        });
-        onChangeStreamStatus && onChangeStreamStatus(-1002);
+        // 针对进入到面板，接收到上报为设备休眠的情况直接忽略
+        if (!wirelessFlag) {
+          setPlayState(d => {
+            d.errorState = true;
+            d.loadingState = false;
+            d.errorMsg = Strings.getLang('ipc_player_preview_fail');
+          });
+          onChangeStreamStatus && onChangeStreamStatus(-1002);
+        }
       }
     });
-  };
+  });
 
   /**
    * 暂停预览
@@ -393,6 +622,45 @@ const Player = props => {
   }, [playState.errorState]);
 
   // 连接状态发生变化
+  const connectChange = useMemoizedFn(e => {
+    var _e$detail;
+    ipcTTTOperatorLog("VID: player_event_connect_change: ".concat(JSON.stringify(e)));
+    console.log('连接状态发生变化', e);
+    const code = e === null || e === void 0 || (_e$detail = e.detail) === null || _e$detail === void 0 ? void 0 : _e$detail.state;
+    onChangeStreamStatus && onChangeStreamStatus(code === 0 ? 1001 : -1001);
+    if (code === 0) {
+      setPlayState(d => {
+        d.connectState = true;
+        d.loadingText = Strings.getLang('ipc_player_get_video_stream');
+      });
+    } else if ((code === -3 || code === -105) && retryCount.current < 1) {
+      // 连接超时或鉴权失败重试一次
+      retryCount.current++;
+      retry();
+    } else {
+      if (privateState) {
+        return;
+      }
+      setPlayState(d => {
+        d.connectState = false;
+        d.loadingState = false;
+        d.errorState = true;
+        d.errorMsg = "".concat(Strings.getLang(IpcFailCode[-1001]), "(").concat(code, ")");
+      });
+      // 安卓隐私模式切换时，会触发此回调，错误码为-108, 此时拿不到最新更新过来的隐私模式状态，延迟1秒对其进行判断
+      // connectChangeTimeRef.current = setTimeout(() => {
+      //   // if (privateState) {
+      //   //   return false;
+      //   // }
+      //   setPlayState(d => {
+      //     d.connectState = false;
+      //     d.loadingState = false;
+      //     d.errorState = true;
+      //     d.errorMsg = `${Strings.getLang(IpcFailCode[-1001])}(${code})`;
+      //   });
+      // }, 1000);
+    }
+  });
 
   // 断开连接
   const disconnect = () => {
@@ -437,6 +705,30 @@ const Player = props => {
    * 退出横屏
    */
 
+  const handleCameraPreviewFailure = useMemoizedFn(data => {
+    console.log(data, 'data======');
+    ipcTTTOperatorLog("cameraPreviewFailure_event_trigger_".concat(JSON.stringify(data)));
+    if (data.type === 'cameraPreviewFailure' && !privateState) {
+      // 隐私模式时不展示错误
+      const {
+        deviceId,
+        errCode,
+        errorCode
+      } = data === null || data === void 0 ? void 0 : data.detail;
+      const codeValue = errCode || errorCode;
+      if (deviceId) {
+        if (deviceId === devId) {
+          setVideoErrCode(codeValue);
+          props.onCameraPreviewFailure && onCameraPreviewFailure(codeValue);
+        }
+      } else {
+        // 兼容匹配安卓 6.8.0 修复错误码不带 deviceId 和 errorCode 修正 为errCode的问题
+        setVideoErrCode(codeValue);
+        props.onCameraPreviewFailure && onCameraPreviewFailure(codeValue);
+      }
+    }
+  });
+
   /**
    * 获取错误展示内容
    */
@@ -450,9 +742,15 @@ const Player = props => {
     if (!isLowPowerDevice && onlineStatus && privateState) {
       return Strings.getLang('ipc_player_device_sleep');
     }
-    if (isLowPowerDevice && lowPowerDeviceOnlineState && privateState) {
+
+    // 低功耗隐私模式正常唤醒
+    if (isLowPowerDevice && lowPowerDeviceOnlineState && privateState && !lowPrivateOutTimeFlag) {
       return Strings.getLang('ipc_player_device_sleep');
     }
+    // 低功耗隐私模式正常唤醒，下发指令失败
+    if (isLowPowerDevice && lowPowerDeviceOnlineState && privateState && !lowPrivateOutTimeFlag) {
+      return Strings.getLang('ipc_player_private_open_low_stream_fail');
+    }
     if (!isLowPowerDevice && device4GIsFreeze && onlineStatus && !privateState) {
       return deviceFreezeReasonStore[deviceFreezeReason];
     }
@@ -471,13 +769,14 @@ const Player = props => {
       return Strings.getLang('ipc_player_no_line');
     }
     if (videoErrCode !== '') {
+      console.log(Strings["ipc_player_error_".concat(codeCoverToInt(videoErrCode))], '多语言');
       if (Strings["ipc_player_error_".concat(codeCoverToInt(videoErrCode))]) {
         return "".concat(Strings.getLang("ipc_player_error_".concat(codeCoverToInt(videoErrCode))), "(").concat(videoErrCode, ")");
       }
       return "".concat(Strings.getLang("ipc_player_error_common"), "(").concat(videoErrCode, ")");
     }
     return playState.errorMsg;
-  }, [phoneNetworkConnect, playState, videoErrCode, privateState, onlineStatus, isLowPowerDevice, lowPowerDeviceOnlineState, device4GIsFreeze, deviceFreezeReason]);
+  }, [phoneNetworkConnect, playState, videoErrCode, privateState, onlineStatus, isLowPowerDevice, lowPowerDeviceOnlineState, device4GIsFreeze, deviceFreezeReason, lowPrivateOutTimeFlag]);
 
   /**
    * 根据自定义类型获取错误码展示内容
@@ -494,12 +793,14 @@ const Player = props => {
         return errContent.suggestedText !== '';
       // 建议文案
       case 'suggestedText':
-        if (contentEmpty) {
+        if (contentEmpty || privateState) {
           return '';
         }
         return errContent.suggestedText;
       // 是否展示点我重试
       case 'retry':
+        console.log(privateState, 'privateState========');
+        console.log(privateState, 'privateState========');
         if (!phoneNetworkConnect) {
           return false;
         }
@@ -559,7 +860,7 @@ const Player = props => {
         if (!phoneNetworkConnect) {
           return true;
         }
-        if (privateState && isShare) {
+        if (privateState) {
           return false;
         }
         if (contentEmpty) {
@@ -604,19 +905,7 @@ const Player = props => {
     objectFit: objectFit,
     onVideoTap: handleVideoTap,
     onZoomChange: onZoomChange,
-    onCameraPreviewFailure: data => {
-      ipcTTTOperatorLog("cameraPreviewFailure_event_trigger_".concat(JSON.stringify(data)));
-      if (data.type === 'cameraPreviewFailure') {
-        const {
-          deviceId,
-          errCode
-        } = data === null || data === void 0 ? void 0 : data.detail;
-        if (deviceId === devId) {
-          setVideoErrCode(errCode);
-          props.onCameraPreviewFailure && onCameraPreviewFailure(errCode);
-        }
-      }
-    },
+    onCameraPreviewFailure: handleCameraPreviewFailure,
     onCameraNotifyWeakNetwork: onCameraNotifyWeakNetwork,
     onInitDone: () => {
       console.log('视图层准备就绪~');
@@ -627,29 +916,7 @@ const Player = props => {
       });
     },
     onError: onError,
-    onConnectChange: e => {
-      var _e$detail;
-      ipcTTTOperatorLog("VID: player_event_connect_change: ".concat(JSON.stringify(e)));
-      console.log('连接状态发生变化', e);
-      const code = e === null || e === void 0 || (_e$detail = e.detail) === null || _e$detail === void 0 ? void 0 : _e$detail.state;
-      onChangeStreamStatus && onChangeStreamStatus(code === 0 ? 1001 : -1001);
-      if (code === 0) {
-        setPlayState(d => {
-          d.connectState = true;
-        });
-      } else if ((code === -3 || code === -105) && retryCount.current < 1) {
-        // 连接超时或鉴权失败重试一次
-        retryCount.current++;
-        retry();
-      } else {
-        setPlayState(d => {
-          d.connectState = false;
-          d.loadingState = false;
-          d.errorState = true;
-          d.errorMsg = Strings.getLang(IpcFailCode[-1001]);
-        });
-      }
-    },
+    onConnectChange: connectChange,
     deviceId: devId,
     autoPauseIfNavigate: false,
     autoPauseIfOpenNative: false,
@@ -676,7 +943,7 @@ const Player = props => {
     className: Styles.load_icon
   }), /*#__PURE__*/React.createElement(View, {
     className: Styles.load_des
-  }, loadText || Strings.getLang('ipc_player_get_video_stream'))), /*#__PURE__*/React.createElement(CoverView, {
+  }, loadText || playState.loadingText || Strings.getLang('ipc_player_get_video_stream'))), /*#__PURE__*/React.createElement(CoverView, {
     style: {
       borderRadius: "".concat(borderRadius)
     },

package/lib/typings/index.d.ts

@@ -126,4 +126,10 @@ export type IProps = {
    * @default {}
    */
   reConnect?: boolean;
+  /**
+   * @description.en needReconnect
+   * @description.zh 是否需要唤醒
+   * @default {}
+   */
+  awakeStatus?: boolean | undefined;
 };

package/lib/utils.d.ts

@@ -40,3 +40,7 @@ export declare const getDpIdByDpCode: (devId: string, code: string) => Promise<n
  * TTT能力写入App日志
  */
 export declare const ipcTTTOperatorLog: (ipcLogString: string) => void;
+/**
+ * TTT 能力唤醒设备
+ */
+export declare const wakeUpDevice: (deviceId: string) => void;

package/lib/utils.js

@@ -152,4 +152,20 @@ export const ipcTTTOperatorLog = ipcLogString => {
   } catch (err) {
     console.log('ipcTTTOperatorLog error', err);
   }
+};
+/**
+ * TTT 能力唤醒设备
+ */
+export const wakeUpDevice = deviceId => {
+  ipcTTTOperatorLog('start publish wakeUpDevice');
+  ty.device.wakeUpDevice({
+    deviceId,
+    dps: {},
+    success: () => {
+      ipcTTTOperatorLog('publish wakeUpDevice success');
+    },
+    fail: () => {
+      ipcTTTOperatorLog('publish wakeUpDevice fail');
+    }
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.0.20",
+  "version": "2.0.21-beta-2",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-miniapp",
@@ -44,8 +44,8 @@
   "devDependencies": {
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
-    "@ray-js/cli": "^1.4.9",
-    "@ray-js/ray": "^1.4.9",
+    "@ray-js/cli": "^1.7.14",
+    "@ray-js/ray": "^1.7.14",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/jest": "^29.5.14",
     "core-js": "^3.19.1",