feat

lib/pages/Login/index.dart

@@ -52,6 +52,7 @@ class _Login extends State<Login> {
   final disableQcode = Rx<bool>(false);
   final isCheck = Rx<bool>(false);
   final loginData = Rx<Map>({});
+  GetStorage box = GetStorage();
 
   void setPhone(e) {
     loginData.value['phone'] = e;
@@ -89,6 +90,8 @@ class _Login extends State<Login> {
           EasyLoading.show(status: '登录中', maskType: EasyLoadingMaskType.black);
           userLogin(loginData.value['phone'], loginData.value['qCode'])
               .then((res) {
+            box.write("token", res['token']);
+            box.write("tokenTimeout", res['tokenTimeout']);
             userInfo(Person.fromJson(res['person']));
             EasyLoading.dismiss();
             Fluttertoast.showToast(msg: '登录成功！');

lib/pages/agreement/index.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 import 'package:worker_client/widgets/layout/BasicPage.dart';
 
 class Agreement extends BasicPage {
@@ -10,12 +11,11 @@ class Agreement extends BasicPage {
     return ListView(
       children: [
         Container(
-          margin: EdgeInsets.symmetric(vertical: 25.h, horizontal: 15.w),
-          child: Column(
-            children: [
-              Container(
-                margin: EdgeInsets.only(bottom: 30.h),
-                child: Row(
+          padding: EdgeInsets.symmetric(vertical: 15.w, horizontal: 15.w),
+          child: SingleChildScrollView(
+            child: Column(
+              children: [
+                Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     Image.asset(
@@ -25,7 +25,7 @@ class Agreement extends BasicPage {
                     Container(
                       margin: EdgeInsets.symmetric(horizontal: 15.5.w),
                       child: Text(
-                        '智慧农机的介绍',
+                        '用户协议',
                         style: TextStyle(
                             fontSize: 22.sp,
                             fontWeight: FontWeight.bold,
@@ -39,50 +39,13 @@ class Agreement extends BasicPage {
                     ),
                   ],
                 ),
-              ),
-              Container(
-                margin: EdgeInsets.only(top: 40.h),
-                child: Column(
-                  children: [
-                    Text(
-                      '本次更新：',
-                      style: TextStyle(
-                          fontSize: 16.sp,
-                          fontWeight: FontWeight.bold,
-                          color: const Color(0xff101010)),
-                    ),
-                    Text(
-                      '--解决了一些已知问题--',
-                      style: TextStyle(
-                          fontSize: 16.sp,
-                          fontWeight: FontWeight.bold,
-                          color: const Color(0xff101010)),
-                    ),
-                  ],
-                ),
-              ),
-              Container(
-                margin: EdgeInsets.only(top: 40.h),
-                child: Column(
-                  children: [
-                    Text(
-                      '最近更新：',
-                      style: TextStyle(
-                          fontSize: 16.sp,
-                          fontWeight: FontWeight.bold,
-                          color: const Color(0xff101010)),
-                    ),
-                    Text(
-                      '--这个页面回头加一个外链进来--',
-                      style: TextStyle(
-                          fontSize: 16.sp,
-                          fontWeight: FontWeight.bold,
-                          color: const Color(0xff101010)),
-                    ),
-                  ],
-                ),
-              ),
-            ],
+                Image.network(
+                  'https://dz-machinery.oss-cn-nanjing.aliyuncs.com/images/privacy_policy.png',
+                  width: Get.width,
+                  fit: BoxFit.cover,
+                )
+              ],
+            ),
           ),
         ),
       ],

lib/pages/splash/splash.dart

@@ -1,54 +1,35 @@
+import 'package:card_swiper/card_swiper.dart';
 import 'package:flutter/material.dart';
-import '../splash/widgets/countdown.dart';
 import 'package:get/get.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import '../home/index.dart';
+import 'package:get_storage/get_storage.dart';
+import 'package:worker_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> {
-  handleOnFinish() {
-    Get.off(Home());
-  }
-
   @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/nongji_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/routes/pages.dart

@@ -1,18 +1,25 @@
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:worker_client/pages/index.dart';
+import 'package:worker_client/utils/tool.dart';
 
 List<GetPage> pages = [
   GetPage(
       name: '/',
       page: () {
         GetStorage box = GetStorage();
-        return box.hasData('token') ? Home() : Login();
+        var isFirstLoad = !box.hasData("not-first-load");
+
+        print("------isFirstLoad------");
+        print(isFirstLoad);
+
+        return isFirstLoad ? const SplashScreen() : ( isLogin() ? Home() : Login() );
       }),
   GetPage(name: '/order', page: () => Order()),
   GetPage(name: '/login', page: () => Login()),
   GetPage(name: '/home', page: () => Home()),
   GetPage(name: '/main', page: () => Main()),
+  GetPage(name: '/splash', page: () => const SplashScreen()), // SplashScreen
   GetPage(name: '/jobDetail', page: () => JobDetail()),
   GetPage(name: '/orderDetail', page: () => OrderDetail()),
   GetPage(name: '/machineryList', page: () => MachineryList()),

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);
+}

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

@@ -48,6 +48,7 @@ dependencies:
   flutter_picker: ^2.0.3
   flutter_easyloading: ^3.0.3
   flutter_easyrefresh: ^2.2.1
+  card_swiper: ^3.0.1
 
 dev_dependencies:
   flutter_test: