@ledvance/base 1.1.88 → 1.1.90

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.1.88",
+  "version": "1.1.90",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/api/native.d.ts

@@ -65,4 +65,5 @@ export declare const queryDpIds: (dpIds: string, deviceId: string) => Promise<un
 export declare const formatNumber: (num: number, fixed: number, shoGroup?: boolean) => string;
 export declare const getTimeZone: () => string;
 export declare const getSystemTimeFormat: () => Promise<number>;
+export declare const getMicrophoneAccess: () => Promise<boolean>;
 export {};

package/src/api/native.ts

@@ -21,6 +21,7 @@ interface LDVDevicePanelManager {
   putFeature: (deviceId: string, featureId: string, value: any, callback: (res: NativeResult<string>) => void) => void
   getGroupDevices: (tyGroupId: number) => Promise<NativeResult<string>>
   getSystemTimeFormat: () => Promise<number>
+  getMicrophoneAccess: (res:any) => Promise<Result<any>>
 }
 
 export enum UADeviceCategory {
@@ -350,3 +351,15 @@ export const getSystemTimeFormat = async (): Promise<number> => {
     return 24
   }
 }
+
+export const getMicrophoneAccess: () => Promise<boolean> = () => {
+  return new Promise((resolve, _reject) => {
+      devicePanel.getMicrophoneAccess(res => {
+        const haveAuthority = (typeof res?.data === 'string') ? !!res?.data && JSON.parse(res?.data)?.haveAuthority : res?.data?.haveAuthority
+        if(!res.result || (res.result && haveAuthority !== 'granted')){
+          resolve(false)
+        }
+        resolve(true)
+      })
+  })
+}

package/src/components/DrawToolView.d.ts

@@ -1,16 +1,19 @@
+import { PropsWithChildren } from 'react';
+import { ViewProps } from 'react-native';
 export declare type Node = {
     color: string;
     backgroundColor?: string;
 };
-interface DrawToolViewProps {
+interface DrawToolViewProps extends PropsWithChildren<ViewProps> {
     switchLed?: boolean;
     showEnable?: boolean;
     setEnable: (enable: boolean) => void;
-    adjustType?: number;
+    adjustType?: 1 | 2 | 3;
     setAdjustType: (type: number) => void;
     stripStyle?: 'ONLY_LINE' | 'WITH_BEAD';
     nodes: Node[];
     fixCount?: number;
+    touchingMode?: 'CLICK' | 'TOUCH';
     nodeTouch: (idx: number) => void;
     fingerUp: (idxList: string) => void;
     hideLightView?: boolean;

package/src/components/DrawToolView.tsx

@@ -1,34 +1,36 @@
-import React, { useMemo, useEffect, useCallback } from 'react'
-import { View, Text, StyleSheet, TouchableOpacity, Image } from 'react-native'
-import { Utils, Modal } from 'tuya-panel-kit'
-import { useReactive } from "ahooks"
-import Card from "@ledvance/base/src/components/Card"
-import res from '@ledvance/base/src/res'
-import I18n from '@ledvance/base/src/i18n'
-import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
-import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
-import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils'
-import Spacer from "@ledvance/base/src/components/Spacer"
-import DeleteButton from "@ledvance/base/src/components/DeleteButton"
-import Stepper from '@ledvance/base/src/components/Stepper'
-const { convertX: cx } = Utils.RatioUtils
+import React, { PropsWithChildren, useCallback, useEffect, useMemo } from 'react'
+import { Image, StyleSheet, Text, TouchableOpacity, View, ViewProps } from 'react-native'
+import { Modal, Utils } from 'tuya-panel-kit'
+import { useReactive } from 'ahooks'
+import Card from './Card'
+import res from '@res'
+import I18n from '@i18n'
+import LdvSwitch from './ldvSwitch'
+import LampAdjustView from './LampAdjustView'
+import { hsv2Hex, mapFloatToRange } from '@utils'
+import Spacer from './Spacer'
+import DeleteButton from './DeleteButton'
+import Stepper from './Stepper'
 import StripLightView from './StripLightView'
-import { nativeEventEmitter} from '@ledvance/base/src/api/nativeEventEmitter'
+import { nativeEventEmitter } from '../api/nativeEventEmitter'
+
+const { convertX: cx } = Utils.RatioUtils
 
 export type Node = {
   color: string,
   backgroundColor?: string
 }
 
-interface DrawToolViewProps {
+interface DrawToolViewProps extends PropsWithChildren<ViewProps> {
   switchLed?: boolean
   showEnable?: boolean
   setEnable: (enable: boolean) => void
-  adjustType?: number   // 1 全选, 2 单选, 3 擦除
+  adjustType?: 1 | 2 | 3   // 1 全选, 2 单选, 3 擦除
   setAdjustType: (type: number) => void
   stripStyle?: 'ONLY_LINE' | 'WITH_BEAD'
   nodes: Node[]
   fixCount?: number
+  touchingMode?: 'CLICK' | 'TOUCH'
   nodeTouch: (idx: number) => void
   fingerUp: (idxList: string) => void
   hideLightView?: boolean
@@ -52,11 +54,12 @@ interface DrawToolViewProps {
   ledNum?: number
   setLedNum: (num: number) => void
 }
+
 const DrawToolView = (props: DrawToolViewProps) => {
   const state = useReactive({
     visible: false,
     ledNum: props.ledNum || 5,
-    width: 0
+    width: 0,
   })
 
   useEffect(() => {
@@ -69,7 +72,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
     }
   }, [])
 
-  const onLayout = (event) => {
+  const onLayout = (event: any) => {
     const { width } = event.nativeEvent.layout
     state.width = width
   }
@@ -86,125 +89,129 @@ const DrawToolView = (props: DrawToolViewProps) => {
     return '#ffffff'
   }, [props.isColorMode, props.h, props.s])
 
-  return <Card style={{ marginHorizontal: cx(24) }}>
-    <LdvSwitch
-      title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
-      color={'#fff'}
-      colorAlpha={1}
-      enable={!!props.switchLed}
-      showSwitch={!!props.showEnable}
-      setEnable={props.setEnable}
-    />
-    {(props.showEnable && props.switchLed || !props.showEnable) && <>
-      <View style={styles.container}>
-        <View style={styles.adjustButtons}>
-          <TouchableOpacity
-            onPress={() => {
-              props.setAdjustType(1)
-            }}>
-            <Image
-              style={[styles.adjustButton, { tintColor: props.adjustType === 1 ? '#f60' : '#666' }]}
-              source={res.ic_paint_bucket} />
-          </TouchableOpacity>
-          <TouchableOpacity
-            onPress={() => {
-              props.setAdjustType(3)
-            }}>
-            <Image
-              style={[styles.adjustButton, { tintColor: props.adjustType === 3 ? '#f60' : '#666' }]}
-              source={res.ic_disabled_light} />
-          </TouchableOpacity>
-          <TouchableOpacity
-            onPress={() => {
-              props.setAdjustType(2)
-            }}>
-            <Image
-              style={[styles.adjustButton, { tintColor: props.adjustType === 2 ? '#f60' : '#666' }]}
-              source={res.ic_colorize} />
-          </TouchableOpacity>
-          {!props.hideLedNum && <TouchableOpacity
-            onPress={() => {
-              state.visible = true
-            }}
-            style={[styles.adjustButton, { alignItems: 'center', justifyContent: 'center', backgroundColor: '#f60', borderRadius: cx(5) }]}>
-            <Text style={{ color: '#fff', fontSize: cx(18), fontWeight: 'bold' }}>{props.ledNum || 5}</Text>
-          </TouchableOpacity>}
-        </View>
-        <StripLightView
-          style={{ height, flex: 1 }}
-          nodes={JSON.stringify(props.nodes)}
-          fixCount={props.fixCount || 5}
-          stripStyle={props.stripStyle || 'WITH_BEAD'}
-          width={state.width}
-          onLayout={onLayout}
-        />
-      </View>
+  return (
+    <Card style={{ marginHorizontal: cx(24) }}>
       <LdvSwitch
-        title={I18n.getLang('add_new_dynamic_mood_lights_field_headline2_text')}
-        color={getBlockColor()}
+        title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
+        color={'#fff'}
         colorAlpha={1}
-        enable={false}
-        showSwitch={false}
-        setEnable={() => { }}
-      />
-      <LampAdjustView
-        isSupportColor={!!props.isSupportColor}
-        isSupportTemperature={!!props.isSupportTemperature}
-        isSupportBrightness={!!props.isSupportBrightness}
-        isColorMode={!!props.isColorMode}
-        reserveSV={true}
-        setIsColorMode={props.setIsColorMode}
-        h={props.h} s={props.s} v={props.v}
-        onHSVChange={props.onHSVChange}
-        onHSVChangeComplete={props.onHSVChangeComplete}
-        colorTemp={props.temperature}
-        brightness={props.brightness}
-        onCCTChange={props.onCCTChange}
-        onCCTChangeComplete={props.onCCTChangeComplete}
-        onBrightnessChange={props.onBrightnessChange}
-        onBrightnessChangeComplete={props.onBrightnessChangeComplete} />
-      {!props.hideLedNum && <Modal
-        visible={state.visible}
-        onMaskPress={() => {
-          state.visible = false
-        }}
-        alignContainer='center'
-        style={{ width: '100%', height: cx(100) }}
-      >
-        <Card style={{ marginHorizontal: cx(24), marginTop: cx(50), alignItems: 'center' }}>
-          <Spacer />
-          <Stepper
-            min={5}
-            max={48}
-            stepValue={1}
-            editable={true}
-            value={state.ledNum}
-            onValueChange={(v) => {
-              state.ledNum = v
-            }}
-          />
-          <Spacer />
-          <DeleteButton
-            text={I18n.getLang('auto_scan_system_wifi_confirm')}
-            style={{ width: cx(150), height: cx(40), backgroundColor: '#f60' }}
-            textStyle={{ fontSize: cx(14) }}
-            onPress={() => {
-              props.setLedNum(state.ledNum)
+        enable={!!props.switchLed}
+        showSwitch={!!props.showEnable}
+        setEnable={props.setEnable}/>
+      {(props.showEnable && props.switchLed || !props.showEnable) && <>
+          <View style={styles.container}>
+              <View style={styles.adjustButtons}>
+                  <TouchableOpacity
+                      onPress={() => {
+                        props.setAdjustType(1)
+                      }}>
+                      <Image
+                          style={[styles.adjustButton, { tintColor: props.adjustType === 1 ? '#f60' : '#666' }]}
+                          source={res.ic_paint_bucket}/>
+                  </TouchableOpacity>
+                  <TouchableOpacity
+                      onPress={() => {
+                        props.setAdjustType(3)
+                      }}>
+                      <Image
+                          style={[styles.adjustButton, { tintColor: props.adjustType === 3 ? '#f60' : '#666' }]}
+                          source={res.ic_disabled_light}/>
+                  </TouchableOpacity>
+                  <TouchableOpacity
+                      onPress={() => {
+                        props.setAdjustType(2)
+                      }}>
+                      <Image
+                          style={[styles.adjustButton, { tintColor: props.adjustType === 2 ? '#f60' : '#666' }]}
+                          source={res.ic_colorize}/>
+                  </TouchableOpacity>
+                {!props.hideLedNum && <TouchableOpacity
+                    onPress={() => {
+                      state.visible = true
+                    }}
+                    style={[styles.adjustButton, {
+                      alignItems: 'center',
+                      justifyContent: 'center',
+                      backgroundColor: '#f60',
+                      borderRadius: cx(5),
+                    }]}>
+                    <Text style={{ color: '#fff', fontSize: cx(18), fontWeight: 'bold' }}>{props.ledNum || 5}</Text>
+                </TouchableOpacity>}
+              </View>
+              <StripLightView
+                  style={{ height, flex: 1 }}
+                  nodes={props.nodes}
+                  fixCount={props.fixCount || 5}
+                  stripStyle={props.stripStyle || 'WITH_BEAD'}
+                  touchingMode={props.touchingMode || 'TOUCH'}
+                  width={state.width}
+                  onLayout={onLayout}/>
+          </View>
+          <LdvSwitch
+              title={I18n.getLang('add_new_dynamic_mood_lights_field_headline2_text')}
+              color={getBlockColor()}
+              colorAlpha={1}
+              enable={false}
+              showSwitch={false}
+              setEnable={() => {
+              }}/>
+          <LampAdjustView
+              isSupportColor={!!props.isSupportColor}
+              isSupportTemperature={!!props.isSupportTemperature}
+              isSupportBrightness={!!props.isSupportBrightness}
+              isColorMode={!!props.isColorMode}
+              reserveSV={true}
+              setIsColorMode={props.setIsColorMode}
+              h={props.h} s={props.s} v={props.v}
+              onHSVChange={props.onHSVChange}
+              onHSVChangeComplete={props.onHSVChangeComplete}
+              colorTemp={props.temperature}
+              brightness={props.brightness}
+              onCCTChange={props.onCCTChange}
+              onCCTChangeComplete={props.onCCTChangeComplete}
+              onBrightnessChange={props.onBrightnessChange}
+              onBrightnessChangeComplete={props.onBrightnessChangeComplete}/>
+        {!props.hideLedNum && <Modal
+            visible={state.visible}
+            onMaskPress={() => {
               state.visible = false
             }}
-          />
-          <Spacer />
-        </Card>
-      </Modal>}
-    </>}
-  </Card>
+            alignContainer="center"
+            style={{ width: '100%', height: cx(100) }}>
+            <Card style={{ marginHorizontal: cx(24), marginTop: cx(50), alignItems: 'center' }}>
+                <Spacer/>
+                <Stepper
+                    min={5}
+                    max={48}
+                    stepValue={1}
+                    editable={true}
+                    value={state.ledNum}
+                    onValueChange={(v) => {
+                      state.ledNum = v
+                    }}/>
+                <Spacer/>
+                <DeleteButton
+                    text={I18n.getLang('auto_scan_system_wifi_confirm')}
+                    style={{ width: cx(150), height: cx(40), backgroundColor: '#f60' }}
+                    textStyle={{ fontSize: cx(14) }}
+                    onPress={() => {
+                      props.setLedNum(state.ledNum)
+                      state.visible = false
+                    }}/>
+                <Spacer/>
+            </Card>
+        </Modal>}
+        {props.children}
+      </>}
+    </Card>
+  )
 }
 
 const styles = StyleSheet.create({
   container: {
     paddingLeft: cx(10),
     flexDirection: 'row',
-    alignItems: 'center'
+    alignItems: 'center',
   },
   title: {
     color: '#000',
@@ -214,12 +221,12 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
   },
   adjustButtons: {
-    width: cx(50)
+    width: cx(50),
   },
   adjustButton: {
     width: cx(44),
-    height: cx(44)
-  }
+    height: cx(44),
+  },
 })
 
 export default DrawToolView

package/src/components/StripLightView.d.ts

@@ -1,2 +1,14 @@
-declare const StripLightView: any;
+import { ViewProps } from 'react-native';
+export interface LightNode {
+    color: string;
+    backgroundColor?: string;
+}
+export interface StripLightViewProps extends ViewProps {
+    nodes: LightNode[];
+    fixCount: number;
+    stripStyle: 'ONLY_LINE' | 'WITH_BEAD';
+    touchingMode?: 'CLICK' | 'TOUCH';
+    width: number;
+}
+declare const StripLightView: (props: StripLightViewProps) => JSX.Element;
 export default StripLightView;

package/src/components/StripLightView.tsx

@@ -0,0 +1,25 @@
+import { requireNativeComponent, ViewProps } from 'react-native'
+import React from 'react-redux/node_modules/@types/react'
+
+const NativeStripLightView = requireNativeComponent('StripLightView')
+
+export interface LightNode {
+  color: string
+  backgroundColor?: string
+}
+
+export interface StripLightViewProps extends ViewProps {
+  nodes: LightNode[]
+  fixCount: number
+  stripStyle: 'ONLY_LINE' | 'WITH_BEAD'
+  touchingMode?: 'CLICK' | 'TOUCH'
+  width: number
+}
+
+const StripLightView = (props: StripLightViewProps) => {
+  return (
+    <NativeStripLightView {...props} nodes={JSON.stringify(props.nodes)}/>
+  )
+}
+
+export default StripLightView

package/src/components/StripLightView.ts

@@ -1,4 +0,0 @@
-import { requireNativeComponent } from 'react-native'
-const StripLightView = requireNativeComponent('StripLightView');
-
- export default StripLightView