feat

lib/models/app.dart

@@ -49,11 +49,16 @@ class AppController extends GetxController {
       );
     });
 
+    var route = Get.routing;
+
     if (box.read('token') != null) {
       // 尝试获取一次人员信息
       getCurrent().then((person) {
-        user(Person.fromJson(person));
+        Person p = Person.fromJson(person);
+        user(p);
+        box.write("user", p);
       }).catchError((e) {
+        box.remove("token");
         print(e);
       });
     }

lib/pages/agreement/index.dart

@@ -1,6 +1,7 @@
 import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 
 class Agreement extends BasicPage {
   @override
@@ -10,27 +11,34 @@ class Agreement extends BasicPage {
       height: 700.h,
       color: const Color(0xFFFFFFFF),
       padding: EdgeInsets.all(15.w),
-      child: Column(
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Image(
-                  image: const AssetImage('images/icons/decorate.png'),
-                  width: 16.5.w),
-              Text(
-                '用户协议',
-                style: TextStyle(
-                    fontSize: 20.sp,
-                    fontWeight: FontWeight.bold,
-                    color: const Color(0xFF222222)),
-              ),
-              Image(
-                  image: const AssetImage('images/icons/decorate.png'),
-                  width: 16.5.w),
-            ],
-          ),
-        ],
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Image(
+                    image: const AssetImage('images/icons/decorate.png'),
+                    width: 16.5.w),
+                Text(
+                  '用户协议',
+                  style: TextStyle(
+                      fontSize: 20.sp,
+                      fontWeight: FontWeight.bold,
+                      color: const Color(0xFF222222)),
+                ),
+                Image(
+                    image: const AssetImage('images/icons/decorate.png'),
+                    width: 16.5.w),
+              ],
+            ),
+            Image.network(
+              'https://dz-machinery.oss-cn-nanjing.aliyuncs.com/images/privacy_policy.png',
+              width: Get.width,
+              fit: BoxFit.cover,
+            )
+          ],
+        ),
       ),
     );
   }

lib/pages/home/index.dart

@@ -24,8 +24,9 @@ class Home extends BasicPage {
   Function? Refresh;
   List<CardListModel> GetList(value) {
     List<CardListModel> list = [];
-    if (value != null)
+    if (value != null) {
       value.forEach((item) => {list.add(CardListModel.fromJson(item))});
+    }
     return list;
   }
 

lib/pages/login/login.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'package:farmer_client/models/app.dart';
-import 'package:farmer_client/pages/home/index.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
 
 import '../../models/entities/person.dart';
 import '../../services/user.dart';
@@ -40,6 +40,7 @@ class _RouteLogin extends State<MyRouteLogin> {
   int count = 60; //初始倒计时时间
   var timer; //倒计时的计时器
   TextEditingController mController = TextEditingController();
+  GetStorage box = GetStorage();
 
   //获取验证码
   void _initTimer() {
@@ -114,12 +115,13 @@ class _RouteLogin extends State<MyRouteLogin> {
     } else {
       if (_newValue) {
         userLogin(handlePhones, handleCodes).then((value) {
+          box.write("token", value['token']);
+          box.write("tokenTimeout", value['tokenTimeout']);
           userInfo(Person.fromJson(value['person']));
-
           if (widget.isBack) {
             Get.back();
           } else {
-            Get.off(Home());
+            Get.offNamed("/home");
           }
         });
       } else {

lib/pages/main/widgets/main/index.dart

@@ -25,6 +25,7 @@ class MainPage extends StatelessWidget {
         onCancel: () => true,
         onConfirm: () => {
               box.remove('token'),
+              box.remove('tokenTimeout'),
               Get.offAllNamed('/login'),
             });
   }

lib/pages/splash/splash.dart

@@ -1,60 +1,35 @@
-import 'package:farmer_client/pages/splash/widgets/countdown.dart';
+import 'package:card_swiper/card_swiper.dart';
 import 'package:get/get.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter/material.dart';
 import 'package:get_storage/get_storage.dart';
+import 'package:farmer_client/utils/tool.dart';
 
-class SplashScreen extends StatefulWidget {
+class SplashScreen extends StatelessWidget {
   const SplashScreen({Key? key}) : super(key: key);
 
-  @override
-  State<SplashScreen> createState() => _SplashScreen();
-}
-
-class _SplashScreen extends State<SplashScreen> {
-  GetStorage box = GetStorage();
-  handleOnFinish() {
-    bool isLogin = box.hasData('token');
-    if (isLogin) {
-      Get.offNamed('/');
-    } else {
-      Get.offNamed('/login');
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-        body: Container(
-      decoration: const BoxDecoration(
-        image: DecorationImage(
-            image: AssetImage("images/splash.png"),
-            fit: BoxFit.cover,
-            alignment: Alignment.topCenter),
-      ),
-      child: Stack(
-        children: [
-          Positioned(
-            right: 15.w,
-            top: 50.h,
-            child: countdown(3, handleOnFinish),
-          ),
-          Positioned(
-            bottom: 0,
-            child: Container(
-              width: 375.w,
-              height: 60.w,
-              child: Center(
-                child: Image.asset(
-                  'images/logo.png',
-                  width: 218.w,
-                  height: 50.w,
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    ));
+    GetStorage box = GetStorage();
+    var pg = isLogin() ? '/home' : '/login';
+    box.write("not-first-load", true);
+
+    return Scaffold (
+        body: Swiper (
+          itemBuilder: (BuildContext context,int index){
+            var adImg = "https://dz-machinery.oss-cn-nanjing.aliyuncs.com/images/nonghu_launch_image_" + (index + 1).toString() + ".png";
+            return Image.network(adImg,fit: BoxFit.fill,);
+          },
+          loop: false,
+          itemCount: 3,
+          pagination: const SwiperPagination(),
+          // control: SwiperControl(),
+          onTap: (index) {
+            if (index == 2) {
+              Get.offNamed(pg);
+            }
+            // foo
+          },
+        )
+    );
   }
 }

lib/pages/welcome/index.dart

@@ -0,0 +1,36 @@
+
+import 'package:card_swiper/card_swiper.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
+
+class WelcomePage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    GetStorage box = GetStorage();
+    var isLogin = box.hasData('token');
+    var pg = isLogin ? '/home' : '/login';
+
+    // box.write("not-first-load", true);
+
+    return Scaffold (
+        body: new Swiper (
+          itemBuilder: (BuildContext context,int index){
+            var adImg = "https://dz-machinery.oss-cn-nanjing.aliyuncs.com/images/nonghu_launch_image_" + (index + 1).toString() + ".png";
+            return Image.network(adImg,fit: BoxFit.fill,);
+          },
+          loop: false,
+          itemCount: 3,
+          pagination: SwiperPagination(),
+          // control: SwiperControl(),
+          onTap: (index) {
+            if (index == 2) {
+              Get.offNamed(pg);
+            }
+            // foo
+          },
+        )
+    );
+  }
+  
+}

lib/routes/middleWares.dart

@@ -1,16 +1,38 @@
 import 'package:flutter/scheduler.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
+import 'package:farmer_client/utils/tool.dart';
+
+var whiteList = [
+  '/',
+  '/splash',
+  '/login',
+  '/agreement',
+];
 
 void routingCallback(routing) {
-  // GetStorage box = GetStorage();
+  print("---------routingCallback---------");
+  print(routing?.current);
+  print(whiteList.contains(routing?.current));
+
+  if (!isLogin()) {
+    if (!whiteList.contains(routing?.current)) {
+      print('----will be to login page----->');
+
+      // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
+      // https://github.com/jonataslaw/getx/issues/262
+      SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
+    }
+  }
+
+
   // bool isLogin = box.hasData('token');
   // bool isSplashScreen = routing?.current == '/splash';
   // bool isLoginPage = routing?.current == '/login';
   // bool isAgreementPage = routing?.current == '/agreement';
   // if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
-  //   // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
-  //   // https://github.com/jonataslaw/getx/issues/262
+    // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
+    // https://github.com/jonataslaw/getx/issues/262
   //   SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
   // }
 }

lib/routes/pages.dart

@@ -1,5 +1,6 @@
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
+import 'package:farmer_client/utils/tool.dart';
 import '../pages/index.dart';
 
 List<GetPage> pages = [
@@ -7,13 +8,19 @@ List<GetPage> pages = [
       name: '/',
       page: () {
         GetStorage box = GetStorage();
-        return box.hasData('token') ? Home() : MyRouteLogin();
+        var isFirstLoad = !box.hasData("not-first-load");
+
+        print("------isFirstLoad------");
+        print(isFirstLoad);
+
+        return  isFirstLoad ? const SplashScreen() : ( isLogin() ? Home() : MyRouteLogin() );
       }),
+  GetPage(name: '/home', page: () => Home()),
   GetPage(name: '/main', page: () => Main()),
   GetPage(name: '/order', page: () => OrderPage()),
   GetPage(name: '/infomation', page: () => Infomation()),
   GetPage(name: '/ArticleInfo', page: () => ArticleInfo()), //资讯详情
-  // GetPage(name: '/splash', page: () => SplashScreen()), // SplashScreen
+  GetPage(name: '/splash', page: () => SplashScreen()), // SplashScreen
   GetPage(name: '/login', page: () => MyRouteLogin()),
   GetPage(name: '/addressList', page: () => AddressList()),
   GetPage(name: '/addAddress', page: () => AddAddress()),
@@ -26,4 +33,5 @@ List<GetPage> pages = [
   GetPage(name: '/orderConfirmation', page: () => OrderConfirmation()),
   GetPage(name: '/orderPageInfo', page: () => OrderPageInfo()),
   GetPage(name: '/searchPage', page: () => SearchPage()),
+  // GetPage(name: '/welcome', page: () => WelcomePage()),
 ];

lib/utils/tool.dart

@@ -0,0 +1,17 @@
+
+import 'package:get_storage/get_storage.dart';
+
+bool isLogin() {
+  GetStorage box = GetStorage();
+
+  print('----tokenTimeout----->');
+  print(box.read("tokenTimeout"));
+
+  if (!box.hasData("tokenTimeout")) {
+    return false;
+  }
+
+  DateTime expireTime = DateTime.parse(box.read("tokenTimeout"));
+  DateTime lastDate = DateTime.now().subtract(const Duration(minutes: 5));
+  return expireTime.isAfter(lastDate);
+}

lib/widgets/CarsCard.dart

@@ -34,7 +34,7 @@ class _CarsCardPage extends State<CarsCard> {
 
   @override
   Widget build(BuildContext context) {
-    print(widget.item);
+    // print(widget.item);
 
     return Container(
       margin: EdgeInsets.fromLTRB(0, 20, 0, 20),
@@ -53,7 +53,7 @@ class _CarsCardPage extends State<CarsCard> {
               });
             },
             child: Image.network(
-              widget.item.thumb.toString(),
+              widget.item.thumb ?? 'https://dz-machinery.oss-cn-nanjing.aliyuncs.com/images/no_image.png',
               width: 345.w,
               height: 230.h,
               fit: BoxFit.cover,
@@ -69,7 +69,7 @@ class _CarsCardPage extends State<CarsCard> {
                 Container(
                   width: 210.w,
                   child: Text(
-                    widget.item.name.toString(),
+                    widget.item.name ?? '',
                     softWrap: true,
                     textAlign: TextAlign.left,
                     overflow: TextOverflow.ellipsis,
@@ -95,7 +95,7 @@ class _CarsCardPage extends State<CarsCard> {
                     child: RichText(
                       text: TextSpan(children: <InlineSpan>[
                         TextSpan(
-                            text: (widget.item.price! / 100).toString(),
+                            text: ((widget.item.price ?? 0) / 100).toString(),
                             style: TextStyle(
                               fontSize: 22,
                               fontWeight: FontWeight.bold,

lib/widgets/layout/barList.dart

@@ -6,7 +6,7 @@ import 'bottomBar/item.dart';
 final BarList = <BarItem>[
   BarItem(
     label: '首页',
-    page: '/',
+    page: '/home',
     normal: Item(
         color: const Color(0xFF323232),
         fontSize: 15.sp,

pubspec.lock

@@ -71,6 +71,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
+  card_swiper:
+    dependency: "direct main"
+    description:
+      name: card_swiper
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.1"
   carousel_slider:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -54,6 +54,7 @@ dependencies:
   flutter_easyrefresh: ^2.2.1 #下拉刷新上拉加载
   fluwx: ^3.9.0 #微信支付
   tobias: ^2.4.0 #支付宝支付
+  card_swiper: ^3.0.1
 
 #  flutter_bmflocation: ^3.1.0+1