|
|
|
@ -8,7 +8,9 @@ import 'package:timezone/data/latest_all.dart' as tzdata; |
|
|
|
import 'package:timezone/timezone.dart' as tz; |
|
|
|
|
|
|
|
import '../../core/utils/logger.dart'; |
|
|
|
import '../models/assistant_directive.dart'; |
|
|
|
import '../models/memory_item.dart'; |
|
|
|
import 'assistant_directive_service.dart'; |
|
|
|
import 'memory_service.dart'; |
|
|
|
|
|
|
|
/// 拾忆的提前提醒：把服务端展开好的提醒时刻排成系统本地通知。 |
|
|
|
@ -131,6 +133,79 @@ class MemoryReminderScheduler extends GetxService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/// 迁移期的本地兜底：把**还没同步到服务端**的助手闹钟也排成通知。 |
|
|
|
/// |
|
|
|
/// ⚠️ 不做这个，「对助手说定个闹钟」在真机上就是**完全不响**。 |
|
|
|
/// 排期的数据源原先只有 `MemoryService.loadUpcoming`，那是纯服务端接口； |
|
|
|
/// 后端还没部署时它恒返回空，于是 SET_clock 把闹钟写进了本地 reminders、 |
|
|
|
/// 拾忆页也显示出来了，却一条通知都没排——用户看到的是「记下了但不会响」， |
|
|
|
/// 而这跟「指令压根没落地」在表现上分不出来。 |
|
|
|
/// |
|
|
|
/// 已同步的跳过：那些服务端会在 loadUpcoming 里给出来，两边都排会响两遍。 |
|
|
|
/// 口径与 CalendarController._localReminderEvents 保持一致。 |
|
|
|
List<MemoryRemindSlot> _localSlots(int days) { |
|
|
|
if (!Get.isRegistered<AssistantDirectiveService>()) return const []; |
|
|
|
final now = DateTime.now(); |
|
|
|
final until = now.add(Duration(days: days)); |
|
|
|
final out = <MemoryRemindSlot>[]; |
|
|
|
for (final AssistantReminder r in AssistantDirectiveService.to.reminders) { |
|
|
|
if (r.synced) continue; |
|
|
|
if (r.done) continue; |
|
|
|
final item = r.toMemoryItem(); |
|
|
|
for (final happen in _occurrences(item, now, until)) { |
|
|
|
final remind = happen.subtract(Duration(minutes: item.remindAhead)); |
|
|
|
// 已经过去的不排。注意判据是**提醒时刻**不是发生时刻： |
|
|
|
// 「10:00 的会、提前 5 分钟」在 9:58 定下来时仍然该响。 |
|
|
|
if (!remind.isAfter(now)) continue; |
|
|
|
out.add(MemoryRemindSlot( |
|
|
|
// 本地项没有服务端 id。0 会被通知点击处理成 focusItem:0， |
|
|
|
// 拾忆页查不到就只是不定位，不会出错。 |
|
|
|
itemId: 0, |
|
|
|
remindAt: remind.millisecondsSinceEpoch ~/ 1000, |
|
|
|
happenAt: happen.millisecondsSinceEpoch ~/ 1000, |
|
|
|
title: item.title, |
|
|
|
detail: '', |
|
|
|
category: item.category, |
|
|
|
)); |
|
|
|
} |
|
|
|
} |
|
|
|
return out; |
|
|
|
} |
|
|
|
|
|
|
|
/// 把一条记忆项在 [from, until] 窗口内的发生时刻摊开。 |
|
|
|
/// |
|
|
|
/// 重复规则的判定与 CalendarController._expandItem 逐条对齐——两处口径不一致 |
|
|
|
/// 会造成「日历上显示了但不会响」或者反过来，而且很难发现。 |
|
|
|
List<DateTime> _occurrences(MemoryItem item, DateTime from, DateTime until) { |
|
|
|
final anchor = item.happenDateTime; |
|
|
|
if (!item.isRepeating) { |
|
|
|
return anchor.isAfter(from) && anchor.isBefore(until) ? [anchor] : const []; |
|
|
|
} |
|
|
|
final out = <DateTime>[]; |
|
|
|
var day = DateTime(from.year, from.month, from.day); |
|
|
|
final anchorDay = DateTime(anchor.year, anchor.month, anchor.day); |
|
|
|
while (!day.isAfter(until)) { |
|
|
|
if (!day.isBefore(anchorDay)) { |
|
|
|
final hit = switch (item.repeatRule) { |
|
|
|
MemoryRepeat.daily => true, |
|
|
|
// weekday 用 1-7（周一~周日），与 DateTime.weekday 一致 |
|
|
|
MemoryRepeat.weekly => day.weekday == item.weekday, |
|
|
|
MemoryRepeat.weekdays => day.weekday <= DateTime.friday, |
|
|
|
MemoryRepeat.weekend => day.weekday == DateTime.saturday || |
|
|
|
day.weekday == DateTime.sunday, |
|
|
|
MemoryRepeat.monthly => day.day == anchor.day, |
|
|
|
_ => false, |
|
|
|
}; |
|
|
|
if (hit) { |
|
|
|
out.add(DateTime( |
|
|
|
day.year, day.month, day.day, anchor.hour, anchor.minute)); |
|
|
|
} |
|
|
|
} |
|
|
|
day = day.add(const Duration(days: 1)); |
|
|
|
} |
|
|
|
return out; |
|
|
|
} |
|
|
|
|
|
|
|
/// 重新排期：先撤旧的，再按服务端给的时刻排新的。 |
|
|
|
/// |
|
|
|
/// 每次都全撤全排，不做增量 diff —— 改期后旧通知还在响比多排一次贵得多。 |
|
|
|
@ -143,15 +218,20 @@ class MemoryReminderScheduler extends GetxService { |
|
|
|
await _ensureTz(); |
|
|
|
await _ensurePlugin(); |
|
|
|
|
|
|
|
final slots = await MemoryService.to.loadUpcoming(days: _days); |
|
|
|
final slots = <MemoryRemindSlot>[ |
|
|
|
...await MemoryService.to.loadUpcoming(days: _days), |
|
|
|
..._localSlots(_days), |
|
|
|
]; |
|
|
|
// 合流之后**必须自己排一次**：服务端那份是升序的，本地补进来的不是， |
|
|
|
// 直接拼起来会让本地闹钟按插入位置抢占前 N 个名额，把服务端更早的挤掉。 |
|
|
|
slots.sort((a, b) => a.remindAt.compareTo(b.remindAt)); |
|
|
|
await _cancelAllOurs(); |
|
|
|
if (slots.isEmpty) { |
|
|
|
Logger.d(_tag, '没有待排的提醒'); |
|
|
|
Logger.w(_tag, '没有待排的提醒'); |
|
|
|
return; |
|
|
|
} |
|
|
|
Logger.w(_tag, '待排提醒 ${slots.length} 条'); |
|
|
|
|
|
|
|
// 服务端已按 remind_at 升序返回。按顺序取前 N 条 —— 顺序错了会把明天的 |
|
|
|
// 排掉、留下一周后的，所以这里不再自己排序，直接信任服务端口径。 |
|
|
|
final now = DateTime.now(); |
|
|
|
var idx = 0; |
|
|
|
for (final slot in slots) { |
|
|
|
|
Rodger-Wang
1 month ago