@ledvance/base 1.2.98 → 1.3.0

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.2.98",
+  "version": "1.3.0",
   "scripts": {
     "prepublishOnly": "python update-localazy.py"
   },

package/src/api/native.ts

@@ -60,6 +60,8 @@ export interface DeviceInfo {
   deviceCategory: UADeviceCategory
   roomName: string
   status: number
+  dps: string 
+  tuyaDeviceId: string
 }
 
 const devicePanel: LDVDevicePanelManager = NativeModules.LDVDevicePanelManager

package/src/components/AdvanceList.tsx

@@ -4,12 +4,15 @@ import AdvanceCard, { AdvancedData } from './AdvanceCard'
 import Spacer from './Spacer'
 import { useNavigation } from '@react-navigation/core'
 import { Utils } from 'tuya-panel-kit'
+import { getMicrophoneAccess } from '@ledvance/base/src/api/native'
 
 const { convertX: cx } = Utils.RatioUtils
 
+const MusicRouterKey = ['ui_biz_music', 'group_ui_biz_music']
+
 export interface AdvanceListProps {
   advanceData: AdvancedData[],
-  onAdvanceItemClick?: (advanceData: AdvancedData, index: number) => Promise<void> | undefined
+  onAdvanceItemClick?: (advanceData: AdvancedData, index: number) => void | undefined
 }
 
 function AdvanceList(props: AdvanceListProps) {
@@ -21,9 +24,15 @@ function AdvanceList(props: AdvanceListProps) {
     <View style={styles.item}>
       <AdvanceCard
         data={item}
-        onPress={() => {
-          if (!onAdvanceItemClick || onAdvanceItemClick(item, index)) {
-            navigation.navigate(item.router.key, item.router.params)
+        onPress={async () => {
+          if(MusicRouterKey.includes(item.router.key)){
+            getMicrophoneAccess().then(res =>{
+              if(!res) return 
+            })
+          }else{
+            if (!onAdvanceItemClick || onAdvanceItemClick(item, index)) {
+              navigation.navigate(item.router.key, item.router.params)
+            }
           }
         }}>
         {item.icons && <View style={{

package/src/components/CircularProgress.tsx

@@ -9,20 +9,19 @@ export interface CircularProgressProps extends PropsWithChildren<ViewProps> {
 }
 
 export function CircularProgress(props: CircularProgressProps) {
-  return <Progress
-    foreColor={{
-      '0%': '#f60',
-      '100%': '#f60',
-    }}
+  return <Progress.Double
     style={[{ width: props.size, height: props.size }, props.style]}
     disabled={true}
-    needMaxCircle={true}
-    thumbRadius={Math.trunc(props.strokeWidth / 2)}
+    thumbRadius={Math.trunc(props.strokeWidth / 2) - 0.5}
+    minThumbFill={'#f60'}
+    minThumbStroke={'#f60'}
     thumbStroke={'#f60'}
     thumbFill={'#f60'}
     thumbStrokeWidth={0}
     scaleHeight={props.strokeWidth}
-    value={props.progress}
+    minValue={0}
+    maxValue={props.progress}
+    foreColor={'#f60'}
     startDegree={270}
     andDegree={360}
     renderCenterView={

package/src/components/Page.tsx

@@ -23,6 +23,7 @@ interface PageProps extends PropsWithChildren<ViewProps> {
   headlineIcon?: string | number
   onHeadlineIconClick?: () => void
   headlineContent?: React.ReactNode
+  headlineTopContent?: React.ReactNode
   showGreenery?: boolean
   greeneryIcon?: string | undefined | number
   loading?: boolean
@@ -88,6 +89,7 @@ const Page = (props: PageProps) => {
             showGreenery={props.showGreenery}
             greeneryIcon={props.greeneryIcon}
             headlineContent={props.headlineContent}
+            headlineTopContent={props.headlineTopContent}
             />}
         {props.children}
       </View>

package/src/components/ldvTopName.tsx

@@ -1,3 +1,4 @@
+import Spacer from '@ledvance/base/src/components/Spacer'
 import React from 'react'
 import {Image, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import {Utils} from 'tuya-panel-kit'
@@ -13,6 +14,7 @@ interface LdvTopNameProps {
   showGreenery?: boolean
   greeneryIcon?: string | undefined | number
   headlineContent?: React.ReactNode
+  headlineTopContent?: React.ReactNode
 }
 
 const LdvTopName = (props: LdvTopNameProps) => {
@@ -31,12 +33,13 @@ const LdvTopName = (props: LdvTopNameProps) => {
   })
   return (
     <View style={styles.container}>
+      {props.headlineTopContent && props.headlineTopContent}
+      {!props.headlineTopContent && <Spacer height={cx(38)}/>}
       <View
         style={{
           flexDirection: 'row',
           justifyContent: 'space-between',
           alignItems: 'center',
-          marginTop: cx(38),
         }}>
         <View style={{flexDirection: 'row', flex: 1}}>
           <Text style={styles.title}>

package/src/components/segmentControl.tsx

@@ -6,7 +6,7 @@ const {convertX} = Utils.RatioUtils
 
 export default function SegmentControl(props) {
 
-  const {title1, title2, isFirst, setIsFirst, style} = props
+  const {title1, title2, isFirst, setIsFirst, style, tabStyle} = props
 
   return (<View style={{}}>
     <View style={[{
@@ -25,7 +25,7 @@ export default function SegmentControl(props) {
           borderRadius: convertX(6.9),
         }, isFirst ?
           {backgroundColor: '#fff', margin: convertX(2), borderRadius: 6.9} :
-          {backgroundColor: '#eeeeef'}]
+          {backgroundColor: '#eeeeef'}, tabStyle]
       } onPress={() => setIsFirst(true)}>
         <Text
           style={{
@@ -48,7 +48,7 @@ export default function SegmentControl(props) {
           },
             !isFirst ?
               {backgroundColor: '#fff'} :
-              {backgroundColor: '#eeeeef'}]
+              {backgroundColor: '#eeeeef'}, tabStyle]
         }
         onPress={() => setIsFirst(false)}>
         <Text