@ledvance/ui-biz-bundle 1.1.122 → 1.1.124

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -117,12 +117,12 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     }
     if ((mode === 'edit' && sleepWakeUp.enable) || mode === 'add') {
       let sleepConflict = false
-      let wakeUpConflict = false  
+      let wakeUpConflict = false
       const cloneSleepPlan = isSleep ? cloneSleepWakeUp : cloneDeep(sleepList)
       const cloneWakeUpPlan = isSleep ? cloneDeep(wakeUpList) : cloneSleepWakeUp
       const currentSleepWakeUp = {
-        ...sleepWakeUp, 
-        startTime: getStartTime(sleepWakeUp), 
+        ...sleepWakeUp,
+        startTime: getStartTime(sleepWakeUp),
         endTime: getEndTime(sleepWakeUp)
       }
       const newSleepList = cloneSleepPlan.map((item, idx) => {
@@ -132,11 +132,11 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
           startTime: getStartTime(item),
           endTime: getEndTime(item)
         }, currentSleepWakeUp)){
-          sleepConflict = true 
-          item.enable = false 
-          return item 
+          sleepConflict = true
+          item.enable = false
+          return item
         }
-        return item 
+        return item
       })
       const newWakeUpList = cloneWakeUpPlan.map((item, idx) => {
         const itself = !isSleep ? (mode === 'add' ? (idx === cloneWakeUpPlan.length - 1) : sleepWakeUp.id === item.id) : !isSleep
@@ -145,11 +145,11 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
           startTime: getStartTime(item),
           endTime: getEndTime(item)
         }, currentSleepWakeUp)){
-          wakeUpConflict = true 
-          item.enable = false 
-          return item 
+          wakeUpConflict = true
+          item.enable = false
+          return item
         }
-        return item 
+        return item
       })
       const isConflict = checkConflict(currentSleepWakeUp) || sleepConflict || wakeUpConflict
       if (isConflict) {
@@ -161,7 +161,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
             onConfirm: async (_, { close }) => {
               close()
               resolveConflict()
-              const res = isSleep ? await setSleepList(newSleepList) : await setWakeUpList(newWakeUpList) 
+              const res = isSleep ? await setSleepList(newSleepList) : await setWakeUpList(newWakeUpList)
               if (isSleep) {
                 if (wakeUpConflict){
                   setWakeUpList(newWakeUpList).then()
@@ -179,7 +179,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
             },
             onCancel: () => {
               resolve({
-                success: false 
+                success: false
               })
               Dialog.close()
             }
@@ -437,7 +437,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
             <Spacer height={cx(70)} />
             <Image
               style={styles.emptyImage}
-              source={res.scheduleEmpty}
+              source={{uri: res.schedule_empty}}
               resizeMode="contain" />
             <Spacer height={cx(20)} />
             <View style={styles.emptyText}>
@@ -492,7 +492,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
             isMax: isWakeUpMax
           },
         ]}
-        onItemPress={(isSleep) => onAddScheduleDialogItemClick(isSleep, 'add', getNewSleepWakeUp(isSleep, params, isSleep ? sleepList.length + 1 : wakeUpList.length + 1))}
+        onItemPress={(isSleep) => onAddScheduleDialogItemClick(isSleep, 'add', getNewSleepWakeUp(isSleep, params))}
       />
     </>
   )

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -411,7 +411,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
                     >
                       <Image
                         style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
-                        source={res.ic_arrows_nav_clear}
+                        source={{ uri: res.ic_arrows_nav_clear}}
                       />
                     </TouchableOpacity>
                   )}
@@ -432,7 +432,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
                 <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{item.key}</Text>
                 <Image
                   style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
-                  source={res.device_panel_timer_add}
+                  source={{ uri: res.device_panel_timer_add}}
                 />
               </TouchableOpacity>
             );

package/src/modules/biorhythm/BiorhythmActions.d.ts

@@ -1,8 +0,0 @@
-import { BiorhythmBean } from './BiorhythmBean';
-import { Result } from '@ledvance/base/src/models/modules/Result';
-type UseBiorhythmType = (dpKey: string) => [BiorhythmBean, SetBiorhythmType];
-type SetBiorhythmType = (deviceId: string, biorhythmObj: BiorhythmBean) => Promise<Result<any>>;
-export declare const useBiorhythm: UseBiorhythmType;
-export declare const userOperation: (deviceId: string, value: boolean) => Promise<any>;
-export declare function dp2Obj(dp: string): BiorhythmBean;
-export {};

package/src/modules/biorhythm/BiorhythmActions.ts

@@ -1,324 +0,0 @@
-import {
-  BiorhythmBean,
-  BiorhythmGradientType,
-  BiorhythmGradientTypeMap,
-  BiorhythmGradientTypeMap2,
-  colorTemperatureValue,
-  colorTempPercent,
-  getDefRepeatPeriod,
-  Period,
-  Plan,
-  RemoteBiorhythmBean,
-} from './BiorhythmBean'
-import {useDispatch} from 'react-redux'
-import {Dispatch, useEffect, useState} from 'react'
-import {NativeResult, Result} from '@ledvance/base/src/models/modules/Result'
-import {asyncSetDps, useDeviceId, useDp} from '@ledvance/base/src/models/modules/NativePropsSlice'
-import {getFeature, NativeApi, putFeature} from '@ledvance/base/src/api/native'
-import {setBiorhythmDp} from '../../hooks/DeviceDpStateHooks'
-import {hex2Int, spliceByStep} from '@ledvance/base/src/utils/common'
-import I18n from '@ledvance/base/src/i18n'
-import BiologicalRes from './res/BiologicalRes'
-import dayjs from 'dayjs'
-
-type UseBiorhythmType = (dpKey: string) => [BiorhythmBean, SetBiorhythmType];
-type SetBiorhythmType = (deviceId: string, biorhythmObj: BiorhythmBean) => Promise<Result<any>>;
-let rhythmTimer: undefined | number = undefined
-export const useBiorhythm: UseBiorhythmType = (dpKey: string) => {
-  const [dp] = useDp<string, any>(dpKey)
-  const deviceId = useDeviceId()
-  const [biorhythmState, setBiorhythmState] = useState(dp2Obj(dp))
-  useEffect(() => {
-    rhythmTimer = setTimeout(() =>{
-      getRemoteBiorhythm(deviceId, biorhythmState).then(res => {
-        if (res.success && res.data) {
-          setBiorhythmState(dto2Vo(res.data))
-        }
-      })
-    }, 400)
-    return () =>{
-      if(rhythmTimer) clearTimeout(rhythmTimer)
-    }
-  }, [dp])
-  return [biorhythmState, setBiorhythm(useDispatch(), dpKey)]
-}
-
-const biorhythmFeatureId = 'Biorhythm'
-
-async function getRemoteBiorhythm(deviceId: string, defBiorhythmState: BiorhythmBean): Promise<Result<RemoteBiorhythmBean>> {
-  const res: NativeResult<RemoteBiorhythmBean> = await getFeature(deviceId, biorhythmFeatureId)
-  if (!(!!res.data)) {
-    const defData = vo2Dto(defBiorhythmState)
-    const pushRes = await putFeature(deviceId, biorhythmFeatureId, defData)
-    if (pushRes.result) {
-      return getRemoteBiorhythm(deviceId, defBiorhythmState)
-    }
-    return {
-      success: false,
-      msg: pushRes.msg,
-    }
-  }
-  return {
-    success: true,
-    data: res.data,
-  }
-}
-
-const setBiorhythm = (dispatch: Dispatch<any>, dpKey: string) => (deviceId: string, biorhythmObj: BiorhythmBean) =>
-  asyncSetDps(dispatch, async () => {
-    const dpValue = obj2Dp(biorhythmObj)
-    const putFeatureRes = await putFeature(deviceId, biorhythmFeatureId, vo2Dto(biorhythmObj))
-    if (putFeatureRes.result) {
-      const controlResult: any = await setBiorhythmDp(deviceId, dpKey, dpValue)
-      return {
-        result: {success: controlResult.result},
-        dps: {[dpKey]: dpValue},
-      }
-    }
-    return {
-      result: {success: false},
-    }
-  })
-
-export const userOperation = async (deviceId: string, value: boolean) => {
-  const currentTime = dayjs().format('YYYY-MM-DD')
-  const json = JSON.stringify({status: value, suspendTime: value && currentTime || ''})
-  return await NativeApi.putJson(deviceId, 'suspendTime', json)
-}
-
-export function dp2Obj(dp: string): BiorhythmBean {
-  if (!dp || dp === '0000000000') {
-    return dp2Obj('0000007f0501060000000000000001061e00000000141901090000000000646401140000000000503201171e000000000000')
-  }
-  let dpCopy = dp
-  // 版本
-  hex2Int(dpCopy.slice(0, 2))
-  dpCopy = dpCopy.slice(2)
-  // 开关
-  const enable = hex2Int(dpCopy.slice(0, 2)) === 1
-  dpCopy = dpCopy.slice(2)
-  // 模式：00 全程渐变，0F 直接渐变
-  const gradient =
-    dpCopy.slice(0, 2).toLowerCase() === '00'
-      ? BiorhythmGradientType.EntireGradient
-      : BiorhythmGradientType.DirectGradient
-  dpCopy = dpCopy.slice(2)
-  // 重复周期
-  const repeatPeriod: Period[] = hex2Int(dpCopy.slice(0, 2))
-    .toString(2)
-    .padStart(7, '0')
-    .split('')
-    .reverse()
-    .map((p, index) => {
-      return {
-        index: index === 0 ? 7 : index,
-        title: getRepeatPeriodTitleByIndex(index),
-        enabled: p === '1',
-      }
-    })
-  dpCopy = dpCopy.slice(2)
-  // 节点个数 (每个节点长度18)，最多8个节点
-  hex2Int(dpCopy.slice(0, 2))
-  dpCopy = dpCopy.slice(2)
-  // 节点列表
-  const planList: Plan[] = dpCopy === '00' ? [] : spliceByStep(dpCopy, 18).map((planHex, index) => {
-    let hex = planHex
-    // 节点开关
-    const enable = hex2Int(hex.slice(0, 2)) === 1
-    hex = hex.slice(2)
-    // 小时
-    const hour = hex2Int(hex.slice(0, 2)).toString().padStart(2, '0')
-    hex = hex.slice(2)
-    // 分钟
-    const minute = hex2Int(hex.slice(0, 2)).toString().padStart(2, '0')
-    hex = hex.slice(2)
-    const startTime = `${hour}:${minute}`
-    // 色调 (色相)
-    hex2Int(hex.slice(0, 4))
-    hex = hex.slice(4)
-    // 饱和度
-    hex2Int(hex.slice(0, 2))
-    hex = hex.slice(2)
-    // 明度
-    hex2Int(hex.slice(0, 2))
-    hex = hex.slice(2)
-    // 亮度
-    const brightness = hex2Int(hex.slice(0, 2))
-    hex = hex.slice(2)
-    // 色温
-    const colorTemperature = hex2Int(hex.slice(0, 2))
-    return {
-      id: index,
-      enable: enable,
-      icon: getNodeIconByIndex(index),
-      startTime: startTime,
-      name: getNodeNameByIndex(index),
-      colorTemperature: colorTemperature,
-      brightness: brightness,
-      action: [
-        {
-          uri: 'model/attribute/set/LightCtrl/ColorTemperature',
-          startValue: `${colorTemperatureValue(colorTemperature)}`,
-        },
-        {
-          uri: 'model/attribute/set/LightCtrl/Brightness',
-          startValue: `${brightness}`,
-        },
-      ],
-    }
-  })
-  return {
-    enable: enable,
-    gradient: gradient,
-    repeatPeriod: repeatPeriod,
-    planList: planList,
-  }
-}
-
-function getNodeNameByIndex(index: number): string {
-  switch (index) {
-    case 0:
-      return I18n.getLang('bio_ryhthm_default_field_text')
-    case 1:
-      return I18n.getLang('bio_ryhthm_default_field_text2')
-    case 2:
-      return I18n.getLang('bio_ryhthm_default_field_text3')
-    case 3:
-      return I18n.getLang('bio_ryhthm_default_field_text4')
-    case 4:
-      return I18n.getLang('bio_ryhthm_default_field_text5')
-    default:
-      return `Node ${index + 1}`
-  }
-}
-
-function getNodeIconByIndex(index: number): string {
-  switch (index) {
-    case 0:
-      return BiologicalRes.rhythm_icon1
-    case 1:
-      return BiologicalRes.rhythm_icon2
-    case 2:
-      return BiologicalRes.rhythm_icon3
-    case 3:
-      return BiologicalRes.rhythm_icon4
-    case 4:
-      return BiologicalRes.rhythm_icon12
-    case 5:
-      return BiologicalRes.rhythm_icon1
-    case 6:
-      return BiologicalRes.rhythm_icon2
-    case 7:
-      return BiologicalRes.rhythm_icon3
-    default:
-      return BiologicalRes.rhythm_icon1
-  }
-}
-
-function getRepeatPeriodTitleByIndex(index: number): string {
-  let title = ''
-  switch (index) {
-    case 0:
-      title = I18n.getLang('bio_ryhthm_default_weekday7_text')
-      break
-    case 1:
-      title = I18n.getLang('bio_ryhthm_default_weekday1_text')
-      break
-    case 2:
-      title = I18n.getLang('bio_ryhthm_default_weekday2_text')
-      break
-    case 3:
-      title = I18n.getLang('bio_ryhthm_default_weekday3_text')
-      break
-    case 4:
-      title = I18n.getLang('bio_ryhthm_default_weekday4_text')
-      break
-    case 5:
-      title = I18n.getLang('bio_ryhthm_default_weekday5_text')
-      break
-    case 6:
-      title = I18n.getLang('bio_ryhthm_default_weekday6_text')
-      break
-  }
-  return title
-}
-
-function obj2Dp(obj: BiorhythmBean): string {
-  const versionHex = '00'
-  const enableHex = obj.enable ? '01' : '00'
-  const gradientHex = obj.gradient === BiorhythmGradientType.EntireGradient ? '00' : '0F'
-  const repeatPeriodHex = parseInt(
-    obj.repeatPeriod
-      .map(p => (p.enabled ? '1' : '0'))
-      .reverse()
-      .join(''),
-    2,
-  )
-    .toString(16)
-    .padStart(2, '0')
-  const planCountHex = obj.planList.length.toString(16).padStart(2, '0')
-  const planListHex = obj.planList
-    .map(plan => {
-      const enableHex = plan.enable ? '01' : '00'
-      const startTime = plan.startTime.split(':')
-      const hourHex = parseInt(startTime[0]).toString(16).padStart(2, '0')
-      const minuteHex = parseInt(startTime[1]).toString(16).padStart(2, '0')
-      const hsvHex = '00000000'
-      const brightnessHex = plan.brightness.toString(16).padStart(2, '0')
-      const colorTemperatureHex = plan.colorTemperature.toString(16).padStart(2, '0')
-      return enableHex + hourHex + minuteHex + hsvHex + brightnessHex + colorTemperatureHex
-    })
-    .join('')
-  return versionHex + enableHex + gradientHex + repeatPeriodHex + planCountHex + planListHex
-}
-
-/**
- * BiorhythmBean 转 RemoteBiorhythmBean
- */
-function vo2Dto(biorhythmBean: BiorhythmBean): RemoteBiorhythmBean {
-  return {
-    enable: biorhythmBean.enable,
-    repeatPeriod: biorhythmBean.repeatPeriod.filter(r => r.enabled).map(r => r.index),
-    gradientWay: BiorhythmGradientTypeMap[biorhythmBean.gradient],
-    rhythmPlan: biorhythmBean.planList.map(plan => {
-      return {
-        name: plan.name,
-        rhythmIcon: plan.icon,
-        enable: plan.enable,
-        startTime: plan.startTime,
-        sustain: plan.id, // 持续时间涂鸦这边没有，直接用来存ID
-        action: plan.action,
-        iconId: plan.iconId,
-      }
-    }),
-  }
-}
-
-/**
- * RemoteBiorhythmBean 转 BiorhythmBean
- */
-function dto2Vo(remoteBiorhythmBean: RemoteBiorhythmBean): BiorhythmBean {
-  return {
-    enable: remoteBiorhythmBean.enable,
-    repeatPeriod: getDefRepeatPeriod().map(repeatItem => {
-      return {
-        ...repeatItem,
-        enabled: remoteBiorhythmBean.repeatPeriod.includes(repeatItem.index),
-      }
-    }),
-    gradient: BiorhythmGradientTypeMap2[remoteBiorhythmBean.gradientWay],
-    planList: remoteBiorhythmBean.rhythmPlan.map(plan => {
-      return {
-        id: plan.sustain,
-        enable: plan.enable,
-        icon: plan.rhythmIcon,
-        startTime: plan.startTime,
-        name: plan.name,
-        colorTemperature: colorTempPercent(parseInt(plan.action[0].startValue)),
-        brightness: parseInt(plan.action[1].startValue),
-        action: plan.action,
-        iconId: plan.iconId,
-      }
-    }),
-  }
-}

package/src/modules/biorhythm/BiorhythmBean.d.ts

@@ -1,58 +0,0 @@
-export declare enum BiorhythmGradientType {
-    EntireGradient = 0,
-    DirectGradient = 1
-}
-export declare const BiorhythmGradientTypeMap: {
-    0: string;
-    1: string;
-};
-export declare const BiorhythmGradientTypeMap2: {
-    entireGradient: BiorhythmGradientType;
-    directGradient: BiorhythmGradientType;
-};
-export interface BiorhythmBean {
-    enable: boolean;
-    repeatPeriod: Period[];
-    gradient: BiorhythmGradientType;
-    planList: Plan[];
-}
-export interface Plan {
-    id: number;
-    enable: boolean;
-    icon: string;
-    startTime: string;
-    name: string;
-    colorTemperature: number;
-    brightness: number;
-    action: Action[];
-    iconId?: any;
-}
-export interface Action {
-    uri: string;
-    startValue: string;
-}
-export interface Period {
-    index: number;
-    title: string;
-    enabled: boolean;
-}
-export declare function colorTemperatureValue(percentageValue: any): number;
-export declare function colorTempPercent(colorTemp: number): number;
-export declare function getDefBiorhythmUIState(): BiorhythmBean;
-export declare function getDefRepeatPeriod(): Period[];
-export interface RemoteBiorhythmBean {
-    enable: boolean;
-    repeatPeriod: number[];
-    gradientWay: string;
-    rhythmPlan: RemoteBiorhythmPlan[];
-}
-interface RemoteBiorhythmPlan {
-    iconId: any;
-    name: string;
-    rhythmIcon: string;
-    enable: boolean;
-    startTime: string;
-    sustain: number;
-    action: Action[];
-}
-export {};