print

Author: CarGuo

lib/common/dao/user_dao.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:gsy_github_app_flutter/common/net/graphql/client.dart';
 import 'package:gsy_github_app_flutter/db/provider/user/user_followed_db_provider.dart';
 import 'package:gsy_github_app_flutter/db/provider/user/user_follower_db_provider.dart';

lib/common/utils/html_utils.dart

@@ -213,9 +213,7 @@ class HtmlUtils {
           lang = formName(tmpLang.toLowerCase());
         }
       }
-      if (lang == null) {
-        lang = defaultLang;
-      }
+      lang ??= defaultLang;
       if ('markdown' == lang) {
         return generateHtml(res.data, backgroundColor: GSYColors.miWhiteString);
       } else {

lib/page/user/person_page.dart

@@ -25,11 +25,10 @@ class PersonPage extends StatefulWidget {
   const PersonPage(this.userName, {super.key});
 
   @override
-  PersonState createState() => PersonState(userName);
+  PersonState createState() => PersonState();
 }
 
 class PersonState extends BasePersonState<PersonPage> {
-  final String? userName;
 
   String beStaredCount = "---";
 
@@ -39,9 +38,10 @@ class PersonState extends BasePersonState<PersonPage> {
 
   User? userInfo = User.empty();
 
+  // ignore: overridden_fields
   final List<UserOrg> orgList = [];
 
-  PersonState(this.userName);
+  PersonState();
 
   ///处理用户信息显示
   _resolveUserInfo(res) {
@@ -61,7 +61,7 @@ class PersonState extends BasePersonState<PersonPage> {
     page = 1;
 
     ///获取网络用户数据
-    var userResult = await UserDao.getUserInfo(userName, needDb: true);
+    var userResult = await UserDao.getUserInfo(widget.userName, needDb: true);
     if (userResult != null && userResult.result) {
       _resolveUserInfo(userResult);
       if (userResult.next != null) {
@@ -94,7 +94,7 @@ class PersonState extends BasePersonState<PersonPage> {
 
   ///获取当前用户的关注状态
   _getFocusStatus() async {
-    var focusRes = await UserDao.checkFollowDao(userName);
+    var focusRes = await UserDao.checkFollowDao(widget.userName);
     if (isShow) {
       setState(() {
         focus = (focusRes != null && focusRes.result)
@@ -168,7 +168,7 @@ class PersonState extends BasePersonState<PersonPage> {
                 return;
               }
               CommonUtils.showLoadingDialog(context);
-              UserDao.doFollowDao(userName, focusStatus).then((res) {
+              UserDao.doFollowDao(widget.userName, focusStatus).then((res) {
                 Navigator.pop(context);
                 _getFocusStatus();
               });

lib/test/demo_appbar.dart

@@ -27,8 +27,7 @@ class ImageAppbar extends StatelessWidget implements PreferredSizeWidget {
   Widget build(BuildContext context) {
     var leading = this.leading;
 
-    if (leading == null) {
-      leading ??= needLeading
+    leading ??= needLeading
           ? IconButton(
               highlightColor: Colors.transparent,
               icon: Icon(
@@ -45,7 +44,6 @@ class ImageAppbar extends StatelessWidget implements PreferredSizeWidget {
               },
             )
           : Container();
-    }
 
     leading = ConstrainedBox(
       constraints: BoxConstraints.tightFor(width: leadingWidth),

lib/test/demo_db.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/model/User.dart';
-import 'package:meta/meta.dart';
 import 'package:sqflite/sqflite.dart';
 
 /**

lib/widget/markdown/syntax_high_lighter.dart

@@ -47,7 +47,7 @@ class DartSyntaxHighlighter extends SyntaxCostomHighlighter {
   DartSyntaxHighlighter([this._style]) {
     _spans = <_HighlightSpan>[];
 
-    if (_style == null) _style = SyntaxHighlighterStyle.defaultStyle();
+    _style ??= SyntaxHighlighterStyle.defaultStyle();
   }
 
   SyntaxHighlighterStyle? _style;