@ledvance/ui-biz-bundle 1.1.132 → 1.1.134

package/package.json

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

package/src/hooks/DeviceDpStateHooks.ts

@@ -112,7 +112,8 @@ export const useConflictTask = (conflictDps: ConflictDps, isPlug?: boolean): [(v
       const biorhythmTask = {
         startTime: 0,
         endTime: 1440,
-        weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0)
+        weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0),
+        channel: 1
       }
       if (isConflictTask(conflictItem, biorhythmTask)){
         newState[conflictDps.biorhythmDpCode] = {

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'
@@ -29,6 +29,8 @@ export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?:
   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 biorhythm = dp2Obj(dp)
@@ -46,27 +48,39 @@ export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?:
 
   useEffect(() => {
     if (disabledFeature) return
-    biorhythmTimer = setTimeout(() => {
-      getBiorhythm()
-    }, 300)
-
-    return () => {
-      clearTimeout(biorhythmTimer)
-    }
+    getBiorhythm()
   }, [])
 
   useUpdateEffect(() => {
+    if (isInternalUpdateRef.current || disabledFeature) {
+      if (isInternalUpdateRef.current) {
+        previousDpRef.current = dp
+      }
+      console.log('跳过更新', isInternalUpdateRef.current, disabledFeature)
+      isInternalUpdateRef.current = false
+      return
+    }
+    console.log('dp updateEffect', dp, previousDpRef.current, dp === previousDpRef.current)
+    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))
       if (putFeatureRes.result) {
+        setBiorhythmState(biorhythmObj)
         return setDp(dpValue)
+      } else {
+        isInternalUpdateRef.current = false
       }
     } else {
+      setBiorhythmState(biorhythmObj)
       return setDp(dpValue)
     }
     return { success: false }

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -25,7 +25,6 @@ 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 +32,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 +78,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,7 +189,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
     }
   }
 
-  useEffect(() =>{
+  useEffect(() => {
     const weeks: string[] = setDataSource(
       biorhythm.repeatPeriod.map(item => {
         return item?.enabled ? 1 : 0
@@ -229,20 +237,20 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   const sunHomeText = string => {
     const text = string.split('SUN@HOME')
     return text?.length === 1 && <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor }}>{text[0]}</Text> ||
-        <Text style={{
-          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>
+      <Text style={{
+        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>
   }
 
   const randomIcon = () => {
@@ -257,6 +265,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
@@ -272,7 +291,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
               startTime: 0,
               endTime: 1440,
               weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0),
-              enable: biorhythm.enable
+              enable: biorhythm.enable,
+              channel: 1
             }
             if (enable && checkConflict(biorhythmTask)) {
               return showCommonDialog({
@@ -347,10 +367,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
@@ -389,7 +409,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             </TouchableOpacity>
           </View>
           <View style={{ height: cx(20) }} />
-          <TimeCircular
+          {/* <TimeCircular
             planEdit={true}
             planList={state.planList}
             onPanMoved={(id, time) => {
@@ -403,7 +423,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',
@@ -413,66 +452,66 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
               marginTop: cx(26),
             }}>
             {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}} />
-                <Text
-                    style={{
-                      flexWrap: 'wrap',
-                      fontSize: cx(12),
-                      color: props.theme?.global.fontColor
-                    }}>{I18n.getLang('add_new_trigger_time_warning_max_number_text')}</Text>
+              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 }} />
+              <Text
+                style={{
+                  flexWrap: 'wrap',
+                  fontSize: cx(12),
+                  color: props.theme?.global.fontColor
+                }}>{I18n.getLang('add_new_trigger_time_warning_max_number_text')}</Text>
             </View>}
             {state.planList.length < 8 &&
-                <>
-                    <Text
-                        style={{
-                          fontSize: cx(16),
-                          fontWeight: 'bold',
-                          color: props.theme?.global.fontColor,
-                        }}>{I18n.getLang('bio_ryhthm_default_subheadline_text')}</Text>
-                    <TouchableOpacity
-                        onPress={() => {
-                          const ids: number[] = state.planList.map(p => p.index)
-                          const newPlan: Plan = {
-                            index: Math.max(...ids) + 1,
-                            icon: res.rhythm_icon1,
-                            time: 0,
-                            name: '',
-                            colorTemperature: 0,
-                            brightness: 100,
-                            action: [
-                              {
-                                uri: 'model/attribute/set/LightCtrl/ColorTemperature',
-                                startValue: `${colorTemperatureValue(0)}`,
-                              },
-                              {
-                                uri: 'model/attribute/set/LightCtrl/Brightness',
-                                startValue: '100',
-                              },
-                            ],
-                            enable: true,
-                            iconId: randomIcon(),
-                          }
-                          const editPageParams: BiorhythmEditPageParams = {
-                            planData: newPlan,
-                            isAdd: true,
-                            onPlanEdited,
-                            onPlanDelete,
-                            minimumEnable,
-                            nameRepeat,
-                            iconIdList: state.planList?.map(item => {
-                              return item.iconId
-                            }),
-                            isMixRGBWLamp: !!params.isMixLight,
-                            isSupportTemperature: params.isSupportTemperature,
-                            isSupportBrightness: params.isSupportBrightness,
-                            showDeleteBtn
-                          }
-                          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 }} />
-                    </TouchableOpacity>
-                </>
+              <>
+                <Text
+                  style={{
+                    fontSize: cx(16),
+                    fontWeight: 'bold',
+                    color: props.theme?.global.fontColor,
+                  }}>{I18n.getLang('bio_ryhthm_default_subheadline_text')}</Text>
+                <TouchableOpacity
+                  onPress={() => {
+                    const ids: number[] = state.planList.map(p => p.index)
+                    const newPlan: Plan = {
+                      index: Math.max(...ids) + 1,
+                      icon: res.rhythm_icon1,
+                      time: 0,
+                      name: '',
+                      colorTemperature: 0,
+                      brightness: 100,
+                      action: [
+                        {
+                          uri: 'model/attribute/set/LightCtrl/ColorTemperature',
+                          startValue: `${colorTemperatureValue(0)}`,
+                        },
+                        {
+                          uri: 'model/attribute/set/LightCtrl/Brightness',
+                          startValue: '100',
+                        },
+                      ],
+                      enable: true,
+                      iconId: randomIcon(),
+                    }
+                    const editPageParams: BiorhythmEditPageParams = {
+                      planData: newPlan,
+                      isAdd: true,
+                      onPlanEdited,
+                      onPlanDelete,
+                      minimumEnable,
+                      nameRepeat,
+                      iconIdList: state.planList?.map(item => {
+                        return item.iconId
+                      }),
+                      isMixRGBWLamp: !!params.isMixLight,
+                      isSupportTemperature: params.isSupportTemperature,
+                      isSupportBrightness: params.isSupportBrightness,
+                      showDeleteBtn
+                    }
+                    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 }} />
+                </TouchableOpacity>
+              </>
             }
           </View>
           <FlatList
@@ -521,7 +560,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),