@ray-js/ipc-player-integration 0.0.35-beta.3 → 0.0.35-beta.31

package/lib/ui/ui.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
+import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.map.js";
 import React, { useContext, useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
 import { View, CoverView, getSystemInfoSync, usePageEvent, setNavigationBarBack, setPageOrientation, getCurrentPages } from '@ray-js/ray';
@@ -12,7 +13,7 @@ import { PlayState, PlayerStreamStatus, MultiCameraScreenMode } from '../interfa
 import { useCtx } from '../ctx/ctx.composition';
 import { useStore, updateAtom } from '../ctx/store';
 import { UIEventContext } from './context';
-import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent, decodeClarityDic, changeIgnoreHideStopPreview, moveablePtzControlId, tileActionsId, tileTipId, landscapeTipId, multiPtzId, ptzMoveableTipId, showFlowLowTipId, zoomLevelChange, setScaleMultipleEvent } from './constant';
+import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent, decodeClarityDic, changeIgnoreHideStopPreview, moveablePtzControlId, tileActionsId, tileTipId, landscapeTipId, multiPtzId, ptzMoveableTipId, showFlowLowTipId, zoomLevelChange, setScaleMultipleEvent, trialCountdownEnd, refreshSmartImageQualityEvent } from './constant';
 import BottomLeftContent from './bottomLeftContent';
 import BottomRightContent from './bottomRightContent';
 import TopLeftContent from './topLeftContent';
@@ -22,8 +23,7 @@ import { useMemoizedFn } from '../hooks';
 import { Storage } from '../utils/storage';
 import './ui.less';
 import { updatePlayerWidgetProps } from '../features';
-import { isSmallScreen } from '../utils';
-import { getSmartImageQualityState } from '../utils/ttt';
+import { getNgRawData, getSmartImageQualityState, isLowPhone } from '../utils/ttt';
 function getCtxInstance(instance, devId) {
   if (instance) return instance;
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -65,12 +65,13 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     awakeStatus = undefined,
     onPlayerTap,
     playerRoute = 'pages/home/index',
-    defaultAutoPlay = true,
     limitFlow = false,
     showFlowLowTip = false,
     extend = {},
     refreshElement = false,
-    autoWakeUp = false
+    autoWakeUp = false,
+    previewEnabled = undefined,
+    onPreviewEnabledChange
   } = props;
   const {
     event
@@ -104,18 +105,37 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   useImperativeHandle(eventRefProp, () => eventRef.current, [eventRef.current]);
   const timer = useRef();
   const reGetOrientationTimer = useRef(null);
-  const [scaleMultiple, setScaleMultiple] = useState(playerFit === 'contain' ? 1 : -2);
-  const [currentZoomLevel, setCurrentZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
+  // 统一调整为1倍缩放，保证画面展示完全
+  const [scaleMultiple, setScaleMultiple] = useState(1);
+  // 统一调整为1倍缩放，保证画面展示完全
+  const [currentZoomLevel, setCurrentZoomLevel] = useState(1);
   const [createCtx, setCreateCtx] = useState(false);
   // 是否需要忽略进入后台停止预览
   const [ignoreStopOnHide, setIgnoreStopOnHide] = useState(ignoreHideStopPreview);
   const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
-  // const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
-  // const [verticalZoomLevel, setVerticalZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
+  const isLowPhoneRef = useRef(false);
+  useEffect(() => {
+    isLowPhone().then(res => {
+      isLowPhoneRef.current = !!res;
+    });
+  }, []);
 
   // 展示顶部内容
   const [showTopContent, setShowTopContent] = useState(true);
 
+  // pad / 折叠屏小窗口展示面板的情况；getSystemInfoSync 在 onLoad 之后才有准确值，
+  // 这里给安全默认 false，由 onLoad / onResize 实际计算并更新
+  const [isSmallScreen, setIsSmallScreen] = useState(false);
+  const computeIsSmallScreen = useMemoizedFn(() => {
+    const {
+      windowWidth,
+      screenWidth,
+      windowHeight
+    } = getSystemInfoSync();
+    // 取小屏值判断是最准确的 pad / 折叠屏小窗口情况
+    return !(screenWidth === windowWidth || screenWidth === windowHeight);
+  });
+
   // 外部传入的ignoreHideStopPreview变化时，同步更新
   useEffect(() => {
     setIgnoreStopOnHide(ignoreHideStopPreview);
@@ -197,7 +217,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     return () => {
       var _ty3;
       if (typeof ((_ty3 = ty) === null || _ty3 === void 0 ? void 0 : _ty3.offOrientationChange) === 'function') {
-        ty.offOrientationChange(handleOrientationChange);
+        var _ty4;
+        (_ty4 = ty) === null || _ty4 === void 0 || _ty4.offOrientationChange(handleOrientationChange);
       }
     };
   }, []);
@@ -407,8 +428,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       eventRef.current.emit(showAllComponent);
       eventRef.current.emit('disablePlayerTap', true);
       eventRef.current.emit(pauseTimeToHideAllComponent);
-      // 按宽填充，保证播放流宽度为屏幕宽度，高度自适应
-      setScaleMultiple(-1);
+      // 按宽填充，保证播放流宽度为屏幕宽度，高度自适应设为1倍
+      setScaleMultiple(1);
     } else {
       // 短屏或横屏时，恢复自动隐藏
       eventRef.current.emit('disablePlayerTap', false);
@@ -417,27 +438,54 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   }, [isVerticalFullLayout, screenType, playerFit]);
   useEffect(() => {
     if (createCtx) {
-      setScaleMultiple(playerFit === 'contain' ? 1 : -2);
-      setCurrentZoomLevel(playerFit === 'contain' ? 1 : -2);
+      // 统一调整为1倍缩放，保证画面展示完全
+      setScaleMultiple(1);
+      setCurrentZoomLevel(1);
     }
   }, [playerFit, createCtx]);
   useEffect(() => {
     setBrandColor(brandColor);
     setVerticalMic(verticalMic);
   }, [brandColor, verticalMic]);
-  const refreshSmartImageQuality = useMemoizedFn(() => {
-    getSmartImageQualityState(devId).then(res => {
-      console.log('res===getSmartImageQualityState', res);
-      updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
-        buttonState: res.buttonState,
-        trialRemainingSec: res.trialRemainingSec,
-        refreshToken: Date.now()
-      });
+
+  // 是否隐藏画质（试用）功能：取 TryExperience widget 的 hideSmartImageQualityState
+  // （由 initPlayerWidgets 的 hideSmartImageQualityState ?? true 映射而来）
+  const hideSmartImageQualityState = useMemo(() => {
+    var _hideSmartImageQualit, _tryExp$initProps;
+    const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
+    return (_hideSmartImageQualit = tryExp === null || tryExp === void 0 || (_tryExp$initProps = tryExp.initProps) === null || _tryExp$initProps === void 0 ? void 0 : _tryExp$initProps.hideSmartImageQualityState) !== null && _hideSmartImageQualit !== void 0 ? _hideSmartImageQualit : true;
+  }, [bottomLeftContent]);
+  const refreshSmartImageQuality = useMemoizedFn(async () => {
+    // 隐藏画质功能时直接跳过，不发起请求与更新
+    console.log('hideSmartImageQualityState');
+    if (hideSmartImageQualityState) return;
+    console.log('refreshSmartImageQuality');
+    const res = await getSmartImageQualityState(devId);
+    if (!res) return;
+    // 调试时使用
+    // res = {
+    //   isPurchase: false,
+    //   buttonState: 0,
+    //   trialRemainingSec: 20,
+    //   canOpenSettings: true,
+    // };
+    const getNgRes = await getNgRawData();
+    console.log('res===getSmartImageQualityState', res);
+    updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
+      isPurchase: res.isPurchase,
+      buttonState: res.buttonState,
+      trialRemainingSec: res.trialRemainingSec,
+      canOpenSettings: res.canOpenSettings,
+      gRawData: !!getNgRes,
+      isLowPhone: isLowPhoneRef.current
     });
   });
+
+  // 首次进入即执行；hideSmartImageQualityState 变化时重新执行。
+  // 是否隐藏的判定在 refreshSmartImageQuality 内部，hide 为 true 时方法内直接 return。
   useEffect(() => {
     refreshSmartImageQuality();
-  }, [instance]);
+  }, [hideSmartImageQualityState]);
   const refreshBottomLeft = () => {
     event.current.emit(startTimeToHideAllComponent);
     event.current.emit(showAllComponent);
@@ -467,6 +515,40 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 监听播放器实例创建完成
    */
 
+  /**
+   * 页面 onLoad 后才能拿到准确的 systemInfo，这里第一次确定小屏状态
+   */
+  usePageEvent('onLoad', () => {
+    setIsSmallScreen(computeIsSmallScreen());
+  });
+
+  // 页面是否处于前台；自动隐藏倒计时要等播放器正常出流（PLAYING）后再启动
+  const pageShownRef = useRef(false);
+  // 用 ref 同步最新 playState，避免 usePageEvent 回调闭包拿到过期值
+  const playStateRef = useRef(playState);
+  playStateRef.current = playState;
+  usePageEvent('onShow', () => {
+    pageShownRef.current = true;
+    // 回到前台时刷新画质（试用）状态（方法内部会按 hideSmartImageQualityState 自行短路）
+    refreshSmartImageQuality();
+    // 已经在出流就直接启动；否则等 playState 变为 PLAYING 的 effect 再启动
+    if (playStateRef.current === PlayState.PLAYING) {
+      eventRef.current.emit(startTimeToHideAllComponent);
+    }
+  });
+  // 进入后台 停止播放器元素动画计时
+  usePageEvent('onHide', () => {
+    pageShownRef.current = false;
+    eventRef.current.emit(pauseTimeToHideAllComponent);
+  });
+
+  // 播放器正常出流后再开始自动隐藏倒计时（仅在前台时）
+  useEffect(() => {
+    if (pageShownRef.current && playState === PlayState.PLAYING) {
+      eventRef.current.emit(startTimeToHideAllComponent);
+    }
+  }, [playState]);
+
   /**
    * 监听屏幕布局变化
    */
@@ -480,8 +562,13 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       const {
         type
       } = sizeData;
+
+      // 折叠屏展开/收起、pad 多窗口拖拽等场景，需要重新计算并同步
+      const small = computeIsSmallScreen();
+      setIsSmallScreen(small);
+
       //  针对pad 和折叠屏展开的情况暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
-      if (isSmallScreen) {
+      if (small) {
         setScreenType('vertical');
       } else {
         setScreenType(type === 'landscape' ? 'full' : 'vertical');
@@ -496,19 +583,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
         }
         triggerEvent(showAllComponent);
       }
-      // 若为全屏模式并且要求按宽填充，即横屏时充满，主动设置模式为-1即可
-      if (type === 'landscape' && landscapeMode === 'fill') {
-        console.log(scaleMultiple, '===========fill');
-        setScaleMultiple(-1);
-      } else if (type === 'landscape' && landscapeMode === 'standard') {
-        console.log(scaleMultiple, '===========landscape');
-        setScaleMultiple(-2);
-      } else {
-        // 竖屏时 将屏幕播放比例设为按宽按高
-
-        console.log(scaleMultiple, '===========landscape');
-        setScaleMultiple(playerFit === 'contain' ? scaleMultiple === 1 ? -1 : 1 : -2);
-      }
+      // 横屏（fill/standard）与竖屏均统一调整为 1 倍缩放，保证画面完整展示
+      setScaleMultiple(1);
     } catch (err) {
       console.log(err, 'err');
     }
@@ -641,14 +717,18 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
 
   /**
    * 右下角可见按钮数 → 右下角组件宽度（左下角同时用作右侧预留宽度）
-   * 1 个按钮: 115px / 2 个按钮: 132px / 0 个按钮: 0
+   * - 横屏: 固定 40%（用百分比，左下角自动按 100% - 40% = 60% 可视，溢出走横向滚动）
+   * - 竖屏: 1 个按钮 115px / 2+ 个按钮 132px / 0 个按钮 0
    */
   const bottomRightWidth = useMemo(() => {
+    if (screenType === 'full') {
+      return '40%';
+    }
     const visibleCount = (bottomRightContent || []).filter(item => !item.hidden).length;
     if (visibleCount <= 0) return 0;
     if (visibleCount === 1) return 115;
     return 132;
-  }, [bottomRightContent]);
+  }, [bottomRightContent, screenType]);
 
   /**
    * 视频流加载状态封装
@@ -672,10 +752,12 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       }
     }
     if (playState === PlayState.PLAYING) {
-      // 仅在第一次播放成功时，针对竖屏并且为cover模式时，设置为-2
+      // 仅在第一次播放成功时，针对竖屏并且为cover模式时，设置为-2 修改为只针对第一次播放成功时
       console.log('Playing状态');
-      if (screenType === 'vertical' && playerFit === 'cover' && !hasPlayedRef.current) {
-        setScaleMultiple(-2);
+      // if (screenType === 'vertical' && playerFit === 'cover' && !hasPlayedRef.current) {
+      if (!hasPlayedRef.current) {
+        // 统一调整为1倍缩放，保证画面展示完全
+        setScaleMultiple(1);
         hasPlayedRef.current = true;
       }
     }
@@ -752,6 +834,12 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   const onSetScaleMultiple = value => {
     setScaleMultiple(value);
   };
+  const onTrialCountdownEnd = useMemoizedFn(() => {
+    // updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience' as any, {
+    //   buttonState: 2,
+    // });
+    refreshSmartImageQuality();
+  });
   useEffect(() => {
     eventRef.current.on(startTimeToHideAllComponent, listenStart);
     eventRef.current.on(pauseTimeToHideAllComponent, listenPause);
@@ -761,6 +849,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     eventRef.current.on('refreshBottomLeft', refreshBottomLeft);
     eventRef.current.on(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
     eventRef.current.on(setScaleMultipleEvent, onSetScaleMultiple);
+    eventRef.current.on(trialCountdownEnd, onTrialCountdownEnd);
+    eventRef.current.on(refreshSmartImageQualityEvent, refreshSmartImageQuality);
     return () => {
       eventRef.current.off(startTimeToHideAllComponent, listenStart);
       eventRef.current.off(pauseTimeToHideAllComponent, listenPause);
@@ -770,6 +860,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       eventRef.current.off('refreshBottomLeft', refreshBottomLeft);
       eventRef.current.off(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
       eventRef.current.off(setScaleMultipleEvent, onSetScaleMultiple);
+      eventRef.current.off(trialCountdownEnd, onTrialCountdownEnd);
+      eventRef.current.off(refreshSmartImageQualityEvent, refreshSmartImageQuality);
       if (multiTapTimerRef.current) {
         clearTimeout(multiTapTimerRef.current);
         multiTapTimerRef.current = null;
@@ -784,14 +876,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   /**
    * 监听当前的zoom比例状态
    */
-  // useEffect(() => {
-  //   if (screenType === 'vertical') {
-  //     console.log(currentZoomLevel, '竖屏时的缩放比例');
-  //     setVerticalZoomLevel(currentZoomLevel);
-  //     // setScaleMultiple(currentZoomLevel);
-  //   }
-  // }, [screenType, currentZoomLevel]);
-
   const onZoomChange = useMemoizedFn(data => {
     const {
       zoomLevel,
@@ -802,30 +886,19 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     if (zoomLevel === 0) {
       return false;
     }
-    /**
-     * 针对竖屏为cover模式时，横屏为standard模式时，主动设置缩放比例，避免因值不能正常变化
-     */
-    if (scaleMode === -2 && playerFit === 'cover' && screenType === 'vertical' && landscapeMode === 'standard') {
-      console.log('dsadsadsad----', zoomLevel);
-      setScaleMultiple(zoomLevel);
-    }
     /**
      * 针对竖屏为contain模式时，横屏为fill模式时，主动设置缩放比例，避免因值不能正常变化
      */
-    if (scaleMode === -1 && playerFit === 'contain' && screenType === 'vertical' && landscapeMode === 'fill') {
-      setVerticalCoverZoom(zoomLevel);
-    }
+    // if (
+    //   scaleMode === -1 &&
+    //   playerFit === 'contain' &&
+    //   screenType === 'vertical' &&
+    //   landscapeMode === 'fill'
+    // ) {
+    //   setVerticalCoverZoom(zoomLevel);
+    // }
 
-    /**
-     * 横屏情况下 针对竖屏为contain模式时，横屏为fill模式时，主动设置缩放比例，避免因值不能正常变化
-     */
-    if (scaleMode === -2 && playerFit === 'cover' && screenType !== 'vertical' && landscapeMode === 'standard') {
-      setScaleMultiple(zoomLevel);
-    }
-    if (scaleMode === -1 && playerFit === 'contain' && screenType !== 'vertical' && landscapeMode === 'fill') {
-      setVerticalCoverZoom(zoomLevel);
-      setScaleMultiple(zoomLevel);
-    }
+    // 直接记录当前缩放比例
     setCurrentZoomLevel(zoomLevel);
     instance.event.emit(zoomLevelChange, zoomLevel);
     return false;
@@ -887,12 +960,12 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ,
     privateState: privateState,
     onPlayerTap: data => {
-      console.log('sdhsajdhsahdsa=========');
+      console.log('playerTap event');
       if (disablePlayerTap.current) {
         console.log('playerTap 事件已禁止');
         return;
       }
-      console.log('res===on onVideoTap', data);
+      console.log('res===on onVideoTap1', data);
       if (instance.multiCameraCtx.isSupport) {
         var _instance$multiCamera, _instance$multiCamera2;
         const preTapIndex = (_instance$multiCamera = (_instance$multiCamera2 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera2 === void 0 ? void 0 : _instance$multiCamera2.index) !== null && _instance$multiCamera !== void 0 ? _instance$multiCamera : prevSelectedIndexRef.current;
@@ -943,7 +1016,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     ,
     brandColor: brandColor,
     playerRoute: playerRoute,
-    defaultAutoPlay: defaultAutoPlay,
+    previewEnabled: previewEnabled,
+    onPreviewEnabledChange: onPreviewEnabledChange,
     limitFlow: limitFlow,
     autoWakeUp: autoWakeUp,
     extend: _objectSpread(_objectSpread({

package/lib/ui/ui.less

@@ -19,7 +19,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    padding-top: 12px;
+    // padding-top: 12px;
     z-index: 90;
     height: 60px;
     background: linear-gradient(360deg, rgba(0, 0, 0, 0.4) 0%, rgba(0, 0, 0, 0) 100%);
@@ -157,7 +157,71 @@
   // 左下角子元素内容区域样式
   .ipc-player-bottom-left-content-container {
     display: flex;
-    flex-direction: inherit;
+    flex-direction: row;
+  }
+
+  // 左下角横滑提示箭头：仅在内容溢出且未滑到对应边缘时由 JS 控制显示
+  .ipc-player-bottom-left-scroll-hint-arrow {
+    width: 7px;
+    height: 7px;
+    animation: ipc-player-bottom-left-scroll-hint-pulse 1.4s ease-in-out infinite;
+  }
+
+  .ipc-player-bottom-left-scroll-hint-arrow--right {
+    border-top: 2px solid rgba(255, 255, 255, 0.95);
+    border-right: 2px solid rgba(255, 255, 255, 0.95);
+    transform: rotate(45deg);
+  }
+
+  .ipc-player-bottom-left-scroll-hint-arrow--left {
+    border-top: 2px solid rgba(255, 255, 255, 0.95);
+    border-left: 2px solid rgba(255, 255, 255, 0.95);
+    transform: rotate(-45deg);
+  }
+
+  // button 模式：半透明黑圆底（点击热区）
+  .ipc-player-bottom-left-scroll-hint--button {
+    background: rgba(0, 0, 0, 0.45);
+    border-radius: 50%;
+  }
+
+  // button 模式：白色箭头
+  .ipc-player-bottom-left-scroll-hint-arrow--light {
+    border-top-color: rgba(255, 255, 255, 0.95);
+    border-right-color: rgba(255, 255, 255, 0.95);
+    border-left-color: rgba(255, 255, 255, 0.95);
+  }
+
+  // button 模式：常显、不做渐隐渐显动画
+  .ipc-player-bottom-left-scroll-hint-arrow--static {
+    animation: none;
+    opacity: 1;
+  }
+
+  // 右边缘淡出：把没完全露出的元素渐隐到透明。写成静态类，避免内联 mask 在原生层反复重绘闪烁
+  .ipc-player-bottom-left-scroll-fademask {
+    -webkit-mask-image: linear-gradient(
+      to right,
+      #000 calc(100% - 72px),
+      rgba(0, 0, 0, 0.25) calc(100% - 24px),
+      transparent 100%
+    );
+    mask-image: linear-gradient(
+      to right,
+      #000 calc(100% - 72px),
+      rgba(0, 0, 0, 0.25) calc(100% - 24px),
+      transparent 100%
+    );
+  }
+
+  @keyframes ipc-player-bottom-left-scroll-hint-pulse {
+    0%,
+    100% {
+      opacity: 0.55;
+    }
+    50% {
+      opacity: 1;
+    }
   }
 
   // 右下角子元素内容区域样式
@@ -233,20 +297,20 @@
 
   // 左下角全屏子元素容器
   .bottom-left-item-full-container {
-    padding: 0 24px !important;
+    padding: 0 20px !important;
     flex-shrink: 0;
   }
 
   .bottom-left-item-full-container:first-of-type {
-    padding: 0 24px 0 16px !important;
+    padding: 0 20px 0 12px !important;
   }
 
   .bottom-left-item-full-container:last-of-type {
-    padding: 0 0 0 24px !important;
+    padding: 0 0 0 20px !important;
   }
 
   .bottom-left-item-full-container:only-of-type {
-    padding: 0 0 0 16px !important;
+    padding: 0 0 0 12px !important;
   }
 
   // 右下角子元素容器

package/lib/utils/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="jest" />
-export declare const isSmallScreen: boolean;
 /**
  * 麦克风对讲按钮径向渐变
  */

package/lib/utils/index.js

@@ -1,14 +1,4 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { getSystemInfoSync } from '@ray-js/ray';
-const {
-  windowWidth,
-  screenWidth,
-  windowHeight
-} = getSystemInfoSync();
-
-// pad和折叠屏小窗口展示面板的情况
-export const isSmallScreen = !(screenWidth === windowWidth || screenWidth === windowHeight);
-
 /**
  * 麦克风对讲按钮径向渐变
  */

package/lib/utils/navigation.d.ts

@@ -4,3 +4,4 @@ export declare const miniIdLabs: {
 };
 export declare function gotoAIDrawMiniProgram(devId: string, brandColor: string): void;
 export declare function gotoSecurityCloudService(homeId: string, uuid: string): Promise<void>;
+export declare function gotoSecurityCloudService2(devId: string): Promise<import("@ray-js/ray-ipc-utils/lib/interface").IRes<unknown>>;

package/lib/utils/navigation.js

@@ -1,4 +1,4 @@
-import { goToMiniProgramByShortLink } from '@ray-js/ray-ipc-utils';
+import { getServiceUrl, goToMiniProgramByShortLink } from '@ray-js/ray-ipc-utils';
 import Color from 'color';
 
 // 小程序ID集合
@@ -11,10 +11,13 @@ export const miniIdLabs = {
 export function gotoAIDrawMiniProgram(devId, brandColor) {
   const color = new Color(brandColor);
   const rgbColor = color.rgb().toString();
-  const url = `godzilla://${miniIdLabs.aiDrawMini}${'/pages/home/index'}?deviceId=${devId}&themeColor=${rgbColor}`;
+  const url = `godzilla://${miniIdLabs.aiDrawMini}?deviceId=${devId}&themeColor=${rgbColor}`;
   goToMiniProgramByShortLink(url, 'right');
 }
 export async function gotoSecurityCloudService(homeId, uuid) {
   const url = `godzilla://${miniIdLabs.securityCloudService}${'/pages/serviceList/index'}?homeId=${homeId}&deviceId=${uuid}&categoryCode=${'security_cloud_service'}`;
   goToMiniProgramByShortLink(url, 'right');
+}
+export async function gotoSecurityCloudService2(devId) {
+  return getServiceUrl(devId, 'security_cloud_service', {}, true);
 }

package/lib/utils/ttt.d.ts

@@ -4,7 +4,7 @@ export type SmartImageQualityResult = {
     trialRemainingSec: number;
     canOpenSettings: boolean;
 };
-export declare function getSmartImageQualityState(devId: string): Promise<SmartImageQualityResult>;
+export declare function getSmartImageQualityState(devId: string): Promise<SmartImageQualityResult | null>;
 export type AIFrameFeatureScope = {
     inPreview: boolean;
     inMessage: boolean;
@@ -25,6 +25,7 @@ export type SetAIFrameFeatureParams = {
     devId: string;
     enabled: boolean;
     aiFrameFeature: AIFrameFeatureConfig;
+    scene: string;
 };
 export type GetAIFrameFeatureResult = {
     enabled: boolean;
@@ -33,7 +34,8 @@ export type GetAIFrameFeatureResult = {
     localPath: string;
     thingFileUri: string;
 };
-export declare function getAIFrameFeature(devId: string): Promise<GetAIFrameFeatureResult>;
-export declare function setAIFrameFeature(devId: string, params: Omit<SetAIFrameFeatureParams, 'devId'>): Promise<any>;
-export declare function getDeviceInfoRay(devId: string): Promise<unknown>;
-export declare function getCurrentHomeInfoRay(): Promise<unknown>;
+export declare function getAIFrameFeature(devId: string): Promise<GetAIFrameFeatureResult | null>;
+export declare function setAIFrameFeature(params: SetAIFrameFeatureParams): Promise<any>;
+export declare function setTrailFinish(devId: string): Promise<unknown>;
+export declare function isLowPhone(): Promise<boolean>;
+export declare function getNgRawData(): Promise<unknown>;