refactor(home schedule): 调整定时任务筛选和展示逻辑,更新多语言文案

1. 优化密码校验正则,支持全角特殊字符
2. 更新首页无定时任务的多语言文案
3. 重构今日任务查找逻辑,仅筛选未开始任务并简化展示
This commit is contained in:
“虞渠成” 2026-06-29 14:01:49 +08:00
parent cc336fd4af
commit c27ef0847a
3 changed files with 12 additions and 27 deletions

View File

@ -501,8 +501,8 @@
},
{
"key": "100101",
"zh": "无定时任务",
"en": "No Schedule"
"zh": "今日无定时任务",
"en": "No Schedule Today"
},
{
"key": "100102",

View File

@ -57,7 +57,7 @@ namespace Kill.UI.Pages
}
/// <summary>
/// 查找今天启用的任务(返回最近的一个未结束任务)
/// 查找今天启用的任务(返回最近的一个未开始任务,排除进行中任务)
/// </summary>
private ScheduleTask? FindTodayTask(byte todayFlag)
{
@ -83,19 +83,17 @@ namespace Kill.UI.Pages
continue;
int taskTime = task.StartHour * 60 + task.StartMinute;
int endTime = task.EndHour * 60 + task.EndMinute;
// 跳过已结束的任务
if (currentTime >= endTime)
// 只保留未开始的任务
if (currentTime >= taskTime)
continue;
int timeDiff = taskTime - currentTime;
// 找距离当前时间最近的任务(包括进行中的和未来未开始的)
int absTimeDiff = Math.Abs(timeDiff);
if (absTimeDiff < nearestTimeDiff)
// 找距离当前时间最近的未开始任务
if (timeDiff < nearestTimeDiff)
{
nearestTimeDiff = absTimeDiff;
nearestTimeDiff = timeDiff;
nearestTask = task;
}
}
@ -111,23 +109,10 @@ namespace Kill.UI.Pages
string modeText = GetModeText(task.Mode);
string timeText = $"{task.StartHour:D2}:{task.StartMinute:D2}";
// 判断任务是未来还是进行中
int currentTime = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
int taskTime = task.StartHour * 60 + task.StartMinute;
bool isFutureTask = taskTime > currentTime;
if (scheduleText != null)
{
if (isFutureTask)
{
// 即将开始的任务
scheduleText.text = $"{modeText}: {timeText}";
}
else
{
// 任务进行中,显示时间段
scheduleText.text = $"{modeText}: {timeText}~{task.EndHour:D2}:{task.EndMinute:D2}";
}
// 经过 FindTodayTask 筛选后,只可能是未开始的任务
scheduleText.text = $"{modeText}: {timeText}";
}
}

View File

@ -57,8 +57,8 @@ namespace Kill.Utils
bool hasDigit = Regex.IsMatch(password, @"\d");
// 必须包含字母
bool hasLetter = Regex.IsMatch(password, @"[a-zA-Z]");
// 必须包含特殊字符
bool hasSpecial = Regex.IsMatch(password, @"[!@#$%^&*()_+\-=\[\]{};':""\\|,.<>\/?]");
// 必须包含特殊字符(支持半角和全角符号)
bool hasSpecial = Regex.IsMatch(password, @"[!@#$%^&*()_+\-=\[\]{};':""\\|,.<>\/?]|\p{P}");
return hasDigit && hasLetter && hasSpecial;
}