@ledvance/ui-biz-bundle 1.1.64 → 1.1.66

package/src/newModules/mood/StaticMoodEditorPage.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { ScrollView, StyleSheet, View } from 'react-native';
-import { cloneDeep, find, isEqual } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import { useReactive } from 'ahooks';
 import Page from '@ledvance/base/src/components/Page';
 import I18n from '@ledvance/base/src/i18n';
@@ -12,26 +12,24 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import res from '@ledvance/base/src/res';
 import TextButton from '@ledvance/base/src/components/TextButton';
 import { useFanMaxSpeed } from '@ledvance/base/src/models/modules/NativePropsSlice';
-import LampAdjustView from '@ledvance/base/src/components/LampAdjustView';
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView';
-import { showDeleteMoodDialog } from './tools';
 import { MoodNodeInfo, MoodPageParams, MoodUIInfo } from './Interface';
 import { Result } from '@ledvance/base/src/models/modules/Result';
 import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
-import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView';
-import { RouterKey } from 'navigation/Router';
+import LampAdjustView2 from '@ledvance/base/src/components/LampAdjustView2';
+import { ui_biz_routerKey } from '../../navigation/Routers'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
+import { showDialog } from '@ledvance/base/src/utils/common';
 
 const cx = Utils.RatioUtils.convertX;
 
 export interface StaticMoodEditorPageParams {
   mode: 'add' | 'edit';
-  moods: MoodUIInfo[];
   currentMood: MoodUIInfo;
-  onSave: () => void;
   moduleParams: MoodPageParams;
+  nameRepeat: (mood: MoodUIInfo) => boolean
   modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
 }
 
@@ -53,7 +51,7 @@ const StaticMoodEditorPage = () => {
     headline: '',
     mood: params.currentMood,
     mainNode: params.currentMood.mainLamp.nodes[0],
-    secondaryNode: params.currentMood?.secondaryLamp?.nodes[0],
+    secondaryNode: params.currentMood?.secondaryLamp?.nodes?.[0],
     loading: false,
   });
   
@@ -73,10 +71,7 @@ const StaticMoodEditorPage = () => {
   }, []);
 
   const onRightClick = async () => {
-    if (getButtonStatus()) {
-      return
-    }
-    if (state.loading) return;
+    if (state.loading || !canSaveMoodData) return;
     state.loading = true;
     const newMood: MoodUIInfo = {
       ...state.mood,
@@ -84,8 +79,12 @@ const StaticMoodEditorPage = () => {
         ...state.mood.mainLamp,
         nodes: [cloneDeep(state.mainNode)],
       },
+      secondaryLamp: {
+        ...state.mood.secondaryLamp,
+        id: undefined
+      }
     };
-    if (isMix) {
+    if (isMix && moduleParams.isMixLight) {
       newMood.secondaryLamp = {
         ...newMood.secondaryLamp,
         nodes: [cloneDeep(state.secondaryNode)],
@@ -101,37 +100,26 @@ const StaticMoodEditorPage = () => {
     const res = await params.modDeleteMood(params.mode, newMood);
     state.loading = false;
     if (res.success) {
-      navigation.navigate(RouterKey.ui_biz_mood);
+      navigation.navigate(ui_biz_routerKey.ui_biz_mood);
     }
   };
 
-  const getButtonStatus = () => {
-    return (
-      (params.mode === 'edit' && isEqual(state.mood, params.currentMood)) ||
-      !state.mood.name ||
-      nameRepeat ||
-      state.mood.name.length > 32
-    );
-  };
-
   const nameRepeat = useMemo(() => {
-    return !!find(params.moods, m => m.id !== state.mood.id && m.name === state.mood.name);
+    return params.nameRepeat(state.mood)
   }, [state.mood.name]);
 
-  useEffect(() =>{
-    console.log(state.mood, '< --- state mood --- >')
-    console.log(params.currentMood, '< --- currentMood --- >')
-  }, [JSON.stringify(state.mood)])
-
+  const checkMoodChanged = useMemo(() =>{
+    return isEqual(state.mood, params.currentMood)
+  }, [JSON.stringify(state.mood), params.currentMood])
 
-  const showBackDialog = (): boolean => {
-    return !isEqual(state.mood, routeParams.currentMood);
-  }
+  const canSaveMoodData = useMemo(() =>{
+    return state.mood.name.length > 0 && state.mood.name.length < 33 && !nameRepeat && (params.mode === 'add' || !checkMoodChanged)
+  }, [nameRepeat, state.mood.name, checkMoodChanged, params.mode])
 
   return (
     <Page
       backText={I18n.getLang('mesh_device_detail_mode')}
-      showBackDialog={showBackDialog()}
+      showBackDialog={!checkMoodChanged}
       backDialogTitle={I18n.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -143,7 +131,7 @@ const StaticMoodEditorPage = () => {
           : 'strip_light_static_mood_editor_step_2_dialog_text'
       )}
       headlineText={state.headline}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={onRightClick}
       loading={state.loading}
     >
@@ -180,86 +168,33 @@ const StaticMoodEditorPage = () => {
               showSwitch={!!moduleParams.isMixLight}
             />
             {(!moduleParams.isMixLight || state.mood.mainLamp.enable) && (
-              <LampAdjustView
+              <LampAdjustView2
                 isSupportColor={isMix ? false : moduleParams.isSupportColor}
                 isSupportBrightness={moduleParams.isSupportBrightness}
-                isSupportTemperature={moduleParams.isSupportTemperature}
+                isSupportCCT={moduleParams.isSupportTemperature}
                 isColorMode={state.mainNode.isColorNode}
                 reserveSV={true}
                 setIsColorMode={isColorMode => {
                   state.mainNode.isColorNode = isColorMode;
                 }}
-                h={state.mainNode.h}
-                s={state.mainNode.s}
-                v={state.mainNode.v}
-                onHSVChange={(h, s, v) => {
-                  state.mainNode.h = h 
-                  state.mainNode.s = s 
-                  state.mainNode.v = v
+                hsv={state.mainNode}
+                onHSVChange={(hsv) => {
+                  state.mainNode.h = hsv.h
+                  state.mainNode.s = hsv.s
+                  state.mainNode.v = hsv.v
                 }}
-                onHSVChangeComplete={(h, s, v) => {
-                  state.mainNode.h = h 
-                  state.mainNode.s = s 
-                  state.mainNode.v = v
-                }}
-                colorTemp={state.mainNode.colorTemp}
+                cct={state.mainNode.colorTemp}
                 brightness={state.mainNode.brightness}
-                onCCTChange={() => {}}
-                onCCTChangeComplete={cct => {
+                onCCTChange={(cct) => {
                   state.mainNode.colorTemp = cct;
                 }}
-                onBrightnessChange={() => {}}
-                onBrightnessChangeComplete={brightness => {
+                onBrightnessChange={(brightness) => {
                   state.mainNode.brightness = brightness;
                 }}
               />
             )}
           </Card>
           <Spacer />
-          {isMix && (
-            <Card style={styles.fanAdjustCard}>
-              <LdvSwitch
-                title={I18n.getLang('light_sources_tile_sec_lighting_headline')}
-                color={'#fff'}
-                colorAlpha={1}
-                enable={!!state.mood.secondaryLamp.enable}
-                setEnable={v => {
-                  if(v && !state.mood.secondaryLamp.nodes.length){
-                    state.mood.secondaryLamp.nodes.push(
-                      {
-                        h: 0,
-                        s: 100,
-                        v: 100,
-                        brightness: 0,
-                        colorTemp: 0,
-                        isColorNode: true,
-                      },
-                    )
-                    state.secondaryNode = state.mood.secondaryLamp.nodes[0]
-                  }
-                  state.mood.secondaryLamp.enable = v;
-                }}
-                showSwitch={!!moduleParams.isMixLight}
-              />
-              {(!moduleParams.isMixLight || state.mood.secondaryLamp.enable) && (
-                <>
-                  <ColorAdjustView
-                  h={state.secondaryNode.h}
-                  s={state.secondaryNode.s}
-                  v={state.secondaryNode.v}
-                  reserveSV={true}
-                  onHSVChange={() => {}}
-                  onHSVChangeComplete={(h, s, v) => {
-                    state.secondaryNode.h = h 
-                    state.secondaryNode.s = s 
-                    state.secondaryNode.v = v
-                  }}
-                />
-                <Spacer height={cx(16)}/>
-                </>
-              )}
-            </Card>
-          )}
           {!!(moduleParams.isFanLight || moduleParams.isUVCFan) && (
             <FanAdjustView
               fanEnable={!!state.mood.mainLamp.fanEnable}
@@ -284,15 +219,20 @@ const StaticMoodEditorPage = () => {
                 textStyle={styles.deleteBtnText}
                 text={I18n.getLang('edit_static_mood_button_delete_text')}
                 onPress={() => {
-                  showDeleteMoodDialog(async (_, { close }) => {
-                    state.loading = true;
-                    close();
-                    const res = await params.modDeleteMood('del', state.mood);
-                    if (res.success) {
-                      navigation.navigate(RouterKey.ui_biz_mood);
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('string_light_pp_dialog_sm_ed_headline_d'),
+                    subTitle: I18n.getLang(`strip_light_static_mood_edit_dialog_text`),
+                    onConfirm: async (_, {close})=>{
+                      close();
+                      state.loading = true;
+                      const res = await params.modDeleteMood('del', state.mood);
+                      state.loading = false;
+                      if (res.success) {
+                        navigation.navigate(ui_biz_routerKey.ui_biz_mood);
+                      }
                     }
-                    state.loading = false;
-                  });
+                  })
                 }}
               />
             </View>

package/src/newModules/randomTime/RandomTimeActions.ts

@@ -115,9 +115,7 @@ export const useRandomTime: UseFixedTimeType = (dpKey: string, isPlug?: boolean,
         v: isPlug ? JSON.stringify({dp: randomHex}) : randomHex
       }
     })
-    console.log(randomData, '< --- randomData')
     const cloudStatus = await putFeatureFn(deviceId, isPlug ? plug_randomFeatureId : randomFeatureId, JSON.stringify(randomData))
-    console.log(cloudStatus, '< --- cloudStatus')
     if (cloudStatus) {
       const randomTimerData = {
         version: 0,

package/src/newModules/randomTime/RandomTimeDetailPage.tsx

@@ -168,10 +168,10 @@ const RandomTimeDetailPage = () => {
         </View>
         <Spacer />
         {/* Devices */}
-        <View style={styles.cardContainer}>
+        {!!state.randomTime.color && !params.isPlug && <View style={styles.cardContainer}>
           <Text style={styles.itemTitle}>{I18n.getLang('timeschedule_add_schedule_subheadline2_text')}</Text>
           <Spacer height={cx(10)} />
-          {state.randomTime.color && !params.isPlug && <Card>
+          <Card>
             <LdvSwitch
               title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
               color={'#fff'}
@@ -213,9 +213,9 @@ const RandomTimeDetailPage = () => {
                 }
               }}
             />
-          </Card>}
+          </Card>
           <Spacer />
-        </View>
+        </View>}
         {/* summary */}
         <Summary
           frequency={loopText(state.randomTime.weeks)}

package/src/newModules/randomTime/Summary.tsx

@@ -19,7 +19,7 @@ interface SummaryProps {
 const Summary = (props: SummaryProps) => {
   return (
     <View style={styles.cardContainer}>
-      <Text style={styles.itemTitle}>{I18n.getLang('add_randomtimecycle_subheadline_text')}</Text>
+      <Text style={styles.itemTitle}>{I18n.getLang('add_sleepschedule_one_source_subheadline4_text')}</Text>
       <Spacer height={cx(10)} />
       <View style={{}}>
         <View style={styles.summaryContainer}>

package/src/newModules/select/Route.ts

@@ -0,0 +1,17 @@
+import {NavigationRoute, TransitionPresets} from "tuya-panel-kit";
+import SelectPage from "./SelectPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const SelectPagePageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_select_page,
+    component: SelectPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+      ...TransitionPresets.ModalPresentationIOS,
+    },
+  }
+]
+
+export default SelectPagePageRouters

package/src/newModules/select/SelectPage.d.ts

@@ -0,0 +1,12 @@
+export interface SelectPageData<T> {
+    text: string;
+    selected: boolean;
+    value: T;
+}
+export interface SelectPageParams<T> {
+    title: string;
+    data: SelectPageData<T>[];
+    onSelect: (selectPageData: SelectPageData<T>) => void;
+}
+declare const SelectPage: () => any;
+export default SelectPage;

package/src/newModules/select/SelectPage.tsx

@@ -0,0 +1,138 @@
+import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
+import React from 'react'
+import {useNavigation, useRoute} from '@react-navigation/core'
+import {Utils} from 'tuya-panel-kit'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import I18n from '@ledvance/base/src/i18n'
+import Card from '@ledvance/base/src/components/Card'
+import res from '@ledvance/base/src/res'
+
+const cx = Utils.RatioUtils.convertX
+
+export interface SelectPageData<T> {
+  text: string
+  selected: boolean
+  value: T
+}
+
+export interface SelectPageParams<T> {
+  title: string
+  data: SelectPageData<T>[]
+  onSelect: (selectPageData: SelectPageData<T>) => void
+}
+
+const SelectPage = () => {
+  const params = useRoute().params as SelectPageParams<any>
+  const navigation = useNavigation()
+  return (
+    <View style={styles.root}>
+      <View style={styles.topBar}>
+        <View style={styles.topContent}>
+          <Text style={styles.title}>{params.title}</Text>
+          <TouchableOpacity
+            onPress={() => {
+              navigation.goBack()
+            }}>
+            <Text style={styles.cancel}>{I18n.getLang('auto_scan_system_cancel')}</Text>
+          </TouchableOpacity>
+        </View>
+        <View style={styles.line}/>
+      </View>
+      <ScrollView nestedScrollEnabled={true}>
+        <View>
+          <Spacer height={cx(40)}/>
+          <Card style={styles.card}>
+            <FlatList
+              data={params.data}
+              renderItem={({item}) => {
+                return (
+                  <TouchableOpacity
+                    onPress={() => {
+                      params.onSelect(item)
+                      navigation.goBack()
+                    }}>
+                    <View style={styles.item}>
+                      <Text style={styles.itemText}>{item.text}</Text>
+                      <Image
+                        style={[
+                          styles.itemIcon,
+                          {
+                            opacity: item.selected ? 1 : 0,
+                          },
+                        ]}
+                        source={{uri: res.ic_check}}/>
+                    </View>
+                  </TouchableOpacity>
+                )
+              }}
+              ItemSeparatorComponent={() => <View style={styles.itemLine}/>}
+              keyExtractor={(_, index) => `${index}`}/>
+          </Card>
+          <Spacer height={cx(40)}/>
+        </View>
+      </ScrollView>
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+  },
+  topBar: {
+    backgroundColor: '#eaeaea',
+  },
+  line: {
+    height: cx(1),
+    backgroundColor: '#d9d9d9',
+  },
+  topContent: {
+    paddingVertical: cx(30),
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  cancel: {
+    marginStart: cx(16),
+    color: '#f60',
+    fontSize: cx(17),
+    fontFamily: 'helvetica_neue_lt_std_roman',
+  },
+  title: {
+    width: '100%',
+    position: 'absolute',
+    start: 0,
+    textAlign: 'center',
+    color: '#000',
+    fontSize: cx(17),
+    paddingHorizontal: cx(110),
+    fontFamily: 'helvetica_neue_lt_std_bd',
+  },
+  card: {
+    marginHorizontal: cx(16),
+  },
+  item: {
+    height: cx(44),
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  itemText: {
+    flex: 1,
+    marginStart: cx(13),
+    color: '#000',
+    fontSize: cx(17),
+    fontFamily: 'helvetica_neue_lt_std_roman',
+  },
+  itemLine: {
+    height: cx(1),
+    marginStart: cx(13),
+    backgroundColor: '#ccc',
+  },
+  itemIcon: {
+    width: cx(30),
+    height: cx(30),
+    marginEnd: cx(13),
+    tintColor: '#f60',
+  },
+})
+
+export default SelectPage

package/src/newModules/mood/tools.ts

@@ -1,12 +0,0 @@
-import { Dialog } from 'tuya-panel-kit'
-import Strings from '@ledvance/base/src/i18n'
-
-export const showDeleteMoodDialog = (onConfirm: (data: any, args: { close: () => void }) => void) => {
-    Dialog.confirm({
-        title: Strings.getLang('string_light_pp_dialog_sm_ed_headline_d'),
-        subTitle: Strings.getLang(`strip_light_static_mood_edit_dialog_text`),
-        cancelText: Strings.getLang('cancel_dialog_delete_item_sleepschedule_answer_no_text'),
-        confirmText: Strings.getLang('cancel_dialog_delete_item_sleepschedule_answer_yes_text'),
-        onConfirm: onConfirm,
-    })
-}