feat: 重构 Reminder Notification 系统并更新应用包名
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/scheduler.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
@@ -14,6 +15,11 @@ import '../data/cache/cache_scope.dart';
|
||||
import 'services/app_prewarm_orchestrator.dart';
|
||||
import 'router/app_router.dart';
|
||||
import '../core/theme/app_theme.dart';
|
||||
import '../core/inbox/inbox_sync_store.dart';
|
||||
import '../core/notification/services/reminder_permission_service.dart';
|
||||
import '../core/notification/services/reminder_notification_router.dart';
|
||||
import '../core/notification/models/reminder_alarm.dart';
|
||||
import 'router/app_routes.dart';
|
||||
|
||||
class LinksyApp extends StatefulWidget {
|
||||
const LinksyApp({super.key});
|
||||
@@ -25,12 +31,15 @@ class LinksyApp extends StatefulWidget {
|
||||
class _LinksyAppState extends State<LinksyApp> {
|
||||
late final AuthBloc _authBloc;
|
||||
late final GoRouter _router;
|
||||
StreamSubscription<ReminderNotificationTap>? _reminderTapSubscription;
|
||||
String? _pendingReminderRoute;
|
||||
int _cacheScopeVersion = 0;
|
||||
|
||||
Future<void> _onAuthenticated(String userId) async {
|
||||
_cacheScopeVersion += 1;
|
||||
final scopeKey = 'user:$userId:v$_cacheScopeVersion';
|
||||
CacheScope.configureProvider(() => scopeKey);
|
||||
await sl<InboxSyncStore>().resetForUser(userId);
|
||||
await sl<ChatBloc>().switchUser(userId);
|
||||
await sl<AppPrewarmOrchestrator>().ensureStartedFor(userId);
|
||||
}
|
||||
@@ -39,6 +48,7 @@ class _LinksyAppState extends State<LinksyApp> {
|
||||
_cacheScopeVersion += 1;
|
||||
final scopeKey = 'anonymous:v$_cacheScopeVersion';
|
||||
CacheScope.configureProvider(() => scopeKey);
|
||||
await sl<InboxSyncStore>().resetForUser(null);
|
||||
await sl<ChatBloc>().switchUser(null);
|
||||
sl<AppPrewarmOrchestrator>().reset();
|
||||
}
|
||||
@@ -51,10 +61,30 @@ class _LinksyAppState extends State<LinksyApp> {
|
||||
CacheScope.configureProvider(() => initialScopeKey);
|
||||
_authBloc.add(AuthStarted());
|
||||
_router = createAppRouter(_authBloc);
|
||||
SchedulerBinding.instance.addPostFrameCallback((_) {
|
||||
unawaited(_bootstrapReminderNotification());
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _bootstrapReminderNotification() async {
|
||||
await sl<ReminderPermissionService>().initializeAtBoot();
|
||||
final router = sl<ReminderNotificationRouter>();
|
||||
await router.start();
|
||||
_reminderTapSubscription ??= router.taps.listen(_onReminderTap);
|
||||
}
|
||||
|
||||
void _onReminderTap(ReminderNotificationTap tap) {
|
||||
final route = AppRoutes.calendarReminderAlarm(tap.eventId);
|
||||
if (_authBloc.state is AuthAuthenticated) {
|
||||
_router.go(route);
|
||||
return;
|
||||
}
|
||||
_pendingReminderRoute = route;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_reminderTapSubscription?.cancel();
|
||||
_router.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
@@ -67,6 +97,11 @@ class _LinksyAppState extends State<LinksyApp> {
|
||||
listener: (context, state) {
|
||||
if (state is AuthAuthenticated) {
|
||||
unawaited(_onAuthenticated(state.user.id));
|
||||
final pendingRoute = _pendingReminderRoute;
|
||||
if (pendingRoute != null) {
|
||||
_pendingReminderRoute = null;
|
||||
_router.go(pendingRoute);
|
||||
}
|
||||
}
|
||||
if (state is AuthUnauthenticated) {
|
||||
unawaited(_onUnauthenticated());
|
||||
|
||||
@@ -6,6 +6,7 @@ import '../../data/cache/cache_store.dart';
|
||||
import '../../features/calendar/data/repositories/calendar_repository.dart';
|
||||
import '../../features/contacts/data/repositories/friend_repository.dart';
|
||||
import '../../features/messages/data/repositories/inbox_repository.dart';
|
||||
import '../../core/inbox/inbox_sync_store.dart';
|
||||
import '../../features/contacts/data/repositories/user_repository.dart';
|
||||
import '../../core/auth/session_controller.dart';
|
||||
import '../../data/network/api_client.dart';
|
||||
@@ -36,6 +37,10 @@ import '../../features/todo/data/apis/todo_api.dart';
|
||||
import '../../features/todo/data/repositories/todo_repository.dart';
|
||||
import '../services/app_prewarm_orchestrator.dart';
|
||||
import '../services/auth_session_controller.dart';
|
||||
import '../../core/notification/services/reminder_scheduler_service.dart';
|
||||
import '../../core/notification/services/reminder_permission_service.dart';
|
||||
import '../../core/notification/services/reminder_reconcile_service.dart';
|
||||
import '../../core/notification/services/reminder_notification_router.dart';
|
||||
|
||||
final sl = GetIt.instance;
|
||||
|
||||
@@ -96,15 +101,31 @@ Future<void> configureDependencies() async {
|
||||
|
||||
final calendarApi = CalendarApi(apiClient);
|
||||
sl.registerSingleton<CalendarApi>(calendarApi);
|
||||
|
||||
final reminderScheduler = ReminderSchedulerService();
|
||||
sl.registerSingleton<ReminderSchedulerService>(reminderScheduler);
|
||||
sl.registerSingleton<ReminderPermissionService>(
|
||||
ReminderPermissionService(scheduler: reminderScheduler),
|
||||
);
|
||||
sl.registerSingleton<ReminderReconcileService>(
|
||||
ReminderReconcileService(scheduler: reminderScheduler),
|
||||
);
|
||||
sl.registerSingleton<ReminderNotificationRouter>(
|
||||
ReminderNotificationRouter(scheduler: reminderScheduler),
|
||||
dispose: (service) => service.dispose(),
|
||||
);
|
||||
|
||||
final calendarService = CalendarService(
|
||||
apiClient: apiClient,
|
||||
invalidator: sl<CacheInvalidator>(),
|
||||
reminderReconcileService: sl<ReminderReconcileService>(),
|
||||
);
|
||||
sl.registerSingleton<CalendarService>(calendarService);
|
||||
|
||||
final calendarRepository = CalendarRepository(
|
||||
store: hybridCacheStore,
|
||||
apiClient: apiClient,
|
||||
reminderReconcileService: sl<ReminderReconcileService>(),
|
||||
);
|
||||
sl.registerSingleton<CalendarRepository>(calendarRepository);
|
||||
|
||||
@@ -125,8 +146,14 @@ Future<void> configureDependencies() async {
|
||||
|
||||
final inboxApi = InboxApi(apiClient);
|
||||
sl.registerSingleton<InboxApi>(inboxApi);
|
||||
sl.registerSingleton<InboxRepository>(
|
||||
InboxRepositoryImpl(apiClient: apiClient, store: hybridCacheStore),
|
||||
final inboxRepository = InboxRepositoryImpl(
|
||||
apiClient: apiClient,
|
||||
store: hybridCacheStore,
|
||||
);
|
||||
sl.registerSingleton<InboxRepository>(inboxRepository);
|
||||
sl.registerSingleton<InboxSyncStore>(
|
||||
InboxSyncStore(repository: inboxRepository, inboxApi: inboxApi),
|
||||
dispose: (store) => store.dispose(),
|
||||
);
|
||||
|
||||
final chatApi = ChatApiImpl(apiClient);
|
||||
@@ -172,7 +199,21 @@ Future<void> configureDependencies() async {
|
||||
sl.registerSingleton<AuthBloc>(authBloc);
|
||||
sl.registerSingleton<SessionController>(AuthSessionController(authBloc));
|
||||
sl.registerSingleton<ChatBloc>(
|
||||
ChatBloc(chatApi: chatApi, historyRepository: chatHistoryRepository),
|
||||
ChatBloc(
|
||||
chatApi: chatApi,
|
||||
historyRepository: chatHistoryRepository,
|
||||
onCalendarMutated: () async {
|
||||
final calendarRepository = sl<CalendarRepository>();
|
||||
final selected = sl<CalendarStateManager>().selectedDate;
|
||||
await Future.wait([
|
||||
calendarRepository.getDayEvents(selected, forceRefresh: true),
|
||||
calendarRepository.getMonthEvents(
|
||||
DateTime(selected.year, selected.month, 1),
|
||||
forceRefresh: true,
|
||||
),
|
||||
]);
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
apiClient.setRefreshCallback((token) async {
|
||||
|
||||
@@ -12,15 +12,16 @@ import '../../../features/auth/presentation/screens/auth_boot_screen.dart';
|
||||
import '../../../features/auth/presentation/screens/login_screen.dart';
|
||||
import '../../../features/home/presentation/screens/home_screen.dart';
|
||||
import '../../../features/messages/presentation/screens/message_invite_list_screen.dart';
|
||||
import '../../../features/messages/presentation/screens/message_invite_detail_screen.dart';
|
||||
import '../../../features/contacts/presentation/screens/contacts_screen.dart';
|
||||
import '../../../features/contacts/presentation/screens/add_contact_screen.dart';
|
||||
import '../../../features/contacts/presentation/screens/contact_detail_screen.dart';
|
||||
import '../../../features/contacts/data/apis/users_api.dart';
|
||||
import '../../../features/calendar/presentation/screens/calendar_dayweek_screen.dart';
|
||||
import '../../../features/calendar/presentation/screens/calendar_month_screen.dart';
|
||||
import '../../../features/calendar/presentation/screens/calendar_event_detail_screen.dart';
|
||||
import '../../../features/calendar/presentation/screens/calendar_event_create_screen.dart';
|
||||
import '../../../features/calendar/presentation/screens/calendar_event_edit_screen.dart';
|
||||
import '../../../features/calendar/presentation/screens/calendar_event_share_screen.dart';
|
||||
import '../../../features/calendar/presentation/screens/calendar_reminder_alarm_screen.dart';
|
||||
import '../../../features/calendar/presentation/calendar_time_utils.dart';
|
||||
import '../../../features/todo/presentation/screens/todo_quadrants_screen.dart';
|
||||
import '../../../features/todo/presentation/screens/todo_detail_screen.dart';
|
||||
@@ -46,8 +47,9 @@ final _homeSecondLevelRoutes = [
|
||||
final _protectedRoutes = [
|
||||
..._homeSecondLevelRoutes,
|
||||
AppRoutes.contactsList,
|
||||
AppRoutes.contactsAdd,
|
||||
'/contacts/',
|
||||
'/calendar/events',
|
||||
'/calendar/reminders',
|
||||
AppRoutes.settingsFeatures,
|
||||
AppRoutes.settingsMemory,
|
||||
AppRoutes.settingsMemoryUser,
|
||||
@@ -73,7 +75,6 @@ String? resolveAuthRedirect({
|
||||
final isProtected =
|
||||
isHomeRoute ||
|
||||
_protectedRoutes.any((route) => matchedLocation.startsWith(route));
|
||||
final _ = prewarm;
|
||||
|
||||
if (isAuthChecking && !isBootRoute) {
|
||||
return AppRoutes.authBoot;
|
||||
@@ -137,6 +138,11 @@ GoRouter createAppRouter(AuthBloc authBloc) {
|
||||
builder: (context, state) =>
|
||||
CalendarEventShareScreen(eventId: state.pathParameters['id']!),
|
||||
),
|
||||
GoRoute(
|
||||
path: '/calendar/reminders/:id/alarm',
|
||||
builder: (context, state) =>
|
||||
CalendarReminderAlarmScreen(eventId: state.pathParameters['id']!),
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.authLogin,
|
||||
builder: (context, state) => const LoginScreen(),
|
||||
@@ -149,18 +155,16 @@ GoRouter createAppRouter(AuthBloc authBloc) {
|
||||
path: AppRoutes.messageInviteList,
|
||||
builder: (context, state) => const MessageInviteListScreen(),
|
||||
),
|
||||
GoRoute(
|
||||
path: '/messages/invites/:id',
|
||||
builder: (context, state) =>
|
||||
MessageInviteDetailScreen(inviteId: state.pathParameters['id']!),
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.contactsList,
|
||||
builder: (context, state) => const ContactsScreen(),
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.contactsAdd,
|
||||
builder: (context, state) => const AddContactScreen(),
|
||||
path: '/contacts/:id',
|
||||
builder: (context, state) {
|
||||
final user = state.extra as UserBasicInfo;
|
||||
return ContactDetailScreen(user: user);
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.calendarDayWeek,
|
||||
|
||||
@@ -9,14 +9,15 @@ class AppRoutes {
|
||||
static const shellTodoBranch = todoList;
|
||||
|
||||
static const messageInviteList = '/messages/invites';
|
||||
static String messageInviteDetail(String id) => '/messages/invites/$id';
|
||||
|
||||
static const contactsList = '/contacts';
|
||||
static const contactsAdd = '/contacts/add';
|
||||
static String contactDetail(String id) => '/contacts/$id';
|
||||
|
||||
static const calendarDayWeek = '/calendar/dayweek';
|
||||
static const calendarMonth = '/calendar/month';
|
||||
static String calendarEventDetail(String id) => '/calendar/events/$id';
|
||||
static String calendarReminderAlarm(String id) =>
|
||||
'/calendar/reminders/$id/alarm';
|
||||
static const calendarEventCreate = '/calendar/events/new';
|
||||
static String calendarEventEdit(String id) => '/calendar/events/$id/edit';
|
||||
static String calendarEventShare(String id) => '/calendar/events/$id/share';
|
||||
|
||||
@@ -16,12 +16,14 @@ class AppPrewarmOrchestrator extends ChangeNotifier {
|
||||
this.bootBudget = const Duration(milliseconds: 1200),
|
||||
Future<void> Function()? prewarmChatHistory,
|
||||
Future<void> Function()? prewarmCalendarToday,
|
||||
Future<void> Function()? prewarmCalendarReminderWindow,
|
||||
Future<void> Function()? prewarmUnreadInbox,
|
||||
}) : _calendarRepository = calendarRepository,
|
||||
_inboxRepository = inboxRepository,
|
||||
_chatHistoryRepository = chatHistoryRepository,
|
||||
_prewarmChatHistory = prewarmChatHistory,
|
||||
_prewarmCalendarToday = prewarmCalendarToday,
|
||||
_prewarmCalendarReminderWindow = prewarmCalendarReminderWindow,
|
||||
_prewarmUnreadInbox = prewarmUnreadInbox;
|
||||
|
||||
final CalendarRepository _calendarRepository;
|
||||
@@ -30,6 +32,7 @@ class AppPrewarmOrchestrator extends ChangeNotifier {
|
||||
final Duration bootBudget;
|
||||
final Future<void> Function()? _prewarmChatHistory;
|
||||
final Future<void> Function()? _prewarmCalendarToday;
|
||||
final Future<void> Function()? _prewarmCalendarReminderWindow;
|
||||
final Future<void> Function()? _prewarmUnreadInbox;
|
||||
|
||||
AppPrewarmStatus _status = AppPrewarmStatus.idle;
|
||||
@@ -59,6 +62,7 @@ class AppPrewarmOrchestrator extends ChangeNotifier {
|
||||
final tasks = Future.wait<void>([
|
||||
_runPrewarmChatHistory(),
|
||||
_runPrewarmCalendarToday(),
|
||||
_runPrewarmCalendarReminderWindow(),
|
||||
_runPrewarmUnreadInbox(),
|
||||
]);
|
||||
|
||||
@@ -95,6 +99,21 @@ class AppPrewarmOrchestrator extends ChangeNotifier {
|
||||
return _inboxRepository.getMessages(isRead: false);
|
||||
}
|
||||
|
||||
Future<void> _runPrewarmCalendarReminderWindow() {
|
||||
final override = _prewarmCalendarReminderWindow;
|
||||
if (override != null) {
|
||||
return override();
|
||||
}
|
||||
final now = DateTime.now();
|
||||
final start = DateTime(
|
||||
now.year,
|
||||
now.month,
|
||||
now.day,
|
||||
).subtract(const Duration(days: 1));
|
||||
final end = start.add(const Duration(days: 90));
|
||||
return _calendarRepository.listByRange(startAt: start, endAt: end);
|
||||
}
|
||||
|
||||
Future<void> _runWithBudget(
|
||||
Future<void> tasks, {
|
||||
required String userId,
|
||||
|
||||
Reference in New Issue
Block a user