@ledvance/ui-biz-bundle 1.1.9 → 1.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -25,6 +25,7 @@ export interface FlagPageProps {
|
|
|
25
25
|
isSupportBrightness?: boolean
|
|
26
26
|
isSupportTemperature?: boolean
|
|
27
27
|
isStringLight?: boolean
|
|
28
|
+
isStripLight?: boolean
|
|
28
29
|
isSupportMixScene?: boolean
|
|
29
30
|
drawToolLight?: {
|
|
30
31
|
drawToolCode: string
|
|
@@ -42,8 +43,8 @@ const FlagPage = () => {
|
|
|
42
43
|
const devInfo = useDeviceInfo()
|
|
43
44
|
const devId = useDeviceId()
|
|
44
45
|
const navigation = useNavigation()
|
|
45
|
-
const [, setDps] = useDps()
|
|
46
|
-
const [flagState, setFlag] = useFlag((params.
|
|
46
|
+
const [dps, setDps] = useDps()
|
|
47
|
+
const [flagState, setFlag] = useFlag((params.isStripLight ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
|
|
47
48
|
isMixLight: params.isSupportMixScene,
|
|
48
49
|
isStringLight: params.isStringLight,
|
|
49
50
|
...params
|
|
@@ -62,13 +63,14 @@ const FlagPage = () => {
|
|
|
62
63
|
return flag?.id
|
|
63
64
|
}
|
|
64
65
|
if(flagState.id !== undefined){
|
|
65
|
-
return flagState
|
|
66
|
+
return flagState.id
|
|
66
67
|
}
|
|
67
68
|
return -1
|
|
68
69
|
}, [JSON.stringify(flagState), JSON.stringify(state.flags)])
|
|
69
70
|
|
|
70
71
|
|
|
71
72
|
useEffect(() => {
|
|
73
|
+
if(!devId) return
|
|
72
74
|
getRemoteFlagInfo().then()
|
|
73
75
|
if(params.getRemoteMoodList){
|
|
74
76
|
params.getRemoteMoodList(devId).then(res =>{
|
|
@@ -77,13 +79,13 @@ const FlagPage = () => {
|
|
|
77
79
|
}
|
|
78
80
|
})
|
|
79
81
|
}
|
|
80
|
-
}, [])
|
|
82
|
+
}, [devId])
|
|
81
83
|
|
|
82
84
|
const getRemoteFlagInfo = async () => {
|
|
83
85
|
const res = await getRemoteFlag(devId)
|
|
84
86
|
if (res.success) {
|
|
85
87
|
let cloneFlag: FlagUiInfo[] = cloneDeep(res.data) || []
|
|
86
|
-
if(params.drawToolLight){
|
|
88
|
+
if(!params.drawToolLight){
|
|
87
89
|
cloneFlag = cloneFlag.map(flag => {
|
|
88
90
|
flag.colors = flag.colors.reverse()
|
|
89
91
|
return flag
|
|
@@ -158,7 +160,6 @@ const FlagPage = () => {
|
|
|
158
160
|
...state.flags,
|
|
159
161
|
...state.moods
|
|
160
162
|
], 'id')
|
|
161
|
-
console.log(useIds, '< --- useIds')
|
|
162
163
|
const idRange = range(0, 256)
|
|
163
164
|
const unuseId = last(difference(idRange, useIds))
|
|
164
165
|
if(unuseId !== undefined){
|
|
@@ -169,7 +170,7 @@ const FlagPage = () => {
|
|
|
169
170
|
<FlatList
|
|
170
171
|
data={state.flags}
|
|
171
172
|
renderItem={({ item }) => <FlagItem
|
|
172
|
-
enable={flagId === item.id}
|
|
173
|
+
enable={dps[params.workModeCode] === WORK_MODE.SCENE && flagId === item.id}
|
|
173
174
|
title={item.name}
|
|
174
175
|
colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}
|
|
175
176
|
onSwitch={async (enable) => {
|