@ledvance/ui-biz-bundle 1.1.133 → 1.1.135

package/package.json

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

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -191,7 +191,7 @@ const DynamicMoodEditorPage = () => {
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? '#f00' : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={Strings.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')}/>
           <Card style={styles.adjustCard}>
             <Spacer height={cx(16)}/>

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -227,7 +227,7 @@ const FantasyMoodEditPage = () => {
             showError={state.mood.name.length > 32 || nameRepeat}
             maxLength={33}
             tipColor={nameRepeat ? '#f00' : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={I18n.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')} />
           <Card style={styles.adjustCard}>
             <Spacer height={cx(16)} />

package/src/modules/mood/MixMood/MixMoodEditPage.tsx

@@ -191,7 +191,7 @@ const RgbcMoodEditPage = () => {
             showError={state.mood.name.length > 32 || nameRepeat}
             maxLength={33}
             tipColor={nameRepeat ? '#f00' : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={I18n.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')} />
           {params.isStatic ? <Card style={styles.adjustCard}>
             <LdvSwitch

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -191,7 +191,7 @@ const StaticMoodEditorPage = () => {
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? '#f00' : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={Strings.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')}/>
           <Card style={styles.adjustCard}>
             <Spacer height={cx(16)}/>
@@ -318,4 +318,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default StaticMoodEditorPage
+export default StaticMoodEditorPage

package/src/newModules/biorhythm/BiorhythmActions.ts

@@ -10,7 +10,7 @@ import {
   Plan,
   RemoteBiorhythmBean,
 } from './BiorhythmBean'
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useState, useRef } from 'react'
 import { NativeResult, Result } from '@ledvance/base/src/models/modules/Result'
 import { useDeviceId, useDp } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { getFeature, NativeApi, putFeature } from '@ledvance/base/src/api/native'
@@ -23,14 +23,16 @@ import { useUpdateEffect } from 'ahooks'
 
 type UseBiorhythmType = (dpKey: string, disabledFeature?: boolean) => [BiorhythmBean, SetBiorhythmType];
 type SetBiorhythmType = (biorhythmObj: BiorhythmBean, pushFeature?: boolean) => Promise<Result<any>>;
-let biorhythmTimer: undefined | number = undefined
 
+let biorhythmTimer: number | undefined = undefined
 export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?: boolean) => {
   const [dp, setDp] = useDp<string, (v: string) => any>(dpKey)
   const deviceId = useDeviceId()
   const [biorhythmState, setBiorhythmState] = useState(dp2Obj(dp))
+  const isInternalUpdateRef = useRef(false)
+  const previousDpRef = useRef(dp)
 
-  const getBiorhythm = useCallback(() => {
+  const getBiorhythm = () => {
     const biorhythm = dp2Obj(dp)
     getRemoteBiorhythm(deviceId, biorhythm).then(res => {
       if (res.success && res.data) {
@@ -42,31 +44,53 @@ export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?:
         }))
       }
     })
-  }, [dp])
+  }
 
   useEffect(() => {
     if (disabledFeature) return
     biorhythmTimer = setTimeout(() => {
       getBiorhythm()
-    }, 300)
-
+    }, 150)
     return () => {
-      clearTimeout(biorhythmTimer)
+      if (biorhythmTimer) {
+        clearTimeout(biorhythmTimer)
+        biorhythmTimer = undefined
+      }
     }
   }, [])
 
   useUpdateEffect(() => {
+    if (isInternalUpdateRef.current || disabledFeature) {
+      if (disabledFeature) {
+        setBiorhythmState(dp2Obj(dp))
+      }
+      if (isInternalUpdateRef.current) {
+        previousDpRef.current = dp
+      }
+      isInternalUpdateRef.current = false
+      return
+    }
+    if (dp?.toLocaleLowerCase() === previousDpRef.current?.toLocaleLowerCase()) {
+      return
+    }
     getBiorhythm()
   }, [dp])
 
   const setBiorhythmFn = async (biorhythmObj: BiorhythmBean, pushFeature: boolean = true) => {
     const dpValue = obj2Dp(biorhythmObj)
+    isInternalUpdateRef.current = true
+
     if (pushFeature) {
       const putFeatureRes = await putFeature(deviceId, biorhythmFeatureId, vo2Dto(biorhythmObj))
+      console.log(vo2Dto(biorhythmObj), '< --- biorhythmObj --- >')
       if (putFeatureRes.result) {
+        setBiorhythmState(biorhythmObj)
         return setDp(dpValue)
+      } else {
+        isInternalUpdateRef.current = false
       }
     } else {
+      setBiorhythmState(biorhythmObj)
       return setDp(dpValue)
     }
     return { success: false }
@@ -182,6 +206,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
         enabled: p === '1',
       }
     })
+  repeatPeriod.sort((a, b) => a.index - b.index)
   dpCopy = dpCopy.slice(2)
   // 节点个数 (每个节点长度18)，最多8个节点
   hex2Int(dpCopy.slice(0, 2))
@@ -346,8 +371,9 @@ function obj2Dp(obj: BiorhythmBean): string {
   const versionHex = '00'
   const enableHex = obj.enable ? '01' : '00'
   const gradientHex = obj.gradient === BiorhythmGradientType.EntireGradient ? '00' : '0F'
+  const newRepeatPeriod = [obj.repeatPeriod[obj.repeatPeriod.length - 1], ...obj.repeatPeriod.slice(0, -1)]
   const repeatPeriodHex = parseInt(
-    obj.repeatPeriod
+    newRepeatPeriod
       .map(p => (p.enabled ? '1' : '0'))
       .reverse()
       .join(''),

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -21,11 +21,9 @@ import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
 import { ui_biz_routerKey } from "../../navigation/Routers";
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
-import { setDataSource } from '@ledvance/base/src/components/weekSelect'
 import { BiorhythmEditPageParams } from './BiorhythmEditPage'
 import { useBiorhythm } from './BiorhythmActions'
 import { convertMinutesTo12HourFormat, showDialog as showCommonDialog } from '@ledvance/base/src/utils/common'
-import TimeCircular from './circular/TimeCircular'
 import Page from '@ledvance/base/src/components/Page'
 import Card from '@ledvance/base/src/components/Card'
 import Spacer from '@ledvance/base/src/components/Spacer'
@@ -33,6 +31,7 @@ import DeleteButton from '@ledvance/base/src/components/DeleteButton'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { useConflictTask } from 'hooks/DeviceDpStateHooks'
+import RhythmsCircle from './circular/RhythmsCircle'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -78,6 +77,14 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
     loading: false
   })
 
+  const timeImg = useMemo(() => {
+    if (is24Hour) {
+      return devicesJudge ? res.ic_warning_amber_sun : res.ic_warning_amber_new
+    } else {
+      return devicesJudge ? res.ic_warning_amber_sun_12 : res.ic_warning_amber_new_12
+    }
+  }, [is24Hour, devicesJudge])
+
   const showGradientTypeSelectModal = useCallback((show: boolean) => {
     state.showGradientTypeSelectModal = show
   }, [])
@@ -181,12 +188,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
     }
   }
 
-  useEffect(() =>{
-    const weeks: string[] = setDataSource(
-      biorhythm.repeatPeriod.map(item => {
-        return item?.enabled ? 1 : 0
-      })).filter(item => item.enabled)
-      .map(item => item.title)
+  useEffect(() => {
+    const weeks = biorhythm.repeatPeriod.filter(it => it.enabled).map(it => it.title)
 
     if (weeks.length > 0) {
       if (weeks.length === 7) {
@@ -233,15 +236,16 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
           fontSize: cx(14),
           flexDirection: 'row',
         }}>
-            <Text style={{color: props.theme?.global.fontColor }}>{text[0]}</Text>
-            <Text onPress={openLink}
-                  style={{
-                    fontFamily: 'helvetica_neue_lt_std_roman',
-                    color: props.theme?.button.primary,
-                    textDecorationLine: 'underline',
-                    flexWrap: 'wrap',
-                  }}>SUN@HOME</Text>
-            <Text style={{color: props.theme?.global.fontColor }}>{text[1]}</Text>
+            <Text style={{ color: props.theme?.global.fontColor }}>{text[0]}</Text>
+            <Text
+                onPress={openLink}
+                style={{
+                  fontFamily: 'helvetica_neue_lt_std_roman',
+                  color: props.theme?.button.primary,
+                  textDecorationLine: 'underline',
+                  flexWrap: 'wrap',
+                }}>SUN@HOME</Text>
+            <Text style={{ color: props.theme?.global.fontColor }}>{text[1]}</Text>
         </Text>
   }
 
@@ -257,6 +261,17 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
     return availableChart[randomIndex]
   }
 
+  const convertPlandata = useCallback(() => {
+    return state.planList.map(item => {
+      return {
+        ...item,
+        noActiveColor: '#474e5d',
+        activeColor: '#F7EB2A',
+        color: item?.brightness === 0 ? '#000' : !params.isSupportTemperature && cctToColor(1) || cctToColor(item.colorTemperature.toFixed(), item?.brightness)
+      }
+    }).filter(plan => plan.enable)
+  }, [JSON.stringify(state.planList), params.isSupportTemperature])
+
   return (
     <>
       <Page
@@ -348,10 +363,10 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             })}
           </View>
           <View style={{ marginHorizontal: cx(24), marginTop: cx(20) }}>
-            <Text style={{color: props.theme?.global.fontColor}}>{state.weekString}</Text>
+            <Text style={{ color: props.theme?.global.fontColor }}>{state.weekString}</Text>
           </View>
           <View style={{ marginHorizontal: cx(24), marginTop: cx(16) }}>
-            <Text style={{color: props.theme?.global.fontColor}}>
+            <Text style={{ color: props.theme?.global.fontColor }}>
               {I18n.getLang('bio_ryhthm_default_selectionfield_topic_text')}
             </Text>
             <TouchableOpacity
@@ -390,7 +405,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             </TouchableOpacity>
           </View>
           <View style={{ height: cx(20) }} />
-          <TimeCircular
+          {/* <TimeCircular
             planEdit={true}
             planList={state.planList}
             onPanMoved={(id, time) => {
@@ -404,7 +419,26 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             }}
             replaceStatus={devicesJudge}
             gradient={state.gradient === BiorhythmGradientType.DirectGradient}
-            isSupportTemperature={!params.isSupportTemperature} />
+            isSupportTemperature={!params.isSupportTemperature} /> */}
+          <View style={{ alignItems: 'center', justifyContent: 'center' }}>
+            <RhythmsCircle
+              size={250}
+              ringWidth={40}
+              thumbSize={36}
+              timeImg={timeImg}
+              gradientMode={state.gradient === BiorhythmGradientType.EntireGradient}
+              data={convertPlandata()}
+              onRelease={(planList) => {
+                state.planList = state.planList.map(item => {
+                  return {
+                    ...item,
+                    time: planList.find(p => p.index === item.index)?.time
+                  }
+                })
+                state.flag = Symbol()
+              }}
+            />
+          </View>
           <View
             style={{
               flexDirection: 'row',
@@ -415,7 +449,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             }}>
             {state.planList.length === 8 && <View
                 style={{ marginVertical: cx(10), flexDirection: 'row', alignItems: 'center', width: width - cx(48) }}>
-                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{uri: res.ic_warning_amber}} />
+                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{ uri: res.ic_warning_amber }} />
                 <Text
                     style={{
                       flexWrap: 'wrap',
@@ -471,7 +505,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                           }
                           navigation.navigate(ui_biz_routerKey.bi_biz_biological_edit, editPageParams)
                         }}>
-                        <Image source={{uri: res.biorhythom_add}} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
+                        <Image source={{ uri: res.biorhythom_add }} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
                     </TouchableOpacity>
                 </>
             }
@@ -522,7 +556,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                     <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', marginTop: cx(16) }}>
                       <View style={{ flexDirection: 'row', justifyContent: 'center', alignItems: 'center' }}>
                         <Image
-                          source={{uri: setImg(item?.iconId)} || type && { uri: item?.icon } || item?.icon}
+                          source={{ uri: setImg(item?.iconId) }}
                           style={{
                             width: cx(24),
                             height: cx(24),