@ray-js/ipc-player-integration 0.0.35-beta.15 → 0.0.35-beta.17

package/lib/ui/bottomLeftContent.js

@@ -39,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 {
@@ -56,7 +61,7 @@ const BottomLeftContent = _ref => {
     handleCountdownEnd
   } = useTrialBadge(ctx.event, ctx.devId, trialRemainingSec);
   const paddingLeftPx = screenType === 'vertical' ? 0 : 25;
-  const showBadge = showSmartImageQuality && showTrialBadge && canOpenSettings && gRawData && !isLowPhone && trialRemainingSec > 0;
+  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`;

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]);
@@ -551,6 +553,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 监听退出此player
    */
   usePageEvent('onUnload', () => {
+    console.log('res===onUnload');
+    siqInitRef.current = false;
     ipcTTTOperatorLog('hide: 调用停止录制方法');
     setRecording(false, true);
     setIntercom(false, true);

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);
@@ -85,6 +79,7 @@ export const TryExperience = props => {
     }
   }, [buttonState]);
   const onTryExperience = useCallback(async () => {
+    console.log('res===onTryExperience', lockRef.current, isLowPhone);
     if (lockRef.current) return;
     if (isLowPhone) {
       showToast({
@@ -104,7 +99,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 +115,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 +133,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);
       }

package/package.json

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