1、提交web字体支持

.vscode/launch.json

@@ -1,60 +1,5 @@
 {
-<<<<<<< HEAD
-    // 使用 IntelliSense 了解相关属性。
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Flyinsono",
-            "request": "launch",
-            "type": "dart",
-            "program": "lib/main.dart",
-            "args": [
-                "--web-port=8080",
-                "--web-hostname=127.0.0.1"
-            ]
-        },
-        {
-            "name": "测量启动时间",
-            "request": "launch",
-            "type": "dart",
-            "program": "lib/main.dart",
-            "args": [
-                "--trace-startup",
-                "--profile",
-                "--web-port=8080",
-                "--web-hostname=127.0.0.1",
-                "--dart-define=FLUTTER_WEB_CANVASKIT_URL=\"/canvaskit/\""
-            ]
-        },
-        {
-            "name": "Detail Mode",
-            "request": "launch",
-            "type": "dart",
-            "program": "lib/main.dart",
-            "args": [
-                "-v",
-                "--web-port=8080",
-                "--web-hostname=127.0.0.1",
-                "--dart-define=FLUTTER_WEB_CANVASKIT_URL=\"/canvaskit/\""
-            ]
-        },
-        {
-            "name": "Release Mode",
-            "request": "launch",
-            "type": "dart",
-            "program": "lib/main.dart",
-            "args": [
-                "--web-port=8080",
-                "--web-hostname=127.0.0.1",
-                "--dart-define=FLUTTER_WEB_CANVASKIT_URL=./canvaskit/",
-                "--release"
-            ]
-        }
-    ]
-}
-=======
+
   // 使用 IntelliSense 了解相关属性。
   // 悬停以查看现有属性的描述。
   // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
@@ -64,7 +9,8 @@
       "name": "vital_app",
       "request": "launch",
       "type": "dart",
-      "args": ["--web-port=8080", "--web-hostname=192.168.6.131"]
+      "args": ["--web-port=8080", "--web-hostname=127.0.0.1","--dart-define=FLUTTER_WEB_CANVASKIT_URL=\"/canvaskit/\"",]
+      
     },
     {
       "name": "vital_app (profile mode)",
@@ -100,4 +46,3 @@
     }
   ]
 }
->>>>>>> 3591210b9929deb5fcca996ce6bb12bb9e705be4

lib/global.dart

@@ -1,7 +1,5 @@
 import 'package:fis_common/web/web_asset_bundle.dart';
 import 'package:fis_i18n/i18n.dart';
-import 'package:fis_lib_report/pages/theme.dart';
-import 'package:fis_theme/theme.dart';
 import 'package:fis_ui/utils/sizer/sizer.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -116,10 +114,10 @@ abstract class Global {
     // 依赖注入
     await initServices();
 
-    // 主题
-    final theme = AppTheme(themeMode: ThemeMode.system);
-    await FTheme.init(theme);
-    Get.put(theme);
+    // // 主题
+    // final theme = AppTheme(themeMode: ThemeMode.system);
+    // await FTheme.init(theme);
+    // Get.put(theme);
 
     Get.put(RPCBridge(rpc, Store.user.token ?? ''));
 

lib/main.dart

@@ -67,9 +67,10 @@ class _AppState extends State<_App> with WidgetsBindingObserver {
         // ),
         // colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
         useMaterial3: true,
-        fontFamily: "NotoSansSC-R-fixed",
-        fontFamilyFallback: const ["NotoSansSC-R-fixed"],
+        fontFamily: "RubikMonoOne",
+        fontFamilyFallback: const ["RubikMonoOne"],
       ),
+
       debugShowCheckedModeBanner: false,
       getPages: Routes.routes,
       initialRoute: "splash",

pubspec.yaml

@@ -137,7 +137,7 @@ dependency_overrides:
   webviewx: 0.2.1
   csslib: 0.17.2
   http: 0.13.4
-  flutter_svg: 1.1.4
+  flutter_svg: 2.0.2
   audio_session: 0.1.6
   flutter_sound: 9.2.13
   flutter_sound_platform_interface: 9.2.13
@@ -226,6 +226,7 @@ flutter:
     - assets/valid_models/ch_PP-OCRv4_rec_infer.onnx
     - assets/valid_models/ch_ppocr_mobile_v2.0_cls_train.onnx
     - assets/valid_models/ppocr_keys_v1.txt
+    - assets/fonts/DroidSansFallback.ttf
   #   - images/a_dot_burr.jpeg
   #   - images/a_dot_ham.jpeg
 
@@ -240,12 +241,23 @@ flutter:
   # "family" key with the font family name, and a "fonts" key with a
   # list giving the asset and other descriptors for the font. For
   # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
+  fonts:
+    - family: RubikMonoOne
+      fonts:
+        - asset: assets/fonts/NotoSansSC-Regular.ttf
+  # - asset: assets/fonts/Roboto-BlackItalic-2.ttf
+  # - asset: assets/fonts/Roboto-Bold-3.ttf
+  # - asset: assets/fonts/Roboto-BoldItalic-6.ttf
+  # - asset: assets/fonts/Roboto-Italic-9.ttf
+  # - asset: assets/fonts/Roboto-Light-10.ttf
+  # - asset: assets/fonts/Roboto-LightItalic-11.ttf
+  # - asset: assets/fonts/Roboto-Medium-12.ttf
+  # - asset: assets/fonts/Roboto-MediumItalic-13.ttf
+  # - asset: assets/fonts/Roboto-Regular-14.ttf
+  # - asset: assets/fonts/Roboto-Thin-15.ttf
+  # - asset: assets/fonts/Roboto-ThinItalic-16.ttf
+  # - asset: fonts/Schyler-Italic.ttf
+  #   style: italic
   #   - family: Trajan Pro
   #     fonts:
   #       - asset: fonts/TrajanPro.ttf