@ledvance/ui-biz-bundle 1.0.2 → 1.0.4

package/src/modules/timer/{timerPageAction.ts → TimerPageAction.ts}

@@ -1,91 +1,91 @@
-import { useDeviceId, useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
-import { Result } from "@ledvance/base/src/models/modules/Result"
-import { dpItem } from "./TimerPage"
-import { useCountDown as useCountDownAHook } from 'ahooks'
-import dayjs from "dayjs"
-import { NativeApi } from "@ledvance/base/src/api/native"
-import { useEffect, useState } from "react"
-
-export const useCountdowns= (dps: dpItem[]) =>{
-    return dps.map(dp => {
-        return ({
-            countdown: useDp<number,(value:number)=>Promise<Result<any>>>(dp.dpId),
-            enable: useDp<boolean, (value:boolean)=>Promise<Result<any>>>(dp.enableDp),
-            ...dp
-        })
-    })
-}
-
-
-const useFormateProgress : (dp: dpItem, func: Function) => [number, (time: number, t: any) => void]= (dp, cancelTimer) =>{
-    const [progress, setProgress] = useCountDownAHook({
-        interval: 1000,
-        onEnd: () => cancelTimer(dp.dpId),
-    })
-    const [countdown] = useDp<number,(value:number)=>Promise<Result<any>>>(dp.dpId)
-    const devId = useDeviceId()
-    const [cloudProgressNumber, setCloudProgressNumber] = useState(0)
-    const [progressNumber, setProgressNumber] = useState(0)
-    const [cloudData, setCloudData] = useState<any>()
-    const getCloudJson = () =>{
-        NativeApi.getJson(devId, dp.cloudKey).then(res =>{
-            if(res.success && res.data){
-                const result = JSON.parse(res.data)
-                setCloudData(result)
-                setCloudProgressNumber(result.progressAllNumber)
-                if(countdown > 0) setProgress(Date.now() + countdown * 1000)
-            }
-        })
-    }
-    useEffect(() =>{
-        getCloudJson()
-    }, [])
-
-    useEffect(() =>{
-        if(cloudProgressNumber > 0){
-            const currentTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-            const remainingTime = Number(cloudData && dayjs(cloudData[getKey('StartTime', dp.dpId)] || 0).diff(currentTime))
-            const time = (cloudData && cloudData[getKey('Status', dp.dpId)] && remainingTime >= -1000) ? remainingTime : Number(progress.toString().slice(0, -3) + "000")
-            const conversion = (time / 1000) / cloudProgressNumber * 100
-            setProgressNumber(!isNaN(conversion) ? conversion : 0)
-        }
-    }, [progress])
-
-    useEffect(() =>{
-        if(countdown === 0 && cloudData){
-            setProgress(0)
-            setProgressNumber(0)
-            setCloudData('')
-            NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: false, [getKey('StartTime', dp.dpId)]: '', progressAllNumber: 0 }))
-        }
-
-        if(countdown === 0 && !cloudData){
-            setProgress(0)
-            setProgressNumber(0)
-        }
-
-        if(countdown > 0 && !cloudData){
-            getCloudJson()
-        }
-    }, [countdown, cloudData])
-
-    const getKey = (suffix:string, dpId:string) =>{
-            const key = dpId + suffix
-            return key
-    }
-
-    const startTimer = (time: number, t) => {
-        setCloudProgressNumber(time)
-        setProgress(Date.now() + time * 1000)
-        NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: true, [getKey('StartTime', dp.dpId)]: t, progressAllNumber: time }));
-    }
-
-    return [progressNumber, startTimer]
-}
-
-export const useProgress = (dps: dpItem[], cancelTimer) =>{
-    return dps.map(dp => ({
-        progressHook: useFormateProgress(dp, cancelTimer),
-        ...dp
-    }))
-}
+import { useDeviceId, useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
+import { Result } from "@ledvance/base/src/models/modules/Result"
+import { dpItem } from "./TimerPage"
+import { useCountDown as useCountDownAHook } from 'ahooks'
+import dayjs from "dayjs"
+import { NativeApi } from "@ledvance/base/src/api/native"
+import { useEffect, useState } from "react"
+
+export const useCountdowns= (dps: dpItem[]) =>{
+    return dps.map(dp => {
+        return ({
+            countdown: useDp<number,(value:number)=>Promise<Result<any>>>(dp.dpId),
+            enable: useDp<boolean, (value:boolean)=>Promise<Result<any>>>(dp.enableDp),
+            ...dp
+        })
+    })
+}
+
+
+const useFormateProgress : (dp: dpItem, func: Function) => [number, (time: number, t: any) => void]= (dp, cancelTimer) =>{
+    const [progress, setProgress] = useCountDownAHook({
+        interval: 1000,
+        onEnd: () => cancelTimer(dp.dpId),
+    })
+    const [countdown] = useDp<number,(value:number)=>Promise<Result<any>>>(dp.dpId)
+    const devId = useDeviceId()
+    const [cloudProgressNumber, setCloudProgressNumber] = useState(0)
+    const [progressNumber, setProgressNumber] = useState(0)
+    const [cloudData, setCloudData] = useState<any>()
+    const getCloudJson = () =>{
+        NativeApi.getJson(devId, dp.cloudKey).then(res =>{
+            if(res.success && res.data){
+                const result = JSON.parse(res.data)
+                setCloudData(result)
+                setCloudProgressNumber(result.progressAllNumber)
+                if(countdown > 0) setProgress(Date.now() + countdown * 1000)
+            }
+        })
+    }
+    useEffect(() =>{
+        getCloudJson()
+    }, [])
+
+    useEffect(() =>{
+        if(cloudProgressNumber > 0){
+            const currentTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+            const remainingTime = Number(cloudData && dayjs(cloudData[getKey('StartTime', dp.dpId)] || 0).diff(currentTime))
+            const time = (cloudData && cloudData[getKey('Status', dp.dpId)] && remainingTime >= -1000) ? remainingTime : Number(progress.toString().slice(0, -3) + "000")
+            const conversion = (time / 1000) / cloudProgressNumber * 100
+            setProgressNumber(!isNaN(conversion) ? conversion : 0)
+        }
+    }, [progress])
+
+    useEffect(() =>{
+        if(countdown === 0 && cloudData){
+            setProgress(0)
+            setProgressNumber(0)
+            setCloudData('')
+            NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: false, [getKey('StartTime', dp.dpId)]: '', progressAllNumber: 0 }))
+        }
+
+        if(countdown === 0 && !cloudData){
+            setProgress(0)
+            setProgressNumber(0)
+        }
+
+        if(countdown > 0 && !cloudData){
+            getCloudJson()
+        }
+    }, [countdown, cloudData])
+
+    const getKey = (suffix:string, dpId:string) =>{
+            const key = dpId + suffix
+            return key
+    }
+
+    const startTimer = (time: number, t) => {
+        setCloudProgressNumber(time)
+        setProgress(Date.now() + time * 1000)
+        NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: true, [getKey('StartTime', dp.dpId)]: t, progressAllNumber: time }));
+    }
+
+    return [progressNumber, startTimer]
+}
+
+export const useProgress = (dps: dpItem[], cancelTimer) =>{
+    return dps.map(dp => ({
+        progressHook: useFormateProgress(dp, cancelTimer),
+        ...dp
+    }))
+}

package/tsconfig.json

@@ -1,51 +1,51 @@
-{
-    "compilerOptions": {
-        /* Basic Options */
-        "target": "ES2017",
-        /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
-        "module": "commonjs",
-        /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-        "jsx": "react",
-        /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-
-        /* Strict Type-Checking Options */
-        /* "strict": true                         /* Enable all strict type-checking options. */
-        "noImplicitAny": false,
-        /* Raise error on expressions and declarations with an implied 'any' type. */
-        "strictNullChecks": true,
-        /* Enable strict null checks. */
-
-        /* Additional Checks */
-        "noUnusedLocals": true,
-        /* Report errors on unused locals. */
-        "noUnusedParameters": true,
-        /* Report errors on unused parameters. */
-
-        /* .d.ts config */
-        "declaration": true,
-        "emitDeclarationOnly": true,
-
-        /* Module Resolution Options */
-        "moduleResolution": "node",
-        /* Specify module resolution strategy: 'node' (Node.js) or 'classic'  */
-        "types": ["react", "react-native"],
-        /* Type declaration files to be included in compilation. */
-        "typeRoots": ["@types/*.d.ts"],
-        "allowSyntheticDefaultImports": true,
-        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-        "esModuleInterop": true,
-        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-        "baseUrl": "./src",
-        "paths": {
-            "@api": ["./api"],
-            "@components": ["./components"],
-            "@config": ["./config"],
-            "@i18n": ["./i18n"],
-            "@models": ["./models"],
-            "@res": ["./res"],
-            "@utils": ["./utils"]
-        }
-    },
-    "include": ["src/**/*.ts","src/**/*.tsx"],
-    "exclude": ["node_modules",".yalc"]
+{
+    "compilerOptions": {
+        /* Basic Options */
+        "target": "ES2017",
+        /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+        "module": "commonjs",
+        /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+        "jsx": "react",
+        /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+
+        /* Strict Type-Checking Options */
+        /* "strict": true                         /* Enable all strict type-checking options. */
+        "noImplicitAny": false,
+        /* Raise error on expressions and declarations with an implied 'any' type. */
+        "strictNullChecks": true,
+        /* Enable strict null checks. */
+
+        /* Additional Checks */
+        "noUnusedLocals": true,
+        /* Report errors on unused locals. */
+        "noUnusedParameters": true,
+        /* Report errors on unused parameters. */
+
+        /* .d.ts config */
+        "declaration": true,
+        "emitDeclarationOnly": true,
+
+        /* Module Resolution Options */
+        "moduleResolution": "node",
+        /* Specify module resolution strategy: 'node' (Node.js) or 'classic'  */
+        "types": ["react", "react-native"],
+        /* Type declaration files to be included in compilation. */
+        "typeRoots": ["@types/*.d.ts"],
+        "allowSyntheticDefaultImports": true,
+        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+        "esModuleInterop": true,
+        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+        "baseUrl": "./src",
+        "paths": {
+            "@api": ["./api"],
+            "@components": ["./components"],
+            "@config": ["./config"],
+            "@i18n": ["./i18n"],
+            "@models": ["./models"],
+            "@res": ["./res"],
+            "@utils": ["./utils"]
+        }
+    },
+    "include": ["src/**/*.ts","src/**/*.tsx"],
+    "exclude": ["node_modules",".yalc"]
 }