@ledvance/base 1.0.37 → 1.1.1

package/src/models/TuyaApi.d.ts

@@ -15,3 +15,15 @@ export interface DpReportSataData {
     value: string;
 }
 export declare function getDpReportSataData(deviceId: string, dpIds: string[], offset: number, limit: number, sortType?: 'ASC' | 'DESC'): Promise<DpReportSataResData>;
+export interface DpResultByMonthResData {
+    years: object;
+    thisDay: string;
+    sum: string;
+}
+export declare function getDpResultByMonth(devId: string, dpId: string, type: "sum" | "minux" | "mac"): Promise<DpResultByMonthResData>;
+export interface DpResultByDataWithSpecifiedResData {
+    result: object;
+    min: string;
+}
+export declare function getDataWithSpecified(devId: string, dpId: string, startDay: string, endDay: string, type: "sum" | "minux" | "avg"): Promise<DpResultByDataWithSpecifiedResData>;
+export declare function getDpResultByHour(devId: string, dpId: string, date: string, type: "sum" | "minux" | "avg"): Promise<DpResultByDataWithSpecifiedResData>;

package/src/models/modules/NativePropsSlice.d.ts

@@ -2,11 +2,21 @@ import { Dispatch } from 'react';
 import { Result } from './Result';
 import { DevInfo, DpValue } from 'tuya-panel-kit';
 export interface NativeProps {
+    familyName: string;
+    deviceInfo: DeviceInfo;
+    uaGroupInfo: UAGroupInfo;
+    timeSchedule?: symbol;
+    energieverbrauch?: object;
+}
+export interface DeviceInfo {
     devId: string;
     pId: string;
     dps: any;
-    familyName: string;
-    timeSchedule: symbol;
+}
+export interface UAGroupInfo {
+    tyGroupId: number;
+    pId: string;
+    dps: any;
 }
 declare function simpleSetDps<T>(dispatch: Dispatch<any>): (deviceId: string, dps: any) => Promise<Result<T>>;
 declare function simpleSetDp<T>(dispatch: Dispatch<any>): (deviceId: string, dp: string, value: any) => Promise<Result<T>>;
@@ -19,7 +29,9 @@ interface DpState {
     [dpCode: string]: DpValue;
 }
 declare const useDeviceInfo: () => DevInfo<DpState>;
-declare const useTimeSchedule: () => [v: Symbol, f: any];
+declare const useTimeSchedule: () => [v: symbol | undefined, f: any];
+declare const useEnergieverbrauch: () => (object | undefined)[];
+export declare const useEngergyGeneration: () => boolean;
 export declare const ldvModules: import("@reduxjs/toolkit").Reducer<NativeProps, import("@reduxjs/toolkit").AnyAction>;
-export declare const setNativeProps: import("@reduxjs/toolkit").ActionCreatorWithPayload<NativeProps, string>, setDps: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setTimeSchedule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
-export { simpleSetDps, simpleSetDp, useDeviceId, useDeviceInfo, useDp, useDps, useFamilyName, useTimeSchedule, };
+export declare const setNativeProps: import("@reduxjs/toolkit").ActionCreatorWithPayload<NativeProps, string>, setGroupNativeProps: import("@reduxjs/toolkit").ActionCreatorWithPayload<NativeProps, string>, setDps: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setTimeSchedule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setEnergieverbrauch: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
+export { simpleSetDps, simpleSetDp, useDeviceId, useDeviceInfo, useDp, useDps, useFamilyName, useTimeSchedule, useEnergieverbrauch, };

package/src/models/modules/NativePropsSlice.tsx

@@ -7,26 +7,44 @@ import {NativeApi} from '../../api/native'
 import {useDispatch} from 'react-redux'
 
 export interface NativeProps {
-    devId: string,
-    pId: string,
-    dps: any,
-    familyName: string,
-    timeSchedule: symbol;
+    familyName: string
+    deviceInfo: DeviceInfo
+    uaGroupInfo: UAGroupInfo
+    timeSchedule?: symbol
     energieverbrauch?: object
 }
 
+export interface DeviceInfo {
+    devId: string
+    pId: string
+    dps: any
+}
+
+export interface UAGroupInfo {
+    tyGroupId: number
+    pId: string
+    dps: any
+}
+
 const initialState: NativeProps = {
-    devId: '',
-    pId: '',
-    dps: {},
     familyName: '',
+    deviceInfo: {
+        devId: '',
+        pId: '',
+        dps: {},
+    },
+    uaGroupInfo: {
+        tyGroupId: -1,
+        pId: '',
+        dps: {},
+    },
     timeSchedule: Symbol(),
-    energieverbrauch: {}
+    energieverbrauch: {},
 }
 
 // energy generation
 const productList = [
-    'rcqe1i17x0vrvws7'
+    'rcqe1i17x0vrvws7',
 ]
 
 const nativePropsSlice = createSlice({
@@ -34,19 +52,29 @@ const nativePropsSlice = createSlice({
     initialState: initialState,
     reducers: {
         setNativeProps: (state, action: PayloadAction<NativeProps>) => {
-            state.devId = action.payload.devId
+            state.deviceInfo.devId = action.payload.deviceInfo.devId
+            if (!!action.payload.familyName) {
+                state.familyName = action.payload.familyName
+            }
+            if (!!action.payload.deviceInfo.devId) {
+                state.deviceInfo.pId = action.payload.deviceInfo.pId
+            }
+            state.deviceInfo.dps = {...state.deviceInfo.dps, ...action.payload.deviceInfo.dps}
+        },
+        setGroupNativeProps: (state, action: PayloadAction<NativeProps>) => {
+            state.uaGroupInfo.tyGroupId = action.payload.uaGroupInfo.tyGroupId
             if (!!action.payload.familyName) {
                 state.familyName = action.payload.familyName
             }
-            if (!!action.payload.pId) {
-                state.pId = action.payload.pId
+            if (!!action.payload.uaGroupInfo.tyGroupId) {
+                state.uaGroupInfo.pId = action.payload.uaGroupInfo.pId
             }
-            state.dps = {...state.dps, ...action.payload.dps}
+            state.uaGroupInfo.dps = {...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps}
         },
         setDps(state, action: PayloadAction<any>) {
             const dpKeys = Object.keys(action.payload)
             dpKeys.forEach(dp => {
-                state.dps[dp] = action.payload[dp]
+                state.deviceInfo.dps[dp] = action.payload[dp]
             })
         },
         setTimeSchedule(state, action: PayloadAction<any>) {
@@ -98,7 +126,7 @@ function simpleSetDp<T>(dispatch: Dispatch<any>): (deviceId: string, dp: string,
 }
 
 const useDeviceId = () => {
-    return useSelector(store => store.ldvModules.devId)
+    return useSelector(store => store.ldvModules.deviceInfo.devId)
 }
 
 const useFamilyName: () => string = () => {
@@ -108,7 +136,7 @@ const useFamilyName: () => string = () => {
 function useDp<T, R>(dp: string): [T, (value: T) => Promise<Result<R>>] {
     const deviceId = useDeviceId()
     const dispatch = useDispatch()
-    const dpValue = useSelector(store => store.ldvModules.dps[dp])
+    const dpValue = useSelector(store => store.ldvModules.deviceInfo.dps[dp])
     const setDp = useCallback((dpValue: T) => {
         return simpleSetDp<R>(dispatch)(deviceId, dp, dpValue)
     }, [])
@@ -118,7 +146,7 @@ function useDp<T, R>(dp: string): [T, (value: T) => Promise<Result<R>>] {
 function useDps<R>(): [any, (dps: any) => Promise<Result<R>>] {
     const deviceId = useDeviceId()
     const dispatch = useDispatch()
-    const dps = useSelector(store => store.ldvModules.dps)
+    const dps = useSelector(store => store.ldvModules.deviceInfo.dps)
     const setDps = useCallback((dps: any) => {
         return simpleSetDps<R>(dispatch)(deviceId, dps)
     }, [])
@@ -135,10 +163,10 @@ const useDeviceInfo: () => DevInfo<DpState> = () => {
     return useSelector(state => state.devInfo)
 }
 
-const useTimeSchedule = (): [v:Symbol, f:any] => {
+const useTimeSchedule = (): [v: symbol | undefined, f: any] => {
     const dps = useSelector(store => store.ldvModules.timeSchedule)
     const dispatch = useDispatch()
-    const setTimeScheduleFn = (value: Symbol) =>{
+    const setTimeScheduleFn = (value: Symbol) => {
         dispatch(setTimeSchedule(value))
     }
     return [dps, setTimeScheduleFn]
@@ -147,20 +175,26 @@ const useTimeSchedule = (): [v:Symbol, f:any] => {
 const useEnergieverbrauch = () => {
     const dps = useSelector(store => store.ldvModules.energieverbrauch)
     const dispatch = useDispatch()
-    const setEnergieverbrauchFn = (value) =>{
+    const setEnergieverbrauchFn = (value) => {
         dispatch(setEnergieverbrauch(value))
     }
     return [dps, setEnergieverbrauchFn]
 }
 
-export const useEngergyGeneration = () =>{
-    const { productId } = useDeviceInfo()
+export const useEngergyGeneration = () => {
+    const {productId} = useDeviceInfo()
     return productList.some(val => val === productId)
 }
 
 export const ldvModules = nativePropsSlice.reducer
 
-export const {setNativeProps, setDps, setTimeSchedule, setEnergieverbrauch} = nativePropsSlice.actions
+export const {
+    setNativeProps,
+    setGroupNativeProps,
+    setDps,
+    setTimeSchedule,
+    setEnergieverbrauch,
+} = nativePropsSlice.actions
 
 export {
     simpleSetDps,
@@ -171,5 +205,5 @@ export {
     useDps,
     useFamilyName,
     useTimeSchedule,
-    useEnergieverbrauch
+    useEnergieverbrauch,
 }

package/src/models/modules/common.d.ts

@@ -1,4 +1,6 @@
-import { DpValue } from 'tuya-panel-kit';
+import { DevInfo, DpValue } from 'tuya-panel-kit';
+import { Observable } from 'rxjs/Observable';
+import { ActionsObservable } from 'redux-observable';
 import 'rxjs/add/observable/fromPromise';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/observable/merge';
@@ -16,21 +18,27 @@ export interface Log {
     time: string;
     isSend: boolean;
 }
+declare type Logs = Array<Log>;
+declare type UpdateDevInfoPayload = DevInfo;
+declare type UpdateDpStatePayload = Partial<DpState> & {
+    [key: string]: DpValue;
+};
 export declare const actions: {
-    devInfoChange: any;
-    deviceChange: any;
-    responseUpdateDp: any;
-    updateDp: any;
-    consoleChange: any;
-    clearConsole: any;
+    devInfoChange: import("redux-actions").ActionFunction1<UpdateDevInfoPayload, import("redux-actions").Action<UpdateDevInfoPayload>>;
+    deviceChange: import("redux-actions").ActionFunction1<UpdateDevInfoPayload, import("redux-actions").Action<UpdateDevInfoPayload>>;
+    responseUpdateDp: import("redux-actions").ActionFunction1<UpdateDpStatePayload, import("redux-actions").Action<UpdateDpStatePayload>>;
+    updateDp: import("redux-actions").ActionFunction1<UpdateDpStatePayload, import("redux-actions").Action<UpdateDpStatePayload>>;
+    consoleChange: import("redux-actions").ActionFunctionAny<import("redux-actions").Action<any>>;
+    clearConsole: import("redux-actions").ActionFunctionAny<import("redux-actions").Action<any>>;
 };
-export type Actions = {
+export declare type Actions = {
     [K in keyof typeof actions]: ReturnType<typeof actions[K]>;
 };
 export declare const reducers: {
-    dpState: any;
-    devInfo: any;
-    logs: any;
-    ldvModules: any;
+    dpState: import("redux-actions").ReduxCompatibleReducer<DpState, UpdateDevInfoPayload | UpdateDpStatePayload>;
+    devInfo: import("redux-actions").ReduxCompatibleReducer<DevInfo<DpState>, DevInfo<DpState>>;
+    logs: import("redux-actions").ReduxCompatibleReducer<Logs, DevInfo<Record<string, import("tuya-panel-kit").DpType>> | UpdateDpStatePayload | undefined>;
+    ldvModules: import("@reduxjs/toolkit").Reducer<import("./NativePropsSlice").NativeProps, import("@reduxjs/toolkit").AnyAction>;
 };
-export declare const epics: ((action$: ActionsObservable<any>) => any)[];
+export declare const epics: ((action$: ActionsObservable<Actions['updateDp']>) => Observable<import("redux-actions").Action<UpdateDpStatePayload>>)[];
+export {};

package/src/utils/common.d.ts

@@ -11,7 +11,7 @@ export declare function getWeek(weekString: any): number[];
  */
 export declare function spliceByStep(str: string, step: number): string[];
 export declare function hex2Int(hex: string): number;
-export declare const localeNumber: (v: number | string, fixed?: number) => string | number;
+export declare const localeNumber: (v: number | string, fixed?: number | undefined) => string | number;
 export declare const exportFile: (list: any) => void;
 export declare const exportHistoryFile: (list: any) => void;
 export declare const monthFormat: (v: number | string) => string;
@@ -30,5 +30,5 @@ interface DialogProps {
         close: () => void;
     }) => void;
 }
-export declare function showDialog(props: DialogProps): any;
+export declare function showDialog(props: DialogProps): void;
 export {};

package/src/components/FanAdjustView.tsx

@@ -1,124 +0,0 @@
-import React from 'react'
-import { Utils } from 'tuya-panel-kit'
-import Card from './Card'
-import {View, Text, ViewProps, Image, TouchableOpacity} from 'react-native'
-import LdvSwitch from './ldvSwitch'
-import I18n from '@i18n'
-import LdvSlider from './ldvSlider'
-import Spacer from './Spacer'
-import res from '../res'
-import Segmented from './Segmented'
-import Popup from './Popup'
-const { convertX: cx } = Utils.RatioUtils
-
-interface FanAdjustViewProps extends ViewProps {
-    fanEnable: boolean
-    fanSpeed: number
-    maxFanSpeed?: number
-    isSupportDirection?: boolean
-    isSupportDisinfect?: boolean
-    isSupportMode?: boolean
-    directValue?: string
-    modeValue?: string 
-    disinfect?: boolean
-    directOptions?:any[]
-    modeOptions?: any[]
-    directChange?: (direct:string) => void
-    modeChange?: (mode: string) => void
-    disinfectChange?: (disinfect: boolean) => void
-    onFanSwitch: (fanEnable: boolean) => void
-    onFanSpeedChange?: (fanSpeed: number) => void
-    onFanSpeedChangeComplete: (fanSpeed: number) => void
-}
-
-const FanAdjustView = (props: FanAdjustViewProps) => {
-    return (
-        <Card
-            style={props.style}>
-            <LdvSwitch
-                title={I18n.getLang('add_new_dynamic_mood_ceiling_fan_field_headline')}
-                enable={props.fanEnable}
-                setEnable={props.onFanSwitch}
-                color={''}
-                colorAlpha={1}/>
-            {props.fanEnable && (
-                <View>
-                    <LdvSlider
-                        title={I18n.getLang('add_new_dynamic_mood_ceiling_fan_field_text')}
-                        value={props.fanSpeed}
-                        min={1}
-                        max={props.maxFanSpeed}
-                        onValueChange={props.onFanSpeedChange}
-                        onSlidingComplete={props.onFanSpeedChangeComplete}
-                        subTitleStr={props.fanSpeed + `/${props.maxFanSpeed}`}/>
-                    <Spacer/>
-                </View>
-            )}
-            {props.isSupportDirection && <View style={{marginHorizontal: cx(16)}}>
-                <View style={{flexDirection: 'row', marginBottom: cx(2), alignItems: 'center'}}>
-                    <Text style={{marginRight: cx(5)}}>{I18n.getLang('ceiling_fan_tile_uvc_fan_direction')}</Text>
-                    <TouchableOpacity onPress={() => Popup({
-                        title: I18n.getLang('ceiling_fan_direction_info_headline'),
-                        confirmText: I18n.getLang('ceiling_fan_direction_info_button_label'),
-                        content: <View>
-                            <Text style={{fontWeight: 'bold', color: '#000'}}>{I18n.getLang('ceiling_fan_direction_info_description_text')}</Text>
-                            <Spacer />
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_direction_info_option_1_headline')}</Text>
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_direction_info_option_1_text')}</Text>
-                            <Spacer />
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_direction_info_option_2_headline')}</Text>
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_direction_info_option_2_text')}</Text>
-                        </View>
-                    })}>
-                        <Image style={{width: cx(16), height: cx(16), tintColor: '#ff6600'}} source={{uri: res.ic_info}}/>
-                    </TouchableOpacity>
-                </View>
-                <Segmented 
-                    options={props.directOptions}
-                    value={props.directValue}
-                    onChange={props.directChange}
-                />
-                <Spacer />
-            </View>}
-
-            {props.isSupportMode && <View style={{marginHorizontal: cx(16)}}>
-                <View style={{flexDirection: 'row', marginBottom: cx(2), alignItems: 'center'}}>
-                    <Text style={{marginRight: cx(5)}}>{I18n.getLang('ceiling_fan_tile_uvc_fan_direction')}</Text>
-                    <TouchableOpacity onPress={() => Popup({
-                        title: I18n.getLang('ceiling_fan_mode_info_headline'),
-                        confirmText: I18n.getLang('ceiling_fan_direction_info_button_label'),
-                        content: <View>
-                            <Text style={{fontWeight: 'bold', color:'#000'}}>{I18n.getLang('ceiling_fan_mode_info_description_text')}</Text>
-                            <Spacer />
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_mode_info_option_1_headline')}</Text>
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_mode_info_option_1_text')}</Text>
-                            <Spacer />
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_mode_info_option_2_headline')}</Text>
-                            <Text style={{color: '#000'}}>{I18n.getLang('ceiling_fan_mode_info_option_2_text')}</Text>
-                        </View>
-                    })}>
-                        <Image style={{width: cx(16), height: cx(16), tintColor: '#ff6600'}} source={{uri: res.ic_info}}/>
-                    </TouchableOpacity>
-                </View>
-                <Segmented 
-                    options={props.modeOptions}
-                    value={props.modeValue}
-                    onChange={props.modeChange}
-                />
-                <Spacer />
-            </View>}
-
-            {props.isSupportDisinfect && <>
-                <LdvSwitch 
-                    enable={props.disinfect || false}
-                    setEnable={props.disinfectChange}
-                    color={''}
-                    colorAlpha={1}
-                    title={'1'}/>
-                <Spacer height={cx(16)}/>
-            </>}
-        </Card>
-    )
-}
-
-export default FanAdjustView

package/src/components/Popup.tsx

@@ -1,72 +0,0 @@
-import React from 'react'
-import { View, Text, TouchableOpacity } from 'react-native'
-import { Utils, Popup } from 'tuya-panel-kit'
-
-const { convertX: cx, height } = Utils.RatioUtils
-
-interface InformationPopupProps{
-    title: string
-    confirmText: string
-    content: any
-}
-
-const InformationPopup = (props: InformationPopupProps) => {
-    console.log(props, '< --- props')
-
-  const titleNode = () => {
-    return (
-      <View style={{ flexDirection: 'row', height: cx(60), justifyContent:'space-between' }}>
-        <View style={{ flexDirection: 'column-reverse', flex: 1, alignItems: 'center',paddingLeft: cx(12) }}>
-          <Text style={{
-            fontSize: cx(16),
-            fontWeight: 'bold',
-            color: '#000000',
-            paddingBottom: cx(12),
-            
-          }}>{props.title}</Text>
-        </View>
-        <TouchableOpacity
-          style={{
-            flexDirection: 'column-reverse',
-            alignItems:'center',
-            paddingBottom: cx(12),
-            paddingRight: cx(6)
-          }}
-          onPress={() => Popup.close()}
-        >
-          <Text
-            style={{
-              fontSize: cx(12),
-              color: '#FF6600',
-            }}
-          >
-            {props.confirmText}
-          </Text>
-        </TouchableOpacity>
-      </View>
-    )
-  }
-
-  Popup.custom({
-    content: <View style={{height: height - cx(60), padding: cx(24)}}>
-      {props.content}
-    </View>,
-    title: titleNode(),
-    footer: null,
-    confirmText: '',
-    cancelText: '',
-    onMaskPress: ({ close }) => {
-      close()
-    },
-    onConfirm: () => {
-      Popup.close()
-    },
-    footerWrapperStyle:{
-      display: 'none'
-    }
-  })
-
-
-}
-
-export default InformationPopup

package/src/components/Segmented.tsx

@@ -1,76 +0,0 @@
-import React, { ReactNode } from "react";
-import { View, Text, TouchableOpacity, StyleSheet, ViewStyle } from "react-native";
-import { Utils } from 'tuya-panel-kit'
-
-const { convertX: cx } = Utils.RatioUtils
-
-interface SegmentedItem{
-    label: ReactNode
-    value: string
-}
-interface SegmentedProps{
-    value?: string | number
-    options?: SegmentedItem[]
-    onChange?: (v:string) => void
-    style?: ViewStyle
-}
-
-const Segmented = (props: SegmentedProps) =>{
-    return (
-        <View style={[styles.wrap_container, props.style]}>
-            {props.options && props.options.map((item,idx) => (
-                <TouchableOpacity
-                    style={[
-                        styles.segmented_item,
-                        idx === 0 && styles.segmented_item_first,
-                        idx === props.options?.length && styles.segmented_item_last,
-                        item.value === props.value && styles.segmented_item_check
-                    ]}
-                    onPress={() => props.onChange && props.onChange(item.value)}
-                    key={idx}
-                >
-                    <Text style={[
-                        styles.segmented_text,
-                        item.value === props.value && styles.segmented_text_check
-                        ]}>{item.label}</Text>
-                </TouchableOpacity>
-            ))}
-        </View>
-    )
-}
-
-export default Segmented
-
-const styles = StyleSheet.create({
-    wrap_container:{
-        flexDirection: 'row',
-        height: cx(48),
-        backgroundColor: '#f6f6f6',
-        padding: cx(2),
-        borderRadius: cx(7)
-    },
-    segmented_item:{
-        flex: 1,
-        alignItems: 'center',
-        justifyContent: 'center',
-        backgroundColor: '#fff'
-    },
-    segmented_item_first:{
-        borderBottomLeftRadius: cx(7),
-        borderTopLeftRadius: cx(7),
-    },
-    segmented_item_last:{
-        borderBottomRightRadius: cx(7),
-        borderTopRightRadius: cx(7)
-    },
-    segmented_item_check:{
-        backgroundColor: '#f60'
-    },
-    segmented_text:{
-        fontSize: cx(16),
-        color: '#999',
-    },
-    segmented_text_check:{
-        color: '#fff'
-    }
-})

package/src/res/Propup.tsx

@@ -1,72 +0,0 @@
-import React from 'react'
-import { View, Text, TouchableOpacity } from 'react-native'
-import { Utils, Popup } from 'tuya-panel-kit'
-
-const { convertX: cx, height } = Utils.RatioUtils
-
-interface InformationPopupProps{
-    title: string
-    confirmText: string
-    content: any
-}
-
-const InformationPopup = (props: InformationPopupProps) => {
-    console.log(props, '< --- props')
-
-  const titleNode = () => {
-    return (
-      <View style={{ flexDirection: 'row', height: cx(60), justifyContent:'space-between' }}>
-        <View style={{ flexDirection: 'column-reverse', flex: 1, alignItems: 'center',paddingLeft: cx(12) }}>
-          <Text style={{
-            fontSize: cx(16),
-            fontWeight: 'bold',
-            color: '#000000',
-            paddingBottom: cx(12),
-            
-          }}>{props.title}</Text>
-        </View>
-        <TouchableOpacity
-          style={{
-            flexDirection: 'column-reverse',
-            alignItems:'center',
-            paddingBottom: cx(12),
-            paddingRight: cx(6)
-          }}
-          onPress={() => Popup.close()}
-        >
-          <Text
-            style={{
-              fontSize: cx(12),
-              color: '#FF6600',
-            }}
-          >
-            {props.confirmText}
-          </Text>
-        </TouchableOpacity>
-      </View>
-    )
-  }
-
-  Popup.custom({
-    content: <View style={{height: height - cx(60), padding: cx(24)}}>
-      {props.content}
-    </View>,
-    title: titleNode(),
-    footer: null,
-    confirmText: '',
-    cancelText: '',
-    onMaskPress: ({ close }) => {
-      close()
-    },
-    onConfirm: () => {
-      Popup.close()
-    },
-    footerWrapperStyle:{
-      display: 'none'
-    }
-  })
-
-
-}
-
-export default InformationPopup