增加下拉刷新上拉加载组件, 个人中心增加下拉刷新.

lib/base/base_lifecycle_state.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lszlgl/base/base_state.dart';
+export 'package:lszlgl/ext/value_notifier_ext.dart';
 
 /// 页面生命周期基类
 ///

lib/base/base_state.dart

@@ -4,6 +4,7 @@ import 'package:lszlgl/config/pics.dart';
 export 'package:lszlgl/config/pics.dart';
 export 'package:lszlgl/router/my_navigator.dart';
 export 'package:lszlgl/router/my_router.dart';
+export 'package:lszlgl/ext/value_notifier_ext.dart';
 
 abstract class BaseState<T extends StatefulWidget> extends State<T> {
   /// 隐藏软键盘

lib/ext/value_notifier_ext.dart

@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+
+/// 万物皆可Notifier
+extension ObjectNotifierExt on Object? {
+  ValueNotifier<T?> notifier<T>() => ValueNotifier(this as T?);
+}
+
+/// 拓展ValueNotifier
+/// 快捷调用builder来编写组件
+extension NotifierObjectExt<T> on ValueNotifier<T> {
+  /// 创建Builder
+  ValueListenableBuilder<T> builder(Widget Function(T v) build) {
+    return ValueListenableBuilder<T>(
+      valueListenable: this,
+      builder: (context, v, child) => build.call(v),
+    );
+  }
+
+  /// ==
+  bool equals(T other) => value == other;
+
+  /// 刷新数据
+  update(T other) => value = other;
+}
+
+/// num相关拓展
+extension NotifierNumExt on ValueNotifier<num> {
+  ValueListenableBuilder<num> builder(Widget Function(num v) build) {
+    return ValueListenableBuilder(
+      valueListenable: this,
+      builder: (context, v, child) => build.call(v),
+    );
+  }
+
+  num operator +(num other) => value += other;
+
+  num operator -(num other) => value -= other;
+
+  num operator *(num other) => value *= other;
+
+  double operator /(num other) => value = value / other;
+
+  int operator ~/(num other) => value = value ~/ other;
+
+  num operator -() => -value;
+
+  /// 取模
+  num operator %(num other) => value % other;
+
+  /// 取余
+  num remainder(num other) => value.remainder(other);
+
+  /// 是否相等
+  bool equals(num other) => value == other;
+
+  bool operator <(num other) => value < other;
+
+  bool operator <=(num other) => value <= other;
+
+  bool operator >(num other) => value > other;
+
+  bool operator >=(num other) => value >= other;
+
+  /// 赋值 通知更新
+  update(num other) => value = other;
+}

lib/main.dart

@@ -1,3 +1,4 @@
+import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -8,6 +9,102 @@ import 'package:lszlgl/router/my_navigator.dart';
 import 'package:lszlgl/utils/sp_utils.dart';
 
 late Logger logger;
+const zhCN = {
+  'Sample': '示例',
+  'Style': '样式',
+  'More': '更多',
+  'Theme': '主题',
+  'System': '系统',
+  'Light': '明亮',
+  'Dark': '暗黑',
+  'Classic': '经典',
+  'Classic and default': '经典和默认',
+  'Direction': '方向',
+  'Vertical': '垂直',
+  'Horizontal': '水平',
+  'Clamping': '固定',
+  'Background': '背景',
+  'Alignment': '对齐',
+  'Center': '中心',
+  'Start': '开端',
+  'End': '结尾',
+  'Infinite': '无限',
+  'Message': '信息',
+  'Text': '文本',
+  'Animation': '动画',
+  'Bounce': '回弹',
+  'List Spring': '列表弹簧',
+  'Pull to refresh': '下拉刷新',
+  'Release ready': '释放开始',
+  'Refreshing...': '刷新中...',
+  'Succeeded': '成功了',
+  'No more': '没有更多',
+  'Failed': '失败了',
+  'Last updated at %T': '最后更新于 %T',
+  'Pull to load': '上拉加载',
+  'Loading...': '加载中...',
+  'Bezier curve': '贝塞尔曲线',
+  'Disable': '禁用',
+  'Display balls': '显示小球',
+  'Spin in center': 'Spin居中',
+  'Only show spin': '只显示Spin',
+  'Bezier circle': '弹出圆圈',
+  'Golden campus': '金色校园',
+  'Rush to the sky': '冲上云霄',
+  'Balloon delivery': '气球快递',
+  'Star track': '太空轨道',
+  'Lumberjack Squats': '暴力深蹲',
+  'Skating boy': '滑雪少年',
+  'Halloween horror': '万圣节惊魂',
+  'User profile': '个人中心',
+  'User personal center': '用户个人中心',
+  'QQ group': 'QQ群',
+  'Name': '名字',
+  'Age': '年龄',
+  'Not yet bald': '尚未秃顶',
+  'City': '城市',
+  'China - ChengDu': '中国 - 成都',
+  'Phone': '电话',
+  'Mail': '邮箱',
+  'NestedScrollView example': 'NestedScrollView示例',
+  'Carousel': '轮播',
+  'Carousel example': '轮播示例',
+  'Refresh on start': '启动时刷新',
+  'Refresh when the list is displayed and specify the Header': '列表显示时刷新并指定Header',
+  'Listener': '监听器',
+  'Use listener to respond anywhere': '使用监听器，在任意位置响应',
+  'Secondary': '二楼',
+  'Combine existing Header with secondary': '将已有的Header结合二楼',
+  'Open the second floor': '打开二楼',
+  'Chat': '聊天',
+  'Chat page example': '聊天页面示例',
+  'PageView example': 'PageView 示例',
+  'Join discussion': '加入讨论',
+  'Join the QQ group (554981921)': '加入QQ群(554981921)',
+  'Repository': '项目地址',
+  'Support me': '支持作者',
+  'Buy me a coffee ~': '请作者喝一杯咖啡~',
+  'Alipay': '支付宝',
+  'Alipay donation': '支付宝捐赠',
+  'Wechat': '微信',
+  'Wechat donation': '微信捐赠',
+  'Cryptocurrency': '加密货币',
+  'Cryptocurrency donation': '加密货币捐赠',
+  'Bitcoin donation': '比特币捐赠',
+  'Ethereum series, ETH, BNB, MATIC, USDT and other tokens': '以太坊系列，ETH、BNB、MATIC、USDT及其他代币',
+  'Tron chain, TRX, USDT, USDC and other tokens': '波场链，TRX、USDT、USDC及其他代币',
+  'Dogecoin donation': '狗狗币捐赠',
+  '%s copied!': '%s 已复制!',
+  'Trigger immediately': '立即触发',
+  'TabBarView example': 'NestedScrollView + TabBarView示例',
+  'Paging': '分页',
+  'Paging example': '分页示例',
+  'No Data': '暂无数据',
+  'Theme switch': '主题切换',
+  'Theme switch example': '主题切换示例',
+  'Theme switch describe': '下拉显示切换面板，左右滑动选中主题色，释放进行切换。',
+  'Bubbles launch': '泡泡发射',
+};
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -19,6 +116,27 @@ void main() async {
   BaseDio.get().init();
   logger = Logger(printer: PrettyPrinter(methodCount: 0));
   await SPUtils.getInstance().init();
+
+  EasyRefresh.defaultHeaderBuilder = () => const ClassicHeader(
+        dragText: '下拉刷新',
+        armedText: '释放开始',
+        readyText: '刷新中...',
+        processingText: '刷新中...',
+        processedText: '成功了',
+        noMoreText: '没有更多',
+        failedText: '失败了',
+        messageText: '最后更新于 %T',
+      );
+  EasyRefresh.defaultFooterBuilder = () => const ClassicFooter(
+        dragText: '上拉加载',
+        armedText: '释放开始',
+        readyText: '加载中...',
+        processingText: '加载中...',
+        processedText: '成功了',
+        noMoreText: '没有更多',
+        failedText: '失败了',
+        messageText: '最后更新于 %T',
+      );
   runApp(const MyApp());
 }
 

lib/network/base_dio.dart

@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -78,7 +76,7 @@ class MyInterceptor extends Interceptor {
     if (options.queryParameters.isNotEmpty) map['queryParameters'] = options.queryParameters;
     if (options.extra.isNotEmpty) map['extra'] = options.extra;
     logger.i('ApiRequest: $map');
-    super.onRequest(options, handler);
+    handler.next(options);
   }
 
   @override
@@ -88,10 +86,27 @@ class MyInterceptor extends Interceptor {
     map['url'] = response.requestOptions.uri;
     map['statusCode'] = response.statusCode;
     map['statusMessage'] = response.statusMessage;
-    map['data'] = response.data;
+    if (response.data != null) {
+      var code = response.data!['code'];
+      var msg = response.data!['msg'];
+      map['code'] = code;
+      map['msg'] = msg;
+      map['data'] = response.data!['data'];
+      if (code != 0) {
+        return handler.reject(
+          DioException(
+            requestOptions: response.requestOptions,
+            response: response,
+            type: DioExceptionType.badResponse,
+            message: msg,
+          ),
+          true,
+        );
+      }
+    }
     if (response.extra.isNotEmpty) map['extra'] = response.extra;
     logger.i('ApiResponse: $map');
-    super.onResponse(response, handler);
+    handler.next(response);
   }
 
   // 是否有网
@@ -102,26 +117,14 @@ class MyInterceptor extends Interceptor {
 
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) async {
-    if (err.error != null && err.error is SocketException) {
-      var error = err.error as SocketException;
-      String message = error.message;
-      // 增加网络检测
-      if (err.type == DioExceptionType.unknown) {
-        bool isConnectNetWork = await isConnected();
-        if (!isConnectNetWork) {
-          message = '当前网络不可用，请检查您的网络';
-        }
+    // 增加网络检测
+    if (err.type == DioExceptionType.unknown) {
+      bool isConnectNetWork = await isConnected();
+      if (!isConnectNetWork) {
+        err.copyWith(message: '当前网络不可用，请检查您的网络');
       }
-      err.copyWith(
-        message: message,
-        error: SocketException(
-          message,
-          osError: error.osError,
-          address: error.address,
-          port: error.port,
-        ),
-      );
     }
+    logger.e('ApiError: message:${err.message}');
     // error统一处理
     AppException appException = AppException.create(err);
     err.copyWith(error: appException);
@@ -129,12 +132,13 @@ class MyInterceptor extends Interceptor {
     Map<String, Object?> map = {};
     map['url'] = err.requestOptions.uri;
     map['statusCode'] = err.response?.statusCode;
+    map['message'] = err.message;
     map['exceptionCode'] = appException.code;
-    map['message'] = appException.message;
+    map['msg'] = appException.message;
     if (err.response?.extra.isNotEmpty ?? false) map['extra'] = err.response?.extra;
     logger.e('ApiError: $map');
     SmartDialog.showToast(appException.message ?? '');
-    super.onError(err, handler);
+    handler.next(err);
   }
 }
 

lib/page/main_tab_page.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/network/api.dart';
 import 'package:lszlgl/page/home/home_page.dart';
 import 'package:lszlgl/page/user_center/user_center_page.dart';
 
@@ -46,6 +47,8 @@ class _MainTabPageState extends State<MainTabPage> {
     tabIconSelectList = [imgNavHomeSelect, imgNavUserCenterSelect];
     pageList = [const HomePage(), const UserCenterPage()];
     ctrl = PageController(initialPage: selectedIndex);
+    // 获取用户数据
+    Api().userProfile();
   }
 
   @override

lib/page/user_center/account_manage_page.dart

@@ -24,7 +24,6 @@ class _AccountManagePageState extends BaseLifecycleState<AccountManagePage> {
 
   void onLogout() {
     UserService.get().logout();
-    MyRouter.startLogin(popAll: true);
   }
 
   @override

lib/page/user_center/user_center_page.dart

@@ -1,7 +1,9 @@
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/network/api.dart';
 import 'package:lszlgl/network/rsp/user_rsp.dart';
 import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/card_item.dart';
@@ -15,7 +17,7 @@ class UserCenterPage extends StatefulWidget {
 }
 
 class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with AutomaticKeepAliveClientMixin {
-  UserRsp? user;
+  final userNotify = null.notifier<UserRsp?>();
 
   void startAccountManage() {
     MyRouter.startAccountManage();
@@ -25,9 +27,16 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
     MyRouter.startSetting();
   }
 
+  Future<void> onRefresh() async {
+    try {
+      var value = await Api().userProfile();
+      if (value.data != null) userNotify.value = value.data;
+    } catch (err) {}
+  }
+
   @override
   void onInit() {
-    user = UserService.get().getUser();
+    userNotify.value = UserService.get().getUser();
   }
 
   @override
@@ -40,11 +49,22 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
     return Column(
       children: [
         myAppBar(title: '用户中心', autoLeading: false),
-        buildUserInfo(),
-        const SizedBox(height: 30),
         Expanded(
-          child: SingleChildScrollView(
-            child: buildList(),
+          child: EasyRefresh(
+            onRefresh: onRefresh,
+            child: CustomScrollView(
+              slivers: [
+                SliverToBoxAdapter(
+                  child: Column(
+                    children: [
+                      buildUserInfo(),
+                      const SizedBox(height: 30),
+                      buildList(),
+                    ],
+                  ),
+                )
+              ],
+            ),
           ),
         ),
       ],
@@ -52,48 +72,50 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
   }
 
   Widget buildUserInfo() {
-    return GestureDetector(
-      onTap: startAccountManage,
-      child: Container(
-        margin: const EdgeInsets.symmetric(horizontal: 12),
-        padding: const EdgeInsets.only(left: 8, right: 14, top: 14, bottom: 26),
-        clipBehavior: Clip.hardEdge,
-        decoration: BoxDecoration(
-          borderRadius: const BorderRadius.all(Radius.circular(12)),
-          boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.1), offset: const Offset(0, 5), blurRadius: 4)],
-          image: const DecorationImage(image: AssetImage(imgHomeListBg), fit: BoxFit.fill),
-        ),
-        child: Column(
-          children: [
-            buildUserText(user?.dept?.name ?? ''),
-            Row(
-              children: [
-                buildUserAvatar(),
-                const SizedBox(width: 12),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      user?.nickname ?? '',
-                      style: const TextStyle(fontSize: 17, color: Color(0xFF333333), fontWeight: FontWeight.w500),
-                    ),
-                    const SizedBox(height: 14),
-                    Text(
-                      user?.username ?? '',
-                      style: const TextStyle(fontSize: 17, color: Color(0xFF333333), fontWeight: FontWeight.w500),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ],
+    return userNotify.builder((user) {
+      return GestureDetector(
+        onTap: startAccountManage,
+        child: Container(
+          margin: const EdgeInsets.symmetric(horizontal: 12),
+          padding: const EdgeInsets.only(left: 8, right: 14, top: 14, bottom: 26),
+          clipBehavior: Clip.hardEdge,
+          decoration: BoxDecoration(
+            borderRadius: const BorderRadius.all(Radius.circular(12)),
+            boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.1), offset: const Offset(0, 5), blurRadius: 4)],
+            image: const DecorationImage(image: AssetImage(imgHomeListBg), fit: BoxFit.fill),
+          ),
+          child: Column(
+            children: [
+              buildUserText(user?.dept?.name ?? ''),
+              Row(
+                children: [
+                  buildUserAvatar(user?.avatar ?? ''),
+                  const SizedBox(width: 12),
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        user?.nickname ?? '',
+                        style: const TextStyle(fontSize: 17, color: Color(0xFF333333), fontWeight: FontWeight.w500),
+                      ),
+                      const SizedBox(height: 14),
+                      Text(
+                        user?.username ?? '',
+                        style: const TextStyle(fontSize: 17, color: Color(0xFF333333), fontWeight: FontWeight.w500),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ],
+          ),
         ),
-      ),
-    );
+      );
+    });
   }
 
-  Widget buildUserAvatar() {
+  Widget buildUserAvatar(String imageUrl) {
     return Container(
       width: 75,
       height: 75,
@@ -105,7 +127,7 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
       ),
       child: CachedNetworkImage(
         fit: BoxFit.cover,
-        imageUrl: user?.avatar ?? '',
+        imageUrl: imageUrl,
         placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
         errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
       ),

lib/service/user_service.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:lszlgl/network/rsp/login_rsp.dart';
 import 'package:lszlgl/network/rsp/user_rsp.dart';
+import 'package:lszlgl/router/my_router.dart';
 import 'package:lszlgl/utils/sp_utils.dart';
 
 class UserService {
@@ -30,11 +31,13 @@ class UserService {
   }
 
   /// 退出登录
-  Future<void> logout() async {
+  Future<void> logout({bool goLogin = true}) async {
     _login = null;
     await SPUtils.getInstance().remove('login');
     _user = null;
     await SPUtils.getInstance().remove('user');
+    // 跳转登录页
+    if (goLogin) MyRouter.startLogin(popAll: true);
   }
 
   /// 存储用户信息

lib/widget/page_widget.dart

@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/config/colors.dart';
+import 'package:lszlgl/widget/button.dart';
+
+enum PageState {
+  loading,
+  success,
+  error,
+}
+
+class PageLoadingWidget extends StatelessWidget {
+  final AlignmentGeometry? alignment;
+  final bool isLoading;
+  final String? title;
+  final String? message;
+  final String? btnText;
+  final VoidCallback? onTap;
+  final EdgeInsetsGeometry? padding;
+
+  const PageLoadingWidget({
+    super.key,
+    this.alignment,
+    this.isLoading = false,
+    this.title,
+    this.message,
+    this.btnText,
+    this.onTap,
+    this.padding = const EdgeInsets.only(top: 150),
+  });
+
+  const PageLoadingWidget.loading({
+    super.key,
+    this.alignment,
+    this.message,
+    this.padding = const EdgeInsets.only(top: 150),
+  })  : isLoading = true,
+        title = null,
+        onTap = null,
+        btnText = null;
+
+  const PageLoadingWidget.empty({
+    super.key,
+    this.alignment,
+    this.message,
+    this.padding = const EdgeInsets.only(top: 150),
+  })  : isLoading = false,
+        title = null,
+        onTap = null,
+        btnText = null;
+
+  const PageLoadingWidget.error({
+    super.key,
+    this.alignment,
+    this.title,
+    this.onTap,
+    this.btnText = '点击重试',
+    this.padding = const EdgeInsets.only(top: 150),
+  })  : isLoading = false,
+        message = null;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      alignment: alignment ?? Alignment.center,
+      padding: padding,
+      child: Column(
+        children: [
+          buildLoading(),
+          buildTitle(),
+          buildMessage(),
+          buildButton(),
+        ],
+      ),
+    );
+  }
+
+  Widget buildLoading() {
+    if (!isLoading) return const SizedBox.shrink();
+    return const Padding(
+      padding: EdgeInsets.only(bottom: 12),
+      child: CircularProgressIndicator(strokeWidth: 3),
+    );
+  }
+
+  Widget buildTitle() {
+    if (title == null) return const SizedBox.shrink();
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 12),
+      child: Text(
+        title!,
+        style: const TextStyle(fontSize: 16, color: MyColor.c_333333),
+      ),
+    );
+  }
+
+  Widget buildMessage() {
+    if (message == null) return const SizedBox.shrink();
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 12),
+      child: Text(
+        message!,
+        style: const TextStyle(fontSize: 12, color: MyColor.c_666666),
+      ),
+    );
+  }
+
+  Widget buildButton() {
+    if (btnText == null) return const SizedBox.shrink();
+    return MyButton(
+      btnText!,
+      onTap: onTap,
+    );
+  }
+}

pubspec.lock

@@ -265,6 +265,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.4.1"
+  easy_refresh:
+    dependency: "direct main"
+    description:
+      name: easy_refresh
+      sha256: f36324c7f50291f85085bd64b39abe6b63909481bfa527f9c654d17ef172de30
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.3.4"
   fake_async:
     dependency: transitive
     description:
@@ -581,6 +589,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   path_provider:
     dependency: transitive
     description:

pubspec.yaml

@@ -66,6 +66,8 @@ dependencies:
   json_annotation: ^4.8.1
   # 共享参数
   shared_preferences: ^2.2.2
+  # 下拉刷新上拉加载
+  easy_refresh: ^3.3.4
 
 dev_dependencies:
   flutter_test: