Merge branch 'main' into feat/add_logger

Author: OctagonalStar

lib/funcs/noification.dart

@@ -7,34 +7,19 @@ import 'package:workmanager/workmanager.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:arabic_learning/package_replacement/storage.dart';
 
-Future<FlutterLocalNotificationsPlugin?> initNotifications() async {
+@pragma('vm:entry-point') 
+Future<FlutterLocalNotificationsPlugin?> initNotificationsBackground() async {
   // 基础设置
   const AndroidInitializationSettings initializationSettingsAndroid =
       AndroidInitializationSettings('@mipmap/launcher_icon'); // 应用图标
 
-  final DarwinInitializationSettings initializationSettingsIOS =
-      DarwinInitializationSettings(
-    requestAlertPermission: false,
-    requestBadgePermission: false,
-    requestSoundPermission: false,
-  );
-
   final InitializationSettings initializationSettings = InitializationSettings(
     android: initializationSettingsAndroid,
-    iOS: initializationSettingsIOS,
   );
 
   // 通知接口
   FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-
-  await flutterLocalNotificationsPlugin.initialize(
-    initializationSettings,
-    onDidReceiveNotificationResponse: (NotificationResponse response) {
-      (response) {
-        return;
-      };
-    },
-  );
+  await flutterLocalNotificationsPlugin.initialize(initializationSettings);
 
   // 通知渠道
   const AndroidNotificationChannel channel = AndroidNotificationChannel(
@@ -55,44 +40,44 @@ Future<FlutterLocalNotificationsPlugin?> initNotifications() async {
   return flutterLocalNotificationsPlugin;
 }
 
+@pragma('vm:entry-point') 
+Future<bool> sendNotification() async {
+  FlutterLocalNotificationsPlugin? localNotificationPlugin = await initNotificationsBackground();
+  if(localNotificationPlugin == null) return Future.value(false);
+  
+  final SharedPreferences prefs = await SharedPreferences.getInstance();
+  final String? configText = prefs.getString("settingData");
+  if(configText == null) return Future.value(false);
+  final Config config = Config.buildFromMap(jsonDecode(configText));
+  
+  // 如果当天连胜续了就不通知
+  if(config.learning.lastDate == DateTime.now().difference(DateTime(2025, 11, 1)).inDays) return Future.value(true);
+  // 起床前不通知
+  if(DateTime.now().hour < 7) return Future.value(true);
+  
+  const androidDetails = AndroidNotificationDetails(
+    'learning_notification_channel',
+    '学习通知',
+    channelDescription: '用于学习提醒的后台通知',
+    importance: Importance.high,
+    priority: Priority.high,
+  );
+  const notificationDetails = NotificationDetails(android: androidDetails);
+  
+  final Random rnd = Random();
+  await localNotificationPlugin.show(
+    rnd.nextInt(9999),
+    '学习提醒',
+    StaticsVar.learningMessage[rnd.nextInt(StaticsVar.learningMessage.length)],
+    notificationDetails,
+  );
+  return Future.value(true);
+}
+
 // 独立 Isolate 后台任务
+@pragma('vm:entry-point') 
 void callbackDispatcher() {
   Workmanager().executeTask((task, inputData) async {
     return await sendNotification();
   });
-}
-
-Future<bool> sendNotification() async {
-  FlutterLocalNotificationsPlugin? localNotificationPlugin = await initNotifications();
-    if(localNotificationPlugin == null) return Future.value(false);
-
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    final String? configText = prefs.getString("settingData");
-    if(configText == null) return Future.value(false);
-    final Config config = Config.buildFromMap(jsonDecode(configText));
-
-    // 如果当天连胜续了就不通知
-    if(config.learning.lastDate == DateTime.now().difference(DateTime(2025, 11, 1)).inDays) return Future.value(true);
-    // 起床前不通知
-    if(DateTime.now().hour < 7) return Future.value(true);
-
-
-    const androidDetails = AndroidNotificationDetails(
-      'learning_notification_channel',
-      '学习通知',
-      channelDescription: '用于学习提醒的后台通知',
-      importance: Importance.high,
-      priority: Priority.high,
-    );
-    const notificationDetails = NotificationDetails(android: androidDetails);
-
-    final Random rnd = Random();
-    await localNotificationPlugin.show(
-      rnd.nextInt(9999),
-      '学习提醒',
-      StaticsVar.learningMessage[rnd.nextInt(StaticsVar.learningMessage.length)],
-      notificationDetails,
-    );
-
-    return Future.value(true);
 }

lib/main.dart

@@ -12,9 +12,9 @@ import 'package:logging/logging.dart';
 
 import 'package:arabic_learning/funcs/ui.dart';
 import 'package:arabic_learning/funcs/utili.dart';
-import 'package:arabic_learning/vars/global.dart';
-import 'package:arabic_learning/vars/license_storage.dart';
-import 'package:arabic_learning/vars/statics_var.dart';
+import 'package:arabic_learning/vars/global.dart' show Global;
+import 'package:arabic_learning/vars/license_storage.dart' show LicenseVars;
+import 'package:arabic_learning/vars/statics_var.dart' show StaticsVar;
 import 'package:arabic_learning/pages/home_page.dart';
 import 'package:arabic_learning/pages/learning_page.dart'show LearningPage;
 import 'package:arabic_learning/pages/setting_page.dart'show SettingPage;
@@ -38,7 +38,7 @@ void main() async {
     Workmanager().registerPeriodicTask(
       "dynamic-notification-task",
       "fetchAndShowNotification",
-      frequency: Duration(minutes: 15),
+      frequency: Duration(minutes: 30),
       constraints: Constraints(),
     );
   }

lib/vars/statics_var.dart

@@ -19,8 +19,8 @@ class StaticsVar {
     "友情提示：今日的学习KPI已完成 0%，是时候启动“填鸭”程序了！",
     "你的阴性、阳性、单数、双数、复数... 你都记清楚了吗？",
     "«هل تتذكر ما تعلمته بالأمس؟» ",
-    "«إن شاء الله» 你今天会完成学习任务的，对吧？"
-    "听说，在沙漠的另一边，有一课书在等你翻开..."
+    "«إن شاء الله» 你今天会完成学习任务的，对吧？",
+    "听说，在沙漠的另一边，有一课书在等你翻开...",
     "..."
   ];
   static const List<MaterialColor> themeList = [