@ledvance/base 1.2.82 → 1.2.83

package/src/api/nativeEventEmitter.d.ts

@@ -1,3 +1,3 @@
-export declare const nativeEventEmitter: import("react-native").EventEmitter;
-export declare const addListener: (store: any) => void;
-export declare const removeListener: () => void;
+export declare const nativeEventEmitter: import("react-native").EventEmitter;
+export declare const addListener: (store: any) => void;
+export declare const removeListener: () => void;

package/src/api/nativeEventEmitter.ts

@@ -1,125 +1,125 @@
-import {EmitterSubscription, NativeEventEmitter, NativeModules} from 'react-native'
-import {
-  DeviceInfo,
-  NativeProps,
-  setGroupDevices,
-  setGroupDps,
-  setGroupNativeProps,
-  setNativeProps,
-  UAGroupInfo,
-} from '../models/modules/NativePropsSlice'
-import {actions} from '@models'
-import { cloneDeep } from 'lodash'
-import {DpValue} from "tuya-panel-kit";
-
-const nativeModule = NativeModules.LDVDeviceEventEmitter
-
-export const nativeEventEmitter = new NativeEventEmitter(nativeModule)
-
-let deviceDPListener: EmitterSubscription | null
-let groupFeatureListener: EmitterSubscription | null
-let groupDeviceListener: EmitterSubscription | null
-let groupDpListener: EmitterSubscription | null
-
-interface GroupFeatureEvent {
-  tyGroupId: number
-  config: string
-}
-
-interface GroupDpEvent {
-  tyGroupId: number
-  dps: any
-}
-
-interface DeviceEvent {
-  devId: string
-  dps: any
-  name: string
-  pId: string
-}
-
-interface TYInfoUpdateType {
-  devId: string
-  online: boolean
-}
-
-export const addListener = (store) => {
-  deviceDPListener = nativeEventEmitter.addListener('TYDataUpdate', (event: DeviceEvent) => {
-    // device info
-    if (event.dps && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
-      console.log('长链接刷新DP数据', event.devId, event.dps)
-      // @ts-ignore
-      const nativeProps: NativeProps = {
-        familyName: '',
-        deviceInfo: {
-          devId: event.devId,
-          pId: event.pId,
-          dps: JSON.parse(event.dps),
-        },
-        uaGroupInfo: {} as UAGroupInfo,
-      }
-      store.dispatch(setNativeProps(nativeProps))
-    }
-    // 兼容ios修改设备名称
-    if (!!event.name && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
-      store.dispatch(actions.common.devInfoChange({...store.getState().devInfo, name: event.name}))
-    }
-  })
-
-  groupFeatureListener = nativeEventEmitter.addListener('UAGroupFeatureUpdate', (event: GroupFeatureEvent) => {
-    const tyGroupId = Number(event.tyGroupId)
-    if (tyGroupId == store.getState().ldvModules.uaGroupInfo.tyGroupId) {
-      console.log('长链接刷新Group数据', event)
-      // @ts-ignore
-      const nativeProps: NativeProps = {
-        familyName: '',
-        deviceInfo: {} as DeviceInfo,
-        uaGroupInfo: {
-          tyGroupId: tyGroupId,
-          pId: '',
-          config: JSON.parse(event.config),
-          dps: {},
-        } as UAGroupInfo,
-      }
-      store.dispatch(setGroupNativeProps(nativeProps))
-    }
-  })
-
-  groupDpListener = nativeEventEmitter.addListener('UAGroupDpUpdate', (event: GroupDpEvent) => {
-    const tyGroupId = Number(event.tyGroupId);
-    const groupId = Number(store.getState().ldvModules.uaGroupInfo.tyGroupId)
-    if (tyGroupId === groupId) {
-      let data = event.dps
-      if (typeof event.dps === 'string') {
-        data = JSON.parse(event.dps)
-      }
-      store.dispatch(setGroupDps(data as Record<string, DpValue>))
-    }
-  })
-
-  groupDeviceListener = nativeEventEmitter.addListener('TYInfoUpdate', (event: TYInfoUpdateType) =>{
-    const groupDevices = cloneDeep(store.getState().ldvModules.uaGroupInfo.groupDevices)
-    const idx = groupDevices.findIndex(device => device?.deviceId?.indexOf(event.devId) !== -1)
-    if(idx !== -1 && Number(groupDevices[idx].status) !== (event.online ? 1 : 0)){
-      groupDevices[idx] = {
-        ...groupDevices[idx],
-        status: event.online ? 1 : 0
-      }
-      store.dispatch(setGroupDevices(groupDevices))
-    }
-  })
-}
-
-export const removeListener = () => {
-  deviceDPListener && deviceDPListener.remove()
-  deviceDPListener = null
-
-  groupFeatureListener && groupFeatureListener.remove()
-  groupFeatureListener = null
-
-  groupDeviceListener && groupDeviceListener.remove()
-  groupDeviceListener = null
-
-  groupDpListener && groupDpListener.remove()
-  groupDpListener = null
-}
+import {EmitterSubscription, NativeEventEmitter, NativeModules} from 'react-native'
+import {
+  DeviceInfo,
+  NativeProps,
+  setGroupDevices,
+  setGroupDps,
+  setGroupNativeProps,
+  setNativeProps,
+  UAGroupInfo,
+} from '../models/modules/NativePropsSlice'
+import {actions} from '@models'
+import { cloneDeep } from 'lodash'
+import {DpValue} from "tuya-panel-kit";
+
+const nativeModule = NativeModules.LDVDeviceEventEmitter
+
+export const nativeEventEmitter = new NativeEventEmitter(nativeModule)
+
+let deviceDPListener: EmitterSubscription | null
+let groupFeatureListener: EmitterSubscription | null
+let groupDeviceListener: EmitterSubscription | null
+let groupDpListener: EmitterSubscription | null
+
+interface GroupFeatureEvent {
+  tyGroupId: number
+  config: string
+}
+
+interface GroupDpEvent {
+  tyGroupId: number
+  dps: any
+}
+
+interface DeviceEvent {
+  devId: string
+  dps: any
+  name: string
+  pId: string
+}
+
+interface TYInfoUpdateType {
+  devId: string
+  online: boolean
+}
+
+export const addListener = (store) => {
+  deviceDPListener = nativeEventEmitter.addListener('TYDataUpdate', (event: DeviceEvent) => {
+    // device info
+    if (event.dps && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
+      console.log('长链接刷新DP数据', event.devId, event.dps)
+      // @ts-ignore
+      const nativeProps: NativeProps = {
+        familyName: '',
+        deviceInfo: {
+          devId: event.devId,
+          pId: event.pId,
+          dps: JSON.parse(event.dps),
+        },
+        uaGroupInfo: {} as UAGroupInfo,
+      }
+      store.dispatch(setNativeProps(nativeProps))
+    }
+    // 兼容ios修改设备名称
+    if (!!event.name && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
+      store.dispatch(actions.common.devInfoChange({...store.getState().devInfo, name: event.name}))
+    }
+  })
+
+  groupFeatureListener = nativeEventEmitter.addListener('UAGroupFeatureUpdate', (event: GroupFeatureEvent) => {
+    const tyGroupId = Number(event.tyGroupId)
+    if (tyGroupId == store.getState().ldvModules.uaGroupInfo.tyGroupId) {
+      console.log('长链接刷新Group数据', event)
+      // @ts-ignore
+      const nativeProps: NativeProps = {
+        familyName: '',
+        deviceInfo: {} as DeviceInfo,
+        uaGroupInfo: {
+          tyGroupId: tyGroupId,
+          pId: '',
+          config: JSON.parse(event.config),
+          dps: {},
+        } as UAGroupInfo,
+      }
+      store.dispatch(setGroupNativeProps(nativeProps))
+    }
+  })
+
+  groupDpListener = nativeEventEmitter.addListener('UAGroupDpUpdate', (event: GroupDpEvent) => {
+    const tyGroupId = Number(event.tyGroupId);
+    const groupId = Number(store.getState().ldvModules.uaGroupInfo.tyGroupId)
+    if (tyGroupId === groupId) {
+      let data = event.dps
+      if (typeof event.dps === 'string') {
+        data = JSON.parse(event.dps)
+      }
+      store.dispatch(setGroupDps(data as Record<string, DpValue>))
+    }
+  })
+
+  groupDeviceListener = nativeEventEmitter.addListener('TYInfoUpdate', (event: TYInfoUpdateType) =>{
+    const groupDevices = cloneDeep(store.getState().ldvModules.uaGroupInfo.groupDevices)
+    const idx = groupDevices.findIndex(device => device?.deviceId?.indexOf(event.devId) !== -1)
+    if(idx !== -1 && Number(groupDevices[idx].status) !== (event.online ? 1 : 0)){
+      groupDevices[idx] = {
+        ...groupDevices[idx],
+        status: event.online ? 1 : 0
+      }
+      store.dispatch(setGroupDevices(groupDevices))
+    }
+  })
+}
+
+export const removeListener = () => {
+  deviceDPListener && deviceDPListener.remove()
+  deviceDPListener = null
+
+  groupFeatureListener && groupFeatureListener.remove()
+  groupFeatureListener = null
+
+  groupDeviceListener && groupDeviceListener.remove()
+  groupDeviceListener = null
+
+  groupDpListener && groupDpListener.remove()
+  groupDpListener = null
+}

package/src/components/AdvanceCard.d.ts

@@ -1,25 +1,25 @@
-export interface AdvancedData {
-    title: string;
-    subtitles?: string[];
-    statusColor: string;
-    router: {
-        key: string;
-        params?: any;
-    };
-    dp?: {
-        key: string;
-        code: string;
-    };
-}
-export declare enum AdvancedStatus {
-    Enable = "enable",
-    Disable = "disable",
-    Suspend = "suspend"
-}
-export declare function getAdvancedStatusColor(status: AdvancedStatus): string;
-export interface AdvanceCardProps {
-    data: AdvancedData;
-    onPress: () => void;
-}
-declare const AdvanceCard: (props: AdvanceCardProps) => JSX.Element;
-export default AdvanceCard;
+export interface AdvancedData {
+    title: string;
+    subtitles?: string[];
+    statusColor: string;
+    router: {
+        key: string;
+        params?: any;
+    };
+    dp?: {
+        key: string;
+        code: string;
+    };
+}
+export declare enum AdvancedStatus {
+    Enable = "enable",
+    Disable = "disable",
+    Suspend = "suspend"
+}
+export declare function getAdvancedStatusColor(status: AdvancedStatus): string;
+export interface AdvanceCardProps {
+    data: AdvancedData;
+    onPress: () => void;
+}
+declare const AdvanceCard: (props: AdvanceCardProps) => JSX.Element;
+export default AdvanceCard;

package/src/components/AdvanceCard.tsx

@@ -1,117 +1,117 @@
-import React, { PropsWithChildren } from 'react'
-import { StyleSheet, Text, View, ViewProps } from 'react-native'
-import { Utils } from 'tuya-panel-kit'
-import Card from 'components/Card'
-import Spacer from 'components/Spacer'
-
-const { convertX: cx } = Utils.RatioUtils
-const { withTheme } = Utils.ThemeUtils
-
-export interface AdvancedData {
-  title: string
-  subtitles?: string[]
-  statusColor?: string
-  router: { key: string, params?: any }
-  dp?: { key: string, code: string }
-  icons?: number | string
-}
-
-const enableStatusColor = 'rgb(0, 201, 49)'
-const suspendStatusColor = '#FFDEAD'
-const disableStatusColor = '#cbcbcb'
-
-export enum AdvancedStatus {
-  Enable = 'enable',
-  Disable = 'disable',
-  Suspend = 'suspend',
-}
-
-export function getAdvancedStatusColor(status: AdvancedStatus): string {
-  switch (status) {
-    case AdvancedStatus.Enable:
-      return enableStatusColor
-    case AdvancedStatus.Suspend:
-      return suspendStatusColor
-    case AdvancedStatus.Disable:
-      return disableStatusColor
-  }
-}
-
-export interface AdvanceCardProps extends PropsWithChildren<ViewProps> {
-  theme?: any
-  data: AdvancedData
-  onPress: () => void
-}
-
-const AdvanceCard = (props: AdvanceCardProps) => {
-  const {statusColor} = props.data;
-  return (
-    <Card
-      style={styles.itemContainer}
-      containerStyle={styles.itemContent}
-      onPress={props.onPress}>
-      {!!statusColor && <View style={styles.dotBg}>
-          <View
-              style={[
-                styles.dot,
-                {backgroundColor: props.data.statusColor},
-              ]}/>
-      </View>}
-      {
-        props.children ?
-          props.children :
-          <View style={styles.titleBg}>
-            <Text style={{...styles.title, color: props.theme.global.fontColor}}>{props.data.title}</Text>
-            <Spacer height={cx(8)} />
-            {
-              (!!props.data.subtitles) && props.data.subtitles.map((subtitle, index) => (
-                <Text style={{...styles.subtitle, color: props.theme.global.secondFontColor}} key={`${subtitle}_${index}`}>{subtitle}</Text>
-              ))
-            }
-          </View>
-      }
-    </Card>
-  )
-}
-
-const styles = StyleSheet.create({
-  itemContainer: {
-    width: cx(154),
-    borderRadius: cx(16),
-  },
-  itemContent: {},
-  titleBg: {
-    height: cx(118),
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  title: {
-    marginHorizontal: cx(16),
-    fontSize: cx(14),
-    textAlign: 'center',
-    fontFamily: 'helvetica_neue_lt_std_roman',
-  },
-  subtitle: {
-    fontSize: cx(10),
-    textAlign: 'center',
-    fontFamily: 'helvetica_neue_lt_std_roman',
-  },
-  dotBg: {
-    position: 'absolute',
-    top: cx(10),
-    end: cx(10),
-    borderWidth: cx(.5),
-    borderColor: '#cbcbcb80',
-    borderRadius: cx(7),
-  },
-  dot: {
-    width: cx(10),
-    height: cx(10),
-    backgroundColor: 'rgb(0, 201, 49)',
-    borderRadius: cx(5),
-    borderColor: '#fff',
-    borderWidth: cx(1),
-  },
-})
-
-export default withTheme(AdvanceCard)
+import React, { PropsWithChildren } from 'react'
+import { StyleSheet, Text, View, ViewProps } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import Card from 'components/Card'
+import Spacer from 'components/Spacer'
+
+const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
+
+export interface AdvancedData {
+  title: string
+  subtitles?: string[]
+  statusColor?: string
+  router: { key: string, params?: any }
+  dp?: { key: string, code: string }
+  icons?: number | string
+}
+
+const enableStatusColor = 'rgb(0, 201, 49)'
+const suspendStatusColor = '#FFDEAD'
+const disableStatusColor = '#cbcbcb'
+
+export enum AdvancedStatus {
+  Enable = 'enable',
+  Disable = 'disable',
+  Suspend = 'suspend',
+}
+
+export function getAdvancedStatusColor(status: AdvancedStatus): string {
+  switch (status) {
+    case AdvancedStatus.Enable:
+      return enableStatusColor
+    case AdvancedStatus.Suspend:
+      return suspendStatusColor
+    case AdvancedStatus.Disable:
+      return disableStatusColor
+  }
+}
+
+export interface AdvanceCardProps extends PropsWithChildren<ViewProps> {
+  theme?: any
+  data: AdvancedData
+  onPress: () => void
+}
+
+const AdvanceCard = (props: AdvanceCardProps) => {
+  const {statusColor} = props.data;
+  return (
+    <Card
+      style={styles.itemContainer}
+      containerStyle={styles.itemContent}
+      onPress={props.onPress}>
+      {!!statusColor && <View style={styles.dotBg}>
+          <View
+              style={[
+                styles.dot,
+                {backgroundColor: props.data.statusColor},
+              ]}/>
+      </View>}
+      {
+        props.children ?
+          props.children :
+          <View style={styles.titleBg}>
+            <Text style={{...styles.title, color: props.theme.global.fontColor}}>{props.data.title}</Text>
+            <Spacer height={cx(8)} />
+            {
+              (!!props.data.subtitles) && props.data.subtitles.map((subtitle, index) => (
+                <Text style={{...styles.subtitle, color: props.theme.global.secondFontColor}} key={`${subtitle}_${index}`}>{subtitle}</Text>
+              ))
+            }
+          </View>
+      }
+    </Card>
+  )
+}
+
+const styles = StyleSheet.create({
+  itemContainer: {
+    width: cx(154),
+    borderRadius: cx(16),
+  },
+  itemContent: {},
+  titleBg: {
+    height: cx(118),
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  title: {
+    marginHorizontal: cx(16),
+    fontSize: cx(14),
+    textAlign: 'center',
+    fontFamily: 'helvetica_neue_lt_std_roman',
+  },
+  subtitle: {
+    fontSize: cx(10),
+    textAlign: 'center',
+    fontFamily: 'helvetica_neue_lt_std_roman',
+  },
+  dotBg: {
+    position: 'absolute',
+    top: cx(10),
+    end: cx(10),
+    borderWidth: cx(.5),
+    borderColor: '#cbcbcb80',
+    borderRadius: cx(7),
+  },
+  dot: {
+    width: cx(10),
+    height: cx(10),
+    backgroundColor: 'rgb(0, 201, 49)',
+    borderRadius: cx(5),
+    borderColor: '#fff',
+    borderWidth: cx(1),
+  },
+})
+
+export default withTheme(AdvanceCard)

package/src/components/AdvanceList.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
-import { AdvancedData } from './AdvanceCard';
-export interface AdvanceListProps {
-    advanceData: AdvancedData[];
-    onAdvanceItemClick?: (advanceData: AdvancedData, index: number) => void | undefined;
-}
-declare function AdvanceList(props: AdvanceListProps): JSX.Element;
-declare const _default: React.MemoExoticComponent<typeof AdvanceList>;
-export default _default;
+import React from 'react';
+import { AdvancedData } from './AdvanceCard';
+export interface AdvanceListProps {
+    advanceData: AdvancedData[];
+    onAdvanceItemClick?: (advanceData: AdvancedData, index: number) => void | undefined;
+}
+declare function AdvanceList(props: AdvanceListProps): JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof AdvanceList>;
+export default _default;