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

package/lib/widgets/trialBadge/index.js

@@ -18,21 +18,24 @@ export const TrialBadge = _ref => {
     className,
     brandColor = FALLBACK_BRAND_COLOR,
     trialRemainingSec = 0,
-    refreshToken,
     onSubscribe,
     onCountdownEnd
   } = _ref;
   const [remainingSec, setRemainingSec] = useState(Math.max(0, Math.floor(trialRemainingSec)));
-  /** 防止 onCountdownEnd 被重复触发；同时持有最新回调，避免依赖变化导致 effect 重跑 */
   const endedRef = useRef(false);
   const onCountdownEndRef = useRef(onCountdownEnd);
   onCountdownEndRef.current = onCountdownEnd;
+  const startTimeRef = useRef(Date.now());
+  const initialSecRef = useRef(Math.max(0, Math.floor(trialRemainingSec)));
   useEffect(() => {
+    const sec = Math.max(0, Math.floor(trialRemainingSec));
     endedRef.current = false;
-    setRemainingSec(Math.max(0, Math.floor(trialRemainingSec)));
-  }, [trialRemainingSec, refreshToken]);
+    initialSecRef.current = sec;
+    startTimeRef.current = Date.now();
+    setRemainingSec(sec);
+  }, [trialRemainingSec]);
   useEffect(() => {
-    if (remainingSec <= 0) {
+    if (trialRemainingSec <= 0) {
       if (!endedRef.current) {
         var _onCountdownEndRef$cu;
         endedRef.current = true;
@@ -41,22 +44,20 @@ export const TrialBadge = _ref => {
       return undefined;
     }
     const timer = setInterval(() => {
-      setRemainingSec(prev => {
-        const next = prev - 1;
-        if (next <= 0) {
-          clearInterval(timer);
-          if (!endedRef.current) {
-            var _onCountdownEndRef$cu2;
-            endedRef.current = true;
-            (_onCountdownEndRef$cu2 = onCountdownEndRef.current) === null || _onCountdownEndRef$cu2 === void 0 || _onCountdownEndRef$cu2.call(onCountdownEndRef);
-          }
-          return 0;
+      const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
+      const next = Math.max(0, initialSecRef.current - elapsed);
+      setRemainingSec(next);
+      if (next <= 0) {
+        clearInterval(timer);
+        if (!endedRef.current) {
+          var _onCountdownEndRef$cu2;
+          endedRef.current = true;
+          (_onCountdownEndRef$cu2 = onCountdownEndRef.current) === null || _onCountdownEndRef$cu2 === void 0 || _onCountdownEndRef$cu2.call(onCountdownEndRef);
         }
-        return next;
-      });
+      }
     }, 1000);
     return () => clearInterval(timer);
-  }, [trialRemainingSec, refreshToken]);
+  }, [trialRemainingSec]);
   const countdownText = formatCountdown(remainingSec);
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-trial-badge', className)
@@ -75,10 +76,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,13 +1,23 @@
+@keyframes ipc-player-trial-badge-slide-in {
+  from {
+    transform: translateX(-100%);
+  }
+  to {
+    transform: translateX(0);
+  }
+}
+
 .ipc-player-trial-badge {
   display: inline-flex;
   align-items: center;
-  height: 28px;
-  padding: 0 4px 0 8px;
-  border-radius: 6px;
+  height: 32px;
+  padding: 0 6px 0 8px;
+  border-radius: 8px;
   background: rgba(0, 0, 0, 0.65);
   flex-shrink: 0;
   vertical-align: middle;
   white-space: nowrap;
+  animation: ipc-player-trial-badge-slide-in 0.3s linear;
 }
 
 .ipc-player-trial-badge-icon {
@@ -43,9 +53,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,22 +1,23 @@
-import { useCallback, useEffect, useState } from 'react';
-import { getAIFrameFeature, getCurrentHomeInfoRay, getDeviceInfoRay, setAIFrameFeature } from '../../utils/ttt';
-import { gotoSecurityCloudService } from '../../utils';
+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);
-      console.log('res===', deviceInfo, homeInfo);
-      gotoSecurityCloudService(homeInfo.homeId, deviceInfo.uuid);
+      await gotoSecurityCloudService2(devId);
     } catch (error) {
-      console.log('res===handleTrialSubscribe error', error);
       ty.showToast({
         title: Strings.getLang('ipc_player_fetch_error'),
         icon: 'none'
@@ -25,13 +26,21 @@ 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
-      });
       setShowTrialBadge(false);
+      // 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

@@ -5,6 +5,11 @@ type Props = ComponentConfigProps & {
     className?: string;
     hideTryExperienceMenu?: 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 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';
@@ -33,36 +36,129 @@ const pickIconByStatus = buttonState => {
     case TryExperienceStatus.Close:
       return tryClose;
     case TryExperienceStatus.Default:
-    default:
       return getDefaultLangIcon();
+    default:
+      return '';
   }
 };
 export const TryExperience = props => {
   const {
     className,
     hideTryExperienceMenu,
-    buttonState = 0
+    buttonState,
+    trialRemainingSec,
+    isPurchase,
+    canOpenSettings,
+    gRawData,
+    isLowPhone,
+    devId
   } = props;
   const {
-    brandColor
+    brandColor,
+    recording
   } = useStore({
-    brandColor: props.brandColor
+    brandColor: props.brandColor,
+    recording: props.recording
   });
-  const iconUrl = pickIconByStatus(buttonState);
+  const [imgSrc, setImgSrc] = useState();
+  const lockRef = useRef(false);
+  useEffect(() => {
+    updateImgSrc();
+  }, [buttonState]);
+  const updateImgSrc = useCallback(() => {
+    if (isLowPhone) {
+      setImgSrc(tryClose);
+      return;
+    }
+    if (buttonState === 0 || buttonState) {
+      const iconUrl = pickIconByStatus(buttonState);
+      setImgSrc(iconUrl);
+    } else {
+      setImgSrc(undefined);
+    }
+  }, [buttonState]);
+  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 (hideTryExperienceMenu) {
     return null;
   }
+  if (!imgSrc || !canOpenSettings || !gRawData) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(className),
-    onClick: () => {
-      console.log('res===onTryExperience', props.devId, brandColor);
-      gotoAIDrawMiniProgram(props.devId, brandColor);
-    }
+    onClick: onTryExperience
   }, /*#__PURE__*/React.createElement(View, {
     className: "try-experience-box"
   }, /*#__PURE__*/React.createElement(Image, {
     className: "try-experience-icon",
-    src: iconUrl,
+    src: imgSrc,
     mode: "heightFix"
   })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.35-beta.3",
+  "version": "0.0.35-beta.30",
   "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.1",
     "@ray-js/ray-ipc-utils": "^1.1.15",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
@@ -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": {