@ray-js/ipc-player-integration 0.0.35-beta.9 → 0.0.36

package/lib/widgets/trialBadge/useTrialBadge.js

@@ -1,24 +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 } 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]);
   const handleTrialSubscribe = useCallback(async () => {
     try {
-      // const homeInfo = await getCurrentHomeInfoRay();
-      // const deviceInfo = await getDeviceInfoRay(devId);
-      // if (homeInfo !== undefined && deviceInfo !== undefined) {
-      // console.log('res===', deviceInfo, homeInfo);
-      // gotoSecurityCloudService(homeInfo.homeId, deviceInfo.uuid);
-      const res = await gotoSecurityCloudService2(devId);
-      console.log('res===gotoSecurityCloudService2', res);
+      await gotoSecurityCloudService2(devId);
     } catch (error) {
       ty.showToast({
         title: Strings.getLang('ipc_player_fetch_error'),
@@ -29,8 +27,20 @@ export const useTrialBadge = (event, devId, trialRemainingSec) => {
   const handleCountdownEnd = useCallback(async () => {
     try {
       setShowTrialBadge(false);
-      event.emit(trialCountdownEnd);
+      // const getAI = await getAIFrameFeature(devId);
+      // const scope = { ...getAI.aiFrameFeature?.scope, inPreview: false };
+      // await setAIFrameFeature({
+      //   devId,
+      //   scene: 'inPreview', // 实时预览场景
+      //   enabled: getAI.enabled,
+      //   aiFrameFeature: {
+      //     scope,
+      //     feature: getAI.aiFrameFeature?.feature,
+      //     exportEnabled: getAI.aiFrameFeature?.exportEnabled,
+      //   },
+      // });
       await setTrailFinish(devId);
+      event.emit(trialCountdownEnd);
     } catch (error) {
       ty.showToast({
         title: Strings.getLang('ipc_player_fetch_error'),

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

@@ -3,10 +3,13 @@ import { ComponentConfigProps } from '../../interface';
 import './tryExperience.less';
 type Props = ComponentConfigProps & {
     className?: string;
-    hideTryExperienceMenu?: boolean;
+    hideSmartImageQualityState?: boolean;
     buttonState?: number;
     trialRemainingSec?: number;
     isPurchase?: boolean;
+    canOpenSettings?: boolean;
+    gRawData?: boolean;
+    isLowPhone?: boolean;
 };
 export declare const TryExperience: (props: Props) => React.JSX.Element | null;
 export {};

package/lib/widgets/tryExperience/tryExperience.js

@@ -1,8 +1,11 @@
-import { View, Image, getSystemInfoSync } from '@ray-js/ray';
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { View, Image, getSystemInfoSync, showToast } from '@ray-js/ray';
 import clsx from 'clsx';
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { useStore } from '../../ctx/store';
-import { gotoAIDrawMiniProgram } from '../../utils';
+import Strings from '../../i18n';
+import { getAIFrameFeature, gotoAIDrawMiniProgram, setAIFrameFeature } from '../../utils';
+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';
@@ -41,33 +44,111 @@ const pickIconByStatus = buttonState => {
 export const TryExperience = props => {
   const {
     className,
-    hideTryExperienceMenu,
+    hideSmartImageQualityState,
     buttonState,
     trialRemainingSec,
-    isPurchase
+    isPurchase,
+    canOpenSettings,
+    gRawData,
+    isLowPhone,
+    devId
   } = props;
   const {
-    brandColor
+    brandColor,
+    recording
   } = useStore({
-    brandColor: props.brandColor
+    brandColor: props.brandColor,
+    recording: props.recording
   });
   const [imgSrc, setImgSrc] = useState();
+  const lockRef = useRef(false);
   useEffect(() => {
-    const iconUrl = pickIconByStatus(buttonState);
-    setImgSrc(iconUrl);
+    updateImgSrc();
   }, [buttonState]);
-  const onTryExperience = useCallback(() => {
-    if (buttonState === TryExperienceStatus.Open) {
-      setImgSrc(tryOpen);
-    } else if (buttonState === TryExperienceStatus.Close && isPurchase) {
-      setImgSrc(tryClose);
-    } else if (buttonState === TryExperienceStatus.Close && trialRemainingSec < 300 && trialRemainingSec > 0) {
+  const updateImgSrc = useCallback(() => {
+    if (isLowPhone) {
       setImgSrc(tryClose);
+      return;
+    }
+    if (buttonState === 0 || buttonState) {
+      const iconUrl = pickIconByStatus(buttonState);
+      setImgSrc(iconUrl);
     } else {
-      gotoAIDrawMiniProgram(props.devId, brandColor);
+      setImgSrc(undefined);
     }
   }, [buttonState]);
-  if (hideTryExperienceMenu) {
+  const onTryExperience = useCallback(async () => {
+    console.log('res===onTryExperience', lockRef.current, isLowPhone);
+    if (lockRef.current) return;
+    if (isLowPhone) {
+      showToast({
+        title: Strings.getLang('ipc_player_low_phone_not_support'),
+        icon: 'none'
+      });
+      return;
+    }
+    if (recording) {
+      showToast({
+        title: Strings.getLang('ipc_player_recording_now_tip'),
+        icon: 'none'
+      });
+      return;
+    }
+    lockRef.current = true;
+    try {
+      if (buttonState === TryExperienceStatus.Open) {
+        var _getAI$aiFrameFeature, _getAI$aiFrameFeature2, _getAI$aiFrameFeature3, _props$event;
+        const getAI = await getAIFrameFeature(devId);
+        if (!getAI) return;
+        // 由开变关的时候，只关inPreview
+        const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature === void 0 ? void 0 : _getAI$aiFrameFeature.scope), {}, {
+          inPreview: false
+        });
+        await setAIFrameFeature({
+          devId,
+          scene: 'inPreview',
+          // 实时预览场景
+          enabled: getAI.enabled,
+          aiFrameFeature: {
+            scope,
+            feature: (_getAI$aiFrameFeature2 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature2 === void 0 ? void 0 : _getAI$aiFrameFeature2.feature,
+            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);
+      } else if (buttonState === TryExperienceStatus.Close && isPurchase || buttonState === TryExperienceStatus.Close && trialRemainingSec < 300 && trialRemainingSec > 0) {
+        var _getAI$aiFrameFeature4, _getAI$aiFrameFeature5, _getAI$aiFrameFeature6, _props$event2;
+        const getAI = await getAIFrameFeature(devId);
+        if (!getAI) return;
+        const scope = _objectSpread(_objectSpread({}, (_getAI$aiFrameFeature4 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature4 === void 0 ? void 0 : _getAI$aiFrameFeature4.scope), {}, {
+          inPreview: true
+        });
+        // 由关变开的时候，enabled和inPreview两个都开
+        await setAIFrameFeature({
+          devId,
+          scene: 'inPreview',
+          // 实时预览场景
+          enabled: true,
+          aiFrameFeature: {
+            scope,
+            feature: (_getAI$aiFrameFeature5 = getAI.aiFrameFeature) === null || _getAI$aiFrameFeature5 === void 0 ? void 0 : _getAI$aiFrameFeature5.feature,
+            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);
+      } else {
+        gotoAIDrawMiniProgram(devId, brandColor);
+      }
+    } catch (error) {
+      //
+    } finally {
+      lockRef.current = false;
+    }
+  }, [buttonState, recording, isPurchase, trialRemainingSec]);
+  if (hideSmartImageQualityState) {
+    return null;
+  }
+  if (!imgSrc || !canOpenSettings || !gRawData) {
     return null;
   }
   return /*#__PURE__*/React.createElement(View, {
@@ -75,7 +156,7 @@ export const TryExperience = props => {
     onClick: onTryExperience
   }, /*#__PURE__*/React.createElement(View, {
     className: "try-experience-box"
-  }, imgSrc && /*#__PURE__*/React.createElement(Image, {
+  }, /*#__PURE__*/React.createElement(Image, {
     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.9",
+  "version": "0.0.36",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -37,7 +37,7 @@
   "dependencies": {
     "@ray-js/direction-control": "^0.0.8",
     "@ray-js/ipc-ptz-zoom": "^0.0.3",
-    "@ray-js/ray-ipc-player": "2.1.1-beta.3",
+    "@ray-js/ray-ipc-player": "^2.1.2",
     "@ray-js/ray-ipc-utils": "^1.1.15",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",