@ledvance/group-ui-biz-bundle 1.0.25 → 1.0.27

package/package.json

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

package/src/modules/flags/FlagEditPage.tsx

@@ -70,7 +70,7 @@ const FlagEditPage = () => {
 
   return (
     <Page
-      backText={I18n.getLang('mesh_device_detail_mode')}
+      backText={I18n.getLang('Feature_devicepanel_flags')}
       showBackDialog={true}
       loading={state.loading}
       backDialogTitle={
@@ -272,6 +272,7 @@ const FlagEditPage = () => {
               h={state.currentNode.h}
               s={state.currentNode.s}
               v={state.currentNode.v}
+              minBrightness={0}
               reserveSV={true}
               onHSVChange={(h, s, v) => {
                 if (state.colorPaintBucketSelected) {

package/src/modules/remoteSwitch/RemoteSwitchAction.ts

@@ -0,0 +1,10 @@
+import {useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import {Result} from "@ledvance/base/src/models/modules/Result";
+
+interface RemoteSwitchConfig {
+  remoteSwitch: boolean
+}
+
+export function useRemoteSwitch(): [boolean, (v: boolean) => Promise<Result<any>>] {
+  return useFeatureHook<RemoteSwitchConfig, boolean>('remoteSwitch', false)
+}

package/src/modules/remoteSwitch/RemoteSwitchPage.tsx

@@ -0,0 +1,69 @@
+import React from 'react'
+import {SwitchButton, Utils} from "tuya-panel-kit";
+import Page from "@ledvance/base/src/components/Page";
+import I18n from "@ledvance/base/src/i18n/index";
+import {useDeviceInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import {useReactive} from "ahooks";
+import Spacer from "@ledvance/base/src/components/Spacer";
+import {useRemoteSwitch} from "./RemoteSwitchAction";
+import {View, Text, StyleSheet} from "react-native";
+
+const { convertX: cx } = Utils.RatioUtils
+
+const RemoteSwitchPage = () => {
+  const devInfo = useDeviceInfo()
+  const [remoteSwitch, setRemoteSwitch] = useRemoteSwitch()
+  const state = useReactive({
+    loading: false
+  })
+  return (<Page
+    backText={devInfo.name}
+    loading={state.loading}>
+    <View style={[styles.titleBGView, styles.shadow]}>
+      <Text style={styles.title}>{I18n.getLang('light_sources_specific_settings_remote_control')}</Text>
+      <View style={[styles.colorBlock, { backgroundColor: 'red', opacity: 0 }]} />
+      <Spacer style={{ flex: 1 }} height={0} width={0} />
+      <SwitchButton value={remoteSwitch} onValueChange={async v => {
+        state.loading = true
+        await setRemoteSwitch(v)
+        state.loading = false
+      } } />
+    </View>
+  </Page>)
+}
+
+const styles = StyleSheet.create({
+  titleBGView: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: cx(16),
+    marginHorizontal: cx(24),
+    marginTop: cx(30),
+  },
+  colorBlock: {
+    width: cx(20),
+    height: cx(20),
+    marginStart: cx(12),
+    borderRadius: cx(4),
+  },
+  title: {
+    color: '#000',
+    fontSize: cx(14),
+    fontFamily: 'helvetica_neue_lt_std_bd',
+    paddingVertical: cx(16),
+  },
+  shadow: {
+    shadowColor: '#000000',
+    shadowOpacity: 0.2,
+    shadowRadius: 8,
+    elevation:8,
+    shadowOffset: {
+      width: 0,
+      height: 4,
+    },
+    backgroundColor: '#fff',
+    borderRadius: 8,
+  },
+})
+
+export default RemoteSwitchPage

package/src/modules/switchGradient/SwitchGradientAction.ts

@@ -0,0 +1,27 @@
+import {useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import {Result} from "@ledvance/base/src/models/modules/Result";
+import {useCallback} from "react";
+
+interface SwitchGradientConfig {
+  switchGradient: string
+}
+
+export function useSwitchGradient(): [number, number, (onDuration: number, offDuration: number) => Promise<Result<any>>] {
+  const [config, setConfig] = useFeatureHook<SwitchGradientConfig, string>('switchGradient', '00000000000000')
+  const sgHexFixed = !!config && config.length == 14 ? config : '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 setConfig(sgHex)
+  }, [setConfig])
+
+  return [
+    switchOnDuration <= 0 ? 0 : switchOnDuration / 1000,
+    switchOffDuration <= 0 ? 0 : switchOffDuration / 1000,
+    setSwitchGradient,
+  ]
+}

package/src/modules/switchGradient/SwitchGradientPage.tsx

@@ -0,0 +1,115 @@
+import {useReactive, useUpdateEffect} from "ahooks";
+import {useSwitchGradient} from "./SwitchGradientAction";
+import { useNavigation } from '@react-navigation/native'
+import {useDeviceInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import {Utils} from "tuya-panel-kit";
+import Page from "@ledvance/base/src/components/Page";
+import I18n from "@ledvance/base/src/i18n";
+import res from "@ledvance/base/src/res";
+import React from "react";
+import {View, Text, StyleSheet} from "react-native";
+import Card from "@ledvance/base/src/components/Card";
+import Spacer from "@ledvance/base/src/components/Spacer";
+import Stepper from '@ledvance/base/src/components/Stepper'
+
+const {convertX: cx} = Utils.RatioUtils
+
+const SwitchGradientPage = () => {
+  const devInfo = useDeviceInfo()
+  const navigation = useNavigation()
+  const [
+    switchOnDuration,
+    switchOffDuration,
+    setSwitchGradient,
+  ] = useSwitchGradient()
+
+  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}
+              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}
+              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

package/src/modules/timer/TimerAction.ts

@@ -1,8 +1,9 @@
-import { useFeatureHook } from '@ledvance/base/src/models/modules/NativePropsSlice'
-import { Result } from '@ledvance/base/src/models/modules/Result'
+import {useFeatureHook} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {Result} from '@ledvance/base/src/models/modules/Result'
 import dayjs from 'dayjs'
-import { useCountDown, useReactive } from 'ahooks'
-import { useEffect, useMemo } from 'react'
+import {useCountDown, useReactive} from 'ahooks'
+import {useEffect, useMemo} from 'react'
+import {I18nKey} from "../../../.yalc/@ledvance/base/src/i18n/index";
 
 export interface TimerTask {
   name: string
@@ -15,8 +16,8 @@ export interface TimerTask {
     enable: boolean
   }
   status: TaskStatus
-  stringOn: string
-  stringOff: string
+  stringOn: I18nKey
+  stringOff: I18nKey
 }
 
 export enum TaskStatus {
@@ -154,14 +155,21 @@ export interface TimerSettableDp {
     code: string
     enable: boolean
   }
-  stringOn: string
-  stringOff: string
+  stringOn: I18nKey
+  stringOff: I18nKey
 }
 
 export interface TimerPageParams {
   timerSettableDps: TimerSettableDp[]
 }
 
+export function timeFormatToRealTime(mCountdown: number) {
+  const date = new Date()
+  const now = date.getTime()
+  const after = new Date(now + mCountdown * 1000)
+  return `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
+}
+
 export function timeFormat(time: number): string {
   let hour = Math.trunc(time / 3600)
   const beforeMin = (time % 3600) / 60

package/src/modules/timer/TimerPage.tsx

@@ -8,7 +8,7 @@ import LdvPickerView from '@ledvance/base/src/components/ldvPickerView'
 import { useReactive } from 'ahooks'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
-import { TaskStatus, timeFormat, TimerPageParams, TimerTask, useTimerTasks } from './TimerAction'
+import {TaskStatus, timeFormat, timeFormatToRealTime, TimerPageParams, TimerTask, useTimerTasks} from './TimerAction'
 import { cloneDeep, groupBy } from 'lodash'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import GroupBizRes from '../../res/GroupBizRes'
@@ -188,7 +188,7 @@ const TimerPage = () => {
                   </View>
                   <Spacer height={cx(32)}/>
                   <Text
-                      style={[styles.activeTaskDesc, { textAlign: 'center' }]}>{I18n.formatValue(startedTasks[0].dp.enable ? startedTasks[0].stringOff : startedTasks[0].stringOn, timeFormat(startedTasks[0].timeLeft))}</Text>
+                      style={[styles.activeTaskDesc, { textAlign: 'center' }]}>{I18n.formatValue(startedTasks[0].dp.enable ? startedTasks[0].stringOff : startedTasks[0].stringOn, timeFormatToRealTime(startedTasks[0].timeLeft))}</Text>
                   <Spacer height={cx(32)}/>
                   <TextButton
                       text={I18n.getLang('auto_scan_system_cancel')}
@@ -241,7 +241,7 @@ function ActiveTimerItem(task: TimerTask, onCancel: () => void) {
       <Spacer/>
       <View style={{ marginHorizontal: cx(20) }}>
         <Text style={styles.activeTaskDesc}>{
-          I18n.formatValue(task.dp.enable ? task.stringOff : task.stringOn, timeFormat(task.timeLeft))
+          I18n.formatValue(task.dp.enable ? task.stringOff : task.stringOn, timeFormatToRealTime(task.timeLeft))
         }</Text>
       </View>
       <Spacer height={cx(22)}/>
@@ -339,7 +339,7 @@ const styles = StyleSheet.create({
     fontSize: cx(14),
   },
   activeTasBtn: {
-    width: cx(75),
+    width: 'auto',
     height: cx(36),
     padding: 0,
     backgroundColor: '#666',

package/src/navigation/Routers.ts

@@ -1,4 +1,4 @@
-import { NavigationRoute, TransitionPresets } from 'tuya-panel-kit'
+import {NavigationRoute, TransitionPresets} from 'tuya-panel-kit'
 import TimerPage from '../modules/timer/TimerPage'
 import TimeSchedulePage from '../modules/time_schedule/TimeSchedulePage'
 import TimeScheduleDetailPage from '../modules/time_schedule/TimeScheduleDetailPage'
@@ -9,6 +9,8 @@ import StaticMoodEditorPage from '../modules/mood/StaticMoodEditorPage'
 import SelectPage from '../modules/select/SelectPage'
 import FlagPage from '../modules/flags/FlagPage'
 import FlagEditPage from '../modules/flags/FlagEditPage'
+import RemoteSwitchPage from "../modules/remoteSwitch/RemoteSwitchPage";
+import SwitchGradientPage from "../modules/switchGradient/SwitchGradientPage";
 
 export const ui_biz_routerKey = {
   'group_ui_biz_timer': 'group_ui_biz_timer',
@@ -20,7 +22,9 @@ export const ui_biz_routerKey = {
   'group_ui_biz_dynamic_mood_edit': 'group_ui_biz_dynamic_mood_edit',
   'group_ui_biz_select_page': 'group_ui_biz_select_page',
   'group_ui_biz_flag_page': 'group_ui_biz_flag_page',
-  'group_ui_biz_flag_page_edit': 'group_ui_biz_flag_page_edit'
+  'group_ui_biz_flag_page_edit': 'group_ui_biz_flag_page_edit',
+  'group_ui_biz_remote_switch': 'group_ui_biz_remote_switch',
+  'group_ui_biz_switch_gradient': 'group_ui_biz_switch_gradient',
 }
 
 export const TimerRouters: NavigationRoute[] = [
@@ -78,7 +82,7 @@ export const MoodRouters: NavigationRoute[] = [
       showOfflineView: false,
     },
   },
-  { 
+  {
     name: ui_biz_routerKey.group_ui_biz_dynamic_mood_edit,
     component: DynamicMoodEditorPage,
     options: {
@@ -117,4 +121,26 @@ export const FlagPageRouters: NavigationRoute[] = [
       showOfflineView: false,
     }
   },
-]
+]
+
+export const RemoteSwitchRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.group_ui_biz_remote_switch,
+    component: RemoteSwitchPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  }
+]
+
+export const SwitchGradientRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.group_ui_biz_switch_gradient,
+    component: SwitchGradientPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  }
+]