@ledvance/base 1.1.47 → 1.1.49

package/package.json

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

package/src/api/native.ts

@@ -319,8 +319,8 @@ export const queryDpIds = (dpIds: string, deviceId: string) => {
   })
 }
 
-export const formatNumber: (num: number, fixed: number, isCN: boolean) => string = (num, fixed, isCN: boolean = false) => {
-  const res = devicePanel.formatNumber(num, fixed, isCN)
+export const formatNumber: (num: number, fixed: number, shoGroup?: boolean) => string = (num, fixed, shoGroup: boolean = true) => {
+  const res = devicePanel.formatNumber(num, fixed, shoGroup)
   log(`formatNumber: num=${num}, fixed=${fixed}, res=${res}`)
   return res
 }

package/src/models/modules/NativePropsSlice.tsx

@@ -186,7 +186,7 @@ const useDeviceInfo: () => DevInfo<DpState> = () => {
 const useTimeSchedule = (): [v: boolean | undefined, f: any] => {
   const dps = useSelector(store => store.ldvModules.timeSchedule)
   const dispatch = useDispatch()
-  const setTimeScheduleFn = (value: Symbol) => {
+  const setTimeScheduleFn = (value: boolean) => {
     dispatch(setTimeSchedule(value))
   }
   return [dps, setTimeScheduleFn]

package/src/utils/common.ts

@@ -86,22 +86,29 @@ if (Platform.OS === 'ios') {
 }
 
 // 德国数字格式化
-export const localeNumber = (v: number | string, fixed?: number) => {
+export const localeNumber = (v: number | string, fixed?: number, showGroup?: boolean) => {
   const mFixed = fixed || 2
   const n = isNaN(Number(v)) ? 0 : Number(v)
-  const num = Number(n.toFixed(mFixed))
   try {
-    if (Platform.OS === 'android') return formatNumber(n, mFixed)
+    if (Platform.OS === 'android') return formatNumber(n, mFixed, showGroup)
     let local = defaultLocale
     if (defaultLocale !== 'pt_BR' && defaultLocale !== 'pt-BR') {
       local = defaultLocale.split('_')[0]
     }
-    return new Intl.NumberFormat(local).format(num)
+    return new Intl.NumberFormat(local, {
+      useGrouping: showGroup !== undefined ? showGroup : true,
+      maximumFractionDigits: mFixed
+    }).format(n)
   } catch (_) {
-    return num
+    return n
   }
 }
 
+// 转换成国际数字
+export const exchangeNumber = (v: number | string) => {
+  return v.toString().replace(/[\,]/g, '.')
+}
+
 
 // 导出文件
 export const exportFile = (list) => {

package/.temp/uaDevInfo.txt

@@ -1,51 +0,0 @@
-    @ColumnInfo(name = "device_id")
-    val deviceId: String,
-    @ColumnInfo(name = "device_name")
-    val deviceName: String,
-    @ColumnInfo(name = "cat_id")
-    val catId: String,
-    @ColumnInfo(name = "channel_no")
-    val channelNo: Int,
-    @ColumnInfo(name = "device_category")
-    val deviceCategory: String,
-    @ColumnInfo(name = "device_image")
-    val deviceImage: String,
-    @ColumnInfo(name = "tuya_device_id")
-    val tuyaDeviceId: String,
-    // deviceType 对应 ProductInfo 的 productId
-    @ColumnInfo(name = "device_type")
-    val deviceType: String,
-    @ColumnInfo(name = "offline_time")
-    val offlineTime: String,
-    @ColumnInfo(name = "rn_package")
-    val rnPackage: String?,
-    @ColumnInfo(name = "status")
-    val status: Int,
-    @ColumnInfo(name = "create_time")
-    val createTime: String,
-    @ColumnInfo(name = "version")
-    val version: String,
-    @ColumnInfo(name = "user_id")
-    val userId: String,
-    @ColumnInfo(name = "family_id")
-    val familyId: Long,
-    @ColumnInfo(name = "room_id")
-    val roomId: Long,
-    @ColumnInfo(name = "room_name")
-    val roomName: String,
-    @ColumnInfo(name = "is_shared")
-    val isShared: Int,
-    @ColumnInfo(name = "local_index")
-    val localIndex: String,
-    @ColumnInfo(name = "resource_category")
-    val resourceCategory: String,
-    @ColumnInfo(name = "resource_id")
-    val resourceId: String,
-    @ColumnInfo(name = "resource_identifier")
-    val resourceIdentifier: String,
-    @ColumnInfo(name = "resource_type")
-    val resourceType: Int,
-    @ColumnInfo(name = "index")
-    val index: Int = 0,
-    @ColumnInfo(name = "switch_state")
-    val switchState: Boolean = true