@ledvance/base 1.3.100 → 1.3.101

package/localazy.json

@@ -1283,7 +1283,15 @@
                 "MATCH:siren_settings_antidismantle",
                 "MATCH:motion_detection_no_safe_mode_subheadline_text",
                 "MATCH:app_navigation_bottom_msg",
-                "MATCH:internetaccess_timeschedule"
+                "MATCH:internetaccess_timeschedule",
+                "MATCH:chart_legend_consumption",
+                "MATCH:chart_legend_generation",
+                "MATCH:infobutton_timeschedule",
+                "MATCH:infobutton_fixedtimecycle",
+                "MATCH:infobutton_randomtimecycle",
+                "MATCH:infobutton_timer",
+                "MATCH:infobutton_poweronbehavior",
+                "MATCH:infobutton_history"
             ],
             "replacements": {
                 "REGEX:% %1\\$s.*?\\)%": "{0}",

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.3.100",
+  "version": "1.3.101",
   "scripts": {
     "prepublishOnly": "python update-localazy.py"
   },

package/src/components/FeatureInfo.tsx

@@ -0,0 +1,82 @@
+import I18n from '@i18n'
+import res from '@res'
+import React, { useMemo, useState } from 'react'
+import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
+import { Modal, Utils } from 'tuya-panel-kit'
+import ThemeType from '../config/themeType'
+
+const { convertX: cx, height, statusBarHeight } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
+
+interface FeatureInfoProps {
+  theme?: ThemeType
+  title: string
+  content: string
+}
+
+const FeatureInfo = (props: FeatureInfoProps) => {
+  const [visible, setVisible] = useState(false)
+
+  const styles = useMemo(() => getStyles(props.theme), [props.theme])
+
+  return (
+    <View>
+      <TouchableOpacity onPress={() => setVisible(true)}>
+        <Image source={{ uri: res.ic_info }} style={styles.icon}/>
+      </TouchableOpacity>
+      <Modal visible={visible} onMaskPress={() => setVisible(false)}>
+        <View>
+          <View style={styles.header}>
+            <View style={{ width: cx(40) }} />
+            <Text style={styles.title}>{props.title}</Text>
+            <TouchableOpacity onPress={() => setVisible(false)}>
+              <Text style={styles.confirm}>{I18n.getLang('home_screen_home_dialog_yes_con')}</Text>
+            </TouchableOpacity>
+          </View>
+          <ScrollView style={styles.contentContainer}>
+            <Text style={styles.content}>{props.content}</Text>
+          </ScrollView>
+        </View>
+      </Modal>
+    </View>
+  )
+}
+
+const getStyles = (theme: ThemeType | undefined) => StyleSheet.create({
+  icon: {
+    width: cx(24),
+    height: cx(24),
+    marginHorizontal: cx(5),
+    tintColor: theme?.global.brand
+  },
+  header: {
+    backgroundColor: theme?.card.head,
+    flexDirection: 'row',
+    height: cx(60),
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    borderTopLeftRadius: cx(10),
+    borderTopRightRadius: cx(10),
+    paddingHorizontal: cx(8)
+  },
+  title: {
+    color: theme?.global.fontColor,
+    fontSize: cx(16),
+    fontWeight: 'bold'
+  },
+  confirm: {
+    color: theme?.button.primary,
+    fontSize: cx(16)
+  },
+  contentContainer: {
+    height: height - statusBarHeight - cx(100),
+    paddingHorizontal: cx(16),
+    backgroundColor: theme?.global.background
+  },
+  content: {
+    color: theme?.global.fontColor,
+    fontSize: cx(14)
+  }
+})
+
+export default withTheme(FeatureInfo)

package/src/components/Page.tsx

@@ -29,6 +29,7 @@ interface PageProps extends PropsWithChildren<ViewProps> {
   showGreenery?: boolean
   greeneryIcon?: string | undefined | number
   loading?: boolean
+  info?: React.ReactNode
 }
 
 const Page = (props: PageProps) => {
@@ -97,6 +98,7 @@ const Page = (props: PageProps) => {
             headlineIconContent={props.headlineIconContent}
             headlineTopContent={props.headlineTopContent}
             headlineContent={props.headlineContent}
+            info={props.info}
             />}
         {props.children}
       </View>

package/src/components/ldvTopName.tsx

@@ -17,6 +17,7 @@ interface LdvTopNameProps {
   headlineIconContent?: React.ReactNode
   headlineTopContent?: React.ReactNode
   headlineContent?: React.ReactNode
+  info?: React.ReactNode
 }
 
 const LdvTopName = (props: LdvTopNameProps) => {
@@ -28,6 +29,16 @@ const LdvTopName = (props: LdvTopNameProps) => {
       marginHorizontal: cx(24),
       marginBottom: cx(12),
     },
+    headlineContainer: {
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+    },
+    headline: {
+      flexDirection: 'row',
+      flex: 1,
+      alignItems: 'center'
+    },
     title: {
       color: props.theme?.global.brand,
       fontSize: cx(24),
@@ -38,12 +49,8 @@ const LdvTopName = (props: LdvTopNameProps) => {
       {props.headlineTopContent && props.headlineTopContent}
       {!props.headlineTopContent && <Spacer height={cx(38)} />}
       <View
-        style={{
-          flexDirection: 'row',
-          justifyContent: 'space-between',
-          alignItems: 'center',
-        }}>
-        {props.headlineContent ? props.headlineContent : <View style={{ flexDirection: 'row', flex: 1 }}>
+        style={styles.headlineContainer}>
+        {props.headlineContent ? props.headlineContent : <View style={styles.headline}>
           <Text style={styles.title}>
             {props.title}
           </Text>
@@ -52,6 +59,7 @@ const LdvTopName = (props: LdvTopNameProps) => {
             resizeMode="contain"
             style={{ height: cx(16), width: cx(16), left: 0 }}
           /> || null}
+          {props.info && props.info || null}
         </View>}
         {props.rightIcon && <TouchableOpacity
             accessibilityLabel={"RightIcon"}

package/src/hooks/Hooks.ts

@@ -1,6 +1,8 @@
-import { useRoute, useNavigation } from '@react-navigation/core'
+import { xLog } from '@utils'
+import { useFocusEffect, useIsFocused, useNavigation, useRoute } from '@react-navigation/native'
 import { Result } from 'models/modules/Result'
 import { useCallback, useEffect, useRef } from 'react'
+import { AppState, AppStateStatus, DeviceEventEmitter, InteractionManager, Platform } from 'react-native'
 
 export function createParams<T>(params: T): T {
   return { ...params }
@@ -12,7 +14,7 @@ export function useParams<T extends any>(): T {
 
 export function useCurrentPage(routeName: string): boolean {
   const navigation = useNavigation()
-  const { index, routes} = navigation.getState()
+  const { index, routes } = navigation.getState()
   return routeName === routes[index].name
 }
 
@@ -21,44 +23,44 @@ export function useCurrentPage(routeName: string): boolean {
  * 用于在指定时间内阻止长连接响应更新界面状态
  */
 export function useDpResponseValidator(timeoutMs: number = 1000) {
-  const dpTimestamps = useRef<{[dpKey: string]: number}>({});
-  
+  const dpTimestamps = useRef<{ [dpKey: string]: number }>({})
+
   // dp 响应时间校验函数
   const sendDpWithTimestamps = useCallback((dpKey: string, sendFunc: () => Promise<any>) => {
     // 记录发送时间戳
-    const timestamp = Date.now();
-    dpTimestamps.current[dpKey] = timestamp;
+    const timestamp = Date.now()
+    dpTimestamps.current[dpKey] = timestamp
 
     // 发送命令
-    return sendFunc();
-  }, []);
+    return sendFunc()
+  }, [])
 
   // 监听 dp 响应，比较时间戳
   const onDpResponse = useCallback((dpKey: string) => {
-    const sendTimestamp = dpTimestamps.current[dpKey];
+    const sendTimestamp = dpTimestamps.current[dpKey]
     if (sendTimestamp) {
-      const responseTimestamp = Date.now();
-      const timeDiff = responseTimestamp - sendTimestamp;
-      
+      const responseTimestamp = Date.now()
+      const timeDiff = responseTimestamp - sendTimestamp
+
       if (timeDiff <= timeoutMs) {
         // 指定时间内收到响应，不接收更新
-        return true; // 阻止更新
+        return true // 阻止更新
       }
     }
-    return false; // 允许更新
-  }, [timeoutMs]);
+    return false // 允许更新
+  }, [timeoutMs])
 
   // 组件卸载时清理所有记录
   useEffect(() => {
     return () => {
-      dpTimestamps.current = {};
-    };
-  }, []);
+      dpTimestamps.current = {}
+    }
+  }, [])
 
   return {
     sendDpWithTimestamps,
     onDpResponse,
-  };
+  }
 }
 
 interface IControlData {
@@ -82,7 +84,7 @@ interface IControlDataOptions {
  * 通用控制支持device和group
  * @param control Tuya Control Formatter
  * @param sendValueFunc send tuya control function
- * @returns 
+ * @returns
  */
 export function useControlData(control: any, sendValueFunc: (value: any) => Promise<Result<any>>): (
   controlValue: IControlData,
@@ -104,10 +106,71 @@ export function useControlData(control: any, sendValueFunc: (value: any) => Prom
         value: controlValue.colorMode ? valueConvert(controlValue.value) : 0,
         temperature: !controlValue.colorMode ? temperatureConvert(controlValue.temperature) : 0,
         brightness: !controlValue.colorMode ? brightnessConvert(controlValue.brightness) : 0,
-      });
+      })
       return await sendValueFunc(value)
     },
     []
-  );
+  )
   return setControlData
+}
+
+/**
+ * 这是一个增强版的 FocusEffect
+ * 1. 使用 useCallback 解决重复调用问题
+ * 2. [Android] 监听 AppState 解决从原生 Activity 返回不触发的问题
+ * 3. [iOS] 监听原生 ViewControllerWillAppear 事件解决从原生 VC 返回不 new的问题
+ */
+export const useSmartFocusEffect = (
+  effect: () => void | (() => void),
+  deps: any[] = []
+) => {
+  const isFocused = useIsFocused()
+  const appState = useRef<AppStateStatus>(AppState.currentState)
+  const stableEffect = useCallback(effect, deps)
+  // 1. react-navigation 内部的焦点处理
+  useFocusEffect(
+    useCallback(() => {
+      const task = InteractionManager.runAfterInteractions(() => {
+        stableEffect()
+      })
+      return () => task.cancel()
+    }, [stableEffect])
+  )
+  // 2. 平台特定的返回事件处理
+  useEffect(() => {
+    // --- Android 平台方案 ---
+    if (Platform.OS === 'android') {
+      const handleAppStateChange = (nextAppState: AppStateStatus) => {
+        if (
+          appState.current.match(/inactive|background/) &&
+          nextAppState === 'active' &&
+          isFocused
+        ) {
+          xLog('[SmartFocus] App returned from Native/Background on Android')
+          stableEffect()
+        }
+        appState.current = nextAppState
+      }
+      AppState.addEventListener('change', handleAppStateChange)
+      return () => {
+        (AppState as any).removeEventListener('change', handleAppStateChange)
+      }
+    }
+    // --- iOS 平台方案 ---
+    if (Platform.OS === 'ios') {
+      const subscription = DeviceEventEmitter.addListener(
+        'RNViewControllerWillAppear',
+        () => {
+          // 同样需要检查 isFocused，确保只有栈顶的 RN 页面响应
+          if (isFocused) {
+            xLog('[SmartFocus] iOS ViewController will appear')
+            stableEffect()
+          }
+        }
+      )
+      return () => {
+        subscription.remove()
+      }
+    }
+  }, [isFocused, stableEffect])
 }