修改冲突

netrain_flutter_app/lib/common/AppColors.dart

 /// 项目颜色配置
 class AppColors{
+  /// 标题背景颜色
+  static const titleBackgroundColor = 0xffffffff;
   /// 主色
   static const mainColor = 0xff2893FF;
   /// hint颜色
   static const hintText = 0xffb4b4b4;
   /// 输入框字体颜色
   static const EditTextColor = 0xff333333;
+  /// 页面背景颜色
+  static const scaffoldBackgroundColor = 0xffffffff;
+  /// 分割线颜色
+  static const dividerColor = 0xffeeeeee;
 
 }
\ No newline at end of file

netrain_flutter_app/lib/jishuaishuai/student.dart

-
 import 'package:flutter/material.dart';
 
 
+
 class jssPageDemo  extends StatelessWidget {
   // const ({Key? key}) : super(key: key)
 

netrain_flutter_app/lib/laishanqi/netrain/HomePage.dart

@@ -13,8 +13,7 @@ class _HomePageState extends State {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      home: Scaffold(
+    return  Scaffold(
         bottomNavigationBar: BottomNavigationBar(
           backgroundColor: Colors.white,
           selectedFontSize: 10,
@@ -37,7 +36,6 @@ class _HomePageState extends State {
           ],
         ),
         body: showBody(),
-      ),
     );
   }
 

netrain_flutter_app/lib/laishanqi/netrain/user/RegisterPage.dart

@@ -38,11 +38,7 @@ class _RegisterState extends State {
   }
 
   Widget registerWidget() {
-    return MaterialApp(
-      theme: ThemeData(
-        primaryColor: Colors.white,
-      ),
-      home: Scaffold(
+    return Scaffold(
           appBar: AppBar(
             leading: IconButton(
               icon: Icon(Icons.arrow_back),
@@ -69,7 +65,6 @@ class _RegisterState extends State {
 
                 _getTextField("请输入9-16位密码",passwordController),
               ],
-            ),
           )),
     );
   }
@@ -77,10 +72,8 @@ class _RegisterState extends State {
   /// 输入框
   Widget _getTextField(String hintText,TextEditingController controller){
     return TextField(
-      style: TextStyle(color: Color(AppColors.EditTextColor),fontSize: 16),
       decoration: InputDecoration(
         hintText: hintText,
-        hintStyle: TextStyle(color: Color(AppColors.hintText)),
       ),
       controller: controller,
     );

netrain_flutter_app/lib/laishanqi/netrain/user/loginPage.dart

@@ -31,12 +31,7 @@ class _LoginState extends State<LoginPage> {
       Fluttertoast.showToast(msg: "global_config 请求成功 ");
     });
 
-    return MaterialApp(
-      title: '登陆页',
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: Scaffold(
+    return Scaffold(
         body: SingleChildScrollView(
           child: Container(
             alignment: Alignment.topCenter,
@@ -136,7 +131,6 @@ class _LoginState extends State<LoginPage> {
             ),
           ),
         ),
-      ),
     );
   }
 

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';
 
 import 'laishanqi/Stateful_page.dart';
@@ -31,7 +33,11 @@ class MyApp extends StatelessWidget {
           title: 'Flutter Demo',
           initialRoute: "main",
           theme: ThemeData(
-            primarySwatch: Colors.blue,
+            primaryColor: Color(AppColors.titleBackgroundColor),
+            hintColor: Color(AppColors.hintText),
+            accentColor: Color(AppColors.mainColor),
+            dividerColor: Color(AppColors.dividerColor),
+            scaffoldBackgroundColor: Color(AppColors.scaffoldBackgroundColor),
             visualDensity: VisualDensity.adaptivePlatformDensity,
           ),
           routes: <String, WidgetBuilder>{
@@ -44,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,58 +9,73 @@ 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,
+    return new Scaffold(
+      appBar: AppBar(
+        title: Text("ListView"),
+        centerTitle: true,
+        //leading 返回按键
+        //GestureDetector 用于事件触发
+        leading: GestureDetector(
+          onTap: () {
+            //当前页面出栈
+            Navigator.pop(context);
+          },
+          //左上角返回的小箭头
+          child: Icon(Icons.arrow_back_ios),
         ),
-        home: Scaffold(
-          appBar: AppBar(
-            title: Text("ListView"),
-            centerTitle: true,
-            //leading 返回按键
-            //GestureDetector 用于事件触发
-            leading: GestureDetector(
-              onTap: () {
-                //当前页面出栈
-                Navigator.pop(context);
-              },
-              //左上角返回的小箭头
-              child: Icon(Icons.arrow_back_ios),
-            ),
-          ),
-          body: EasyRefresh(
-            //下拉刷新头布局、可以自定义
-            header: TaurusHeader(),
-            //上拉加载尾布局，可以自定义
-            footer: TaurusFooter(),
-            enableControlFinishRefresh: true,
-            enableControlFinishLoad: true,
-            //刷新和加载的控制器，用于控制刷新和加载
-            controller: _controller,
-            child: ListView.builder(
-              //返回数据条数
-              itemCount: datas.length,
-              //itemBuilder 需要返回一个Widget
-              itemBuilder: _getDatas,
-            ),
-            //刷新动作被触发
-            onRefresh: () async {
-              refreshData();
-            },
-            //加载动作被触发
-            onLoad: () async {
-              loadData();
-            },
-          ),
-        ));
+      ),
+      body: EasyRefresh(
+        //下拉刷新头布局、可以自定义
+        header: TaurusHeader(),
+        //上拉加载尾布局，可以自定义
+        footer: TaurusFooter(),
+        enableControlFinishRefresh: true,
+        enableControlFinishLoad: true,
+        //刷新和加载的控制器，用于控制刷新和加载
+        controller: _controller,
+        child: ListView.builder(
+          //返回数据条数
+          itemCount: datas.length,
+          //itemBuilder 需要返回一个Widget
+          itemBuilder: (context,index){
+            return _getDatas(index);
+          },
+        ),
+        //刷新动作被触发
+        onRefresh: () async {
+          refreshData();
+        },
+        //加载动作被触发
+        onLoad: () async {
+          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(