@ray-js/ipc-player-integration 0.0.35-beta.23 → 0.0.35-beta.25

package/lib/ui/bottomLeftContent.js

@@ -8,10 +8,6 @@ import { useComponentHideState } from './hooks';
 import { TrialBadge, useTrialBadge } from '../widgets/trialBadge';
 /** 右侧透明渐变宽度，用于提示横向可滑动 */
 const FADE_MASK = 'linear-gradient(to right, #000 calc(100% - 48px), transparent 100%)';
-
-/** TrialBadge 组件高度 40px + 间距 */
-const BADGE_HEIGHT_VERTICAL = 44;
-const BADGE_HEIGHT_FULL = 48;
 const BottomLeftContent = _ref => {
   let {
     ctx,
@@ -62,25 +58,22 @@ const BottomLeftContent = _ref => {
   } = useTrialBadge(ctx.event, ctx.devId, trialRemainingSec);
   const paddingLeftPx = screenType === 'vertical' ? 0 : 25;
   const showBadge = showSmartImageQuality && showTrialBadge && canOpenSettings && gRawData && !isLowPhone && buttonState === 1 && trialRemainingSec > 0;
-  const bottomBarHeight = screenType === 'vertical' ? 40 : 58;
-  const badgeAreaHeight = screenType === 'vertical' ? BADGE_HEIGHT_VERTICAL : BADGE_HEIGHT_FULL;
-  const containerHeight = showBadge ? `${bottomBarHeight + badgeAreaHeight}px` : `${bottomBarHeight}px`;
+  const containerHeight = screenType === 'vertical' ? 48 : 83;
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-bottom-left-content-wrap'),
     style: {
       right: `${reservedRight}px`,
-      height: containerHeight,
+      height: showBadge ? `${containerHeight + 30}px` : `${containerHeight}px`,
       display: 'flex',
       flexDirection: 'column',
-      justifyContent: 'flex-end',
+      justifyContent: 'center',
       opacity: shouldHide ? 0 : 1,
       pointerEvents: shouldHide ? 'none' : 'auto'
     }
   }, showBadge && /*#__PURE__*/React.createElement(View, {
     style: {
-      paddingLeft: screenType === 'vertical' ? '0px' : '25px',
-      marginBottom: screenType === 'vertical' ? '4px' : '8px',
-      marginLeft: '12px'
+      height: '32px',
+      marginLeft: screenType === 'vertical' ? '12px' : '25px'
     }
   }, /*#__PURE__*/React.createElement(TrialBadge, {
     brandColor: brandColor,
@@ -89,10 +82,12 @@ const BottomLeftContent = _ref => {
     onCountdownEnd: handleCountdownEnd
   })), /*#__PURE__*/React.createElement(View, {
     style: {
-      paddingBottom: screenType === 'vertical' ? '14px' : '32px',
+      paddingBottom: screenType === 'vertical' ? 0 : '32px',
       paddingLeft: `${paddingLeftPx}px`,
       paddingRight: '16px',
       width: '100%',
+      height: `${containerHeight}px`,
+      marginTop: showBadge ? '-2px' : 0,
       overflowX: 'auto',
       overflowY: 'hidden',
       whiteSpace: 'nowrap',

package/lib/ui/bottomRightContent.js

@@ -17,20 +17,21 @@ const BottomRightContent = _ref => {
     playState: ctx.playState
   });
   const [shouldHide] = useComponentHideState();
+  const containerHeight = screenType === 'vertical' ? 48 : 83;
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-bottom-right-content-wrap'),
     style: _objectSpread({
       paddingLeft: screenType === 'vertical' ? '10px' : '0',
-      height: screenType === 'vertical' ? shouldHide ? '41px' : '40px' : shouldHide ? '57px' : '58px'
+      height: screenType === 'vertical' ? shouldHide ? '49px' : '48px' : shouldHide ? '84px' : '83px'
     }, typeof width === 'number' && width > 0 ? {
       width: `${width}px`,
       boxSizing: 'border-box'
     } : null)
   }, /*#__PURE__*/React.createElement(View, {
     style: {
-      paddingBottom: screenType === 'vertical' ? '14px' : '32px',
       paddingRight: screenType === 'vertical' ? 0 : '25px',
       width: '100%',
+      height: `${containerHeight}px`,
       justifyContent: 'flex-end'
     },
     className: clsx('ipc-player-bottom-right-content-container', {

package/lib/ui/ui.js

@@ -794,9 +794,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setScaleMultiple(value);
   };
   const onTrialCountdownEnd = useMemoizedFn(() => {
-    updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
-      buttonState: 2
-    });
+    // updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience' as any, {
+    //   buttonState: 2,
+    // });
+    refreshSmartImageQuality();
   });
   useEffect(() => {
     eventRef.current.on(startTimeToHideAllComponent, listenStart);

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%);
@@ -233,16 +233,16 @@
 
   // 左下角全屏子元素容器
   .bottom-left-item-full-container {
-    padding: 0 24px !important;
+    padding: 0 12px !important;
     flex-shrink: 0;
   }
 
   .bottom-left-item-full-container:first-of-type {
-    padding: 0 24px 0 16px !important;
+    padding: 0 12px 0 16px !important;
   }
 
   .bottom-left-item-full-container:last-of-type {
-    padding: 0 0 0 24px !important;
+    padding: 0 0 0 12px !important;
   }
 
   .bottom-left-item-full-container:only-of-type {

package/lib/widgets/trialBadge/index.less

@@ -1,13 +1,23 @@
+@keyframes ipc-player-trial-badge-slide-in {
+  from {
+    transform: translateX(-100%);
+  }
+  to {
+    transform: translateX(0);
+  }
+}
+
 .ipc-player-trial-badge {
   display: inline-flex;
   align-items: center;
-  height: 40px;
+  height: 32px;
   padding: 0 6px 0 8px;
   border-radius: 8px;
   background: rgba(0, 0, 0, 0.65);
   flex-shrink: 0;
   vertical-align: middle;
   white-space: nowrap;
+  animation: ipc-player-trial-badge-slide-in 0.3s linear;
 }
 
 .ipc-player-trial-badge-icon {

package/lib/widgets/trialBadge/useTrialBadge.js

@@ -1,6 +1,5 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { getAIFrameFeature, setAIFrameFeature, setTrailFinish } from '../../utils/ttt';
+import { setTrailFinish } from '../../utils/ttt';
 import { gotoSecurityCloudService2 } from '../../utils';
 import { trialCountdownEnd } from '../../ui/constant';
 import Strings from '../../i18n';
@@ -27,25 +26,21 @@ export const useTrialBadge = (event, devId, trialRemainingSec) => {
   }, [devId]);
   const handleCountdownEnd = useCallback(async () => {
     try {
-      var _getAI$aiFrameFeature, _getAI$aiFrameFeature2, _getAI$aiFrameFeature3;
       setShowTrialBadge(false);
-      event.emit(trialCountdownEnd);
-      const getAI = await getAIFrameFeature(devId);
-      const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature === void 0 ? void 0 : _getAI$aiFrameFeature.scope), {}, {
-        inPreview: false
-      });
-      await setAIFrameFeature({
-        devId,
-        scene: 'inPreview',
-        // 实时预览场景
-        enabled: getAI.enabled,
-        aiFrameFeature: {
-          scope,
-          feature: (_getAI$aiFrameFeature2 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature2 === void 0 ? void 0 : _getAI$aiFrameFeature2.feature,
-          exportEnabled: (_getAI$aiFrameFeature3 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature3 === void 0 ? void 0 : _getAI$aiFrameFeature3.exportEnabled
-        }
-      });
+      // const getAI = await getAIFrameFeature(devId);
+      // const scope = { ...getAI.aiFrameFeature?.scope, inPreview: false };
+      // await setAIFrameFeature({
+      //   devId,
+      //   scene: 'inPreview', // 实时预览场景
+      //   enabled: getAI.enabled,
+      //   aiFrameFeature: {
+      //     scope,
+      //     feature: getAI.aiFrameFeature?.feature,
+      //     exportEnabled: getAI.aiFrameFeature?.exportEnabled,
+      //   },
+      // });
       await setTrailFinish(devId);
+      event.emit(trialCountdownEnd);
     } catch (error) {
       ty.showToast({
         title: Strings.getLang('ipc_player_fetch_error'),

package/package.json

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