@ledvance/ui-biz-bundle 1.0.8 → 1.0.10

package/package.json

@@ -4,10 +4,10 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "scripts": {},
   "dependencies": {
-    "@ledvance/base": "^1.1.19",
+    "@ledvance/base": "^1.x",
     "@reduxjs/toolkit": "^1.8.6",
     "@tuya/tuya-panel-api": "^1.12.0",
     "@tuya/tuya-panel-lamp-sdk": "^1.14.1",

package/src/{modules/hooks → hooks}/DeviceDpStateHooks.ts

@@ -1,9 +1,16 @@
 import { NativeApi } from "@ledvance/base/src/api/native"
+import { useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
+import { Result } from "@ledvance/base/src/models/modules/Result"
 export const WHITE = 'white'
 export const COLOUR = 'colour'
 export const SCENE = 'scene'
 export const MUSIC = 'music'
 
+export const modeOptions = [
+    {label: 'Classic', value: 'normal'},
+    {label: 'Nature', value: 'nature'},
+]
+
 export const setBiorhythmDp = (deviceId: string, value: string, dpCodes: Record<string, string>) => {
     return NativeApi.setDp(deviceId, dpCodes.rhythm_mode, value)
 }
@@ -24,4 +31,8 @@ export const setSceneDp = (deviceId: string, value: string, dpCodes: Record<stri
 
 export const setMixSceneDp = (deviceId: string, value: string, dpCodes: Record<string, string>) => {
     return NativeApi.setDps(deviceId, { [dpCodes.work_mode]: 'scene', [dpCodes.mix_light_scene]: value })
-}
+}
+
+export const useWorkMode = (dpCodes: Record<string,string>): [string, (mode: string) => Promise<Result<any>>] => {
+    return useDp(dpCodes.work_mode);
+  }

package/src/modules/history/HistoryPage.tsx

@@ -15,7 +15,7 @@ import Tag from "@ledvance/base/src/components/Tag"
 const cx = Utils.RatioUtils.convertX
 
 type SwitchHistoryPageRouteParams = {
-    params: { dpIds: string[], tags?: object }
+    params: { dpIds: string[], tags?: object, headlineText: string, backText?: string, stringOff?:string, stringOn?: string, showLimit?: boolean, actionKey?:string}
 }
 
 type Props = {
@@ -24,7 +24,7 @@ type Props = {
 
 const SwitchHistoryPage = () => {
     const deviceInfo = useDeviceInfo()
-    const { dpIds, tags } = useRoute<Props['route']>().params
+    const { dpIds, tags ,headlineText, backText, stringOff, stringOn, actionKey, showLimit  } = useRoute<Props['route']>().params
 
     const state = useReactive<SwitchHistoryPageState>({
         refreshing: true,
@@ -68,7 +68,7 @@ const SwitchHistoryPage = () => {
 
 
     useEffect(() => {
-        getSwitchHistoryData(deviceInfo.devId, getRequestIds(), state.dataOffset)
+        getSwitchHistoryData(deviceInfo.devId, getRequestIds(), state.dataOffset,  100, stringOn, stringOff, actionKey, showLimit)
             .then(res => {
                 state.refreshing = false
                 state.data = res.data
@@ -79,8 +79,8 @@ const SwitchHistoryPage = () => {
 
     return (
         <Page
-            backText={deviceInfo.name}
-            headlineText={I18n.getLang('history_socket_headline_text')}
+            backText={backText || deviceInfo.name}
+            headlineText={headlineText || I18n.getLang('history_socket_headline_text')}
             headlineIcon={res.rn_ic_download}>
             <View style={styles.content}>
                 <Text style={styles.titleText}>{I18n.getLang('history_contact_sensor_description_text')}</Text>

package/src/modules/history/SwitchHistoryPageActions.ts

@@ -1,7 +1,9 @@
 import { getDpReportSataData, PagingResult } from '@ledvance/base/src/models/TuyaApi'
-import { groupBy, isEqual, uniqWith } from 'lodash'
+import { cloneDeep, groupBy, isEqual, uniqWith } from 'lodash'
 import dayjs from 'dayjs'
 import I18n from '@ledvance/base/src/i18n'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration)
 export interface SwitchHistoryUIItemData {
     title: string
     actions: SwitchHistoryUIItemActionData[]
@@ -24,17 +26,38 @@ export interface SwitchHistoryUIItemActionData {
     dpId: string
 }
 
-type getSwitchHistoryDataFunType = (deviceId: string, dpIds: string[], offset: number, limit?: number) => Promise<PagingResult<SwitchHistoryUIItemData[]>>
+const formateLimitTime = (time: number) =>{
+    const duration = dayjs.duration(time * 1000);
+    const hours = duration.hours();
+    const minutes = duration.minutes();
+    const seconds = duration.seconds();
+    const hoursString = ` ${hours}h ${minutes}min ${seconds}sec`
+    const minutesString = ` ${minutes}min ${seconds}sec`
+    const secondsString = ` ${seconds}sec`
+    const v = hours > 0 ? hoursString : (hours > 0 || minutes > 0) ? minutesString : secondsString
+    return v
+    // return ` ${hours > 0 ? hours + 'h' : ''} ${(minutes > 0 || hours > 0) ? minutes + 'min' : ''} ${seconds}sec`
+}
+
+type getSwitchHistoryDataFunType = (deviceId: string, dpIds: string[], offset: number, limit?: number, stringOn?:string, stringOff?:string, actionKey?:string, showLimit?:boolean) => Promise<PagingResult<SwitchHistoryUIItemData[]>>
 
-export const getSwitchHistoryData: getSwitchHistoryDataFunType = async (deviceId: string, dpIds: string[], offset: number, limit: number = 100) => {
+export const getSwitchHistoryData: getSwitchHistoryDataFunType = async (deviceId: string, dpIds: string[], offset: number, limit: number = 100, stringOn, stringOff, actionKey, showLimit) => {
     const res = await getDpReportSataData(deviceId, dpIds, 0, offset + limit)
     const uniqData = uniqWith(res.dps, isEqual)
-    const dateActionsMap = groupBy(uniqData.map(dpData => {
+    const reverseData = cloneDeep(uniqData).reverse()
+    const limitTimeData = reverseData.map((item, idx) =>{
+        return {
+            ...item,
+            limitTime: reverseData[idx + 1] ? formateLimitTime(reverseData[idx + 1].timeStamp - item.timeStamp) : ''
+        }
+    })
+    const key = actionKey || 'true'
+    const dateActionsMap = groupBy(limitTimeData.reverse().map(dpData => {
         const dayjsDate = dayjs(dpData.timeStr)
         return {
             date: `${dayjsDate.format('DD/MM/YYYY')} (${weekList[dayjsDate.format('ddd')]})`,
             time: dayjsDate.format('HH:mm:ss'),
-            action: I18n.formatValue(dpData.value === 'true' ? 'history_powerstrip_field1_text' : 'history_powerstrip_field1_text2', '', ''),
+            action: I18n.formatValue(dpData.value === key ? (stringOn || 'history_powerstrip_field1_text') : (stringOff || 'history_powerstrip_field1_text2'), '', showLimit ? dpData.limitTime : ''),
             dpId: dpData.dpId,
         }
     }), 'date')