@ledvance/group-ui-biz-bundle 1.0.25 → 1.0.26

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/group-ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/timer/TimerAction.ts

@@ -1,8 +1,9 @@
-import { useFeatureHook } from '@ledvance/base/src/models/modules/NativePropsSlice'
-import { Result } from '@ledvance/base/src/models/modules/Result'
+import {useFeatureHook} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {Result} from '@ledvance/base/src/models/modules/Result'
 import dayjs from 'dayjs'
-import { useCountDown, useReactive } from 'ahooks'
-import { useEffect, useMemo } from 'react'
+import {useCountDown, useReactive} from 'ahooks'
+import {useEffect, useMemo} from 'react'
+import {I18nKey} from "../../../.yalc/@ledvance/base/src/i18n/index";
 
 export interface TimerTask {
   name: string
@@ -15,8 +16,8 @@ export interface TimerTask {
     enable: boolean
   }
   status: TaskStatus
-  stringOn: string
-  stringOff: string
+  stringOn: I18nKey
+  stringOff: I18nKey
 }
 
 export enum TaskStatus {
@@ -154,14 +155,21 @@ export interface TimerSettableDp {
     code: string
     enable: boolean
   }
-  stringOn: string
-  stringOff: string
+  stringOn: I18nKey
+  stringOff: I18nKey
 }
 
 export interface TimerPageParams {
   timerSettableDps: TimerSettableDp[]
 }
 
+export function timeFormatToRealTime(mCountdown: number) {
+  const date = new Date()
+  const now = date.getTime()
+  const after = new Date(now + mCountdown * 1000)
+  return `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
+}
+
 export function timeFormat(time: number): string {
   let hour = Math.trunc(time / 3600)
   const beforeMin = (time % 3600) / 60

package/src/modules/timer/TimerPage.tsx

@@ -8,7 +8,7 @@ import LdvPickerView from '@ledvance/base/src/components/ldvPickerView'
 import { useReactive } from 'ahooks'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
-import { TaskStatus, timeFormat, TimerPageParams, TimerTask, useTimerTasks } from './TimerAction'
+import {TaskStatus, timeFormat, timeFormatToRealTime, TimerPageParams, TimerTask, useTimerTasks} from './TimerAction'
 import { cloneDeep, groupBy } from 'lodash'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import GroupBizRes from '../../res/GroupBizRes'
@@ -188,7 +188,7 @@ const TimerPage = () => {
                   </View>
                   <Spacer height={cx(32)}/>
                   <Text
-                      style={[styles.activeTaskDesc, { textAlign: 'center' }]}>{I18n.formatValue(startedTasks[0].dp.enable ? startedTasks[0].stringOff : startedTasks[0].stringOn, timeFormat(startedTasks[0].timeLeft))}</Text>
+                      style={[styles.activeTaskDesc, { textAlign: 'center' }]}>{I18n.formatValue(startedTasks[0].dp.enable ? startedTasks[0].stringOff : startedTasks[0].stringOn, timeFormatToRealTime(startedTasks[0].timeLeft))}</Text>
                   <Spacer height={cx(32)}/>
                   <TextButton
                       text={I18n.getLang('auto_scan_system_cancel')}
@@ -241,7 +241,7 @@ function ActiveTimerItem(task: TimerTask, onCancel: () => void) {
       <Spacer/>
       <View style={{ marginHorizontal: cx(20) }}>
         <Text style={styles.activeTaskDesc}>{
-          I18n.formatValue(task.dp.enable ? task.stringOff : task.stringOn, timeFormat(task.timeLeft))
+          I18n.formatValue(task.dp.enable ? task.stringOff : task.stringOn, timeFormatToRealTime(task.timeLeft))
         }</Text>
       </View>
       <Spacer height={cx(22)}/>
@@ -339,7 +339,7 @@ const styles = StyleSheet.create({
     fontSize: cx(14),
   },
   activeTasBtn: {
-    width: cx(75),
+    width: 'auto',
     height: cx(36),
     padding: 0,
     backgroundColor: '#666',