优化代码

seasonZhu · seasonZhu · commit 027f529e4c46 · 2023-03-06T17:41:36.000+08:00
diff --git a/lib/base/base_refresh_controller.dart b/lib/base/base_refresh_controller.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:get/get.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
@@ -32,7 +33,7 @@ abstract class BaseRefreshController<R extends IRepository, T>
   @override
   void onClose() {
     super.onClose();
-    //refreshController.dispose();
+    debugPrint("onClose");
   }
 
   Future<void> onRefresh() async {}
diff --git a/lib/base/get_bind_widget.dart b/lib/base/get_bind_widget.dart
@@ -46,7 +46,7 @@ class GetBindWidget extends StatefulWidget {
   final Widget child;
 
   @override
-  _GetBindWidgetState createState() => _GetBindWidgetState();
+  State<GetBindWidget> createState() => _GetBindWidgetState();
 }
 
 class _GetBindWidgetState extends State<GetBindWidget> {
@@ -132,7 +132,7 @@ class AutoDisposePage extends StatefulWidget {
   const AutoDisposePage({Key? key}) : super(key: key);
 
   @override
-  _AutoDisposePageState createState() => _AutoDisposePageState();
+  State<AutoDisposePage> createState() => _AutoDisposePageState();
 }
 
 class _AutoDisposePageState extends State<AutoDisposePage> {
diff --git a/lib/base/interface.dart b/lib/base/interface.dart
@@ -1,7 +1,5 @@
 import 'package:get/get.dart';
 
-typedef GetPage<T> = GetView<T>;
-
 abstract class IRepository {}
 
 abstract class IRetry {
@@ -18,8 +16,6 @@ abstract class IClassName {
   // String some();
 }
 
-abstract class IRequestController extends GetxController {}
-
 abstract class IWebLoadInfo {
   int? id;
   int? originId;
@@ -28,7 +24,13 @@ abstract class IWebLoadInfo {
 }
 
 /// 以下代码没有使用,是思考
-String typeName(Type type) => type.toString();
+
+abstract class IRequestController extends GetxController {}
+
+/// 危险,不要定义这个类
+/// typedef GetPage<T> = GetView<T>;
+
+String typeName(Type type) => (type).toString();
 
 class Box<T extends Object> {
   T value;
diff --git a/lib/my_app.dart b/lib/my_app.dart
@@ -26,7 +26,8 @@ class MyApp extends StatelessWidget {
       initialRoute: isFirst ? Routes.welcome : Routes.splash,
       getPages: Routes.routePage,
       onGenerateRoute: (settings) {
-        print(settings.name);
+        debugPrint(settings.name);
+        return null;
       },
 
       /// 经过初始化的binding,
diff --git a/lib/my_home_page.dart b/lib/my_home_page.dart
@@ -25,7 +25,7 @@ class MyHomePage extends GetView<CountEasyController> {
               builder: ((controller) {
                 return Text(
                   controller.count.toString(),
-                  style: Theme.of(context).textTheme.headline4,
+                  style: Theme.of(context).textTheme.headlineMedium,
                 );
               }),
             ),
@@ -88,7 +88,7 @@ class MyNextPage extends GetView<CountRxController> {
             Obx(() {
               return Text(
                 controller.count.value.toString(),
-                style: Theme.of(context).textTheme.headline4,
+                style: Theme.of(context).textTheme.headlineMedium,
               );
             }),
             GetBuilder<CountRxController>(
diff --git a/lib/pages/common/error_view.dart b/lib/pages/common/error_view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 
 class ErrorView extends StatelessWidget {
-  VoidCallback? retryAction;
+  final VoidCallback? retryAction;
 
-  ErrorView({Key? key, this.retryAction}) : super(key: key);
+  const ErrorView({Key? key, this.retryAction}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/common/keep_alive_wrapper.dart b/lib/pages/common/keep_alive_wrapper.dart
@@ -10,7 +10,7 @@ class KeepAliveWrapper extends StatefulWidget {
   final Widget child;
  
   @override
-  _KeepAliveWrapperState createState() => _KeepAliveWrapperState();
+  State<KeepAliveWrapper> createState() => _KeepAliveWrapperState();
 }
  
 class _KeepAliveWrapperState extends State<KeepAliveWrapper>
diff --git a/lib/pages/common/loading_view.dart b/lib/pages/common/loading_view.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 
 class LoadingView extends StatelessWidget {
   final String? _message;
diff --git a/lib/pages/common/refresh_status_view.dart b/lib/pages/common/refresh_status_view.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 import 'package:getx_study/base/base_refresh_controller.dart';
-import 'package:getx_study/enum/response_status.dart';
 import 'loading_view.dart';
 import 'error_view.dart';
 import 'empty_view.dart';
diff --git a/lib/pages/common/status_view.dart b/lib/pages/common/status_view.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 import 'package:getx_study/base/base_request_controller.dart';
-import 'package:getx_study/enum/response_status.dart';
 import 'loading_view.dart';
 import 'error_view.dart';
 import 'empty_view.dart';
diff --git a/lib/pages/home/controller/home_controller.dart b/lib/pages/home/controller/home_controller.dart
@@ -9,7 +9,6 @@ import 'package:getx_study/entity/page_entity.dart';
 import 'package:getx_study/enum/response_status.dart';
 import 'package:getx_study/enum/scroll_view_action_type.dart';
 import 'package:getx_study/pages/home/repository/home_repository.dart';
-import 'package:getx_study/routes/routes.dart';
 
 class HomeController
     extends BaseRefreshController<HomeRepository, ArticleInfoDatas>
diff --git a/lib/pages/hot_key/view/hot_key_page.dart b/lib/pages/hot_key/view/hot_key_page.dart
@@ -1,7 +1,5 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
 
 import 'package:get/get.dart';
 
diff --git a/lib/pages/launch/splash_page.dart b/lib/pages/launch/splash_page.dart
@@ -8,6 +8,8 @@ import 'package:getx_study/pages/common/countdown_circle.dart';
 /// 模拟的一个广告页面
 class SplashPage extends StatelessWidget {
 
+  const SplashPage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Stack(
diff --git a/lib/pages/launch/welcome_page.dart b/lib/pages/launch/welcome_page.dart
@@ -6,6 +6,8 @@ import 'package:getx_study/account_manager/account_manager.dart';
 import 'package:getx_study/routes/routes.dart';
 
 class WelcomePage extends StatelessWidget {
+  const WelcomePage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
diff --git a/lib/pages/my/controller/my_controller.dart b/lib/pages/my/controller/my_controller.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:get/get.dart';
 
 import 'package:getx_study/account_manager/account_manager.dart';
@@ -17,6 +18,7 @@ class MyController
   @override
   void onInit() {
     super.onInit();
+    debugPrint("onInit");
   }
 
   void login({required String username, required String password}) async {
@@ -48,7 +50,6 @@ class MyController
           // navigator?.popUntil(
           //   (route) => route.settings.name == Routes.main,
           // );
-
         }
       },
     );
diff --git a/lib/pages/project_public_number/controller/project_controller.dart b/lib/pages/project_public_number/controller/project_controller.dart
@@ -3,7 +3,6 @@ import 'package:getx_study/base/base_request_controller.dart';
 import 'package:getx_study/entity/tab_entity.dart';
 import 'package:getx_study/enum/response_status.dart';
 import 'package:getx_study/pages/project_public_number/repository/project_repository.dart';
-import 'package:getx_study/pages/tree/repository/tabs_repository.dart';
 
 class ProjectController
     extends BaseRequestController<ProjectRepository, List<TabEntity>> {
diff --git a/lib/pages/project_public_number/view/project_page.dart b/lib/pages/project_public_number/view/project_page.dart
@@ -23,9 +23,9 @@ class _ProjectPageState extends State<ProjectPage>
     with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
   final _tabsController = Get.find<ProjectController>();
 
-  final _alreadyRequestIndex = Set<int>();
+  final _alreadyRequestIndex = <int>{};
 
-  List<TabListController> _tabListControllers = [];
+  final List<TabListController> _tabListControllers = [];
 
   late TabController _tabController;
 
@@ -52,7 +52,7 @@ class _ProjectPageState extends State<ProjectPage>
                 _tabListControllers[index]
                     .aRequest(type: ScrollViewActionType.refresh);
               } else {
-                print("已经包含不用请求");
+                debugPrint("已经包含不用请求");
               }
             }
           });
diff --git a/lib/pages/project_public_number/view/public_number_page.dart b/lib/pages/project_public_number/view/public_number_page.dart
@@ -23,9 +23,9 @@ class _PublicNumberPageState extends State<PublicNumberPage>
     with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
   final _tabsController = Get.find<PublicNumberController>();
 
-  var _alreadyRequestIndex = Set<int>();
+  final _alreadyRequestIndex = <int>{};
 
-  List<TabListController> _tabListControllers = [];
+  final List<TabListController> _tabListControllers = [];
 
   late TabController _tabController;
 
diff --git a/lib/pages/search_result/view/search_result_page.dart b/lib/pages/search_result/view/search_result_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+
 import 'package:getx_study/pages/common/info_cell.dart';
 import 'package:getx_study/pages/common/refresh_header_footer.dart';
 import 'package:getx_study/pages/common/refresh_status_view.dart';
diff --git a/lib/pages/tree/controller/tabs_controller.dart b/lib/pages/tree/controller/tabs_controller.dart
@@ -1,5 +1,3 @@
-import 'package:get/get.dart';
-
 import 'package:getx_study/enum/tag_type.dart';
 import 'package:getx_study/base/base_request_controller.dart';
 import 'package:getx_study/entity/tab_entity.dart';
diff --git a/lib/pages/tree/controller/tree_controller.dart b/lib/pages/tree/controller/tree_controller.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:get/get_state_manager/get_state_manager.dart';
 import 'package:getx_study/enum/tag_type.dart';
 import 'package:getx_study/base/base_request_controller.dart';
@@ -31,11 +32,11 @@ class TreeController
 
   @override
   Future<void> onTopScroll() async {
-    print("滑到了顶部");
+    debugPrint("滑到了顶部");
   }
 
   @override
   Future<void> onEndScroll() async {
-    print("滑到了底部");
+    debugPrint("滑到了底部");
   }
 }
diff --git a/lib/pages/tree/view/tabs_page.dart b/lib/pages/tree/view/tabs_page.dart
@@ -23,7 +23,7 @@ class _TabsPageState extends State<TabsPage>
     with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
   final _tabsController = Get.find<TabsController>();
 
-  final _alreadyRequestIndex = Set<int>();
+  final _alreadyRequestIndex = <int>{};
 
   final _tabListControllers = <TabListController>[];
 
@@ -52,7 +52,7 @@ class _TabsPageState extends State<TabsPage>
                 _tabListControllers[index]
                     .aRequest(type: ScrollViewActionType.refresh);
               } else {
-                print("已经包含不用请求");
+                debugPrint("已经包含不用请求");
               }
             }
           });
@@ -124,7 +124,7 @@ class _TabsPageState extends State<TabsPage>
       return Container();
     }
 
-    final map = Map<int, Widget>();
+    final map = <int, Widget>{};
     for (var i = 0; i < array.length; i++) {
       final model = array[i];
       final widget = Container(
diff --git a/lib/pages/tree/view/tree_cell.dart b/lib/pages/tree/view/tree_cell.dart
@@ -19,16 +19,16 @@ class TreeCell extends StatelessWidget {
       onTap: () {},
       child: Container(
         padding: const EdgeInsets.all(16.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: _chipTitleItem(model),
-        ),
         decoration: BoxDecoration(
           border: Border(
             bottom: BorderSide(width: 0.33, color: Colors.grey[400]!),
           ),
         ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: _chipTitleItem(model),
+        ),
       ),
     );
   }
diff --git a/lib/pages/tree/view/tree_page.dart b/lib/pages/tree/view/tree_page.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
 
diff --git a/lib/pages/web/view/web_page.dart b/lib/pages/web/view/web_page.dart
@@ -133,7 +133,7 @@ class WebPage extends GetView<WebController> {
             debugPrint('WebView is loading (progress : $progress%)');
           },
           onPageStarted: (String url) {
-            print('Page started loading: $url');
+            debugPrint('Page started loading: $url');
             EasyLoading.show(
                 indicator: const CupertinoActivityIndicator(
                   color: Colors.white,
@@ -142,7 +142,7 @@ class WebPage extends GetView<WebController> {
                 maskType: EasyLoadingMaskType.none);
           },
           onPageFinished: (String url) {
-            print('Page finished loading: $url');
+            debugPrint('Page finished loading: $url');
             EasyLoading.dismiss();
           },
           onWebResourceError: (WebResourceError error) {
diff --git a/lib/routes/routes.dart b/lib/routes/routes.dart
@@ -9,7 +9,7 @@ import 'package:getx_study/pages/home/binding/home_binding.dart';
 import 'package:getx_study/pages/hot_key/bindings/hot_key_binding.dart';
 import 'package:getx_study/pages/hot_key/view/hot_key_page.dart';
 import 'package:getx_study/pages/launch/splash_page.dart';
-import 'package:getx_study/pages/launch/welcom_page.dart';
+import 'package:getx_study/pages/launch/welcome_page.dart';
 import 'package:getx_study/pages/main/bindings/main_binding.dart';
 import 'package:getx_study/pages/main/view/main_page.dart';
 import 'package:getx_study/pages/my/binding/my_binding.dart';
@@ -146,11 +146,11 @@ abstract class Routes {
 
     GetPage(
       name: welcome,
-      page: () => WelcomePage(),
+      page: () => const WelcomePage(),
     ),
     GetPage(
       name: splash,
-      page: () => SplashPage()
+      page: () => const SplashPage()
     ),
 
     /// 以下是测试路由
diff --git a/test/widget_test.dart b/test/widget_test.dart
@@ -13,7 +13,7 @@ import 'package:getx_study/my_app.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp(isFirst: true,));
+    await tester.pumpWidget(const MyApp(isFirst: true,));
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class GetBindWidget extends StatefulWidget {`
`46`	`46`	`final Widget child;`
`47`	`47`
`48`	`48`	`@override`
`49`		`- _GetBindWidgetState createState() => _GetBindWidgetState();`
	`49`	`+ State<GetBindWidget> createState() => _GetBindWidgetState();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`class _GetBindWidgetState extends State<GetBindWidget> {`
`@@ -132,7 +132,7 @@ class AutoDisposePage extends StatefulWidget {`
`132`	`132`	`const AutoDisposePage({Key? key}) : super(key: key);`
`133`	`133`
`134`	`134`	`@override`
`135`		`- _AutoDisposePageState createState() => _AutoDisposePageState();`
	`135`	`+ State<AutoDisposePage> createState() => _AutoDisposePageState();`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`class _AutoDisposePageState extends State<AutoDisposePage> {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class KeepAliveWrapper extends StatefulWidget {`
`10`	`10`	`final Widget child;`
`11`	`11`
`12`	`12`	`@override`
`13`		`- _KeepAliveWrapperState createState() => _KeepAliveWrapperState();`
	`13`	`+ State<KeepAliveWrapper> createState() => _KeepAliveWrapperState();`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`class _KeepAliveWrapperState extends State<KeepAliveWrapper>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import 'package:flutter/cupertino.dart';`
`2`		`-import 'package:flutter/material.dart';`
`3`	`2`
`4`	`3`	`class LoadingView extends StatelessWidget {`
`5`	`4`	`final String? _message;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import 'package:get/get.dart';`
`2`		`-`
`3`	`1`	`import 'package:getx_study/enum/tag_type.dart';`
`4`	`2`	`import 'package:getx_study/base/base_request_controller.dart';`
`5`	`3`	`import 'package:getx_study/entity/tab_entity.dart';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import 'package:flutter/foundation.dart';`
`1`	`2`	`import 'package:get/get_state_manager/get_state_manager.dart';`
`2`	`3`	`import 'package:getx_study/enum/tag_type.dart';`
`3`	`4`	`import 'package:getx_study/base/base_request_controller.dart';`
`@@ -31,11 +32,11 @@ class TreeController`
`31`	`32`
`32`	`33`	`@override`
`33`	`34`	`Future<void> onTopScroll() async {`
`34`		`- print("滑到了顶部");`
	`35`	`+ debugPrint("滑到了顶部");`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`@override`
`38`	`39`	`Future<void> onEndScroll() async {`
`39`		`- print("滑到了底部");`
	`40`	`+ debugPrint("滑到了底部");`
`40`	`41`	`}`
`41`	`42`	`}`