@ray-js/ipc-player-integration 0.0.35-beta.11 → 0.0.35-beta.13

package/lib/ui/bottomLeftContent.js

@@ -8,7 +8,7 @@ import { useStore } from '../ctx/store';
 import { useComponentHideState } from './hooks';
 import { TrialBadge, useTrialBadge } from '../widgets/trialBadge';
 /** 右侧透明渐变宽度，用于提示横向可滑动 */
-const FADE_MASK = 'linear-gradient(to right, #000 calc(100% - 16px), transparent 100%)';
+const FADE_MASK = 'linear-gradient(to right, #000 calc(100% - 48px), transparent 100%)';
 
 /**
  * 试用徽章在不同 screenType 下的容器样式。
@@ -58,15 +58,10 @@ const BottomLeftContent = _ref => {
     const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
     return (_trialRemainingSec = tryExp === null || tryExp === void 0 || (_tryExp$initProps2 = tryExp.initProps) === null || _tryExp$initProps2 === void 0 ? void 0 : _tryExp$initProps2.trialRemainingSec) !== null && _trialRemainingSec !== void 0 ? _trialRemainingSec : 0;
   }, [bottomLeftContent]);
-  const refreshToken = useMemo(() => {
-    var _refreshToken, _tryExp$initProps3;
-    const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
-    return (_refreshToken = tryExp === null || tryExp === void 0 || (_tryExp$initProps3 = tryExp.initProps) === null || _tryExp$initProps3 === void 0 ? void 0 : _tryExp$initProps3.refreshToken) !== null && _refreshToken !== void 0 ? _refreshToken : 0;
-  }, [bottomLeftContent]);
   const isLowPhone = useMemo(() => {
-    var _isLowPhone, _tryExp$initProps4;
+    var _isLowPhone, _tryExp$initProps3;
     const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
-    return (_isLowPhone = tryExp === null || tryExp === void 0 || (_tryExp$initProps4 = tryExp.initProps) === null || _tryExp$initProps4 === void 0 ? void 0 : _tryExp$initProps4.isLowPhone) !== null && _isLowPhone !== void 0 ? _isLowPhone : false;
+    return (_isLowPhone = tryExp === null || tryExp === void 0 || (_tryExp$initProps3 = tryExp.initProps) === null || _tryExp$initProps3 === void 0 ? void 0 : _tryExp$initProps3.isLowPhone) !== null && _isLowPhone !== void 0 ? _isLowPhone : false;
   }, []);
   const [shouldHide] = useComponentHideState();
   const {
@@ -76,6 +71,13 @@ const BottomLeftContent = _ref => {
   } = useTrialBadge(ctx.event, ctx.devId, trialRemainingSec);
   const paddingLeftPx = screenType === 'vertical' ? 0 : 25;
   const trialBadgeWrapStyle = screenType === 'vertical' ? TRIAL_BADGE_WRAP_STYLE_VERTICAL : TRIAL_BADGE_WRAP_STYLE_FULL;
+  const showBadge = showSmartImageQuality && showTrialBadge && canOpenSettings && !isLowPhone && trialRemainingSec > 0;
+  const containerHeight = (() => {
+    if (showBadge) {
+      return screenType === 'vertical' ? '40px' : '58px';
+    }
+    return screenType === 'vertical' ? shouldHide ? '41px' : '40px' : shouldHide ? '57px' : '58px';
+  })();
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-bottom-left-content-wrap')
     // 注意：不要在这里覆盖 position，CSS 类已经设置 position: absolute; left: 0; bottom: 0
@@ -83,19 +85,17 @@ const BottomLeftContent = _ref => {
     ,
     style: {
       right: `${reservedRight}px`,
-      height: screenType === 'vertical' ? shouldHide ? '41px' : '40px' : shouldHide ? '57px' : '58px'
+      height: containerHeight
     }
-  }, showSmartImageQuality && showTrialBadge && canOpenSettings && !isLowPhone && /*#__PURE__*/React.createElement(View, {
+  }, showBadge && /*#__PURE__*/React.createElement(View, {
     className: clsx('bottom-left-item-container'),
     style: _objectSpread(_objectSpread({}, trialBadgeWrapStyle), {}, {
-      transform: shouldHide ? 'translateY(40px)' : 'translateY(0)',
       opacity: shouldHide ? 0 : 1,
-      transition: 'transform 0.3s ease-in-out, opacity 0.3s ease-in-out'
+      pointerEvents: shouldHide ? 'none' : 'auto'
     })
   }, /*#__PURE__*/React.createElement(TrialBadge, {
     brandColor: brandColor,
     trialRemainingSec: trialRemainingSec,
-    refreshToken: refreshToken,
     onSubscribe: handleTrialSubscribe,
     onCountdownEnd: handleCountdownEnd
   })), /*#__PURE__*/React.createElement(View, {

package/lib/ui/ui.js

@@ -448,25 +448,22 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setVerticalMic(verticalMic);
   }, [brandColor, verticalMic]);
   const refreshSmartImageQuality = useMemoizedFn(async () => {
-    let res = await getSmartImageQualityState(devId);
-    console.log('res===refreshSmartImageQuality1', res);
-    // if (res === undefined) return;
-    // TODO: TEST
-    if (res === undefined) {
-      res = {
-        isPurchase: false,
-        buttonState: 0,
-        trialRemainingSec: 20,
-        canOpenSettings: true
-      };
-    }
+    const res = await getSmartImageQualityState(devId);
+    if (res === undefined) return;
+    // 可调试
+    // res = {
+    //   isPurchase: false,
+    //   buttonState: 0,
+    //   trialRemainingSec: 20,
+    //   canOpenSettings: true,
+    // };
+    console.log('res===refreshSmartImageQuality', res);
     updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
       isPurchase: res.isPurchase,
       buttonState: res.buttonState,
       trialRemainingSec: res.trialRemainingSec,
       canOpenSettings: res.canOpenSettings,
-      isLowPhone: isLowPhoneRef.current,
-      refreshToken: Date.now()
+      isLowPhone: isLowPhoneRef.current
     });
   });
   useEffect(() => {

package/lib/utils/navigation.js

@@ -10,8 +10,8 @@ export const miniIdLabs = {
 };
 export function gotoAIDrawMiniProgram(devId, brandColor) {
   const color = new Color(brandColor);
-  color.rgb().toString();
-  const url = `godzilla://${miniIdLabs.aiDrawMini}${'/pages/smartImageQuality/index'}?deviceId=${devId}`;
+  const rgbColor = color.rgb().toString();
+  const url = `godzilla://${miniIdLabs.aiDrawMini}?deviceId=${devId}&themeColor=${rgbColor}`;
   goToMiniProgramByShortLink(url, 'right');
 }
 export async function gotoSecurityCloudService(homeId, uuid) {

package/lib/widgets/trialBadge/index.d.ts

@@ -6,12 +6,10 @@ type Props = {
     brandColor?: string;
     /** 试看倒计时初始秒数，来源于 smartImageQualityState.trialRemainingSec */
     trialRemainingSec?: number;
-    /** 刷新令牌，变化时重置倒计时状态 */
-    refreshToken?: number;
     /** 点击「开通」按钮回调 */
     onSubscribe?: () => void;
     /** 倒计时归零时触发，本组件保证整个生命周期内只回调一次 */
     onCountdownEnd?: () => void;
 };
-export declare const TrialBadge: ({ className, brandColor, trialRemainingSec, refreshToken, onSubscribe, onCountdownEnd, }: Props) => React.JSX.Element;
+export declare const TrialBadge: ({ className, brandColor, trialRemainingSec, onSubscribe, onCountdownEnd, }: Props) => React.JSX.Element;
 export { useTrialBadge } from './useTrialBadge';

package/lib/widgets/trialBadge/index.js

@@ -18,21 +18,25 @@ export const TrialBadge = _ref => {
     className,
     brandColor = FALLBACK_BRAND_COLOR,
     trialRemainingSec = 0,
-    refreshToken,
     onSubscribe,
     onCountdownEnd
   } = _ref;
   const [remainingSec, setRemainingSec] = useState(Math.max(0, Math.floor(trialRemainingSec)));
-  /** 防止 onCountdownEnd 被重复触发；同时持有最新回调，避免依赖变化导致 effect 重跑 */
   const endedRef = useRef(false);
   const onCountdownEndRef = useRef(onCountdownEnd);
   onCountdownEndRef.current = onCountdownEnd;
+  const startTimeRef = useRef(Date.now());
+  const initialSecRef = useRef(Math.max(0, Math.floor(trialRemainingSec)));
   useEffect(() => {
+    console.log('res===trialRemainingSec', trialRemainingSec);
+    const sec = Math.max(0, Math.floor(trialRemainingSec));
     endedRef.current = false;
-    setRemainingSec(Math.max(0, Math.floor(trialRemainingSec)));
-  }, [trialRemainingSec, refreshToken]);
+    initialSecRef.current = sec;
+    startTimeRef.current = Date.now();
+    setRemainingSec(sec);
+  }, [trialRemainingSec]);
   useEffect(() => {
-    if (remainingSec <= 0) {
+    if (trialRemainingSec <= 0) {
       if (!endedRef.current) {
         var _onCountdownEndRef$cu;
         endedRef.current = true;
@@ -41,22 +45,20 @@ export const TrialBadge = _ref => {
       return undefined;
     }
     const timer = setInterval(() => {
-      setRemainingSec(prev => {
-        const next = prev - 1;
-        if (next <= 0) {
-          clearInterval(timer);
-          if (!endedRef.current) {
-            var _onCountdownEndRef$cu2;
-            endedRef.current = true;
-            (_onCountdownEndRef$cu2 = onCountdownEndRef.current) === null || _onCountdownEndRef$cu2 === void 0 || _onCountdownEndRef$cu2.call(onCountdownEndRef);
-          }
-          return 0;
+      const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
+      const next = Math.max(0, initialSecRef.current - elapsed);
+      setRemainingSec(next);
+      if (next <= 0) {
+        clearInterval(timer);
+        if (!endedRef.current) {
+          var _onCountdownEndRef$cu2;
+          endedRef.current = true;
+          (_onCountdownEndRef$cu2 = onCountdownEndRef.current) === null || _onCountdownEndRef$cu2 === void 0 || _onCountdownEndRef$cu2.call(onCountdownEndRef);
         }
-        return next;
-      });
+      }
     }, 1000);
     return () => clearInterval(timer);
-  }, [trialRemainingSec, refreshToken]);
+  }, [trialRemainingSec]);
   const countdownText = formatCountdown(remainingSec);
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-trial-badge', className)

package/lib/widgets/tryExperience/tryExperience.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { View, Image, getSystemInfoSync, showToast } from '@ray-js/ray';
 import clsx from 'clsx';
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { useStore } from '../../ctx/store';
 import Strings from '../../i18n';
 import { getAIFrameFeature, gotoAIDrawMiniProgram, setAIFrameFeature } from '../../utils';
@@ -60,6 +60,7 @@ export const TryExperience = props => {
     recording: props.recording
   });
   const [imgSrc, setImgSrc] = useState();
+  const lockRef = useRef(false);
   useEffect(() => {
     updateImgSrc();
   }, [buttonState]);
@@ -77,6 +78,7 @@ export const TryExperience = props => {
     }
   }, [buttonState]);
   const onTryExperience = useCallback(async () => {
+    if (lockRef.current) return;
     if (isLowPhone) {
       showToast({
         title: Strings.getLang('ipc_player_low_phone_not_support'),
@@ -91,10 +93,12 @@ export const TryExperience = props => {
       });
       return;
     }
+    lockRef.current = true;
     try {
       const getAI = await getAIFrameFeature(devId);
       if (buttonState === TryExperienceStatus.Open) {
         var _getAI$aiFrameFeature, _getAI$aiFrameFeature2, _getAI$aiFrameFeature3, _props$event;
+        // 由开变关的时候，只关inPreview
         const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature === void 0 ? void 0 : _getAI$aiFrameFeature.scope), {}, {
           inPreview: false
         });
@@ -115,11 +119,12 @@ export const TryExperience = props => {
         const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature4 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature4 === void 0 ? void 0 : _getAI$aiFrameFeature4.scope), {}, {
           inPreview: true
         });
+        // 由关变开的时候，enabled和inPreview两个都开
         await setAIFrameFeature({
           devId,
           scene: 'inPreview',
           // 实时预览场景
-          enabled: getAI.enabled,
+          enabled: true,
           aiFrameFeature: {
             scope,
             feature: (_getAI$aiFrameFeature5 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature5 === void 0 ? void 0 : _getAI$aiFrameFeature5.feature,
@@ -132,6 +137,8 @@ export const TryExperience = props => {
       }
     } catch (error) {
       //
+    } finally {
+      lockRef.current = false;
     }
   }, [buttonState, recording, isPurchase, trialRemainingSec]);
   if (hideTryExperienceMenu) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.35-beta.11",
+  "version": "0.0.35-beta.13",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [