@ray-js/ipc-player-integration 0.0.35-beta.14 → 0.0.35-beta.16

package/lib/ui/bottomLeftContent.js

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.find.js";
 import React, { useMemo } from 'react';
@@ -9,6 +8,10 @@ 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,
@@ -36,15 +39,20 @@ 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 buttonState = useMemo(() => {
+    var _tryExp$initProps3;
+    const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
+    return tryExp === null || tryExp === void 0 || (_tryExp$initProps3 = tryExp.initProps) === null || _tryExp$initProps3 === void 0 ? void 0 : _tryExp$initProps3.buttonState;
+  }, [bottomLeftContent]);
   const isLowPhone = useMemo(() => {
-    var _isLowPhone, _tryExp$initProps3;
+    var _isLowPhone, _tryExp$initProps4;
     const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
-    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;
+    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;
   }, []);
   const gRawData = useMemo(() => {
-    var _gRawData, _tryExp$initProps4;
+    var _gRawData, _tryExp$initProps5;
     const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
-    return (_gRawData = tryExp === null || tryExp === void 0 || (_tryExp$initProps4 = tryExp.initProps) === null || _tryExp$initProps4 === void 0 ? void 0 : _tryExp$initProps4.gRawData) !== null && _gRawData !== void 0 ? _gRawData : false;
+    return (_gRawData = tryExp === null || tryExp === void 0 || (_tryExp$initProps5 = tryExp.initProps) === null || _tryExp$initProps5 === void 0 ? void 0 : _tryExp$initProps5.gRawData) !== null && _gRawData !== void 0 ? _gRawData : false;
   }, [bottomLeftContent]);
   const [shouldHide] = useComponentHideState();
   const {
@@ -53,40 +61,32 @@ const BottomLeftContent = _ref => {
     handleCountdownEnd
   } = useTrialBadge(ctx.event, ctx.devId, trialRemainingSec);
   const paddingLeftPx = screenType === 'vertical' ? 0 : 25;
-  const containerHeight = screenType === 'vertical' ? '40px' : '58px';
-  const trialBadgeStyle = screenType === 'vertical' ? {
-    position: 'absolute',
-    left: '0px',
-    bottom: '48px',
-    marginBottom: 4,
-    zIndex: 101,
-    width: 'max-content'
-  } : {
-    position: 'absolute',
-    left: '25px',
-    bottom: '72px',
-    marginBottom: 8,
-    zIndex: 101,
-    width: 'max-content'
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, showSmartImageQuality && showTrialBadge && canOpenSettings && gRawData && !isLowPhone && trialRemainingSec > 0 && /*#__PURE__*/React.createElement(CoverView, {
-    style: _objectSpread(_objectSpread({}, trialBadgeStyle), {}, {
+  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`;
+  return /*#__PURE__*/React.createElement(CoverView, {
+    className: clsx('ipc-player-bottom-left-content-wrap'),
+    style: {
+      right: `${reservedRight}px`,
+      height: containerHeight,
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'flex-end',
       opacity: shouldHide ? 0 : 1,
       pointerEvents: shouldHide ? 'none' : 'auto'
-    }),
-    onClick: e => e.stopPropagation()
+    }
+  }, showBadge && /*#__PURE__*/React.createElement(View, {
+    style: {
+      paddingLeft: screenType === 'vertical' ? '0px' : '25px',
+      marginBottom: screenType === 'vertical' ? '4px' : '8px'
+    }
   }, /*#__PURE__*/React.createElement(TrialBadge, {
     brandColor: brandColor,
     trialRemainingSec: trialRemainingSec,
     onSubscribe: handleTrialSubscribe,
     onCountdownEnd: handleCountdownEnd
-  })), /*#__PURE__*/React.createElement(CoverView, {
-    className: clsx('ipc-player-bottom-left-content-wrap'),
-    style: {
-      right: `${reservedRight}px`,
-      height: containerHeight
-    }
-  }, /*#__PURE__*/React.createElement(View, {
+  })), /*#__PURE__*/React.createElement(View, {
     style: {
       paddingBottom: screenType === 'vertical' ? '14px' : '32px',
       paddingLeft: `${paddingLeftPx}px`,
@@ -100,6 +100,6 @@ const BottomLeftContent = _ref => {
       maskImage: FADE_MASK
     },
     className: clsx('ipc-player-bottom-left-content-container')
-  }, children)));
+  }, children));
 };
 export default BottomLeftContent;

package/lib/ui/ui.js

@@ -455,7 +455,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     //   canOpenSettings: true,
     // };
     const getNgRes = await getNgRawData();
-    console.log('res===getNgRes', res, getNgRes);
+    console.log('res===getNgRes111', res, getNgRes);
     updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
       isPurchase: res.isPurchase,
       buttonState: res.buttonState,
@@ -465,8 +465,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       isLowPhone: isLowPhoneRef.current
     });
   });
+  const siqInitRef = useRef(false);
   useEffect(() => {
-    if (playState === PlayState.PLAYING) {
+    if (playState === PlayState.PLAYING && !siqInitRef.current) {
+      siqInitRef.current = true;
       refreshSmartImageQuality();
     }
   }, [instance, playState]);

package/lib/ui/ui.less

@@ -157,7 +157,7 @@
   // 左下角子元素内容区域样式
   .ipc-player-bottom-left-content-container {
     display: flex;
-    flex-direction: inherit;
+    flex-direction: row;
   }
 
   // 右下角子元素内容区域样式

package/lib/widgets/trialBadge/useTrialBadge.js

@@ -1,26 +1,22 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { setTrailFinish } from '../../utils/ttt';
 import { gotoSecurityCloudService2 } from '../../utils';
-import { trialCountdownEnd, hideTrialBadgeEvent } from '../../ui/constant';
+import { trialCountdownEnd } from '../../ui/constant';
 import Strings from '../../i18n';
 export const useTrialBadge = (event, devId, trialRemainingSec) => {
   const [showTrialBadge, setShowTrialBadge] = useState(false);
+  const prevTrialSecRef = useRef(trialRemainingSec);
   useEffect(() => {
     if (trialRemainingSec > 0 && trialRemainingSec < 300) {
-      setShowTrialBadge(true);
+      if (trialRemainingSec !== prevTrialSecRef.current) {
+        setShowTrialBadge(true);
+      }
     }
+    prevTrialSecRef.current = trialRemainingSec;
   }, [trialRemainingSec]);
-  useEffect(() => {
-    const hide = () => setShowTrialBadge(false);
-    event.on(hideTrialBadgeEvent, hide);
-    return () => {
-      event.off(hideTrialBadgeEvent, hide);
-    };
-  }, [event]);
   const handleTrialSubscribe = useCallback(async () => {
     try {
-      const res = await gotoSecurityCloudService2(devId);
-      console.log('res===gotoSecurityCloudService2', res);
+      await gotoSecurityCloudService2(devId);
     } catch (error) {
       ty.showToast({
         title: Strings.getLang('ipc_player_fetch_error'),

package/lib/widgets/tryExperience/tryExperience.js

@@ -5,7 +5,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { useStore } from '../../ctx/store';
 import Strings from '../../i18n';
 import { getAIFrameFeature, gotoAIDrawMiniProgram, setAIFrameFeature } from '../../utils';
-import { refreshSmartImageQualityEvent, hideTrialBadgeEvent } from '../../ui/constant';
+import { refreshSmartImageQualityEvent } from '../../ui/constant';
 import tryZh from '../../res/try/try_zh.png';
 import tryEn from '../../res/try/try_en.png';
 import tryOpen from '../../res/try/try_open.png';
@@ -71,12 +71,6 @@ export const TryExperience = props => {
       setImgSrc(tryClose);
       return;
     }
-    // ty.getNgRawData({
-    //   rawKey: 'is_smart_image_quality',
-    //   success: （） => {},
-    //   fail: () => {},
-    // });
-    // success里具体的值 要看看实际调试结果， APP NG 配置支持的话 才展示智能画质开关哦
     if (buttonState === 0 || buttonState) {
       const iconUrl = pickIconByStatus(buttonState);
       setImgSrc(iconUrl);
@@ -104,7 +98,7 @@ export const TryExperience = props => {
     try {
       const getAI = await getAIFrameFeature(devId);
       if (buttonState === TryExperienceStatus.Open) {
-        var _getAI$aiFrameFeature, _getAI$aiFrameFeature2, _getAI$aiFrameFeature3, _props$event, _props$event2;
+        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
@@ -120,10 +114,9 @@ export const TryExperience = props => {
             exportEnabled: (_getAI$aiFrameFeature3 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature3 === void 0 ? void 0 : _getAI$aiFrameFeature3.exportEnabled
           }
         });
-        (_props$event = props.event) === null || _props$event === void 0 || _props$event.emit(hideTrialBadgeEvent);
-        (_props$event2 = props.event) === null || _props$event2 === void 0 || _props$event2.emit(refreshSmartImageQualityEvent);
+        (_props$event = props.event) === null || _props$event === void 0 || _props$event.emit(refreshSmartImageQualityEvent);
       } else if (buttonState === TryExperienceStatus.Close && isPurchase || buttonState === TryExperienceStatus.Close && trialRemainingSec < 300 && trialRemainingSec > 0) {
-        var _getAI$aiFrameFeature4, _getAI$aiFrameFeature5, _getAI$aiFrameFeature6, _props$event3;
+        var _getAI$aiFrameFeature4, _getAI$aiFrameFeature5, _getAI$aiFrameFeature6, _props$event2;
         const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature4 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature4 === void 0 ? void 0 : _getAI$aiFrameFeature4.scope), {}, {
           inPreview: true
         });
@@ -139,7 +132,7 @@ export const TryExperience = props => {
             exportEnabled: (_getAI$aiFrameFeature6 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature6 === void 0 ? void 0 : _getAI$aiFrameFeature6.exportEnabled
           }
         });
-        (_props$event3 = props.event) === null || _props$event3 === void 0 || _props$event3.emit(refreshSmartImageQualityEvent);
+        (_props$event2 = props.event) === null || _props$event2 === void 0 || _props$event2.emit(refreshSmartImageQualityEvent);
       } else {
         gotoAIDrawMiniProgram(devId, brandColor);
       }
@@ -152,7 +145,10 @@ export const TryExperience = props => {
   if (hideTryExperienceMenu) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, imgSrc && canOpenSettings && gRawData && /*#__PURE__*/React.createElement(View, {
+  if (!imgSrc || !canOpenSettings || !gRawData) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(View, {
     className: clsx(className),
     onClick: onTryExperience
   }, /*#__PURE__*/React.createElement(View, {
@@ -161,5 +157,5 @@ export const TryExperience = props => {
     className: "try-experience-icon",
     src: imgSrc,
     mode: "heightFix"
-  }))));
+  })));
 };

package/package.json

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