@ledvance/group-ui-biz-bundle 1.0.120 → 1.0.122

package/package.json

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

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -1,7 +1,6 @@
 import React, { useCallback, useEffect, useMemo } from 'react'
 import { FlatList, Image, Linking, ScrollView, Switch, Text, TouchableOpacity, View } from 'react-native'
 import { useNavigation } from '@react-navigation/native'
-import TimeCircular from './circular/TimeCircular'
 import { useDebounceFn, useReactive, useUpdateEffect } from 'ahooks'
 import {
   BiorhythmBean,
@@ -34,6 +33,7 @@ import ApplyForDeviceList from '@ledvance/base/src/components/ApplyForDeviceList
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
 import InfoText from '@ledvance/base/src/components/InfoText'
 import ThemeType from '@ledvance/base/src/config/themeType'
+import RhythmsCircle from './circular/RhythmsCircle'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -73,6 +73,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
   }, [])
@@ -211,20 +219,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 = () => {
@@ -243,6 +251,18 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
     return !!state.planList.filter(p => p.id !== plan.id).find(p => p.name === plan.name)
   }, [state.planList])
 
+  const convertPlandata = useCallback(() => {
+    return state.planList.map(item => {
+      return {
+        ...item,
+        index: item.id,
+        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
       backText={uaGroupInfo.name}
@@ -327,10 +347,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
@@ -369,7 +389,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
               </TouchableOpacity>
             </View>
             <View style={{ height: cx(20) }} />
-            <TimeCircular
+            {/* <TimeCircular
               planEdit={true}
               planList={state.planList}
               onPanMoved={(id, time) => {
@@ -383,7 +403,27 @@ 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.id)?.time
+                    }
+                  })
+                  state.flag = Symbol()
+                }}
+              />
+            </View>
             <View
               style={{
                 flexDirection: 'row',
@@ -393,66 +433,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.id)
-                            const newPlan: Plan = {
-                              id: 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,
-                              nameRepeat,
-                              minimumEnable,
-                              iconIdList: state.planList?.map(item => {
-                                return item.iconId
-                              }),
-                              isMixLight: params.isMixLight,
-                              isSupportTemperature: params.isSupportTemperature,
-                              isSupportBrightness: params.isSupportBrightness,
-                              showDeleteBtn
-                            }
-                            navigation.navigate(ui_biz_routerKey.group_ui_biz_biological_detail, 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.id)
+                      const newPlan: Plan = {
+                        id: 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,
+                        nameRepeat,
+                        minimumEnable,
+                        iconIdList: state.planList?.map(item => {
+                          return item.iconId
+                        }),
+                        isMixLight: params.isMixLight,
+                        isSupportTemperature: params.isSupportTemperature,
+                        isSupportBrightness: params.isSupportBrightness,
+                        showDeleteBtn
+                      }
+                      navigation.navigate(ui_biz_routerKey.group_ui_biz_biological_detail, editPageParams)
+                    }}>
+                    <Image source={{ uri: res.biorhythom_add }} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
+                  </TouchableOpacity>
+                </>
               }
             </View>
             <FlatList
@@ -516,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) } || type && { uri: item?.icon } || item?.icon}
                               style={{
                                 width: cx(24),
                                 height: cx(24),