@ledvance/ui-biz-bundle 1.1.72 → 1.1.74

package/package.json

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

package/src/modules/timer/TimerPage.tsx

@@ -193,6 +193,8 @@ const TimerPage = (props: {theme?: any}) => {
     activeTimerTitle: {
       fontSize: cx(20),
       color: props.theme.global.fontColor,
+      flex: 1,
+      paddingRight: cx(10)
     },
     activeTimerCancelBtn: {
       paddingHorizontal: cx(8),

package/src/modules/timer/TimerPageAction.ts

@@ -138,5 +138,5 @@ export function timeFormat(time: number): string {
     hour += 1
     min = 0
   }
-  return `${hour > 0 ? `${hour} h ` : ''}${min > 0 ? `${min} min` : ''}`
+  return `${hour > 0 ? `${hour} h ` : ''}${min > 0 ? `${min}` : ''}`
 }

package/src/navigation/Routers.ts

@@ -43,5 +43,6 @@ export const ui_biz_routerKey = {
   'ui_biz_light_mode': 'ui_biz_light_mode',
   'ui_biz_overcharge_switch': 'ui_biz_overcharge_switch',
   'ui_biz_child_lock': 'ui_biz_child_lock',
-  'ui_biz_remote_control': 'ui_biz_remote_control'
+  'ui_biz_remote_control': 'ui_biz_remote_control',
+  'ui_biz_switch_gradient': 'ui_biz_switch_gradient'
 }

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -268,12 +268,12 @@ const FixedTimeDetailPage = () => {
             <View style={{ flexDirection: 'column' }}>
               <Text style={{ color: '#000' }}>{I18n.formatValue('feature_summary_action_txt_4', `${Math.trunc(state.fixedTime.openTime / 60)}`, `${state.fixedTime.openTime % 60}`)}</Text>
               <View style={styles.summaryTag}>
-                <Text style={{ color: '#000' }}>{I18n.getLang('timeschedule_add_schedule_nightlight_plug_selectionfield_text2')}</Text>
+                <Text style={{ color: '#000' }}>{params.applyForList[params.isPlug ? (state.fixedTime.channel ?? 0) : 0]?.key}</Text>
               </View>
               <Spacer height={cx(5)} />
               <Text style={{ color: '#000' }}>{I18n.formatValue('feature_summary_action_txt_6', `${Math.trunc(state.fixedTime.closeTime / 60)}`, `${state.fixedTime.closeTime % 60}`)}</Text>
               <View style={styles.summaryTag}>
-                <Text style={{ color: '#000' }}>{I18n.getLang('timeschedule_add_schedule_nightlight_plug_selectionfield_text2')}</Text>
+                <Text style={{ color: '#000' }}>{params.applyForList[params.isPlug ? (state.fixedTime.channel ?? 0) : 0]?.key}</Text>
               </View>
             </View>
           )}

package/src/newModules/switchGradient/Routers.ts

@@ -0,0 +1,16 @@
+import {NavigationRoute} from "tuya-panel-kit";
+import SwitchGradientPage from "./SwitchGradientPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const SwitchGradientPagePageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_switch_gradient,
+    component: SwitchGradientPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
+]
+
+export default SwitchGradientPagePageRouters

package/src/newModules/switchGradient/SwitchGradientActions.ts

@@ -0,0 +1,26 @@
+import { useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
+import { Result } from "@ledvance/base/src/models/modules/Result"
+import { useCallback } from "react"
+
+export function useSwitchGradient(dpCode: string): [number, number, (onDuration: number, offDuration: number) => Promise<Result<any>>] {
+  const [sgHex, setSgHex] = useDp<string, any>(dpCode)
+
+  const sgHexFixed = !!sgHex && sgHex.length == 14 ? sgHex : '00000000000000'
+
+  const versionHex = sgHexFixed.substring(0, 2)
+
+  const switchOnDuration = parseInt(sgHexFixed.substring(2, 8), 16)
+  const switchOffDuration = parseInt(sgHexFixed.substring(8), 16)
+  const setSwitchGradient = useCallback(async (onDuration: number, offDuration: number) => {
+    const switchOnDurationHex = (onDuration * 1000).toString(16).padStart(6, '0')
+    const switchOffDurationHex = (offDuration * 1000).toString(16).padStart(6, '0')
+    const sgHex = `${versionHex}${switchOnDurationHex}${switchOffDurationHex}`
+    return await setSgHex(sgHex)
+  }, [setSgHex])
+
+  return [
+    switchOnDuration <= 0 ? 0 : switchOnDuration / 1000,
+    switchOffDuration <= 0 ? 0 : switchOffDuration / 1000,
+    setSwitchGradient,
+  ]
+}

package/src/newModules/switchGradient/SwitchGradientPage.tsx

@@ -0,0 +1,124 @@
+import Page from '@ledvance/base/src/components/Page'
+import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import React from 'react'
+import res from '@ledvance/base/src/res'
+import {useSwitchGradient} from './SwitchGradientActions'
+import {StyleSheet, Text, View} from 'react-native'
+import {useReactive, useUpdateEffect} from 'ahooks'
+import { Utils} from 'tuya-panel-kit'
+import Card from '@ledvance/base/src/components/Card'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import {useNavigation} from '@react-navigation/core'
+import I18n from '@ledvance/base/src/i18n'
+import Stepper from '@ledvance/base/src/components/Stepper'
+import { useParams } from '@ledvance/base/src/hooks/Hooks'
+
+const {convertX: cx} = Utils.RatioUtils
+
+export interface SwitchGradientPageParams {
+  switchGradientDpCode: string 
+}
+
+const SwitchGradientPage = () => {
+  const devInfo = useDeviceInfo()
+  const navigation = useNavigation()
+  const params = useParams<SwitchGradientPageParams>()
+  const [
+    switchOnDuration,
+    switchOffDuration,
+    setSwitchGradient,
+  ] = useSwitchGradient(params.switchGradientDpCode)
+
+  const state = useReactive({
+    loading: false,
+    switchOnDuration,
+    switchOffDuration,
+  })
+
+  useUpdateEffect(() => {
+    state.switchOnDuration = switchOnDuration
+    state.switchOffDuration = switchOffDuration
+
+  }, [switchOnDuration, switchOffDuration])
+
+  return (
+    <Page
+      backText={devInfo.name}
+      headlineText={I18n.getLang('matter_gradient_overview_headline_text')}
+      rightButtonIcon={res.ic_check}
+      rightButtonIconClick={async () => {
+        state.loading = true
+        const res = await setSwitchGradient(state.switchOnDuration, state.switchOffDuration)
+        state.loading = false
+        console.log(res)
+        navigation.goBack()
+      }}
+      loading={state.loading}>
+      <View>
+        <Card style={styles.stepCard}>
+          <Spacer height={cx(16)}/>
+          <Text style={styles.stepTitle}>{I18n.getLang('matter_gradient_light_on_description_text')}</Text>
+          <Spacer height={cx(10)}/>
+          <View style={styles.stepGroup}>
+            <Text style={styles.stepText}>{I18n.getLang('matter_gradient_light_on_title')}</Text>
+            <Stepper
+              value={state.switchOnDuration}
+              min={0}
+              max={60}
+              stepValue={0.2}
+              precision={1}
+              editable={true}
+              isRealTime={true}
+              onValueChange={v => {
+                state.switchOnDuration = v
+              }}/>
+          </View>
+          <Spacer height={cx(16)}/>
+        </Card>
+        <Spacer/>
+        <Card style={styles.stepCard}>
+          <Spacer height={cx(16)}/>
+          <Text style={styles.stepTitle}>{I18n.getLang('matter_gradient_light_off_description_text')}</Text>
+          <Spacer height={cx(10)}/>
+          <View style={styles.stepGroup}>
+            <Text style={styles.stepText}>{I18n.getLang('matter_gradient_light_off_title')}</Text>
+            <Stepper
+              value={state.switchOffDuration}
+              min={0}
+              max={60}
+              stepValue={0.2}
+              precision={1}
+              editable={true}
+              isRealTime={true}
+              onValueChange={v => {
+                state.switchOffDuration = v
+              }}/>
+          </View>
+          <Spacer height={cx(16)}/>
+        </Card>
+      </View>
+    </Page>
+  )
+}
+
+const styles = StyleSheet.create({
+  stepCard: {
+    marginHorizontal: cx(24),
+    paddingHorizontal: cx(16),
+  },
+  stepTitle: {
+    color: '#000',
+    fontSize: cx(14),
+  },
+  stepGroup: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  stepText: {
+    flex: 1,
+    color: '#000',
+    fontSize: cx(16),
+  },
+})
+
+export default SwitchGradientPage