@ledvance/base 1.1.13 → 1.1.15

package/src/models/modules/NativePropsSlice.tsx

@@ -9,210 +9,210 @@ import {GlobalParams} from '../GlobalParams'
 import {snakeCase} from 'lodash'
 
 export interface NativeProps {
-    familyName: string
-    deviceInfo: DeviceInfo
-    uaGroupInfo: UAGroupInfo
-    timeSchedule?: symbol
-    energieverbrauch?: object
+  familyName: string
+  deviceInfo: DeviceInfo
+  uaGroupInfo: UAGroupInfo
+  timeSchedule?: symbol
+  energieverbrauch?: object
 }
 
 export interface DeviceInfo {
-    devId: string
-    pId: string
-    dps: any
+  devId: string
+  pId: string
+  dps: any
 }
 
 export interface UAGroupInfo {
-    tyGroupId: number
-    pId: string
-    dps: any
-    config: any
+  tyGroupId: number
+  pId: string
+  dps: any
+  config: any
 }
 
 const initialState: NativeProps = {
-    familyName: '',
-    deviceInfo: {
-        devId: '',
-        pId: '',
-        dps: {},
-    },
-    uaGroupInfo: {
-        tyGroupId: -1,
-        pId: '',
-        dps: {},
-        config: {},
-    },
-    timeSchedule: Symbol(),
-    energieverbrauch: {},
+  familyName: '',
+  deviceInfo: {
+    devId: '',
+    pId: '',
+    dps: {},
+  },
+  uaGroupInfo: {
+    tyGroupId: -1,
+    pId: '',
+    dps: {},
+    config: {},
+  },
+  timeSchedule: Symbol(),
+  energieverbrauch: {},
 }
 
 // energy generation
 const productList = [
-    'rcqe1i17x0vrvws7',
+  'rcqe1i17x0vrvws7',
 ]
 
 const nativePropsSlice = createSlice({
-    name: 'ldvModules',
-    initialState: initialState,
-    reducers: {
-        setNativeProps: (state, action: PayloadAction<NativeProps>) => {
-            state.deviceInfo.devId = action.payload.deviceInfo.devId
-            if (!!action.payload.familyName) {
-                state.familyName = action.payload.familyName
-            }
-            if (!!action.payload.deviceInfo.pId) {
-                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.uaGroupInfo.pId) {
-                state.uaGroupInfo.pId = action.payload.uaGroupInfo.pId
-            }
-            state.uaGroupInfo.dps = {...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps}
-            state.uaGroupInfo.config = action.payload.uaGroupInfo.config
-        },
-        setGroupConfig: (state, action: PayloadAction<any>) => {
-            state.uaGroupInfo.config = action.payload
-        },
-        setDps(state, action: PayloadAction<any>) {
-            const dpKeys = Object.keys(action.payload)
-            dpKeys.forEach(dp => {
-                state.deviceInfo.dps[dp] = action.payload[dp]
-            })
-        },
-        setTimeSchedule(state, action: PayloadAction<any>) {
-            state.timeSchedule = action.payload
-        },
-        setEnergieverbrauch(state, action: PayloadAction<any>) {
-            state.energieverbrauch = action.payload
-        },
+  name: 'ldvModules',
+  initialState: initialState,
+  reducers: {
+    setNativeProps: (state, action: PayloadAction<NativeProps>) => {
+      state.deviceInfo.devId = action.payload.deviceInfo.devId
+      if (!!action.payload.familyName) {
+        state.familyName = action.payload.familyName
+      }
+      if (!!action.payload.deviceInfo.pId) {
+        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.uaGroupInfo.pId) {
+        state.uaGroupInfo.pId = action.payload.uaGroupInfo.pId
+      }
+      state.uaGroupInfo.dps = {...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps}
+      state.uaGroupInfo.config = action.payload.uaGroupInfo.config
+    },
+    setGroupConfig: (state, action: PayloadAction<any>) => {
+      state.uaGroupInfo.config = action.payload
+    },
+    setDps(state, action: PayloadAction<any>) {
+      const dpKeys = Object.keys(action.payload)
+      dpKeys.forEach(dp => {
+        state.deviceInfo.dps[dp] = action.payload[dp]
+      })
     },
+    setTimeSchedule(state, action: PayloadAction<any>) {
+      state.timeSchedule = action.payload
+    },
+    setEnergieverbrauch(state, action: PayloadAction<any>) {
+      state.energieverbrauch = action.payload
+    },
+  },
 })
 
 type AsyncBlockType<T> = () => Promise<DpsResult<T>>
 type SyncBlockType<T> = () => DpsResult<T>
 
 function asyncSetDps<T>(dispatch: Dispatch<any>, block: AsyncBlockType<T> | SyncBlockType<T>): Promise<Result<T>> {
-    return new Promise<Result<T>>(async (res, _rej) => {
-        const dpsResult = await block()
-        if (dpsResult.result.success) {
-            // 只在结果成功时才改变 redux 数据
-            dispatch(setDps(dpsResult.dps))
-        }
-        res(dpsResult.result)
-    })
+  return new Promise<Result<T>>(async (res, _rej) => {
+    const dpsResult = await block()
+    if (dpsResult.result.success) {
+      // 只在结果成功时才改变 redux 数据
+      dispatch(setDps(dpsResult.dps))
+    }
+    res(dpsResult.result)
+  })
 }
 
 function simpleSetDps<T>(dispatch: Dispatch<any>): (deviceId: string, dps: any) => Promise<Result<T>> {
-    return (deviceId, dps) => {
-        return asyncSetDps(dispatch, async () => {
-            console.log('发送dp数据：', deviceId, JSON.stringify(dps))
-            const res = await NativeApi.setDps(deviceId, dps)
-            if (res.result) {
-                return {
-                    result: {success: true},
-                    dps: dps,
-                }
-            }
-            return {
-                result: {success: false, msg: res.msg},
-            }
-        })
-    }
+  return (deviceId, dps) => {
+    return asyncSetDps(dispatch, async () => {
+      console.log('发送dp数据：', deviceId, JSON.stringify(dps))
+      const res = await NativeApi.setDps(deviceId, dps)
+      if (res.result) {
+        return {
+          result: {success: true},
+          dps: dps,
+        }
+      }
+      return {
+        result: {success: false, msg: res.msg},
+      }
+    })
+  }
 }
 
 function simpleSetDp<T>(dispatch: Dispatch<any>): (deviceId: string, dp: string, value: any) => Promise<Result<T>> {
-    return (deviceId, dp, value) => {
-        const fun = simpleSetDps<T>(dispatch)
-        return fun(deviceId, {[dp]: value})
-    }
+  return (deviceId, dp, value) => {
+    const fun = simpleSetDps<T>(dispatch)
+    return fun(deviceId, {[dp]: value})
+  }
 }
 
 const useDeviceId = () => {
-    return useSelector(store => store.ldvModules.deviceInfo.devId)
+  return useSelector(store => store.ldvModules.deviceInfo.devId)
 }
 
 const useFamilyName: () => string = () => {
-    return useSelector(store => store.ldvModules.familyName)
+  return useSelector(store => store.ldvModules.familyName)
 }
 
 function useDp<T, R>(dp: string): [T, (value: T) => Promise<Result<R>>] {
-    const deviceId = useDeviceId()
-    const dispatch = useDispatch()
-    const dpValue = useSelector(store => store.ldvModules.deviceInfo.dps[dp])
-    const setDp = useCallback((dpValue: T) => {
-        return simpleSetDp<R>(dispatch)(deviceId, dp, dpValue)
-    }, [])
-    return [dpValue, setDp]
+  const deviceId = useDeviceId()
+  const dispatch = useDispatch()
+  const dpValue = useSelector(store => store.ldvModules.deviceInfo.dps[dp])
+  const setDp = useCallback((dpValue: T) => {
+    return simpleSetDp<R>(dispatch)(deviceId, dp, dpValue)
+  }, [])
+  return [dpValue, setDp]
 }
 
 function useDps<R>(): [any, (dps: any) => Promise<Result<R>>] {
-    const deviceId = useDeviceId()
-    const dispatch = useDispatch()
-    const dps = useSelector(store => store.ldvModules.deviceInfo.dps)
-    const setDps = useCallback((dps: any) => {
-        return simpleSetDps<R>(dispatch)(deviceId, dps)
-    }, [])
-    return [dps, setDps]
+  const deviceId = useDeviceId()
+  const dispatch = useDispatch()
+  const dps = useSelector(store => store.ldvModules.deviceInfo.dps)
+  const setDps = useCallback((dps: any) => {
+    return simpleSetDps<R>(dispatch)(deviceId, dps)
+  }, [])
+  return [dps, setDps]
 }
 
 interface DpState {
-    switch: boolean;
+  switch: boolean;
 
-    [dpCode: string]: DpValue;
+  [dpCode: string]: DpValue;
 }
 
 const useDeviceInfo: () => DevInfo<DpState> = () => {
-    return useSelector(state => state.devInfo)
+  return useSelector(state => state.devInfo)
 }
 
 const useTimeSchedule = (): [v: symbol | undefined, f: any] => {
-    const dps = useSelector(store => store.ldvModules.timeSchedule)
-    const dispatch = useDispatch()
-    const setTimeScheduleFn = (value: Symbol) => {
-        dispatch(setTimeSchedule(value))
-    }
-    return [dps, setTimeScheduleFn]
+  const dps = useSelector(store => store.ldvModules.timeSchedule)
+  const dispatch = useDispatch()
+  const setTimeScheduleFn = (value: Symbol) => {
+    dispatch(setTimeSchedule(value))
+  }
+  return [dps, setTimeScheduleFn]
 }
 
 const useEnergieverbrauch = () => {
-    const dps = useSelector(store => store.ldvModules.energieverbrauch)
-    const dispatch = useDispatch()
-    const setEnergieverbrauchFn = (value) => {
-        dispatch(setEnergieverbrauch(value))
-    }
-    return [dps, setEnergieverbrauchFn]
+  const dps = useSelector(store => store.ldvModules.energieverbrauch)
+  const dispatch = useDispatch()
+  const setEnergieverbrauchFn = (value) => {
+    dispatch(setEnergieverbrauch(value))
+  }
+  return [dps, setEnergieverbrauchFn]
 }
 
 export const useEngergyGeneration = () => {
-    const {productId} = useDeviceInfo()
-    return productList.some(val => val === productId)
+  const {productId} = useDeviceInfo()
+  return productList.some(val => val === productId)
 }
 
 export function useUAGroupInfo(): UAGroupInfo {
-    return useSelector(state => state.ldvModules.uaGroupInfo)
+  return useSelector(state => state.ldvModules.uaGroupInfo)
 }
 
 export function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Promise<Result<any>>] {
-    const tyGroupId = useUAGroupInfo().tyGroupId
-    const config = useUAGroupInfo().config as T
-    const dispatch = useDispatch()
-    const {setGroupConfig} = nativePropsSlice.actions
-    const setConfig = useCallback(async (dps: any, newConfig: T) => {
-        // 发送控制命令
-        const res = await NativeApi.groupControl(tyGroupId, JSON.stringify(dps), JSON.stringify(newConfig))
-        if (res.success) {
-            // 只在结果成功时才改变 redux 数据
-            dispatch(setGroupConfig(newConfig))
-        }
-        return res
-    }, [])
-    return [config, setConfig]
+  const tyGroupId = useUAGroupInfo().tyGroupId
+  const config = useUAGroupInfo().config as T
+  const dispatch = useDispatch()
+  const {setGroupConfig} = nativePropsSlice.actions
+  const setConfig = useCallback(async (dps: any, newConfig: T) => {
+    // 发送控制命令
+    const res = await NativeApi.groupControl(tyGroupId, JSON.stringify(dps), JSON.stringify(newConfig))
+    if (res.success) {
+      // 只在结果成功时才改变 redux 数据
+      dispatch(setGroupConfig(newConfig))
+    }
+    return res
+  }, [])
+  return [config, setConfig]
 }
 
 /**
@@ -223,40 +223,41 @@ export function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Promise<Res
  */
 export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K] }[keyof GC]>
 (key: keyof GC, extraDps: any = {}): [GCPT, (value: GCPT, dpValue: any) => Promise<Result<any>>] {
-    const [groupConfig, setGroupConfig] = useGroupConfig<GC>()
-    const setGroupConfigFeature = async (value: GCPT, dpValue: any) => {
-        return await setGroupConfig(
-          {
-              [GlobalParams.dpSchemaMap[snakeCase(key as string)].dp]: dpValue,
-              ...extraDps,
-          },
-          {
-              ...groupConfig,
-              [key]: value,
-          },
-        )
-    }
-    return [groupConfig[key] as GCPT, setGroupConfigFeature]
+  const [groupConfig, setGroupConfig] = useGroupConfig<GC>()
+  const setGroupConfigFeature = async (value: GCPT, dpValue: any) => {
+    return await setGroupConfig(
+      {
+        [GlobalParams.dpSchemaMap[snakeCase(key as string)].dp]: dpValue,
+        ...extraDps,
+      },
+      {
+        ...groupConfig,
+        [key]: value,
+      },
+    )
+  }
+  return [groupConfig[key] as GCPT, setGroupConfigFeature]
 }
 
 export const ldvModules = nativePropsSlice.reducer
 
 export const {
-    setNativeProps,
-    setGroupNativeProps,
-    setDps,
-    setTimeSchedule,
-    setEnergieverbrauch,
+  setNativeProps,
+  setGroupNativeProps,
+  setDps,
+  setTimeSchedule,
+  setEnergieverbrauch,
 } = nativePropsSlice.actions
 
 export {
-    simpleSetDps,
-    simpleSetDp,
-    useDeviceId,
-    useDeviceInfo,
-    useDp,
-    useDps,
-    useFamilyName,
-    useTimeSchedule,
-    useEnergieverbrauch,
+  asyncSetDps,
+  simpleSetDps,
+  simpleSetDp,
+  useDeviceId,
+  useDeviceInfo,
+  useDp,
+  useDps,
+  useFamilyName,
+  useTimeSchedule,
+  useEnergieverbrauch,
 }

package/src/models/modules/Result.ts

@@ -1,16 +1,16 @@
 export interface Result<T> {
-    success: boolean;
-    data?: T | undefined,
-    msg?: string | undefined
+  success: boolean;
+  data?: T | undefined,
+  msg?: string | undefined
 }
 
 export interface DpsResult<T> {
-    result: Result<T>,
-    dps?: any | undefined
+  result: Result<T>,
+  dps?: any | undefined
 }
 
 export interface NativeResult<T> {
-    result: boolean
-    data?: T
-    msg?: string
+  result: boolean
+  data?: T
+  msg?: string
 }

package/src/models/modules/common.ts

@@ -14,16 +14,16 @@ import {ldvModules} from './NativePropsSlice'
 const {putDeviceData} = TYSdk.device
 
 export interface DpState {
-    switch: boolean;
+  switch: boolean;
 
-    [dpCode: string]: DpValue;
+  [dpCode: string]: DpValue;
 }
 
 export interface Log {
-    strCodes: string;
-    strIds: string;
-    time: string;
-    isSend: boolean;
+  strCodes: string;
+  strIds: string;
+  time: string;
+  isSend: boolean;
 }
 
 type Logs = Array<Log>;
@@ -42,12 +42,12 @@ const consoleChange = createAction('CONSOLECHNAGE')
 const clearConsole = createAction('CLEARCONSOLE')
 
 export const actions = {
-    devInfoChange,
-    deviceChange,
-    responseUpdateDp,
-    updateDp,
-    consoleChange,
-    clearConsole,
+  devInfoChange,
+  deviceChange,
+  responseUpdateDp,
+  updateDp,
+  consoleChange,
+  clearConsole,
 }
 
 export type Actions = { [K in keyof typeof actions]: ReturnType<typeof actions[K]> };
@@ -56,106 +56,106 @@ export type Actions = { [K in keyof typeof actions]: ReturnType<typeof actions[K
  * reducers
  */
 const dpState = handleActions<DpState, UpdateDpStatePayload | UpdateDevInfoPayload>(
-    {
-        [devInfoChange.toString()]: (state, action: Actions['devInfoChange']) => {
-            return {
-                ...state,
-                ...action.payload.state,
-            }
-        },
-
-        [responseUpdateDp.toString()]: (state, action: Actions['responseUpdateDp']) => ({
-            ...state,
-            ...action.payload,
-        }),
+  {
+    [devInfoChange.toString()]: (state, action: Actions['devInfoChange']) => {
+      return {
+        ...state,
+        ...action.payload.state,
+      }
     },
-    {} as DpState,
+
+    [responseUpdateDp.toString()]: (state, action: Actions['responseUpdateDp']) => ({
+      ...state,
+      ...action.payload,
+    }),
+  },
+  {} as DpState,
 )
 
 const devInfo = handleActions<DevInfo<DpState>>(
-    {
-        [devInfoChange.toString()]: (state, action) => ({
-            ...state,
-            ...action.payload,
-        }),
-
-        [deviceChange.toString()]: (state, action) => ({
-            ...state,
-            ...action.payload,
-        }),
-    },
-    {} as DevInfo<DpState>,
+  {
+    [devInfoChange.toString()]: (state, action) => ({
+      ...state,
+      ...action.payload,
+    }),
+
+    [deviceChange.toString()]: (state, action) => ({
+      ...state,
+      ...action.payload,
+    }),
+  },
+  {} as DevInfo<DpState>,
 )
 
 let isSend = false
 
 const formatLogs = (state: Logs, action: { payload: UpdateDpStatePayload }, send: boolean) => {
-    const ret = Object.keys(action.payload).reduce((obj, p) => {
-        const id = TYSdk.device.getDpIdByCode(p)
-        return {...obj, [id]: action.payload[p]}
-    }, {})
-    const strIds = JSON.stringify(ret, null, 2)
-    const strCodes = JSON.stringify(action.payload, null, 2)
-    const date = new Date()
-    const time = `[${[
-        date.getHours(),
-        date.getMinutes(),
-        date.getSeconds(),
-        date.getMilliseconds(),
-    ].join(':')}]`
-    const s = [{strCodes, strIds, time, isSend: send}, ...state]
-    return s.slice(0, 30)
+  const ret = Object.keys(action.payload).reduce((obj, p) => {
+    const id = TYSdk.device.getDpIdByCode(p)
+    return {...obj, [id]: action.payload[p]}
+  }, {})
+  const strIds = JSON.stringify(ret, null, 2)
+  const strCodes = JSON.stringify(action.payload, null, 2)
+  const date = new Date()
+  const time = `[${[
+    date.getHours(),
+    date.getMinutes(),
+    date.getSeconds(),
+    date.getMilliseconds(),
+  ].join(':')}]`
+  const s = [{strCodes, strIds, time, isSend: send}, ...state]
+  return s.slice(0, 30)
 }
 
 const logs = handleActions<Logs, undefined | UpdateDpStatePayload | DevInfo>(
-    {
-        [consoleChange.toString()]: state => {
-            isSend = true
-            return state
-        },
-
-        [updateDp.toString()]: (state, action: Actions['updateDp']) => {
-            isSend = true
-            return formatLogs(state, action, isSend)
-        },
-
-        [devInfoChange.toString()]: (state, action: Actions['devInfoChange']) => {
-            const formatAction = {payload: action.payload.state}
-            return formatLogs(state, formatAction, isSend)
-        },
-
-        [responseUpdateDp.toString()]: (state, action: Actions['responseUpdateDp']) => {
-            isSend = false
-            return formatLogs(state, action, isSend)
-        },
-
-        [clearConsole.toString()]: () => [],
+  {
+    [consoleChange.toString()]: state => {
+      isSend = true
+      return state
     },
-    [],
+
+    [updateDp.toString()]: (state, action: Actions['updateDp']) => {
+      isSend = true
+      return formatLogs(state, action, isSend)
+    },
+
+    [devInfoChange.toString()]: (state, action: Actions['devInfoChange']) => {
+      const formatAction = {payload: action.payload.state}
+      return formatLogs(state, formatAction, isSend)
+    },
+
+    [responseUpdateDp.toString()]: (state, action: Actions['responseUpdateDp']) => {
+      isSend = false
+      return formatLogs(state, action, isSend)
+    },
+
+    [clearConsole.toString()]: () => [],
+  },
+  [],
 )
 
 export const reducers = {
-    dpState,
-    devInfo,
-    logs,
-    ldvModules,
+  dpState,
+  devInfo,
+  logs,
+  ldvModules,
 }
 
 /**
  * epics
  */
 const dpUpdateEpic$ = (action$: ActionsObservable<Actions['updateDp']>) => {
-    return action$.ofType(updateDp.toString()).mergeMap(action => {
-        const {payload} = action
-        const [success, error] = Observable.fromPromise(putDeviceData(payload))
-            .catch(() => Observable.of(responseUpdateDp({})))
-            .partition((x: { success: boolean }) => x.success)
-
-        return Observable.merge(
-            success.map(() => responseUpdateDp(payload)), // 如果每次操作都必须等到上报以后再更新，可以注释掉本段代码
-            error.map(() => responseUpdateDp({})),
-        )
-    })
+  return action$.ofType(updateDp.toString()).mergeMap(action => {
+    const {payload} = action
+    const [success, error] = Observable.fromPromise(putDeviceData(payload))
+      .catch(() => Observable.of(responseUpdateDp({})))
+      .partition((x: { success: boolean }) => x.success)
+
+    return Observable.merge(
+      success.map(() => responseUpdateDp(payload)), // 如果每次操作都必须等到上报以后再更新，可以注释掉本段代码
+      error.map(() => responseUpdateDp({})),
+    )
+  })
 }
 
 export const epics = [dpUpdateEpic$]