修复调整部分代码

CarGuo · May 16, 2023 · f4afeb8 · f4afeb8
1 parent 52eacc4
commit f4afeb8
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 55 deletions.
diff --git a/lib/common/net/interceptors/log_interceptor.dart b/lib/common/net/interceptors/log_interceptor.dart
@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:gsy_github_app_flutter/common/config/config.dart';
 

diff --git a/lib/common/utils/navigator_utils.dart b/lib/common/utils/navigator_utils.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:gsy_github_app_flutter/model/CommonListDataType.dart';
 import 'package:gsy_github_app_flutter/page/code_detail_page_web.dart';
 import 'package:gsy_github_app_flutter/page/common_list_page.dart';
 import 'package:gsy_github_app_flutter/page/debug/debug_data_page.dart';
@@ -173,7 +174,7 @@ class NavigatorUtils {
 
   ///通用列表
   static gotoCommonList(
-      BuildContext context, String? title, String showType, String dataType,
+      BuildContext context, String? title, String showType, CommonListDataType dataType,
       {String? userName, String? reposName}) {
     NavigatorRouter(
         context,

diff --git a/lib/model/CommonListDataType.dart b/lib/model/CommonListDataType.dart
@@ -0,0 +1,20 @@
+enum CommonListDataType {
+  follower("follower"),
+  followed("followed"),
+  userRepos('user_repos'),
+  repoStar("repo_star"),
+  userStar("user_star"),
+  repoWatcher("repo_watcher"),
+  repoFork("repo_fork"),
+  repoRelease("repoRelease"),
+  repoTag("repo_tag"),
+  notify("notify"),
+  history("history"),
+  topics("topics"),
+  userBeStared("user_be_stared"),
+  userOrgs("user_orgs");
+
+  final String value;
+
+  const CommonListDataType(this.value);
+}
diff --git a/lib/page/common_list_page.dart b/lib/page/common_list_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:gsy_github_app_flutter/common/dao/repos_dao.dart';
 import 'package:gsy_github_app_flutter/common/dao/user_dao.dart';
 import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
+import 'package:gsy_github_app_flutter/model/CommonListDataType.dart';
 import 'package:gsy_github_app_flutter/widget/state/gsy_list_state.dart';
 import 'package:gsy_github_app_flutter/widget/pull/gsy_pull_load_widget.dart';
 import 'package:gsy_github_app_flutter/page/repos/widget/repos_item.dart';
@@ -20,7 +21,7 @@ class CommonListPage extends StatefulWidget {
 
   final String showType;
 
-  final String dataType;
+  final CommonListDataType dataType;
 
   final String? title;
 
@@ -73,48 +74,35 @@ class _CommonListPageState extends State<CommonListPage>
   }
 
   _getDataLogic() async {
-    switch (widget.dataType) {
-      case 'follower':
-        return await UserDao.getFollowerListDao(widget.userName, page,
-            needDb: page <= 1);
-      case 'followed':
-        return await UserDao.getFollowedListDao(widget.userName, page,
-            needDb: page <= 1);
-      case 'user_repos':
-        return await ReposDao.getUserRepositoryDao(widget.userName, page, null,
-            needDb: page <= 1);
-      case 'user_star':
-        return await ReposDao.getStarRepositoryDao(widget.userName, page, null,
-            needDb: page <= 1);
-      case 'repo_star':
-        return await ReposDao.getRepositoryStarDao(
-            widget.userName, widget.reposName, page,
-            needDb: page <= 1);
-      case 'repo_watcher':
-        return await ReposDao.getRepositoryWatcherDao(
-            widget.userName, widget.reposName, page,
-            needDb: page <= 1);
-      case 'repo_fork':
-        return await ReposDao.getRepositoryForksDao(
-            widget.userName, widget.reposName, page,
-            needDb: page <= 1);
-      case 'repo_release':
-        return null;
-      case 'repo_tag':
-        return null;
-      case 'notify':
-        return null;
-      case 'history':
-        return await ReposDao.getHistoryDao(page);
-      case 'topics':
-        return await ReposDao.searchTopicRepositoryDao(widget.userName,
-            page: page);
-      case 'user_be_stared':
-        return null;
-      case 'user_orgs':
-        return await UserDao.getUserOrgsDao(widget.userName, page,
-            needDb: page <= 1);
-    }
+    return switch (widget.dataType) {
+      CommonListDataType.follower => await UserDao.getFollowerListDao(
+          widget.userName, page,
+          needDb: page <= 1),
+      CommonListDataType.followed => await UserDao.getFollowedListDao(
+          widget.userName, page,
+          needDb: page <= 1),
+      CommonListDataType.userRepos => await ReposDao.getUserRepositoryDao(
+          widget.userName, page, null,
+          needDb: page <= 1),
+      CommonListDataType.userStar => await ReposDao.getStarRepositoryDao(
+          widget.userName, page, null,
+          needDb: page <= 1),
+      CommonListDataType.repoStar => await ReposDao.getRepositoryStarDao(
+          widget.userName, widget.reposName, page,
+          needDb: page <= 1),
+      CommonListDataType.repoWatcher => await ReposDao.getRepositoryWatcherDao(
+          widget.userName, widget.reposName, page,
+          needDb: page <= 1),
+      CommonListDataType.repoFork => await ReposDao.getRepositoryForksDao(
+          widget.userName, widget.reposName, page,
+          needDb: page <= 1),
+      CommonListDataType.history => await ReposDao.getHistoryDao(page),
+      CommonListDataType.topics =>
+        await ReposDao.searchTopicRepositoryDao(widget.userName, page: page),
+      CommonListDataType.userOrgs =>
+        await UserDao.getUserOrgsDao(widget.userName, page, needDb: page <= 1),
+      _ => null,
+    };
   }
 
   @override

diff --git a/lib/page/home/widget/home_drawer.dart b/lib/page/home/widget/home_drawer.dart
@@ -5,6 +5,7 @@ import 'package:gsy_github_app_flutter/common/dao/issue_dao.dart';
 import 'package:gsy_github_app_flutter/common/dao/repos_dao.dart';
 import 'package:gsy_github_app_flutter/common/local/local_storage.dart';
 import 'package:gsy_github_app_flutter/common/localization/default_localizations.dart';
+import 'package:gsy_github_app_flutter/model/CommonListDataType.dart';
 import 'package:gsy_github_app_flutter/model/User.dart';
 import 'package:gsy_github_app_flutter/redux/gsy_state.dart';
 import 'package:gsy_github_app_flutter/redux/login_redux.dart';
@@ -142,7 +143,7 @@ class HomeDrawer extends StatelessWidget {
                                   context,
                                   GSYLocalizations.i18n(context)!.home_history,
                                   "repositoryql",
-                                  "history",
+                                  CommonListDataType.history,
                                   userName: "",
                                   reposName: "");
                             }),

diff --git a/lib/page/repos/widget/repos_header_item.dart b/lib/page/repos/widget/repos_header_item.dart
@@ -5,6 +5,7 @@ import 'package:gsy_github_app_flutter/common/localization/default_localizations
 import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
 import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
 import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
+import 'package:gsy_github_app_flutter/model/CommonListDataType.dart';
 import 'package:gsy_github_app_flutter/model/RepositoryQL.dart';
 import 'package:gsy_github_app_flutter/widget/gsy_card_item.dart';
 import 'package:gsy_github_app_flutter/widget/gsy_icon_text.dart';
@@ -62,7 +63,7 @@ class _ReposHeaderItemState extends State<ReposHeaderItem> {
             ? layoutLastTopicKey
             : null,
         onPressed: () {
-          NavigatorUtils.gotoCommonList(context, item, "repository", "topics",
+          NavigatorUtils.gotoCommonList(context, item, "repository", CommonListDataType.topics,
               userName: item, reposName: "");
         },
         materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
@@ -255,7 +256,7 @@ class _ReposHeaderItemState extends State<ReposHeaderItem> {
                     context,
                     widget.reposHeaderViewModel.repositoryName,
                     "user",
-                    "repo_star",
+                    CommonListDataType.repoStar,
                     userName: widget.reposHeaderViewModel.ownerName,
                     reposName: widget.reposHeaderViewModel.repositoryName);
               },
@@ -280,7 +281,7 @@ class _ReposHeaderItemState extends State<ReposHeaderItem> {
                     context,
                     widget.reposHeaderViewModel.repositoryName,
                     "repository",
-                    "repo_fork",
+                    CommonListDataType.repoFork,
                     userName: widget.reposHeaderViewModel.ownerName,
                     reposName: widget.reposHeaderViewModel.repositoryName);
               },
@@ -305,7 +306,7 @@ class _ReposHeaderItemState extends State<ReposHeaderItem> {
                     context,
                     widget.reposHeaderViewModel.repositoryName,
                     "user",
-                    "repo_watcher",
+                    CommonListDataType.repoWatcher,
                     userName: widget.reposHeaderViewModel.ownerName,
                     reposName: widget.reposHeaderViewModel.repositoryName);
               },

diff --git a/lib/page/user/widget/user_header.dart b/lib/page/user/widget/user_header.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:gsy_github_app_flutter/common/localization/default_localizations.dart';
+import 'package:gsy_github_app_flutter/model/CommonListDataType.dart';
 import 'package:gsy_github_app_flutter/model/User.dart';
 import 'package:gsy_github_app_flutter/model/UserOrg.dart';
 import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
@@ -90,7 +91,7 @@ class UserHeaderItem extends StatelessWidget {
                     " " +
                     GSYLocalizations.i18n(context)!.user_orgs_title,
                 "org",
-                "user_orgs",
+                CommonListDataType.userOrgs,
                 userName: userInfo.login);
           },
           materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
@@ -311,7 +312,7 @@ class UserHeaderBottom extends StatelessWidget {
               userInfo.public_repos,
               () {
                 NavigatorUtils.gotoCommonList(
-                    context, userInfo.login, "repository", "user_repos",
+                    context, userInfo.login, "repository", CommonListDataType.userRepos,
                     userName: userInfo.login);
               },
             ),
@@ -325,7 +326,7 @@ class UserHeaderBottom extends StatelessWidget {
               userInfo.followers,
               () {
                 NavigatorUtils.gotoCommonList(
-                    context, userInfo.login, "user", "follower",
+                    context, userInfo.login, "user", CommonListDataType.follower,
                     userName: userInfo.login);
               },
             ),
@@ -339,7 +340,7 @@ class UserHeaderBottom extends StatelessWidget {
               userInfo.following,
               () {
                 NavigatorUtils.gotoCommonList(
-                    context, userInfo.login, "user", "followed",
+                    context, userInfo.login, "user", CommonListDataType.followed,
                     userName: userInfo.login);
               },
             ),
@@ -353,7 +354,7 @@ class UserHeaderBottom extends StatelessWidget {
               userInfo.starred,
               () {
                 NavigatorUtils.gotoCommonList(
-                    context, userInfo.login, "repository", "user_star",
+                    context, userInfo.login, "repository", CommonListDataType.userStar,
                     userName: userInfo.login);
               },
             ),