@ledvance/ui-biz-bundle 1.1.67 → 1.1.69

package/src/modules/history/HistoryPage.tsx

@@ -1,262 +1,262 @@
-import Page from '@ledvance/base/src/components/Page'
-import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
-import React, {useCallback, useEffect} from 'react'
-import I18n from '@ledvance/base/src/i18n'
-import {getSwitchHistoryData, SwitchHistoryUIItemData} from './SwitchHistoryPageActions'
-import res from '@ledvance/base/src/res'
-import {Utils} from 'tuya-panel-kit'
-import {useReactive} from 'ahooks'
-import {FlatList, Image, StyleSheet, Text, View} from 'react-native'
-import Spacer from '@ledvance/base/src/components/Spacer'
-import {RouteProp, useRoute} from '@react-navigation/core'
-import { isEmpty } from 'lodash'
-import Tag from "@ledvance/base/src/components/Tag"
-import { exportHistoryFile } from '@ledvance/base/src/utils/common'
-
-const cx = Utils.RatioUtils.convertX
-
-type SwitchHistoryPageRouteParams = {
-    params: { dpIds: string[], tags?: object, headlineText: string, backText?: string, stringOff?:string, stringOn?: string, showLimit?: boolean, actionKey?:string}
-}
-
-type Props = {
-    route: RouteProp<SwitchHistoryPageRouteParams, 'params'>
-}
-
-const SwitchHistoryPage = () => {
-    const deviceInfo = useDeviceInfo()
-    const { dpIds, tags ,headlineText, backText, stringOff, stringOn, actionKey, showLimit  } = useRoute<Props['route']>().params
-
-    const state = useReactive<SwitchHistoryPageState>({
-        refreshing: true,
-        refreshType: 'refresh',
-        onRefresh: Symbol(),
-        data: [],
-        dataOffset: 0,
-        hasNext: true,
-        filterTags: tags ? Object.keys(tags).reduce((pre, cur)=> {
-            pre[cur] = false
-            return pre
-        }, {}) : {}
-    })
-
-    const loadData: (refreshType: RefreshType) => void = useCallback(async refreshType => {
-        state.refreshType = refreshType
-        if (state.refreshType === 'refresh') {
-            state.dataOffset = 0
-            state.onRefresh = Symbol()
-        } else if (state.hasNext) {
-            state.onRefresh = Symbol()
-        }
-    }, [])
-
-    const changeFilter = useCallback((v:boolean, tag: string) =>{
-        state.filterTags = {
-            ...state.filterTags,
-            [tag]: v
-        }
-    }, [])
-
-    const getRequestIds = useCallback(() =>{
-        const tagValue = Object.values(state.filterTags)
-        const isAllData = tagValue.every(tag => tag) || tagValue.every(tag => !tag)
-        const checkedTags = Object.keys(state.filterTags).reduce((pre:string[], cur) => {
-            if(state.filterTags[cur]) pre.push(cur)
-            return pre
-        }, [])
-        return isAllData ? dpIds : checkedTags
-    }, [state.filterTags])
-
-
-    useEffect(() => {
-        getSwitchHistoryData(deviceInfo.devId, getRequestIds(), state.dataOffset,  100, stringOn, stringOff, actionKey, showLimit)
-            .then(res => {
-                state.refreshing = false
-                state.data = res.data
-                state.dataOffset = res.currentOffset
-                state.hasNext = res.hasNext
-            })
-    }, [state.onRefresh, state.filterTags])
-
-    const downFile = () => {
-      exportHistoryFile(state.data)
-    }
-
-    return (
-        <Page
-            backText={backText || deviceInfo.name}
-            headlineText={headlineText || I18n.getLang('history_socket_headline_text')}
-            headlineIcon={res.download_icon}
-            onHeadlineIconClick={downFile}
-            >
-            <View style={styles.content}>
-                <Text style={styles.titleText}>{I18n.getLang('history_contact_sensor_description_text')}</Text>
-                <Spacer/>
-                {!isEmpty(state.filterTags) && !!state.data.length &&
-                    <View style={{
-                        display: 'flex',
-                        flexDirection: 'row',
-                        flexWrap: 'wrap',
-                        marginHorizontal: cx(24),
-                        marginBottom: cx(12),
-                        alignSelf: 'flex-start'
-                    }}>
-                        {
-                            Object.keys(state.filterTags)?.map((tag) => {
-                                return <Tag
-                                    key={tag}
-                                    text={tags && tags[tag]}
-                                    checked={state.filterTags[tag]}
-                                    onCheckedChange={(v) => changeFilter(v, tag)}
-                                    style={{ marginTop: cx(5), marginHorizontal: cx(5) }}
-                                />
-                            })
-                        }
-                    </View>
-                }
-                <FlatList
-                    data={state.data}
-                    style={styles.list}
-                    renderItem={({item}) => <SwitchHistoryItem {...{itemData :item, tags}}/>}
-                    keyExtractor={(_, index) => `${index}`}
-                    ListFooterComponent={<Spacer/>}
-                    ListEmptyComponent={(
-                        <View style={styles.listEmptyView}>
-                            <Spacer height={cx(26)}/>
-                            <Image
-                                style={styles.listEmptyImage}
-                                source={{uri: res.ldv_timer_empty}}/>
-                            <Spacer height={cx(14)}/>
-                            <View style={{flexDirection: 'row', alignItems: 'center'}}>
-                                <Image style={styles.listEmptyTextIcon} source={res.ic_info}/>
-                                <Spacer width={cx(4)} height={0}/>
-                                <Text style={styles.listEmptyText}>{I18n.getLang('history_overview_empty_information_text')}</Text>
-                            </View>
-                        </View>
-                    )}
-                    refreshing={state.refreshing}
-                    onEndReachedThreshold={.1}
-                    onRefresh={async () => {
-                        await loadData('refresh')
-                    }}
-                    onEndReached={async () => {
-                        await loadData('loadMore')
-                    }}/>
-            </View>
-        </Page>
-    )
-}
-
-interface SwitchHistoryItemBean {
-    itemData: SwitchHistoryUIItemData
-    tags?: object
-}
-
-const SwitchHistoryItem = (props: SwitchHistoryItemBean)  => {
-    const { itemData, tags} = props
-    return (
-        <View style={styles.switchHistoryItem}>
-            <Text style={styles.switchHistoryItemTitle}>{itemData.title}</Text>
-            <Spacer height={cx(10)}/>
-            {itemData.actions.map((actionData, index) => (
-                <View style={styles.switchHistoryItemActionItem} key={`${index}`}>
-                    <View style={styles.switchHistoryItemActionItemLineGroup}>
-                        <View style={styles.switchHistoryItemActionItemLine}/>
-                        <View style={styles.switchHistoryItemActionItemPoint}/>
-                        <View style={styles.switchHistoryItemActionItemLine}/>
-                    </View>
-                    <Spacer width={cx(20)} height={0}/>
-                    <Text style={styles.switchHistoryItemActionItemText}>{`${actionData.time}`}</Text>
-                    <Spacer width={cx(20)} height={0}/>
-                    <Text style={styles.switchHistoryItemActionItemText}>{`${actionData.action}`}</Text>
-                    {!!tags && <View style={styles.switchHistoryItemTag}><Text >{tags[actionData.dpId]}</Text></View>}
-                </View>
-            ))}
-            <Spacer/>
-        </View>
-    )
-}
-
-const styles = StyleSheet.create({
-    content: {
-        flex: 1,
-    },
-    list: {
-        flex: 1,
-    },
-    listEmptyView: {
-        alignItems: 'center',
-    },
-    listEmptyImage: {
-        width: cx(200),
-        height: cx(200),
-    },
-    listEmptyTextIcon: {
-        width: cx(16),
-        height: cx(16),
-        tintColor: '#000',
-    },
-    listEmptyText: {
-        color: '#000',
-        fontSize: cx(12),
-        fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    titleText: {
-        marginHorizontal: cx(24),
-        color: '#000',
-        fontSize: cx(16),
-        fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    switchHistoryItem: {
-        marginHorizontal: cx(24),
-    },
-    switchHistoryItemTitle: {
-        color: '#000',
-        fontSize: cx(18),
-        fontFamily: 'helvetica_neue_lt_std_bd',
-    },
-    switchHistoryItemActionItem: {
-        flexDirection: 'row',
-        alignItems: 'center',
-    },
-    switchHistoryItemActionItemLineGroup: {
-        alignItems: 'center',
-    },
-    switchHistoryItemActionItemLine: {
-        width: cx(1),
-        height: cx(11.5),
-        backgroundColor: '#E6E7E8',
-    },
-    switchHistoryItemActionItemPoint: {
-        width: cx(7),
-        height: cx(7),
-        backgroundColor: '#f60',
-        borderRadius: cx(4),
-    },
-    switchHistoryItemActionItemText: {
-        color: '#000',
-        fontSize: cx(16),
-        fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    switchHistoryItemTag:{
-        paddingHorizontal: cx(10),
-        borderRadius: cx(10),
-        backgroundColor: '#cbcbcb',
-        marginLeft: cx(5)
-    }
-})
-
-export default SwitchHistoryPage
-
-type RefreshType = 'refresh' | 'loadMore'
-
-
-interface SwitchHistoryPageState {
-    refreshing: boolean
-    refreshType: RefreshType
-    onRefresh: symbol
-    data: SwitchHistoryUIItemData[]
-    hasNext: boolean
-    dataOffset: number
-    filterTags: object
+import Page from '@ledvance/base/src/components/Page'
+import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import React, {useCallback, useEffect} from 'react'
+import I18n from '@ledvance/base/src/i18n'
+import {getSwitchHistoryData, SwitchHistoryUIItemData} from './SwitchHistoryPageActions'
+import res from '@ledvance/base/src/res'
+import {Utils} from 'tuya-panel-kit'
+import {useReactive} from 'ahooks'
+import {FlatList, Image, StyleSheet, Text, View} from 'react-native'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import {RouteProp, useRoute} from '@react-navigation/core'
+import { isEmpty } from 'lodash'
+import Tag from "@ledvance/base/src/components/Tag"
+import { exportHistoryFile } from '@ledvance/base/src/utils/common'
+
+const cx = Utils.RatioUtils.convertX
+
+type SwitchHistoryPageRouteParams = {
+    params: { dpIds: string[], tags?: object, headlineText: string, backText?: string, stringOff?:string, stringOn?: string, showLimit?: boolean, actionKey?:string}
+}
+
+type Props = {
+    route: RouteProp<SwitchHistoryPageRouteParams, 'params'>
+}
+
+const SwitchHistoryPage = () => {
+    const deviceInfo = useDeviceInfo()
+    const { dpIds, tags ,headlineText, backText, stringOff, stringOn, actionKey, showLimit  } = useRoute<Props['route']>().params
+
+    const state = useReactive<SwitchHistoryPageState>({
+        refreshing: true,
+        refreshType: 'refresh',
+        onRefresh: Symbol(),
+        data: [],
+        dataOffset: 0,
+        hasNext: true,
+        filterTags: tags ? Object.keys(tags).reduce((pre, cur)=> {
+            pre[cur] = false
+            return pre
+        }, {}) : {}
+    })
+
+    const loadData: (refreshType: RefreshType) => void = useCallback(async refreshType => {
+        state.refreshType = refreshType
+        if (state.refreshType === 'refresh') {
+            state.dataOffset = 0
+            state.onRefresh = Symbol()
+        } else if (state.hasNext) {
+            state.onRefresh = Symbol()
+        }
+    }, [])
+
+    const changeFilter = useCallback((v:boolean, tag: string) =>{
+        state.filterTags = {
+            ...state.filterTags,
+            [tag]: v
+        }
+    }, [])
+
+    const getRequestIds = useCallback(() =>{
+        const tagValue = Object.values(state.filterTags)
+        const isAllData = tagValue.every(tag => tag) || tagValue.every(tag => !tag)
+        const checkedTags = Object.keys(state.filterTags).reduce((pre:string[], cur) => {
+            if(state.filterTags[cur]) pre.push(cur)
+            return pre
+        }, [])
+        return isAllData ? dpIds : checkedTags
+    }, [state.filterTags])
+
+
+    useEffect(() => {
+        getSwitchHistoryData(deviceInfo.devId, getRequestIds(), state.dataOffset,  100, stringOn, stringOff, actionKey, showLimit)
+            .then(res => {
+                state.refreshing = false
+                state.data = res.data
+                state.dataOffset = res.currentOffset
+                state.hasNext = res.hasNext
+            })
+    }, [state.onRefresh, state.filterTags])
+
+    const downFile = () => {
+      exportHistoryFile(state.data)
+    }
+
+    return (
+        <Page
+            backText={backText || deviceInfo.name}
+            headlineText={headlineText || I18n.getLang('history_socket_headline_text')}
+            headlineIcon={res.download_icon}
+            onHeadlineIconClick={downFile}
+            >
+            <View style={styles.content}>
+                <Text style={styles.titleText}>{I18n.getLang('history_contact_sensor_description_text')}</Text>
+                <Spacer/>
+                {!isEmpty(state.filterTags) && !!state.data.length &&
+                    <View style={{
+                        display: 'flex',
+                        flexDirection: 'row',
+                        flexWrap: 'wrap',
+                        marginHorizontal: cx(24),
+                        marginBottom: cx(12),
+                        alignSelf: 'flex-start'
+                    }}>
+                        {
+                            Object.keys(state.filterTags)?.map((tag) => {
+                                return <Tag
+                                    key={tag}
+                                    text={tags && tags[tag]}
+                                    checked={state.filterTags[tag]}
+                                    onCheckedChange={(v) => changeFilter(v, tag)}
+                                    style={{ marginTop: cx(5), marginHorizontal: cx(5) }}
+                                />
+                            })
+                        }
+                    </View>
+                }
+                <FlatList
+                    data={state.data}
+                    style={styles.list}
+                    renderItem={({item}) => <SwitchHistoryItem {...{itemData :item, tags}}/>}
+                    keyExtractor={(_, index) => `${index}`}
+                    ListFooterComponent={<Spacer/>}
+                    ListEmptyComponent={(
+                        <View style={styles.listEmptyView}>
+                            <Spacer height={cx(26)}/>
+                            <Image
+                                style={styles.listEmptyImage}
+                                source={{uri: res.ldv_timer_empty}}/>
+                            <Spacer height={cx(14)}/>
+                            <View style={{flexDirection: 'row', alignItems: 'center'}}>
+                                <Image style={styles.listEmptyTextIcon} source={res.ic_info}/>
+                                <Spacer width={cx(4)} height={0}/>
+                                <Text style={styles.listEmptyText}>{I18n.getLang('history_overview_empty_information_text')}</Text>
+                            </View>
+                        </View>
+                    )}
+                    refreshing={state.refreshing}
+                    onEndReachedThreshold={.1}
+                    onRefresh={async () => {
+                        await loadData('refresh')
+                    }}
+                    onEndReached={async () => {
+                        await loadData('loadMore')
+                    }}/>
+            </View>
+        </Page>
+    )
+}
+
+interface SwitchHistoryItemBean {
+    itemData: SwitchHistoryUIItemData
+    tags?: object
+}
+
+const SwitchHistoryItem = (props: SwitchHistoryItemBean)  => {
+    const { itemData, tags} = props
+    return (
+        <View style={styles.switchHistoryItem}>
+            <Text style={styles.switchHistoryItemTitle}>{itemData.title}</Text>
+            <Spacer height={cx(10)}/>
+            {itemData.actions.map((actionData, index) => (
+                <View style={styles.switchHistoryItemActionItem} key={`${index}`}>
+                    <View style={styles.switchHistoryItemActionItemLineGroup}>
+                        <View style={styles.switchHistoryItemActionItemLine}/>
+                        <View style={styles.switchHistoryItemActionItemPoint}/>
+                        <View style={styles.switchHistoryItemActionItemLine}/>
+                    </View>
+                    <Spacer width={cx(20)} height={0}/>
+                    <Text style={styles.switchHistoryItemActionItemText}>{`${actionData.time}`}</Text>
+                    <Spacer width={cx(20)} height={0}/>
+                    <Text style={styles.switchHistoryItemActionItemText}>{`${actionData.action}`}</Text>
+                    {!!tags && <View style={styles.switchHistoryItemTag}><Text >{tags[actionData.dpId]}</Text></View>}
+                </View>
+            ))}
+            <Spacer/>
+        </View>
+    )
+}
+
+const styles = StyleSheet.create({
+    content: {
+        flex: 1,
+    },
+    list: {
+        flex: 1,
+    },
+    listEmptyView: {
+        alignItems: 'center',
+    },
+    listEmptyImage: {
+        width: cx(200),
+        height: cx(200),
+    },
+    listEmptyTextIcon: {
+        width: cx(16),
+        height: cx(16),
+        tintColor: '#000',
+    },
+    listEmptyText: {
+        color: '#000',
+        fontSize: cx(12),
+        fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    titleText: {
+        marginHorizontal: cx(24),
+        color: '#000',
+        fontSize: cx(16),
+        fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    switchHistoryItem: {
+        marginHorizontal: cx(24),
+    },
+    switchHistoryItemTitle: {
+        color: '#000',
+        fontSize: cx(18),
+        fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    switchHistoryItemActionItem: {
+        flexDirection: 'row',
+        alignItems: 'center',
+    },
+    switchHistoryItemActionItemLineGroup: {
+        alignItems: 'center',
+    },
+    switchHistoryItemActionItemLine: {
+        width: cx(1),
+        height: cx(11.5),
+        backgroundColor: '#E6E7E8',
+    },
+    switchHistoryItemActionItemPoint: {
+        width: cx(7),
+        height: cx(7),
+        backgroundColor: '#f60',
+        borderRadius: cx(4),
+    },
+    switchHistoryItemActionItemText: {
+        color: '#000',
+        fontSize: cx(16),
+        fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    switchHistoryItemTag:{
+        paddingHorizontal: cx(10),
+        borderRadius: cx(10),
+        backgroundColor: '#cbcbcb',
+        marginLeft: cx(5)
+    }
+})
+
+export default SwitchHistoryPage
+
+type RefreshType = 'refresh' | 'loadMore'
+
+
+interface SwitchHistoryPageState {
+    refreshing: boolean
+    refreshType: RefreshType
+    onRefresh: symbol
+    data: SwitchHistoryUIItemData[]
+    hasNext: boolean
+    dataOffset: number
+    filterTags: object
 }

package/src/modules/history/Router.ts

@@ -1,16 +1,16 @@
-import {NavigationRoute} from "tuya-panel-kit";
-import HistoryPage from "./HistoryPage";
-import {ui_biz_routerKey} from "../../navigation/Routers";
-
-const HistoryPageRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.ui_biz_history,
-    component: HistoryPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    }
-  }
-]
-
-export default HistoryPageRouters
+import {NavigationRoute} from "tuya-panel-kit";
+import HistoryPage from "./HistoryPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const HistoryPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_history,
+    component: HistoryPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
+]
+
+export default HistoryPageRouters

package/src/modules/history/SwitchHistoryPageActions.d.ts

@@ -1,14 +1,14 @@
-import { PagingResult } from '@ledvance/base/src/models/TuyaApi';
-export interface SwitchHistoryUIItemData {
-    title: string;
-    actions: SwitchHistoryUIItemActionData[];
-}
-export interface SwitchHistoryUIItemActionData {
-    date: string;
-    time: string;
-    action: string;
-    dpId: string;
-}
-type getSwitchHistoryDataFunType = (deviceId: string, dpIds: string[], offset: number, limit?: number, stringOn?: string, stringOff?: string, actionKey?: string, showLimit?: boolean) => Promise<PagingResult<SwitchHistoryUIItemData[]>>;
-export declare const getSwitchHistoryData: getSwitchHistoryDataFunType;
-export {};
+import { PagingResult } from '@ledvance/base/src/models/TuyaApi';
+export interface SwitchHistoryUIItemData {
+    title: string;
+    actions: SwitchHistoryUIItemActionData[];
+}
+export interface SwitchHistoryUIItemActionData {
+    date: string;
+    time: string;
+    action: string;
+    dpId: string;
+}
+type getSwitchHistoryDataFunType = (deviceId: string, dpIds: string[], offset: number, limit?: number, stringOn?: string, stringOff?: string, actionKey?: string, showLimit?: boolean) => Promise<PagingResult<SwitchHistoryUIItemData[]>>;
+export declare const getSwitchHistoryData: getSwitchHistoryDataFunType;
+export {};