From 7dfa5eb5940c1a7fc622f628e544313665d39c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com>
Date: Thu, 19 May 2022 22:45:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/personal/personal_page.dart | 15 +++++++--------
 lib/pages/tab_navigator.dart          | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart
index 696a505c..eee27e14 100644
--- a/lib/pages/personal/personal_page.dart
+++ b/lib/pages/personal/personal_page.dart
@@ -31,7 +31,9 @@ import 'intergral/integral_center_page.dart';
 class PersonalIndex extends StatefulWidget {
   final bool? isSign;
 
-  PersonalIndex({Key? key, this.isSign}) : super(key: key);
+  final EasyRefreshController refreshController;
+
+  PersonalIndex({Key? key, this.isSign, required this.refreshController}) : super(key: key);
 
   @override
   _PersonalIndexState createState() => _PersonalIndexState();
@@ -39,8 +41,6 @@ class PersonalIndex extends StatefulWidget {
 
 class _PersonalIndexState extends State<PersonalIndex>
     with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
-  EasyRefreshController _refreshController = EasyRefreshController();
-
   Widget _orderButton({
     required String name,
     required String path,
@@ -74,7 +74,6 @@ class _PersonalIndexState extends State<PersonalIndex>
 
   @override
   void dispose() {
-    _refreshController.dispose();
     super.dispose();
   }
 
@@ -89,7 +88,7 @@ class _PersonalIndexState extends State<PersonalIndex>
         child: Scaffold(
           body: EasyRefresh(
               header: MaterialHeader(),
-              controller: _refreshController,
+              controller: widget.refreshController,
               onRefresh: () async {
                 await userProvider.updateUserInfo();
                 await userProvider.updateMyHouseInfo();
@@ -196,7 +195,7 @@ class _PersonalIndexState extends State<PersonalIndex>
                                           tomorrowIntegral: 2));
                                       await UserTool.userProvider
                                           .changeTodayClocked();
-                                      _refreshController.callRefresh();
+                                      widget.refreshController.callRefresh();
                                     } else {
                                       BotToast.showText(text: base.msg);
                                     }
@@ -389,7 +388,7 @@ class _PersonalIndexState extends State<PersonalIndex>
                         await Get.to(WalletRechargePage(
                           initIndex: 0,
                         ));
-                        _refreshController.callRefresh();
+                        widget.refreshController.callRefresh();
                       },
                       child: Material(
                         color: Colors.transparent,
@@ -412,7 +411,7 @@ class _PersonalIndexState extends State<PersonalIndex>
                         await Get.to(WalletRechargePage(
                           initIndex: 1,
                         ));
-                        _refreshController.callRefresh();
+                        widget.refreshController.callRefresh();
                       },
                       child: Material(
                         color: Colors.transparent,
diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart
index 3edf659b..eadecdd6 100644
--- a/lib/pages/tab_navigator.dart
+++ b/lib/pages/tab_navigator.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
@@ -38,6 +39,8 @@ class _TabNavigatorState extends State<TabNavigator>
   //页面列表
   List<Widget> _pages = <Widget>[];
 
+  EasyRefreshController _refreshController = EasyRefreshController();
+
   @override
   void initState() {
     super.initState();
@@ -51,7 +54,9 @@ class _TabNavigatorState extends State<TabNavigator>
       // PropertyPage(),
       OpeningCodePage(),
       CommunityPage(),
-      PersonalIndex()
+      PersonalIndex(
+        refreshController: _refreshController,
+      )
     ];
 
     _tabController = TabController(
@@ -73,6 +78,9 @@ class _TabNavigatorState extends State<TabNavigator>
           } else {
             _tabController!.animateTo(index, curve: Curves.easeInOutCubic);
             _currentIndex = index;
+            if (_currentIndex == 4) {
+              _refreshController.callRefresh();
+            }
             setState(() {});
           }
         },
@@ -138,10 +146,9 @@ class _TabNavigatorState extends State<TabNavigator>
               //暂时隐去一键登录页
               Get.offAll(() => OtherLoginPage());
             } else {}
-              _tabController!.animateTo(2, curve: Curves.easeInOutCubic);
-              _currentIndex = 2;
-              setState(() {});
-
+            _tabController!.animateTo(2, curve: Curves.easeInOutCubic);
+            _currentIndex = 2;
+            setState(() {});
           },
           child: Material(
             color: Colors.transparent,