瀏覽代碼

fix 17692: 【居民列表】居民列表里的姓名,部分字的笔画黏连在一起,显示不正常:同、皮、怡、陈、雁等

Melon 1 年之前
父節點
當前提交
9a3dd42039
共有 3 個文件被更改,包括 18 次插入6 次删除
  1. 11 0
      lib/global.dart
  2. 2 2
      lib/main.dart
  3. 5 4
      pubspec.yaml

+ 11 - 0
lib/global.dart

@@ -118,6 +118,7 @@ abstract class Global {
     // final theme = AppTheme(themeMode: ThemeMode.system);
     // await FTheme.init(theme);
     // Get.put(theme);
+    await _loadDefaultFont();
 
     Get.put(RPCBridge(rpc, Store.user.token ?? ''));
 
@@ -139,6 +140,16 @@ abstract class Global {
     }
   }
 
+  static Future<void> _loadDefaultFont() async {
+    try {
+      final loader = FontLoader("NotoSansSC");
+      loader.addFont(rootBundle.load("assets/fonts/NotoSansSC-R-fixed.otf"));
+      await loader.load();
+    } catch (e) {
+      logger.e("Global load default font error.", e);
+    }
+  }
+
   static void _initRpc() {
     RpcSettingCache.setRpcHostPath(Store.app.serverUrl);
   }

+ 2 - 2
lib/main.dart

@@ -67,8 +67,8 @@ class _AppState extends State<_App> with WidgetsBindingObserver {
         // ),
         // colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
         useMaterial3: true,
-        fontFamily: "RubikMonoOne",
-        fontFamilyFallback: const ["RubikMonoOne"],
+        fontFamily: "NotoSansSC",
+        fontFamilyFallback: const ["NotoSansSC"],
       ),
 
       debugShowCheckedModeBanner: false,

+ 5 - 4
pubspec.yaml

@@ -228,6 +228,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/NotoSansSC-R-fixed.otf
   #   - images/a_dot_burr.jpeg
   #   - images/a_dot_ham.jpeg
 
@@ -242,10 +243,10 @@ 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: RubikMonoOne
-      fonts:
-        - asset: assets/fonts/NotoSansSC-Regular.ttf
+  # 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