From 87739c3e230eef23eb17513f8e7b8ea19315c0e8 Mon Sep 17 00:00:00 2001 From: wyl2022 <2373073266@qq.com> Date: Wed, 15 Jun 2022 10:09:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/home/ic_kaimen.png | Bin 1793 -> 4600 bytes lib/pages/tab_navigator.dart | 83 ++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/assets/home/ic_kaimen.png b/assets/home/ic_kaimen.png index a563a4582dca60019b85b97cc2430e632a5edad2..ed0a113f36ee53aff497954ab133b5cb2c258293 100644 GIT binary patch literal 4600 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

9Y}duy`%7mKkQJ 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 QSbQ*ey85}Sb4q9e0D|3@4*&oF diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index 6b36fe71..6e3a1f54 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -1,3 +1,4 @@ +import 'package:aku_new_community/ui/home/application/all_application_new.dart'; import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; @@ -142,13 +143,14 @@ class _TabNavigatorState extends State Expanded( child: GestureDetector( onTap: () { - if (UserTool.userProvider.isLogin == false) { - //暂时隐去一键登录页 - Get.offAll(() => OtherLoginPage()); - } else {} - _tabController!.animateTo(2, curve: Curves.easeInOutCubic); - _currentIndex = 2; - setState(() {}); + Get.to(() => AllApplicationNewPage()); + // if (UserTool.userProvider.isLogin == false) { + // //暂时隐去一键登录页 + // Get.offAll(() => OtherLoginPage()); + // } else {} + // _tabController!.animateTo(2, curve: Curves.easeInOutCubic); + // _currentIndex = 2; + // setState(() {}); }, child: Material( color: Colors.transparent, @@ -181,42 +183,41 @@ class _TabNavigatorState extends State 4, ), ]; - return - BeeScaffold( - body: WillPopScope( - onWillPop: () async { - if (_lastPressed == null || - DateTime.now().difference(_lastPressed!) > Duration(seconds: 1)) { - //两次点击间隔超过1秒重新计算 - _lastPressed = DateTime.now(); - BotToast.showText(text: '再点击一次返回退出'); - return false; - } - //否则关闭app - WebSocketUtil().closeWebSocket(); - return true; - }, - child: TabBarView( - children: _pages, - controller: _tabController, - physics: NeverScrollableScrollPhysics(), - ), - ), - bottomNavi: ConstrainedBox( - constraints: BoxConstraints(maxWidth: 750.w, maxHeight: 146.w), - child: Container( - margin: + return BeeScaffold( + body: WillPopScope( + onWillPop: () async { + if (_lastPressed == null || + DateTime.now().difference(_lastPressed!) > Duration(seconds: 1)) { + //两次点击间隔超过1秒重新计算 + _lastPressed = DateTime.now(); + BotToast.showText(text: '再点击一次返回退出'); + return false; + } + //否则关闭app + WebSocketUtil().closeWebSocket(); + return true; + }, + child: TabBarView( + children: _pages, + controller: _tabController, + physics: NeverScrollableScrollPhysics(), + ), + ), + bottomNavi: ConstrainedBox( + constraints: BoxConstraints(maxWidth: 750.w, maxHeight: 146.w), + child: Container( + margin: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), - decoration: BoxDecoration( - image: DecorationImage( - image: Assets.home.imgTabdi, fit: BoxFit.fitWidth), - color: Colors.transparent), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: _bottomNav.cast().toList(), - ), - ), + decoration: BoxDecoration( + image: DecorationImage( + image: Assets.home.imgTabdi, fit: BoxFit.fitWidth), + color: Colors.transparent), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: _bottomNav.cast().toList(), ), + ), + ), ); } }