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

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';
@@ -10,27 +9,9 @@ import { TrialBadge, useTrialBadge } from '../widgets/trialBadge';
 /** 右侧透明渐变宽度，用于提示横向可滑动 */
 const FADE_MASK = 'linear-gradient(to right, #000 calc(100% - 48px), transparent 100%)';
 
-/**
- * 试用徽章在不同 screenType 下的容器样式。
- * 「贴在底栏顶部」的策略一致（bottom: 100%），只是 left / marginBottom
- * 等数值按横竖屏不同的边距规则做差异化处理。
- */
-const TRIAL_BADGE_WRAP_STYLE_VERTICAL = {
-  position: 'absolute',
-  left: '0px',
-  bottom: '100%',
-  marginBottom: 4,
-  zIndex: 2,
-  width: 'max-content'
-};
-const TRIAL_BADGE_WRAP_STYLE_FULL = {
-  position: 'absolute',
-  left: '25px',
-  bottom: '100%',
-  marginBottom: 8,
-  zIndex: 2,
-  width: 'max-content'
-};
+/** TrialBadge 组件高度 40px + 间距 */
+const BADGE_HEIGHT_VERTICAL = 44;
+const BADGE_HEIGHT_FULL = 48;
 const BottomLeftContent = _ref => {
   let {
     ctx,
@@ -63,6 +44,11 @@ const BottomLeftContent = _ref => {
     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;
   }, []);
+  const gRawData = useMemo(() => {
+    var _gRawData, _tryExp$initProps4;
+    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;
+  }, [bottomLeftContent]);
   const [shouldHide] = useComponentHideState();
   const {
     showTrialBadge,
@@ -70,29 +56,26 @@ const BottomLeftContent = _ref => {
     handleCountdownEnd
   } = 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';
-  })();
+  const showBadge = showSmartImageQuality && showTrialBadge && canOpenSettings && gRawData && !isLowPhone && 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')
-    // 注意：不要在这里覆盖 position，CSS 类已经设置 position: absolute; left: 0; bottom: 0
-    // 否则 children 会失去贴底定位，从而与 bottomRightContent 不对齐
-    ,
+    className: clsx('ipc-player-bottom-left-content-wrap'),
     style: {
       right: `${reservedRight}px`,
-      height: containerHeight
-    }
-  }, showBadge && /*#__PURE__*/React.createElement(View, {
-    className: clsx('bottom-left-item-container'),
-    style: _objectSpread(_objectSpread({}, trialBadgeWrapStyle), {}, {
+      height: containerHeight,
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'flex-end',
       opacity: shouldHide ? 0 : 1,
       pointerEvents: shouldHide ? 'none' : 'auto'
-    })
+    }
+  }, showBadge && /*#__PURE__*/React.createElement(View, {
+    style: {
+      paddingLeft: screenType === 'vertical' ? '0px' : '25px',
+      marginBottom: screenType === 'vertical' ? '4px' : '8px'
+    }
   }, /*#__PURE__*/React.createElement(TrialBadge, {
     brandColor: brandColor,
     trialRemainingSec: trialRemainingSec,
@@ -111,10 +94,7 @@ const BottomLeftContent = _ref => {
       WebkitMaskImage: FADE_MASK,
       maskImage: FADE_MASK
     },
-    className: clsx('ipc-player-bottom-left-content-container', {
-      // 'ipc-player-bottom-left-content-hide': shouldHide,
-      // 'ipc-player-bottom-left-content-show': !shouldHide,
-    })
+    className: clsx('ipc-player-bottom-left-content-container')
   }, children));
 };
 export default BottomLeftContent;

package/lib/ui/constant.d.ts

@@ -26,6 +26,7 @@ export declare const widgetClick = "widgetClick";
  * 业务侧/相关控件可监听此事件刷新自己的状态（例如 TryExperience 重新拉取状态）
  */
 export declare const trialCountdownEnd = "trialCountdownEnd";
+export declare const hideTrialBadgeEvent = "hideTrialBadge";
 export declare const refreshSmartImageQualityEvent = "refreshSmartImageQuality";
 /** 控件点击事件用的 widgetId，统一在此维护 */
 export declare const widgetLabs: {

package/lib/ui/constant.js

@@ -27,6 +27,7 @@ export const widgetClick = 'widgetClick';
  * 业务侧/相关控件可监听此事件刷新自己的状态（例如 TryExperience 重新拉取状态）
  */
 export const trialCountdownEnd = 'trialCountdownEnd';
+export const hideTrialBadgeEvent = 'hideTrialBadge';
 export const refreshSmartImageQualityEvent = 'refreshSmartImageQuality';
 
 /** 控件点击事件用的 widgetId，统一在此维护 */

package/lib/ui/ui.js

@@ -22,7 +22,7 @@ import { useMemoizedFn } from '../hooks';
 import { Storage } from '../utils/storage';
 import './ui.less';
 import { updatePlayerWidgetProps } from '../features';
-import { getSmartImageQualityState, isLowPhone } 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
@@ -111,9 +111,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   // 是否需要忽略进入后台停止预览
   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 => {
@@ -450,19 +447,21 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   const refreshSmartImageQuality = useMemoizedFn(async () => {
     const res = await getSmartImageQualityState(devId);
     if (res === undefined) return;
-    // 可调试
+    // 调试时使用
     // res = {
     //   isPurchase: false,
     //   buttonState: 0,
     //   trialRemainingSec: 20,
     //   canOpenSettings: true,
     // };
-    console.log('res===refreshSmartImageQuality', res);
+    const getNgRes = await getNgRawData();
+    console.log('res===getNgRes', res, getNgRes);
     updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
       isPurchase: res.isPurchase,
       buttonState: res.buttonState,
       trialRemainingSec: res.trialRemainingSec,
       canOpenSettings: res.canOpenSettings,
+      gRawData: !!getNgRes,
       isLowPhone: isLowPhoneRef.current
     });
   });
@@ -918,7 +917,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
         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;

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/utils/ttt.d.ts

@@ -40,3 +40,4 @@ export declare function getDeviceInfo(devId: string): Promise<unknown>;
 export declare function getCurrentHomeInfo(): Promise<unknown>;
 export declare function setTrailFinish(devId: string): Promise<unknown>;
 export declare function isLowPhone(): Promise<unknown>;
+export declare function getNgRawData(): Promise<unknown>;

package/lib/utils/ttt.js

@@ -6,7 +6,6 @@ export function getSmartImageQualityState(devId) {
         devId,
         scene: 'inPreview',
         success: data => {
-          console.log('res===getSmartImageQualityState data', data);
           resolve(data);
         },
         fail: () => {
@@ -120,4 +119,21 @@ export function isLowPhone() {
       resolve(false);
     }
   });
+}
+export function getNgRawData() {
+  return new Promise(resolve => {
+    try {
+      ty.getNgRawData({
+        rawKey: 'is_smart_image_quality',
+        success: res => {
+          resolve(res);
+        },
+        fail: () => {
+          resolve(false);
+        }
+      });
+    } catch (e) {
+      resolve(false);
+    }
+  });
 }

package/lib/widgets/trialBadge/index.js

@@ -77,10 +77,7 @@ export const TrialBadge = _ref => {
     style: {
       backgroundColor: brandColor
     },
-    onClick: e => {
-      if (e && typeof e.stopPropagation === 'function') {
-        e.stopPropagation();
-      }
+    onClick: () => {
       onSubscribe === null || onSubscribe === void 0 || onSubscribe();
     }
   }, /*#__PURE__*/React.createElement(Text, {

package/lib/widgets/trialBadge/index.less

@@ -1,7 +1,7 @@
 .ipc-player-trial-badge {
   display: inline-flex;
   align-items: center;
-  height: 28px;
+  height: 40px;
   padding: 0 4px 0 8px;
   border-radius: 6px;
   background: rgba(0, 0, 0, 0.65);
@@ -43,9 +43,10 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  height: 22px;
-  padding: 0 10px;
-  border-radius: 11px;
+  min-width: 44px;
+  min-height: 28px;
+  padding: 0 12px;
+  border-radius: 14px;
   flex-shrink: 0;
 }
 

package/lib/widgets/trialBadge/useTrialBadge.js

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { setTrailFinish } from '../../utils/ttt';
 import { gotoSecurityCloudService2 } from '../../utils';
-import { trialCountdownEnd } from '../../ui/constant';
+import { trialCountdownEnd, hideTrialBadgeEvent } from '../../ui/constant';
 import Strings from '../../i18n';
 export const useTrialBadge = (event, devId, trialRemainingSec) => {
   const [showTrialBadge, setShowTrialBadge] = useState(false);
@@ -10,6 +10,13 @@ export const useTrialBadge = (event, devId, trialRemainingSec) => {
       setShowTrialBadge(true);
     }
   }, [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);

package/lib/widgets/tryExperience/tryExperience.d.ts

@@ -8,6 +8,7 @@ type Props = ComponentConfigProps & {
     trialRemainingSec?: number;
     isPurchase?: boolean;
     canOpenSettings?: boolean;
+    gRawData?: boolean;
     isLowPhone?: boolean;
 };
 export declare const TryExperience: (props: Props) => React.JSX.Element | null;

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 } from '../../ui/constant';
+import { refreshSmartImageQualityEvent, hideTrialBadgeEvent } 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';
@@ -49,6 +49,7 @@ export const TryExperience = props => {
     trialRemainingSec,
     isPurchase,
     canOpenSettings,
+    gRawData,
     isLowPhone,
     devId
   } = props;
@@ -70,6 +71,12 @@ 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);
@@ -97,7 +104,7 @@ export const TryExperience = props => {
     try {
       const getAI = await getAIFrameFeature(devId);
       if (buttonState === TryExperienceStatus.Open) {
-        var _getAI$aiFrameFeature, _getAI$aiFrameFeature2, _getAI$aiFrameFeature3, _props$event;
+        var _getAI$aiFrameFeature, _getAI$aiFrameFeature2, _getAI$aiFrameFeature3, _props$event, _props$event2;
         // 由开变关的时候，只关inPreview
         const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature === void 0 ? void 0 : _getAI$aiFrameFeature.scope), {}, {
           inPreview: false
@@ -113,9 +120,10 @@ 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(refreshSmartImageQualityEvent);
+        (_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);
       } else if (buttonState === TryExperienceStatus.Close && isPurchase || buttonState === TryExperienceStatus.Close && trialRemainingSec < 300 && trialRemainingSec > 0) {
-        var _getAI$aiFrameFeature4, _getAI$aiFrameFeature5, _getAI$aiFrameFeature6, _props$event2;
+        var _getAI$aiFrameFeature4, _getAI$aiFrameFeature5, _getAI$aiFrameFeature6, _props$event3;
         const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature4 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature4 === void 0 ? void 0 : _getAI$aiFrameFeature4.scope), {}, {
           inPreview: true
         });
@@ -131,7 +139,7 @@ export const TryExperience = props => {
             exportEnabled: (_getAI$aiFrameFeature6 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature6 === void 0 ? void 0 : _getAI$aiFrameFeature6.exportEnabled
           }
         });
-        (_props$event2 = props.event) === null || _props$event2 === void 0 || _props$event2.emit(refreshSmartImageQualityEvent);
+        (_props$event3 = props.event) === null || _props$event3 === void 0 || _props$event3.emit(refreshSmartImageQualityEvent);
       } else {
         gotoAIDrawMiniProgram(devId, brandColor);
       }
@@ -144,7 +152,10 @@ export const TryExperience = props => {
   if (hideTryExperienceMenu) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, imgSrc && canOpenSettings && /*#__PURE__*/React.createElement(View, {
+  if (!imgSrc || !canOpenSettings || !gRawData) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(View, {
     className: clsx(className),
     onClick: onTryExperience
   }, /*#__PURE__*/React.createElement(View, {
@@ -153,5 +164,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.13",
+  "version": "0.0.35-beta.15",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [