@ray-js/ipc-player-integration 0.0.35-beta.3 → 0.0.35-beta.5

package/lib/ui/constant.d.ts

@@ -21,8 +21,6 @@ export declare const landscapeTipId = "landscapeTipId";
 export declare const multiPtzId = "multiPtzId";
 /** 控件点击统一事件：任意播放器内控件被点击时触发，可用于埋点或统一处理 */
 export declare const widgetClick = "widgetClick";
-/** 「去体验」按钮业务事件，与清晰度 resolutionBtnControlClick 用法一致 */
-export declare const tryExperienceBtnClick = "tryExperienceBtnClick";
 /**
  * 试看倒计时结束事件：试看徽章倒计时归零时触发，
  * 业务侧/相关控件可监听此事件刷新自己的状态（例如 TryExperience 重新拉取状态）

package/lib/ui/constant.js

@@ -22,9 +22,6 @@ export const multiPtzId = 'multiPtzId';
 /** 控件点击统一事件：任意播放器内控件被点击时触发，可用于埋点或统一处理 */
 export const widgetClick = 'widgetClick';
 
-/** 「去体验」按钮业务事件，与清晰度 resolutionBtnControlClick 用法一致 */
-export const tryExperienceBtnClick = 'tryExperienceBtnClick';
-
 /**
  * 试看倒计时结束事件：试看徽章倒计时归零时触发，
  * 业务侧/相关控件可监听此事件刷新自己的状态（例如 TryExperience 重新拉取状态）

package/lib/ui/index.d.ts

@@ -3,4 +3,4 @@ export * from './hooks';
 export * from './context';
 export type * from './event';
 export { widgetClick } from './widgetClick';
-export { widgetLabs, tryExperienceBtnClick, trialCountdownEnd } from './constant';
+export { widgetLabs, trialCountdownEnd } from './constant';

package/lib/ui/index.js

@@ -2,4 +2,4 @@ export * from './ui';
 export * from './hooks';
 export * from './context';
 export { widgetClick } from './widgetClick';
-export { widgetLabs, tryExperienceBtnClick, trialCountdownEnd } from './constant';
+export { widgetLabs, trialCountdownEnd } from './constant';

package/lib/ui/ui.js

@@ -12,7 +12,7 @@ import { PlayState, PlayerStreamStatus, MultiCameraScreenMode } from '../interfa
 import { useCtx } from '../ctx/ctx.composition';
 import { useStore, updateAtom } from '../ctx/store';
 import { UIEventContext } from './context';
-import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent, decodeClarityDic, changeIgnoreHideStopPreview, moveablePtzControlId, tileActionsId, tileTipId, landscapeTipId, multiPtzId, ptzMoveableTipId, showFlowLowTipId, zoomLevelChange, setScaleMultipleEvent } from './constant';
+import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent, decodeClarityDic, changeIgnoreHideStopPreview, moveablePtzControlId, tileActionsId, tileTipId, landscapeTipId, multiPtzId, ptzMoveableTipId, showFlowLowTipId, zoomLevelChange, setScaleMultipleEvent, trialCountdownEnd } from './constant';
 import BottomLeftContent from './bottomLeftContent';
 import BottomRightContent from './bottomRightContent';
 import TopLeftContent from './topLeftContent';
@@ -427,7 +427,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   }, [brandColor, verticalMic]);
   const refreshSmartImageQuality = useMemoizedFn(() => {
     getSmartImageQualityState(devId).then(res => {
-      console.log('res===getSmartImageQualityState', res);
       updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
         buttonState: res.buttonState,
         trialRemainingSec: res.trialRemainingSec,
@@ -436,8 +435,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     });
   });
   useEffect(() => {
-    refreshSmartImageQuality();
-  }, [instance]);
+    if (playState === PlayState.PLAYING) {
+      refreshSmartImageQuality();
+    }
+  }, [playState]);
   const refreshBottomLeft = () => {
     event.current.emit(startTimeToHideAllComponent);
     event.current.emit(showAllComponent);
@@ -752,6 +753,11 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   const onSetScaleMultiple = value => {
     setScaleMultiple(value);
   };
+  const onTrialCountdownEnd = useMemoizedFn(() => {
+    updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
+      buttonState: 2
+    });
+  });
   useEffect(() => {
     eventRef.current.on(startTimeToHideAllComponent, listenStart);
     eventRef.current.on(pauseTimeToHideAllComponent, listenPause);
@@ -761,6 +767,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     eventRef.current.on('refreshBottomLeft', refreshBottomLeft);
     eventRef.current.on(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
     eventRef.current.on(setScaleMultipleEvent, onSetScaleMultiple);
+    eventRef.current.on(trialCountdownEnd, onTrialCountdownEnd);
     return () => {
       eventRef.current.off(startTimeToHideAllComponent, listenStart);
       eventRef.current.off(pauseTimeToHideAllComponent, listenPause);
@@ -770,6 +777,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       eventRef.current.off('refreshBottomLeft', refreshBottomLeft);
       eventRef.current.off(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
       eventRef.current.off(setScaleMultipleEvent, onSetScaleMultiple);
+      eventRef.current.off(trialCountdownEnd, onTrialCountdownEnd);
       if (multiTapTimerRef.current) {
         clearTimeout(multiTapTimerRef.current);
         multiTapTimerRef.current = null;

package/lib/utils/ttt.d.ts

@@ -34,6 +34,6 @@ export type GetAIFrameFeatureResult = {
     thingFileUri: string;
 };
 export declare function getAIFrameFeature(devId: string): Promise<GetAIFrameFeatureResult>;
-export declare function setAIFrameFeature(devId: string, params: Omit<SetAIFrameFeatureParams, 'devId'>): Promise<any>;
+export declare function setAIFrameFeature(params: SetAIFrameFeatureParams): Promise<any>;
 export declare function getDeviceInfoRay(devId: string): Promise<unknown>;
 export declare function getCurrentHomeInfoRay(): Promise<unknown>;

package/lib/utils/ttt.js

@@ -1,87 +1,119 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 export function getSmartImageQualityState(devId) {
-  // const mockData: SmartImageQualityResult = {
-  //   isPurchase: false,
-  //   buttonState: 1,
-  //   trialRemainingSec: 200,
-  //   canOpenSettings: false,
-  // };
-  // if (typeof ty?.ipc?.getSmartImageQualityState !== 'function') {
-  //   console.log('res===getSmartImageQualityState not exist, use mockData', mockData);
-  //   return Promise.resolve(mockData);
-  // }
   return new Promise((resolve, reject) => {
-    ty.ipc.getSmartImageQualityState({
-      params: {
-        devId
-      },
-      success: data => {
-        console.log('res===getSmartImageQualityState data', data);
-        resolve(data);
-      },
-      fail: e => {
-        console.warn('res===getSmartImageQualityState fail', e);
-        reject(e);
-      }
-    });
+    var _ty;
+    if (typeof ((_ty = ty) === null || _ty === void 0 || (_ty = _ty.ipc) === null || _ty === void 0 ? void 0 : _ty.getSmartImageQualityState) !== 'function') {
+      reject(new Error('getSmartImageQualityState is not supported'));
+      return;
+    }
+    try {
+      ty.ipc.getSmartImageQualityState({
+        devId,
+        scene: 'inPreview',
+        success: data => {
+          console.log('res===getSmartImageQualityState data', data);
+          resolve(data);
+        },
+        fail: e => {
+          console.warn('res===getSmartImageQualityState fail', e);
+          reject(e);
+        }
+      });
+    } catch (e) {
+      console.warn('res===getSmartImageQualityState exception', e);
+      reject(e);
+    }
   });
 }
 export function getAIFrameFeature(devId) {
   return new Promise((resolve, reject) => {
-    ty.ipc.getAIFrameFeature({
-      params: {
-        devId
-      },
-      success: data => {
-        console.log('res===getAIFrameFeature data', data);
-        resolve(data);
-      },
-      fail: e => {
-        console.warn('res===getAIFrameFeature fail', e);
-        reject(e);
-      }
-    });
+    var _ty2;
+    if (typeof ((_ty2 = ty) === null || _ty2 === void 0 || (_ty2 = _ty2.ipc) === null || _ty2 === void 0 ? void 0 : _ty2.getAIFrameFeature) !== 'function') {
+      reject(new Error('getAIFrameFeature is not supported'));
+      return;
+    }
+    try {
+      ty.ipc.getAIFrameFeature({
+        devId,
+        success: data => {
+          console.log('res===getAIFrameFeature data', data);
+          resolve(data);
+        },
+        fail: e => {
+          console.warn('res===getAIFrameFeature fail', e);
+          reject(e);
+        }
+      });
+    } catch (e) {
+      console.warn('res===getAIFrameFeature exception', e);
+      reject(e);
+    }
   });
 }
-export function setAIFrameFeature(devId, params) {
+export function setAIFrameFeature(params) {
   return new Promise((resolve, reject) => {
-    ty.ipc.setAIFrameFeature({
-      params: _objectSpread({
-        devId
-      }, params),
-      success: data => {
-        console.log('res===setAIFrameFeature data', data);
-        resolve(data);
-      },
-      fail: e => {
-        console.warn('res===setAIFrameFeature fail', e);
-        reject(e);
-      }
-    });
+    var _ty3;
+    if (typeof ((_ty3 = ty) === null || _ty3 === void 0 || (_ty3 = _ty3.ipc) === null || _ty3 === void 0 ? void 0 : _ty3.setAIFrameFeature) !== 'function') {
+      reject(new Error('setAIFrameFeature is not supported'));
+      return;
+    }
+    try {
+      ty.ipc.setAIFrameFeature(_objectSpread(_objectSpread({}, params), {}, {
+        success: data => {
+          console.log('res===setAIFrameFeature data', data);
+          resolve(data);
+        },
+        fail: e => {
+          console.warn('res===setAIFrameFeature fail', e);
+          reject(e);
+        }
+      }));
+    } catch (e) {
+      console.warn('res===setAIFrameFeature exception', e);
+      reject(e);
+    }
   });
 }
 export function getDeviceInfoRay(devId) {
   return new Promise((resolve, reject) => {
-    ty.device.getDeviceInfo({
-      deviceId: devId,
-      success: res => {
-        resolve(res);
-      },
-      fail: error => {
-        reject(error);
-      }
-    });
+    var _ty4;
+    if (typeof ((_ty4 = ty) === null || _ty4 === void 0 || (_ty4 = _ty4.device) === null || _ty4 === void 0 ? void 0 : _ty4.getDeviceInfo) !== 'function') {
+      reject(new Error('getDeviceInfo is not supported'));
+      return;
+    }
+    try {
+      ty.device.getDeviceInfo({
+        deviceId: devId,
+        success: res => {
+          resolve(res);
+        },
+        fail: error => {
+          reject(error);
+        }
+      });
+    } catch (e) {
+      reject(e);
+    }
   });
 }
 export function getCurrentHomeInfoRay() {
   return new Promise((resolve, reject) => {
-    ty.home.getCurrentHomeInfo({
-      success: res => {
-        resolve(res);
-      },
-      fail: error => {
-        reject(error);
-      }
-    });
+    var _ty5;
+    if (typeof ((_ty5 = ty) === null || _ty5 === void 0 || (_ty5 = _ty5.home) === null || _ty5 === void 0 ? void 0 : _ty5.getCurrentHomeInfo) !== 'function') {
+      reject(new Error('getCurrentHomeInfo is not supported'));
+      return;
+    }
+    try {
+      ty.home.getCurrentHomeInfo({
+        success: res => {
+          resolve(res);
+        },
+        fail: error => {
+          reject(error);
+        }
+      });
+    } catch (e) {
+      reject(e);
+    }
   });
 }

package/lib/widgets/trialBadge/useTrialBadge.js

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
-import { getAIFrameFeature, getCurrentHomeInfoRay, getDeviceInfoRay, setAIFrameFeature } from '../../utils/ttt';
+import { getCurrentHomeInfoRay, getDeviceInfoRay } from '../../utils/ttt';
 import { gotoSecurityCloudService } from '../../utils';
+import { trialCountdownEnd } from '../../ui/constant';
 import Strings from '../../i18n';
 export const useTrialBadge = (event, devId, trialRemainingSec) => {
   const [showTrialBadge, setShowTrialBadge] = useState(false);
@@ -25,13 +26,9 @@ export const useTrialBadge = (event, devId, trialRemainingSec) => {
   }, [devId]);
   const handleCountdownEnd = useCallback(async () => {
     try {
-      const getAI = await getAIFrameFeature(devId);
-      console.log('res===handleCountdownEnd', getAI);
-      setAIFrameFeature(devId, {
-        enabled: false,
-        aiFrameFeature: getAI.aiFrameFeature
-      });
+      console.log('res===handleCountdownEnd');
       setShowTrialBadge(false);
+      event.emit(trialCountdownEnd);
     } catch (error) {
       ty.showToast({
         title: Strings.getLang('ipc_player_fetch_error'),

package/lib/widgets/tryExperience/tryExperience.js

@@ -41,21 +41,20 @@ export const TryExperience = props => {
   const {
     className,
     hideTryExperienceMenu,
-    buttonState = 0
+    buttonState
   } = props;
   const {
     brandColor
   } = useStore({
     brandColor: props.brandColor
   });
-  const iconUrl = pickIconByStatus(buttonState);
   if (hideTryExperienceMenu) {
     return null;
   }
+  const iconUrl = pickIconByStatus(buttonState);
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(className),
     onClick: () => {
-      console.log('res===onTryExperience', props.devId, brandColor);
       gotoAIDrawMiniProgram(props.devId, brandColor);
     }
   }, /*#__PURE__*/React.createElement(View, {

package/package.json

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