@ray-js/ipc-player-integration 0.0.35-beta.4 → 0.0.35-beta.6

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';
@@ -104,14 +104,14 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   useImperativeHandle(eventRefProp, () => eventRef.current, [eventRef.current]);
   const timer = useRef();
   const reGetOrientationTimer = useRef(null);
-  const [scaleMultiple, setScaleMultiple] = useState(playerFit === 'contain' ? 1 : -2);
-  const [currentZoomLevel, setCurrentZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
+  // 统一调整为1倍缩放，保证画面展示完全
+  const [scaleMultiple, setScaleMultiple] = useState(1);
+  // 统一调整为1倍缩放，保证画面展示完全
+  const [currentZoomLevel, setCurrentZoomLevel] = useState(1);
   const [createCtx, setCreateCtx] = useState(false);
   // 是否需要忽略进入后台停止预览
   const [ignoreStopOnHide, setIgnoreStopOnHide] = useState(ignoreHideStopPreview);
   const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
-  // const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
-  // const [verticalZoomLevel, setVerticalZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
 
   // 展示顶部内容
   const [showTopContent, setShowTopContent] = useState(true);
@@ -407,8 +407,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       eventRef.current.emit(showAllComponent);
       eventRef.current.emit('disablePlayerTap', true);
       eventRef.current.emit(pauseTimeToHideAllComponent);
-      // 按宽填充，保证播放流宽度为屏幕宽度，高度自适应
-      setScaleMultiple(-1);
+      // 按宽填充，保证播放流宽度为屏幕宽度，高度自适应设为1倍
+      setScaleMultiple(1);
     } else {
       // 短屏或横屏时，恢复自动隐藏
       eventRef.current.emit('disablePlayerTap', false);
@@ -417,8 +417,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   }, [isVerticalFullLayout, screenType, playerFit]);
   useEffect(() => {
     if (createCtx) {
-      setScaleMultiple(playerFit === 'contain' ? 1 : -2);
-      setCurrentZoomLevel(playerFit === 'contain' ? 1 : -2);
+      // 统一调整为1倍缩放，保证画面展示完全
+      setScaleMultiple(1);
+      setCurrentZoomLevel(1);
     }
   }, [playerFit, createCtx]);
   useEffect(() => {
@@ -427,7 +428,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 +436,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);
@@ -496,19 +498,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
         }
         triggerEvent(showAllComponent);
       }
-      // 若为全屏模式并且要求按宽填充，即横屏时充满，主动设置模式为-1即可
-      if (type === 'landscape' && landscapeMode === 'fill') {
-        console.log(scaleMultiple, '===========fill');
-        setScaleMultiple(-1);
-      } else if (type === 'landscape' && landscapeMode === 'standard') {
-        console.log(scaleMultiple, '===========landscape');
-        setScaleMultiple(-2);
-      } else {
-        // 竖屏时 将屏幕播放比例设为按宽按高
-
-        console.log(scaleMultiple, '===========landscape');
-        setScaleMultiple(playerFit === 'contain' ? scaleMultiple === 1 ? -1 : 1 : -2);
-      }
+      // 横屏（fill/standard）与竖屏均统一调整为 1 倍缩放，保证画面完整展示
+      setScaleMultiple(1);
     } catch (err) {
       console.log(err, 'err');
     }
@@ -672,10 +663,12 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       }
     }
     if (playState === PlayState.PLAYING) {
-      // 仅在第一次播放成功时，针对竖屏并且为cover模式时，设置为-2
+      // 仅在第一次播放成功时，针对竖屏并且为cover模式时，设置为-2 修改为只针对第一次播放成功时
       console.log('Playing状态');
-      if (screenType === 'vertical' && playerFit === 'cover' && !hasPlayedRef.current) {
-        setScaleMultiple(-2);
+      // if (screenType === 'vertical' && playerFit === 'cover' && !hasPlayedRef.current) {
+      if (!hasPlayedRef.current) {
+        // 统一调整为1倍缩放，保证画面展示完全
+        setScaleMultiple(1);
         hasPlayedRef.current = true;
       }
     }
@@ -752,6 +745,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 +759,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 +769,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;
@@ -784,14 +784,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   /**
    * 监听当前的zoom比例状态
    */
-  // useEffect(() => {
-  //   if (screenType === 'vertical') {
-  //     console.log(currentZoomLevel, '竖屏时的缩放比例');
-  //     setVerticalZoomLevel(currentZoomLevel);
-  //     // setScaleMultiple(currentZoomLevel);
-  //   }
-  // }, [screenType, currentZoomLevel]);
-
   const onZoomChange = useMemoizedFn(data => {
     const {
       zoomLevel,
@@ -802,30 +794,19 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     if (zoomLevel === 0) {
       return false;
     }
-    /**
-     * 针对竖屏为cover模式时，横屏为standard模式时，主动设置缩放比例，避免因值不能正常变化
-     */
-    if (scaleMode === -2 && playerFit === 'cover' && screenType === 'vertical' && landscapeMode === 'standard') {
-      console.log('dsadsadsad----', zoomLevel);
-      setScaleMultiple(zoomLevel);
-    }
     /**
      * 针对竖屏为contain模式时，横屏为fill模式时，主动设置缩放比例，避免因值不能正常变化
      */
-    if (scaleMode === -1 && playerFit === 'contain' && screenType === 'vertical' && landscapeMode === 'fill') {
-      setVerticalCoverZoom(zoomLevel);
-    }
+    // if (
+    //   scaleMode === -1 &&
+    //   playerFit === 'contain' &&
+    //   screenType === 'vertical' &&
+    //   landscapeMode === 'fill'
+    // ) {
+    //   setVerticalCoverZoom(zoomLevel);
+    // }
 
-    /**
-     * 横屏情况下 针对竖屏为contain模式时，横屏为fill模式时，主动设置缩放比例，避免因值不能正常变化
-     */
-    if (scaleMode === -2 && playerFit === 'cover' && screenType !== 'vertical' && landscapeMode === 'standard') {
-      setScaleMultiple(zoomLevel);
-    }
-    if (scaleMode === -1 && playerFit === 'contain' && screenType !== 'vertical' && landscapeMode === 'fill') {
-      setVerticalCoverZoom(zoomLevel);
-      setScaleMultiple(zoomLevel);
-    }
+    // 直接记录当前缩放比例
     setCurrentZoomLevel(zoomLevel);
     instance.event.emit(zoomLevelChange, zoomLevel);
     return false;

package/lib/utils/ttt.js

@@ -1,83 +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({
-      devId,
-      scene: 'inPreview',
-      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({
-      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(params) {
   return new Promise((resolve, reject) => {
-    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);
-      }
-    }));
+    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) => {
-    var _ty$device;
-    (_ty$device = ty.device) === null || _ty$device === void 0 || _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) => {
-    var _ty$home;
-    (_ty$home = ty.home) === null || _ty$home === void 0 || _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,14 +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.4",
+  "version": "0.0.35-beta.6",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -64,7 +64,7 @@
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS --config commitlint.config.js",
-      "pre-commit": "lint-staged"
+      "pre-commit": "node ./scripts/check-protected-files.js && lint-staged"
     }
   },
   "lint-staged": {