Merge remote-tracking branch 'origin/master'

# Conflicts:
#	netrain_flutter_app/lib/main.dart

netrain_flutter_app/lib/main.dart

 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:netrain_flutter_app/xuehao/car_details.dart';
 import 'package:netrain_flutter_app/common/AppColors.dart';
 import 'package:netrain_flutter_app/xuehao/list_page.dart';
 
@@ -49,8 +50,8 @@ class MyApp extends StatelessWidget {
             "listPage":(context) => List_Page(),
             "LoginRequestPage":(context) => LoginRequestPage(),
             "main": (context) => mainPage(),
-            "student":(context) => jssPageDemo()
-
+            "student":(context) => jssPageDemo(),
+            "car_details":(context) =>CarDetailsPage()
           },
         ),
         onWillPop: () async {

netrain_flutter_app/lib/xuehao/car_details.dart

 import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/xuehao/Car.dart';
 
 /**
  * @author xuehao
  * on 2021/7/9
  */
 class CarDetailsPage extends StatefulWidget {
-  String name, imageUrl;
-
-  CarDetailsPage({Key key, @required this.name, @required this.imageUrl})
-      : super(key: key);
-
   @override
-  _CarDetailsState createState() => _CarDetailsState(name, imageUrl);
+  _CarDetailsState createState() => _CarDetailsState();
 }
 
 class _CarDetailsState extends State<CarDetailsPage> {
-  String name, imageUrl;
-
-  _CarDetailsState(this.name, this.imageUrl);
-
+  Car args;
   @override
   Widget build(BuildContext context) {
+    args = ModalRoute.of(context).settings.arguments;
+
     return MaterialApp(
       title: "car_details",
       home: Scaffold(
@@ -37,9 +32,8 @@ class _CarDetailsState extends State<CarDetailsPage> {
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Text(name),
-              SizedBox(height: 40),
-              Image.network(imageUrl),
+              Text(args.name),
+              Image.network(args.imageUrl),
             ],
           ),
         ),

netrain_flutter_app/lib/xuehao/list_page.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:netrain_flutter_app/xuehao/car_details.dart';
 import 'Car.dart';
 
 class List_Page extends StatefulWidget {
@@ -11,15 +9,10 @@ class List_Page extends StatefulWidget {
 
 EasyRefreshController _controller = EasyRefreshController();
 
-class _ListPageState extends State<List_Page> {
+class _ListPageState extends State<List_Page> with WidgetsBindingObserver {
   @override
   Widget build(BuildContext context) {
-    return new MaterialApp(
-        title: "listPage",
-        theme: ThemeData(
-          primarySwatch: Colors.blue,
-        ),
-        home: Scaffold(
+    return new Scaffold(
       appBar: AppBar(
         title: Text("ListView"),
         centerTitle: true,
@@ -47,7 +40,9 @@ class _ListPageState extends State<List_Page> {
           //返回数据条数
           itemCount: datas.length,
           //itemBuilder 需要返回一个Widget
-              itemBuilder: _getDatas,
+          itemBuilder: (context,index){
+            return _getDatas(index);
+          },
         ),
         //刷新动作被触发
         onRefresh: () async {
@@ -58,11 +53,29 @@ class _ListPageState extends State<List_Page> {
           loadData();
         },
       ),
-        ));
+    );
+  }
+
+  void dispose() {
+    super.dispose();
+    WidgetsBinding.instance.removeObserver(this);
+    print("dispose");
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+    print("initState");
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    print(state);
   }
 
   ///获取item视图
-  Widget _getDatas(BuildContext context, int position) {
+  Widget _getDatas(int position) {
     return Container(
         child: GestureDetector(
       child: Card(
@@ -85,15 +98,14 @@ class _ListPageState extends State<List_Page> {
       ),
       onTap: () {
         var data = datas[position];
-        Fluttertoast.showToast(msg: "我点击了${data.name}");
-        Navigator.push(context, new MaterialPageRoute(builder: (context) => new CarDetailsPage(name: data.name,imageUrl: data.imageUrl,)));
+        Navigator.pushNamed(context, "car_details", arguments: data);
       },
     ));
   }
 
   ///刷新数据
   Future<void> refreshData() async {
-    await Future.delayed(Duration(seconds: 3), () {
+    await Future.delayed(Duration(seconds: 2), () {
       setState(() {
         for (int i = 0; i < datas.length; i++) {
           datas[i].name = "刷新后的数据$i";
@@ -105,7 +117,7 @@ class _ListPageState extends State<List_Page> {
 
   ///加载数据
   Future<void> loadData() async {
-    await Future.delayed(Duration(seconds: 3), () {
+    await Future.delayed(Duration(seconds: 2), () {
       setState(() {
         for (int i = 0; i < 10; i++) {
           datas.add(Car(