@ledvance/group-ui-biz-bundle 1.0.41 → 1.0.43

package/package.json

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

package/src/modules/music/MusicPage.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { StyleSheet, View, Text, Image } from 'react-native'
 import { useNavigation } from '@react-navigation/core'
 import Page from '@ledvance/base/src/components/Page'
-import { useDeviceInfo, useGroupConfig, putGroupTYDps, useUAGroupInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceInfo, putGroupTYDps, useUAGroupInfo, useGroupDp } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import I18n from '@ledvance/base/src/i18n'
 import Img from './res'
 import { useDreamMusicData } from './MusicActions'
@@ -32,10 +32,10 @@ export interface MusicPageParams {
 const MusicPage = () => {
   const deviceInfo = useDeviceInfo()
   const tyGroupId = useUAGroupInfo().tyGroupId
-  const parmas = useParams<MusicPageParams>()
+  const params = useParams<MusicPageParams>()
   const navigation = useNavigation()
-  const [musicData, setMusicData] = useDreamMusicData(parmas)
-  const [config] = useGroupConfig<any>()
+  const [musicData, setMusicData] = useDreamMusicData(params)
+  const [workMode] = useGroupDp<WorkMode>(params.workModeDp)
   const state = useReactive({
     musicData: cloneDeep(musicData),
   })
@@ -45,9 +45,10 @@ const MusicPage = () => {
   }, [musicData])
   
   const openMusic = () =>{
-    if(config['workMode'] !== WorkMode.Music) state.musicData.lastWorkMode = config['workMode']
+    if(workMode !== WorkMode.Music) state.musicData.lastWorkMode = workMode
     state.musicData.musicSwitch = true
-    if (parmas.dreamMusicDp && state.musicData.musicType === 0){
+    if (params.dreamMusicDp && state.musicData.musicType === 0){
+      MusicManager.close()
       setMusicData(cloneDeep(state.musicData))
     }else{
       setMusicData({
@@ -66,7 +67,7 @@ const MusicPage = () => {
             v.brightness,
             v.temperature
           );
-          putGroupTYDps(tyGroupId, {[parmas.musicDataDp]: musicDpData}).then()
+          putGroupTYDps(tyGroupId, {[params.musicDataDp]: musicDpData}).then()
         },
         { isColourExist: true, isTempExist: true }
       )
@@ -80,8 +81,8 @@ const MusicPage = () => {
   }
 
   const getSelectModeData = (): [string | undefined, any[]] => {
-    const genreModeData = parmas.dreamMusicDp && state.musicData.musicType === 0 ? state.musicData.deviceMusicData : state.musicData.phoneMusicData
-    const genreMode = parmas.dreamMusicDp && state.musicData.musicType === 0 ? state.musicData.deviceGenreMode : state.musicData.phoneGenreMode
+    const genreModeData = params.dreamMusicDp && state.musicData.musicType === 0 ? state.musicData.deviceMusicData : state.musicData.phoneMusicData
+    const genreMode = params.dreamMusicDp && state.musicData.musicType === 0 ? state.musicData.deviceGenreMode : state.musicData.phoneGenreMode
     const title = genreModeData.find(mode => mode.id === genreMode)?.title
     const selectModeData = genreModeData.map(music => {
       return {
@@ -92,6 +93,7 @@ const MusicPage = () => {
     })
     return [title, selectModeData]
   }
+
   return (
     <Page
       backText={deviceInfo.name}
@@ -100,7 +102,7 @@ const MusicPage = () => {
       <View style={styles.content}>
         <SwitchButton
           style={styles.headSwitch}
-          value={state.musicData.musicSwitch}
+          value={state.musicData.musicSwitch && workMode === WorkMode.Music}
           thumbStyle={{ elevation: 0 }}
           onValueChange={async v => {
             if(v) {
@@ -109,16 +111,16 @@ const MusicPage = () => {
               closeMusic()
             }
           }} />
-        {parmas.dreamMusicDp && <TabBar
+        {params.dreamMusicDp && <TabBar
           type='radio'
           tabs={musicTabs}
           style={{ borderRadius: cx(8), backgroundColor: '#f6f6f6', height: cx(36) }}
-          tabTextStyle={{ color: '#000' }}
-          tabActiveTextStyle={{ color: '#000', fontWeight: 'bold' }}
+          tabTextStyle={{ color: '#000', fontSize: cx(14) }}
+          tabActiveTextStyle={{ color: '#000', fontSize: cx(14), fontWeight: 'bold' }}
           activeKey={state.musicData.musicType}
           onChange={async (v) => {
             state.musicData.musicType = Number(v)
-            if(state.musicData.musicSwitch) openMusic()
+            if(state.musicData.musicSwitch && workMode === WorkMode.Music) openMusic()
           }}
         />}
         <Spacer />
@@ -126,14 +128,14 @@ const MusicPage = () => {
         <View style={{ alignItems: 'center', marginVertical: cx(38) }}>
           <Image
             style={{ width: cx(200), height: cx(204) }}
-            source={state.musicData.musicSwitch ? Img.app_music_center_on : Img.app_music_center_off}
+            source={(state.musicData.musicSwitch && workMode === WorkMode.Music) ? Img.app_music_center_on : Img.app_music_center_off}
             resizeMode="contain"
           />
         </View>
         {
-          state.musicData.musicSwitch &&
+          state.musicData.musicSwitch && workMode === WorkMode.Music &&
           <>
-            {parmas.dreamMusicDp && state.musicData.musicType === 0 &&
+            {params.dreamMusicDp && state.musicData.musicType === 0 &&
               <LdvSlider
                 title={I18n.getLang('devicemusic_switch_tab_device_sensitivity')}
                 value={state.musicData.deviceMusicData[state.musicData.deviceGenreMode]?.sensitivity || 50}
@@ -162,7 +164,7 @@ const MusicPage = () => {
                   title: I18n.getLang('devicemusic_subheadline_text'),
                   data: getSelectModeData()[1],
                   onSelect: selectPageData => {
-                    if (parmas.dreamMusicDp && state.musicData.musicType === 0) {
+                    if (params.dreamMusicDp && state.musicData.musicType === 0) {
                       state.musicData.deviceGenreMode = selectPageData.value
                     } else {
                       state.musicData.phoneGenreMode = selectPageData.value