@ledvance/group-ui-biz-bundle 1.0.45 → 1.0.47

package/package.json

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

package/src/modules/biorhythm/BiorhythmActions.ts

@@ -7,11 +7,10 @@ import {
   Plan,
 } from './BiorhythmBean'
 import { useFeatureHook} from '@ledvance/base/src/models/modules/NativePropsSlice'
-import { NativeApi } from '@ledvance/base/src/api/native'
 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'
+import { to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 
 interface BiorhythmConfig {
   rhythm_mode: BiorhythmBean
@@ -23,12 +22,6 @@ export const useBiorhythm = () => {
   })
 }
 
-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')
@@ -75,7 +68,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
     // 分钟
     const minute = hex2Int(hex.slice(0, 2)).toString().padStart(2, '0')
     hex = hex.slice(2)
-    const startTime = `${hour}:${minute}`
+    const time = hour * 60 + minute
     // 色调 (色相)
     hex2Int(hex.slice(0, 4))
     hex = hex.slice(4)
@@ -94,7 +87,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
       id: index,
       enable: enable,
       icon: getNodeIconByIndex(index),
-      startTime: startTime,
+      time,
       name: getNodeNameByIndex(index),
       colorTemperature: colorTemperature,
       brightness: brightness,
@@ -203,9 +196,8 @@ function obj2Dp(obj: BiorhythmBean): string {
   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 hourHex = to16(Math.trunc(plan.time / 60))
+      const minuteHex = to16(plan.time % 60)
       const hsvHex = '00000000'
       const brightnessHex = plan.brightness.toString(16).padStart(2, '0')
       const colorTemperatureHex = plan.colorTemperature.toString(16).padStart(2, '0')

package/src/modules/biorhythm/BiorhythmBean.ts

@@ -29,7 +29,7 @@ export interface Plan {
   id: number;
   enable: boolean;
   icon: string;
-  startTime: string;
+  time: number;
   name: string;
   colorTemperature: number;
   brightness: number;
@@ -71,7 +71,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 0,
         icon: icon1,
-        startTime: '06:00',
+        time: 360,
         name: I18n.getLang('bio_ryhthm_default_field_text'),
         colorTemperature: 0,
         brightness: 0,
@@ -91,7 +91,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 1,
         icon: icon12,
-        startTime: '06:30',
+        time: 420,
         name: I18n.getLang('bio_ryhthm_default_field_text2'),
         colorTemperature: 25,
         brightness: 20,
@@ -111,7 +111,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 2,
         icon: icon2,
-        startTime: '09:00',
+        time: 540,
         name: I18n.getLang('bio_ryhthm_default_field_text3'),
         colorTemperature: 100,
         brightness: 100,
@@ -131,7 +131,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 3,
         icon: icon3,
-        startTime: '20:00',
+        time: 1200,
         name: I18n.getLang('bio_ryhthm_default_field_text4'),
         colorTemperature: 50,
         brightness: 80,
@@ -151,7 +151,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 4,
         icon: icon4,
-        startTime: '23:30',
+        time: 1410,
         name: I18n.getLang('bio_ryhthm_default_field_text5'),
         colorTemperature: 0,
         brightness: 0,

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -88,19 +88,10 @@ const BiorhythmPage = () => {
     state.flag = Symbol()
   }, [])
 
-  const requestSetBiorhythm: () => void = useCallback(async () => {
+  const requestSetBiorhythm = useCallback(async () => {
+    state.loading = true 
     const planList = state.planList?.map(item => { return { ...item, icon: `${item.icon}` } })
-      .sort((a, b) => {
-        const timeA = a.startTime.split(":");
-        const timeB = b.startTime.split(":");
-        // 比较小时
-        if (parseInt(timeA[0]) !== parseInt(timeB[0])) {
-          return parseInt(timeA[0]) - parseInt(timeB[0]);
-        }
-        // 如果小时相等，比较分钟
-        return parseInt(timeA[1]) - parseInt(timeB[1]);
-      });
-    // await userOperation(deviceId, false)
+      .sort((a, b) => a.time - b.time);
     const res = await setBiorhythm(cloneDeep({ ...state, planList }))
     state.loading = false
     console.log('设置生物节律res', res)
@@ -123,28 +114,20 @@ const BiorhythmPage = () => {
     }
   }
 
-  const minimumEnable = (plan: Plan) => {
-    const [h, m] = plan.startTime.split(':').map(str => parseInt(str, 10))
-    const min = h * 60 + m
-    const minutes = state.planList
-      .filter(item => item.id !== plan.id && item.enable)
-      .map(item => {
-        const [hour, minute] = item.startTime.split(':').map(str => parseInt(str, 10))
-        return hour * 60 + minute
-      })
+  const minimumEnable = useCallback((plan: Plan) => {
     let enable = false
-    minutes.forEach(item => {
-      const diff = Math.abs(min - item)
+    state.planList.filter(p => p.index !== plan.id).forEach(item => {
+      const diff = Math.abs(plan.time - item.time)
       if (diff < 15) enable = true
     })
     return enable
-  }
+  }, [state.planList])
 
   const showDeleteBtn = useMemo(() => {
     return state.planList?.length > 1
   }, [state.planList?.length])
 
-  const { run } = useDebounceFn(requestSetBiorhythm, { wait: 200 })
+  const { run } = useDebounceFn(requestSetBiorhythm, { wait: 300 })
 
   useUpdateEffect(() => {
     run()
@@ -315,21 +298,14 @@ const BiorhythmPage = () => {
               marginHorizontal: cx(24),
             }}
           >
-            {state.repeatPeriod.map((period, idx) => {
+            {state.repeatPeriod.map((period) => {
               return (
                 <TouchableOpacity
                   key={period.title}
                   onPress={() => {
-                    state.repeatPeriod = state.repeatPeriod.map((period, index) => {
-                      if(idx === index){
-                        return {
-                          ...period,
-                          enabled: !period.enabled
-                        }
-                      }
-                      return period
-                    })
-                    // period.enabled = !period.enabled
+                    const periodNum = state.repeatPeriod.filter(p => p.enabled)?.length
+                    if (periodNum === 1 && period.enabled) return 
+                    period.enabled = !period.enabled
                     state.flag = Symbol()
                   }}
                 >
@@ -408,7 +384,7 @@ const BiorhythmPage = () => {
               state.planList = state.planList.map(plan => {
                 return {
                   ...plan,
-                  startTime: plan.id === id ? time : plan.startTime,
+                  time: plan.index === id ? time : plan.time,
                 }
               })
               state.flag = Symbol()
@@ -447,7 +423,7 @@ const BiorhythmPage = () => {
                     const newPlan: Plan = {
                       id: Math.max(...ids) + 1,
                       icon: res.rhythm_icon1,
-                      startTime: '00:00',
+                      time: 0,
                       name: '',
                       colorTemperature: 0,
                       brightness: 100,

package/src/modules/biorhythm/Router.ts

@@ -0,0 +1,34 @@
+import {NavigationRoute} from "tuya-panel-kit";
+import BiorhythmPage from "./BiorhythmPage";
+import BiorhythmEditPage from "./BiorhythmDetailPage";
+import BiorhythmIconSelectPage from "./IconSelect"
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const BiorhythmPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.group_ui_biz_biological,
+    component: BiorhythmPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.group_ui_biz_biological_detail,
+    component: BiorhythmEditPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.group_ui_biz_biological_icon_select,
+    component: BiorhythmIconSelectPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+]
+
+export default BiorhythmPageRouters

package/src/modules/fixedTimeForPlug/Router.ts

@@ -0,0 +1,25 @@
+import {NavigationRoute} from "tuya-panel-kit";
+import FixedTimeForPlugPage from "./FixedTimeForPlugPage";
+import FixedTimeForPlugDetailPage from "./FixedTimeForPlugDetailPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const FixedTimeForPlugRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug,
+    component: FixedTimeForPlugPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug_detail,
+    component: FixedTimeForPlugDetailPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
+]
+
+export default FixedTimeForPlugRouters

package/src/modules/fixedTimingForLight/Router.ts

@@ -0,0 +1,25 @@
+import {NavigationRoute} from "tuya-panel-kit";
+import FixedTimingForLightPage from "./FixedTimingForLightPage";
+import FixedTimingForLightDetailPage from "./FixedTimingForLightDetailPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const FixedTimingForLightRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.group_ui_biz_fixed_timing_light,
+    component: FixedTimingForLightPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.group_ui_biz_fixed_timing_light_detail,
+    component: FixedTimingForLightDetailPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
+]
+
+export default FixedTimingForLightRouters

package/src/modules/flags/Router.ts

@@ -0,0 +1,25 @@
+import {NavigationRoute} from "tuya-panel-kit";
+import FlagPage from "./FlagPage";
+import FlagEditPage from "./FlagEditPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const FlagPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.group_ui_biz_flag_page,
+    component: FlagPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.group_ui_biz_flag_page_edit,
+    component: FlagEditPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
+]
+
+export default FlagPageRouters

package/src/modules/mood_new/AddMoodPage.tsx

@@ -0,0 +1,197 @@
+import Strings from '@ledvance/base/src/i18n';
+import Page from '@ledvance/base/src/components/Page';
+import React, { useCallback } from 'react';
+import { FlatList, StyleSheet, Text, View } from 'react-native';
+import { Utils } from 'tuya-panel-kit';
+import RecommendMoodItem from './RecommendMoodItem';
+import Spacer from '@ledvance/base/src/components/Spacer';
+import { useReactive } from 'ahooks';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import {
+  MoodPageParams,
+  MoodNodeTransitionMode,
+  MoodUIInfo,
+  MoodJumpGradientMode,
+} from './Interface';
+import { Result } from '@ledvance/base/src/models/modules/Result';
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { difference, head, map, range } from 'lodash';
+import { RecommendMood, getRecommendMixMoods, getRecommendMoods } from './MoodInfo';
+
+const cx = Utils.RatioUtils.convertX;
+
+export interface AddMoodPageParams {
+  isStatic: boolean;
+  moods: MoodUIInfo[];
+  moduleParams: MoodPageParams;
+  modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
+}
+
+interface AddMoodPageState {
+  data: RecommendMood[];
+}
+
+const AddMoodPage = () => {
+  const navigation = useNavigation();
+  const routeParams = useRoute().params as AddMoodPageParams;
+  const moduleParams = routeParams.moduleParams;
+  const isMix = !!(moduleParams.isMixLight || moduleParams.isCeilingLight);
+  const state = useReactive<AddMoodPageState>({
+    data: isMix
+      ? getRecommendMixMoods(routeParams.isStatic, moduleParams)
+      : getRecommendMoods(routeParams.isStatic, moduleParams),
+  });
+
+  const getFormateItem = item => {
+    return {
+      ...item,
+      version: 0,
+      secondaryLamp: item.secondaryLamp ?? {
+        nodes: [],
+        mode: 0,
+        speed: 75,
+      },
+    };
+  };
+
+  const onMoodItemClick = useCallback(
+    (moodItem: RecommendMood) => {
+      let useIds: any[] = []
+      if(moduleParams.isCeilingLight){
+        const mainIds = map(routeParams.moods.map(m => m.mainLamp), 'id') ?? 0
+        const secondaryIds = map(routeParams.moods.map(m => m.secondaryLamp), 'id') ?? 0
+        useIds = [...mainIds, ...secondaryIds]
+      }else{
+        useIds = map(routeParams.moods, 'id');
+      }
+      const idRange = range(0, 256);
+      const mainId: number = head(difference(idRange, useIds));
+      const secondaryId: number = head(difference(idRange, [...useIds, mainId])) 
+      console.log(mainId, secondaryId, '< --- iddddddddd ')
+      const url = routeParams.isStatic
+        ? ui_biz_routerKey.group_ui_biz_static_mood_edit
+        : !!(moduleParams.isCeilingLight || moduleParams.isMixLight)
+        ? ui_biz_routerKey.group_ui_biz_dynamic_mix_mood_edit
+        : ui_biz_routerKey.group_ui_biz_dynamic_mood_edit;
+      const currentMood = moodItem.mainLamp
+        ? { ...moodItem, id: mainId, mainLamp: {...moodItem.mainLamp, id: mainId}, secondaryLamp: {...moodItem.secondaryLamp, id: secondaryId}}
+        : newMood(mainId, secondaryId ,moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
+      navigation.navigate(url, {
+        mode: 'add',
+        currentMood,
+        moods: routeParams.moods,
+        moduleParams,
+        modDeleteMood: routeParams.modDeleteMood,
+      });
+    },
+    [routeParams]
+  );
+
+  return (
+    <Page
+      backText={Strings.getLang('add_new_static_mood_system_back')}
+      headlineText={Strings.getLang(
+        routeParams.isStatic
+          ? 'add_new_static_mood_headline_text'
+          : 'add_new_dynamic_mood_headline_text'
+      )}
+    >
+      <View style={styles.root}>
+        <Text style={styles.desc}>
+          {Strings.getLang(
+            routeParams.isStatic
+              ? 'add_new_static_mood_description_text'
+              : 'add_new_dynamic_mood_description_text'
+          )}
+        </Text>
+        <FlatList
+          style={{ flex: 1 }}
+          data={state.data}
+          renderItem={({ item }) => {
+            return (
+              <RecommendMoodItem
+                title={item.name}
+                isMix={isMix}
+                mood={getFormateItem(item)}
+                onPress={() => {
+                  onMoodItemClick(item);
+                }}
+              />
+            );
+          }}
+          ItemSeparatorComponent={() => <Spacer />}
+          ListHeaderComponent={() => <Spacer />}
+          ListFooterComponent={() => <Spacer />}
+          keyExtractor={item => item.name}
+        />
+      </View>
+    </Page>
+  );
+};
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+    flexDirection: 'column',
+  },
+  desc: {
+    color: '#000',
+    fontSize: cx(16),
+    marginHorizontal: cx(24),
+    marginTop: cx(12),
+  },
+});
+
+export default AddMoodPage;
+
+function newMood(
+  mainId: number,
+  secondaryId: number,
+  isColorMode: boolean,
+  isStatic: boolean,
+  moduleParams: MoodPageParams
+): MoodUIInfo {
+  const jump = moduleParams.isStringLight
+    ? MoodJumpGradientMode.StringJump
+    : moduleParams.isStripLight
+    ? MoodJumpGradientMode.StripJump
+    : MoodJumpGradientMode.SourceJump;
+  const node = {
+    brightness: 100,
+    colorTemp: 100,
+    h: 0,
+    s: 100,
+    v: 100,
+    isColorNode: !!(moduleParams.isCeilingLight || moduleParams.isMixLight) ? false : isColorMode,
+  };
+  return {
+    version: 0,
+    name: '',
+    image: '',
+    id: mainId,
+    mainLamp: {
+      id: mainId,
+      speed: 75,
+      enable: true,
+      fanEnable: true,
+      fanSpeed: 1,
+      mode: isStatic ? MoodNodeTransitionMode.Static : jump,
+      nodes: isStatic ? [node] : [node, { ...node }],
+    },
+    secondaryLamp: {
+      id: secondaryId,
+      enable: true,
+      mode: MoodJumpGradientMode.StripJump,
+      speed: 75,
+      version: 0,
+      expand: 0,
+      reserved1: 0,
+      reserved2: 0,
+      segmented: 0,
+      loop: 0,
+      excessive: 0,
+      direction: 0,
+      nodes: isStatic ? [] : [{...node, isColorNode: true}, {...node, isColorNode: true}],
+    },
+  };
+}