Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

夜灯模式细节修改 #159

Merged
merged 1 commit into from
Oct 17, 2024
Merged

夜灯模式细节修改 #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 46 additions & 15 deletions src/panels/LightsV4/Common/MoreSetting/MoreSetting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,42 @@ const timeStringToTimestamp = (timeString) => {

};


const nightLightStartTimeOptions = (() => {
const result = [[], []] as any;
for (let i = 0; i < 24; i++) {
if (i < 10) {
result[0].push({ label: `0${i}${t('时')}`, value: `0${i}` });
} else {
result[0].push({ label: `${i}${t('时')}`, value: `${i}` });
}
}
for (let i = 0; i < 60; i++) {
if (i < 10) {
result[1].push({ label: `0${i}${t('分')}`, value: `0${i}` });
} else {
result[1].push({ label: `${i}${t('分')}`, value: `${i}` });
}
}
return result;
})();
const nightLightEndTimeOptions = (() => {
const result = [[], []] as any;
for (let i = 0; i < 24; i++) {
if (i < 10) {
result[0].push({ label: `0${i}${t('时')}`, value: `0${i}` });
} else {
result[0].push({ label: `${i}${t('时')}`, value: `${i}` });
}
}
for (let i = 0; i < 60; i++) {
if (i < 10) {
result[1].push({ label: `0${i}${t('分')}`, value: `0${i}` });
} else {
result[1].push({ label: `${i}${t('分')}`, value: `${i}` });
}
}
return result;
})();
const timeOptions = (() => {
const result = [[], []] as any;
for (let i = 0; i < 24; i++) {
Expand Down Expand Up @@ -335,49 +370,45 @@ export function MoreSetting({ deviceData, doControlDeviceData, sdk }) {
<>
<List.Item
clickable
extra={openNightTimer?.TimePoint || '22:00'}
extra={nightLightTime.startTime || '默认开启时间'}
onClick={async () => {
const res = await Picker.prompt({
columns: timeOptions,
defaultValue: (openNightTimer?.TimePoint || '22:00')?.split(':'),
columns: nightLightStartTimeOptions,
defaultValue: (nightLightTime.startTime || '默认开启时间')?.split(':'),
});
if (res) {
let [hour, minute] = res;
hour = `${hour}`.padStart(2, '0');
minute = `${minute}`.padStart(2, '0');
const newTime = `${hour}:${minute}`;
const timeStamp = timeStringToTimestamp(newTime);
// 存储夜灯开启时间到localStorage
// localStorage.setItem('nightLightStartTime', newTime);
doControlDeviceData({ night_start_time: timeStamp });
setNightLightTime({ ...nightLightTime, startTime: newTime });
await updateNightLightTimerTimePoint({ ...nightLightTime, startTime: `${hour}:${minute}` });
setNightLightTime({ ...nightLightTime, startTime: `${hour}:${minute}` });
// await updateNightLightTimerTimePoint({ ...nightLightTime, startTime: `${hour}:${minute}` });
// setNightLightTime({ ...nightLightTime, startTime: `${hour}:${minute}` });
}
}}
>
{t('夜灯模式开启时间')}
</List.Item>
<List.Item
clickable
extra={closeNightTimer?.TimePoint || '6:00'}
extra={nightLightTime.endTime || '默认关闭时间'}
onClick={async () => {
const res = await Picker.prompt({
columns: timeOptions,
defaultValue: (closeNightTimer?.TimePoint || '6:00')?.split(':'),
columns: nightLightEndTimeOptions,
defaultValue: (nightLightTime.endTime || '默认关闭时间')?.split(':'),
});
if (res) {
let [hour, minute] = res;
hour = `${hour}`.padStart(2, '0');
minute = `${minute}`.padStart(2, '0');
const newTime = `${hour}:${minute}`;
const timeStamp = timeStringToTimestamp(newTime);
// 存储夜灯关闭时间到localStorage
// localStorage.setItem('nightLightEndTime', newTime);
doControlDeviceData({ night_end_time: timeStamp });
setNightLightTime({ ...nightLightTime, endTime: newTime });
await updateNightLightTimerTimePoint({ ...nightLightTime, endTime: `${hour}:${minute}` });
setNightLightTime({ ...nightLightTime, endTime: `${hour}:${minute}` });
// await updateNightLightTimerTimePoint({ ...nightLightTime, endTime: `${hour}:${minute}` });
// setNightLightTime({ ...nightLightTime, endTime: `${hour}:${minute}` });
}
}}
>
Expand Down
Loading