Merge branch 'OctagonalStar:main' into main

Author: JYinherit

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v?.?.?? - ????-??-?? - (??????)
+
+### Improvement
+
+- 优化了网页端字体加载逻辑
+
 ## v0.1.11 - 2025-11-28 - (000111)
 
 ### Added

lib/pages/setting_page.dart

@@ -110,6 +110,11 @@ class _SettingPage extends State<SettingPage> {
               DropdownMenuItem(value: 2, child: Text('中阿均使用备用字体')),
             ],
             onChanged: (value) {
+              if(value == 2 && kIsWeb) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(content: Text("网页版加载中文字体需要较长时间，请先耐心等待"), duration: Duration(seconds: 3),),
+                );
+              }
               setting['regular']['font'] = value;
               Provider.of<Global>(context, listen: false).updateSetting();
             },

lib/vars/global.dart

@@ -2,7 +2,7 @@ import 'package:arabic_learning/funcs/utili.dart';
 import 'package:arabic_learning/vars/statics_var.dart';
 import 'package:flutter/foundation.dart';
 import 'package:path_provider/path_provider.dart' as path_provider;
-import 'package:flutter/services.dart' show rootBundle;
+import 'package:flutter/services.dart' show rootBundle, FontLoader;
 import 'package:arabic_learning/package_replacement/storage.dart';
 import 'dart:convert';
 import 'package:flutter/material.dart';
@@ -15,7 +15,7 @@ class Global with ChangeNotifier {
   late bool updateLogRequire; //是否需要显示更新日志
   late bool isWideScreen; // 设备是否是宽屏幕
   late final SharedPreferences prefs; // 储存实例
-
+  bool backupFontLoaded = false;
   late bool modelTTSDownloaded = false;
 
   /// the setting data
@@ -239,6 +239,19 @@ class Global with ChangeNotifier {
     if(refresh) await postInit();
   }
 
+  void loadFont() async {
+    if(backupFontLoaded) return;
+    backupFontLoaded = true;
+    try{
+      final ByteData bundle = await rootBundle.load("assets/fonts/zh/NotoSansSC-Medium.ttf");
+      final FontLoader loader = FontLoader(StaticsVar.zhBackupFont)..addFont(Future.value(bundle));
+      loader.load();
+    } catch (e) {
+      backupFontLoaded = false;
+    }
+    notifyListeners();
+  }
+
   Future<void> postInit() async {
     await loadTTS();
     await loadEggs();
@@ -285,24 +298,25 @@ class Global with ChangeNotifier {
   }
 
   void updateTheme() {
-    _themeData = ThemeData(
-      useMaterial3: true,
-      colorScheme: ColorScheme.fromSeed(
-        seedColor: _themeList[settingData["regular"]["theme"]],
-        brightness: settingData["regular"]["darkMode"] ? Brightness.dark : Brightness.light,
-      ),
-      fontFamily: settingData["regular"]["font"] == 2 ? "NotoSansSC" : null,
-    );
     if(settingData["regular"]["font"] == 2) {
       arFont = StaticsVar.arBackupFont;
       zhFont = StaticsVar.zhBackupFont;
+      loadFont();
     } else if(settingData["regular"]["font"] == 1) {
       arFont = StaticsVar.arBackupFont;
       zhFont = null;
     } else {
       arFont = null;
       zhFont = null;
     }
+    _themeData = ThemeData(
+      useMaterial3: true,
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: _themeList[settingData["regular"]["theme"]],
+        brightness: settingData["regular"]["darkMode"] ? Brightness.dark : Brightness.light,
+      ),
+      fontFamily: zhFont,
+    );
   }
 
   void acceptAggrement(String name) {

pubspec.yaml

@@ -83,13 +83,14 @@ flutter:
   assets:
     - CHANGELOG.md
     - assets/eggs/s.txt
+    - assets/fonts/zh/NotoSansSC-Medium.ttf
   fonts:
     - family: Vazirmatn
       fonts:
         - asset: assets/fonts/ar/Vazirmatn-VariableFont_wght.ttf
     - family: NotoSansSC
-      fonts:
-        - asset: assets/fonts/zh/NotoSansSC-Medium.ttf
+    #   fonts:
+    #     - asset: assets/fonts/zh/NotoSansSC-Medium.ttf
 flutter_launcher_icons:
   android: "launcher_icon"
   ios: true

web/flutter_bootstrap.js

@@ -0,0 +1,23 @@
+{{flutter_js}}
+{{flutter_build_config}}
+
+const loading = document.createElement('div');
+document.body.appendChild(loading);
+loading.textContent = "正在加载中(Step 1)...\n若长时间无响应请尝试更换网络";
+_flutter.loader.load({
+    config: {
+        'canvasKitBaseUrl': '/arabic_learning/canvaskit/',
+    },
+    serviceWorkerSettings: {
+        serviceWorkerVersion: {{flutter_service_worker_version}},
+    },
+    onEntrypointLoaded: async function (engineInitializer) {
+        loading.textContent = "正在加载中(Step 2)...长时间无响应请尝试删除缓存或更换浏览器";
+        const appRunner = await engineInitializer.initializeEngine({
+            'fontFallbackBaseUrl': 'https://fonts.gstatic.cn/s/',
+        });
+
+        loading.textContent = "加载完成正在进入...";
+        await appRunner.runApp();
+    },
+});

web/index.html

@@ -1,19 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
-
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
-
-    For more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-
-    This is a placeholder for base href that will be replaced by the value of
-    the `--base-href` argument provided to `flutter build`.
-  -->
   <base href="$FLUTTER_BASE_HREF">
 
   <meta charset="UTF-8">