@ledvance/base 1.2.38 → 1.2.39

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.2.38",
+  "version": "1.2.39",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/components/DrawToolView.tsx

@@ -84,7 +84,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
   }, [props.ledNum])
 
   useUpdateEffect(() =>{
-    state.visible = props.ledNumModalVisible
+    state.visible = props.ledNumModalVisible || false
   }, [props.ledNumModalVisible])
 
   const onLayout = (event: any) => {
@@ -103,7 +103,11 @@ const DrawToolView = (props: DrawToolViewProps) => {
     }
     return '#ffffff'
   }, [props.isColorMode, props.h, props.s])
-  
+
+  const ledNumValidator = (num?: number) => {
+    return num && Number.isInteger(num) && num >= 5 && num <= 48;
+  }
+
   return (
     <Card style={{ marginHorizontal: cx(24) }}>
       <LdvSwitch
@@ -216,10 +220,10 @@ const DrawToolView = (props: DrawToolViewProps) => {
             <Spacer />
             <DeleteButton
               text={I18n.getLang('auto_scan_system_wifi_confirm')}
-              style={{ width: cx(150), height: cx(40), backgroundColor: (state.ledNum < 5 || state.ledNum > 48) ? '#666' : '#f60' }}
+              style={{ width: cx(150), height: cx(40), backgroundColor: ledNumValidator(state.ledNum) ? '#f60' : '#666' }}
               textStyle={{ fontSize: cx(14) }}
               onPress={() => {
-                if(state.ledNum < 5 || state.ledNum > 48) return
+                if (!ledNumValidator(state.ledNum)) return
                 props.setLedNum(state.ledNum)
                 state.visible = false
               }} />
@@ -254,4 +258,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default DrawToolView
+export default DrawToolView

package/src/utils/common.ts

@@ -4,7 +4,9 @@ import { formatNumber, openDownloadFile } from 'api/native'
 import dayjs from 'dayjs'
 import RNFetchBlob from 'rn-fetch-blob'
 import { isEqual } from 'lodash'
-import { Dialog } from 'tuya-panel-kit'
+import { Dialog, Utils } from 'tuya-panel-kit'
+
+const { toFixedString } = Utils.NumberUtils
 
 const loopsText = [
   I18n.getLang('timeschedule_add_schedule_weekday7_text'),
@@ -313,19 +315,21 @@ export function convertTo12HourFormat(time24: string) {
 }
 
 // 将分钟数转换为12小时制时间
-export function convertMinutesTo12HourFormat(minutes: number) {
-  var hours = Math.floor(minutes / 60); // 获取小时数
-  var mins = minutes % 60; // 获取剩余分钟数
-
+export function convertMinutesTo12HourFormat(minutes: number, is24: boolean) {
+  let hours = Math.floor(minutes / 60); // 获取小时数
+  const mins = minutes % 60; // 获取剩余分钟数
+  if(is24){
+    return `${toFixedString(hours, 2)}:${toFixedString(mins, 2)}`
+  }
   // 检查小时数是否大于12，并调整
   if (hours > 12) {
     hours -= 12;
   }
 
   // 构造12小时制时间字符串
-  var suffix = (hours >= 12) ? I18n.getLang('manage_user_calendar_label_pm') : I18n.getLang('manage_user_calendar_label_am');
+  const suffix = (hours >= 12) ? I18n.getLang('manage_user_calendar_label_pm') : I18n.getLang('manage_user_calendar_label_am');
   hours = (hours == 0) ? 12 : hours; // 处理午夜0点为12小时制的12点
-  var time12Hour = suffix + ' ' + hours + ':' + (mins < 10 ? '0' : '') + mins;
+  const time12Hour = suffix + ' ' + hours + ':' + (mins < 10 ? '0' : '') + mins;
 
   return time12Hour;
 }