修改

netrain_flutter_app/lib/common/AppColors.dart

@@ -12,5 +12,6 @@ class AppColors{
   static const scaffoldBackgroundColor = 0xffffffff;
   /// 分割线颜色
   static const dividerColor = 0xffeeeeee;
-
+  /// 控件禁用时的颜色
+  static const disabledColor = 0xffdddddd;
 }
\ No newline at end of file

netrain_flutter_app/lib/common/Images.dart

@@ -18,4 +18,6 @@ class Images{
   static const ic_privacy = "${imagesPath}ic_privacy.png";
   static const ic_sign = "${imagesPath}ic_sign.png";
   static const ic_back_black = "${imagesPath}ic_back_black.png";
+  static const ic_login_button = "${imagesPath}login_button.png";
+
 }
\ No newline at end of file

netrain_flutter_app/lib/laishanqi/netrain/DoctorHomePage.dart

+import 'package:flutter/material.dart';
+
+class DoctorHomePage extends StatefulWidget {
+
+  @override
+  _DoctorHomePageState createState() => _DoctorHomePageState();
+}
+
+class _DoctorHomePageState extends State<DoctorHomePage>{
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container();
+  }
+}

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

@@ -16,15 +16,33 @@ class _RegisterState extends State {
   final phoneController = TextEditingController();
   final codeController = TextEditingController();
   final passwordController = TextEditingController();
+  var isShowPassword = false;
+  var isShowClean = false;
+  final GlobalKey<FormState> _formKey = GlobalKey();
 
   @override
-  Widget build(BuildContext context) {
-
-    // 获取上一个页面的传值
-    List<String> args = ModalRoute.of(context).settings.arguments;
+  void initState() {
+    super.initState();
 
-    phoneController.text = args.first;
+    /*nameController.addListener(() {
+      setState(() {});
+    });
+    phoneController.addListener(() {
+      setState(() {});
+    });
+    codeController.addListener(() {
+      setState(() {});
+    });*/
+    passwordController.addListener(() {
+      print("密码  ${passwordController.text}");
+      setState(() {
+        isShowClean = passwordController.text.isNotEmpty;
+      });
+    });
+  }
 
+  @override
+  Widget build(BuildContext context) {
     return registerWidget();
   }
 
@@ -52,28 +70,149 @@ class _RegisterState extends State {
         elevation: 0,
       ),
       body: Container(
-            margin: EdgeInsets.fromLTRB(16, 16, 16, 0),
+          margin: EdgeInsets.fromLTRB(16, 0, 16, 0),
+          child: Form(
+              key:_formKey,
               child: ListView(
                 children: [
-                _getTextField("请输入姓名",nameController),
-                _getTextField("请输入手机号码",phoneController),
-                Stack(children: [
-                  _getTextField("请输入验证码",codeController),
-                  // Positioned(child: )
+                  _getTextField(
+                      TextInputType.text, "请输入姓名", nameController, 10, false),
+                  _getTextField(
+                      TextInputType.number, "请输入手机号码", phoneController, 11,
+                      false),
+                  Stack(
+                    children: [
+                      _getTextField(
+                          TextInputType.number, "请输入验证码", codeController, 8,
+                          false),
+                      Positioned(
+                        child: Text("获取验证码"),
+                        right: 16,
+                        top: 20,
+                      )
+                    ],
+                  ),
+                  _getPassWordField(),
+                  Text(
+                    "密码由9-16位大小写字母、数字加特殊符号组成",
+                    style:
+                    TextStyle(color: Color(AppColors.mainColor), fontSize: 12),
+                  ),
+                  Container(
+                    margin: EdgeInsets.only(top: 20),
+                    height: 40,
+                    child: ElevatedButton(
+                        style: ButtonStyle(
+                          backgroundColor:
+                          MaterialStateProperty.resolveWith((states) {
+                            if (states.contains(MaterialState.disabled)) {
+                              return Color(AppColors.disabledColor);
+                            }
+                            return Color(AppColors.mainColor);
+                          }),
+                        ),
+                        child: Text(
+                          "注册",
+                          style: TextStyle(color: Colors.white),
+                        ),
+                        onPressed: onRegisterClick),
+                  )
+                ],
+              ))),
+    );
+  }
 
-                ],),
+  onRegisterClick() {
+    if(_formKey.currentState.validate()){
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("请求注册")));
+    }
+  }
 
-                _getTextField("请输入9-16位密码",passwordController),
-              ],
+  /// 校验是否全部为空
+  bool checkIsAllEmpty() {
+    if (phoneController.text.isNotEmpty &&
+        nameController.text.isNotEmpty &&
+        codeController.text.isNotEmpty &&
+        passwordController.text.isNotEmpty) {
+      return false;
+    }
+    return true;
+  }
+
+  Widget _getPassWordField() {
+    TextFormField password = _getTextField(TextInputType.number, "请输入9-16位密码",
+        passwordController, 16, isShowPassword);
+    return Stack(
+      children: [
+        password,
+        Positioned(
+            right: 32,
+            top: 10,
+            child: Visibility(
+              visible: isShowClean,
+              child: IconButton(
+                  icon: Icon(Icons.close),
+                  onPressed: () {
+                    setState(() {
+                      passwordController.text = "";
+                    });
+                  }),
             )),
+        Positioned(
+            right: 0,
+            top: 10,
+            child: Visibility(
+                visible: isShowClean,
+                child: IconButton(
+                  icon: isShowPassword
+                      ? Icon(Icons.visibility_off)
+                      : Icon(Icons.visibility),
+                  onPressed: () {
+                    setState(() {
+                      isShowPassword = !isShowPassword;
+                      // isShowPassword = !password.obscureText;
+                    });
+                  },
+                ))),
+      ],
     );
   }
 
   /// 输入框
-  Widget _getTextField(String hintText,TextEditingController controller){
-    return TextField(
+  Widget _getTextField(TextInputType keyboardType, String hintText,
+      TextEditingController controller, int maxLength, bool isPassword) {
+    return TextFormField(
+      validator: (value) {
+        if(value.isEmpty){
+          return "${hintText}不能为空";
+        }else{
+          return null;
+        }
+      },
+      keyboardType: keyboardType,
+      obscureText: isPassword,
+      buildCounter: (context, {currentLength, isFocused, maxLength}) => null,
+      maxLength: maxLength,
+      autofocus: false,
+      // 自动获取焦点
       decoration: InputDecoration(
+        labelStyle: TextStyle(height: 0.5),
+        //装饰
+        alignLabelWithHint: true,
+        contentPadding: EdgeInsets.only(top: 20, bottom: 10),
+        enabledBorder: UnderlineInputBorder(
+          // 默认状态的下划线边框
+            borderSide:
+            BorderSide(color: Color(AppColors.dividerColor), width: 0.5)),
+        focusedBorder: UnderlineInputBorder(
+          // 输入框获取焦点后
+            borderSide:
+            BorderSide(color: Color(AppColors.mainColor), width: 0.5)),
+        errorBorder: UnderlineInputBorder(
+          // 错误的时候
+            borderSide: BorderSide(color: Colors.red, width: 0.5)),
         hintText: hintText,
+        // labelText: hintText.substring(3)
       ),
       controller: controller,
     );

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

@@ -5,7 +5,7 @@ import 'package:netrain_flutter_app/laishanqi/mqtt/MqttClient.dart';
 import 'package:netrain_flutter_app/laishanqi/netrain/Http/HttpUtil.dart';
 import 'package:netrain_flutter_app/laishanqi/netrain/user/RegisterPage.dart';
 
-import '../HomePage.dart';
+import '../PharmacistHomePage.dart';
 import '../../../common/Images.dart';
 
 /// 登录页
@@ -21,15 +21,18 @@ class _LoginState extends State<LoginPage> {
   final codeController = TextEditingController();
 
   @override
-  Widget build(BuildContext context) {
-    print("loginPage.dart initState");
-
+  void initState() {
+    super.initState();
     var mqtt = MqttClient();
     mqtt.connect();
 
     HttpUtil.get(HttpUtil.global_config).then((Response value) {
       Fluttertoast.showToast(msg: "global_config 请求成功 ");
     });
+  }
+
+  @override
+  Widget build(BuildContext context) {
 
     return Scaffold(
         body: SingleChildScrollView(

netrain_flutter_app/lib/main.dart

@@ -3,6 +3,7 @@ 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 'package:netrain_flutter_app/zhangfeng/TestPage.dart';
 
 import 'laishanqi/Stateful_page.dart';
 import 'laishanqi/Stateless_page.dart';
@@ -49,6 +50,7 @@ class MyApp extends StatelessWidget {
             "login": (context) => LoginPage(),
             "listPage":(context) => List_Page(),
             "LoginRequestPage":(context) => LoginRequestPage(),
+            "TestPage": (context) => SampleAppPage(),
             "main": (context) => mainPage(),
             "firstVC":(context) => jssPageDemo(),
             "car_details":(context) =>CarDetailsPage()
@@ -101,6 +103,7 @@ class _RouterNavigatorState extends State<RouterNavigator> {
           _item("拍照页面", PhotoApp(), 'photo'),
           _item("登陆", LoginPage(), 'login'),
           _item("登录网络请求", LoginRequestPage(), 'LoginRequestPage'),
+          _item("zhangfengTest页面",List_Page(),'TestPage'),
           _item("listview页面",List_Page(),'listPage'),
           _item("jssDemo", jssPageDemo(), 'firstVC')
         ],

netrain_flutter_app/lib/zhangfeng/LoginApi.dart

@@ -10,6 +10,7 @@ class LoginApi {
       BaseHttpModel httpModel = data;
       UserModel userModel = UserModel.fromJson(httpModel.data);
       UserModel.saveModel(userModel);
+      print(UserModel.getModel().token);
       if(onResult != null){
         onResult(data, errorMsg);
       }

netrain_flutter_app/lib/zhangfeng/LoginPage.dart

 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:netrain_flutter_app/zhangfeng/UserModel.dart';
 import 'LoginApi.dart';
+import 'package:netrain_flutter_app/common/Images.dart';
 
 class LoginRequestPage extends StatefulWidget {
   final String title = "登录页";
@@ -12,6 +14,17 @@ class LoginRequestPage extends StatefulWidget {
 
 class _LoginState extends State<LoginRequestPage> {
   // This widget is the root of your application.
+  final phoneTextField = TextEditingController();
+  final pwdTextField = TextEditingController();
+
+  @override
+  void dispose() {
+    // Clean up the controller when disposing of the Widget.
+    phoneTextField.dispose();
+    pwdTextField.dispose();
+    super.dispose();
+  }
+
   void _loginAction() {
     if(UserModel.getModel() != null){
       Fluttertoast.showToast(msg:'已经登录');
@@ -46,15 +59,33 @@ class _LoginState extends State<LoginRequestPage> {
       ),
       body: Center(
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
-            FloatingActionButton(
-              onPressed: _loginAction,
-              child:Icon(Icons.add),
+            Container(
+              child:Image(image: AssetImage(Images.logo_01)),
+              padding: EdgeInsets.only(top: 50,left: 50,right: 50),
+            ),
+            Container(
+              padding: EdgeInsets.only(top: 100,left: 16,right: 16),
+              child: TextField(
+                controller: phoneTextField,
+                decoration: InputDecoration(hintText: "请输入手机号码",border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(30.0),
+                    borderSide: BorderSide()),),
+              ),
+            ),
+            Container(
+              padding: EdgeInsets.only(top: 20,left: 16,right: 16),
+              child: TextField(
+                controller: pwdTextField,
+                decoration: InputDecoration(hintText: "请输入密码",border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(30.0),
+                    borderSide: BorderSide()),),
+              ),
             ),
-            FloatingActionButton(
-              onPressed: _logoutAction,
-              child:Icon(Icons.add),
+            Container(
+              padding: EdgeInsets.only(top: 50,left: 16,right: 16),
+              decoration: BoxDecoration(
+                  image: DecorationImage(image: AssetImage(Images.ic_login_button))),
             ),
           ],
         ),

netrain_flutter_app/lib/zhangfeng/Network/SaveModel.dart

 import 'dart:convert';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flustars/flustars.dart';
 
 class SaveModel {
   // factory UserData() => getInstance();
@@ -17,17 +17,15 @@ class SaveModel {
   //
   // }
 
-  static saveModel(dynamic model,String modelName) async {
-    SharedPreferences pref= await SharedPreferences.getInstance();
+  static saveModel(dynamic model,String modelName) {
     //将data转换成json字符串
     var jsonStr = json.encode(model);
-    pref.setString(modelName,jsonStr);
+    SpUtil.putString(modelName, jsonStr);
   }
 
   // 读取 SharedPreferences
-  static Future<Map> getModel(String modelName) async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    final jsonStr = prefs.getString(modelName);
+  static getModel(String modelName) {
+    final jsonStr = SpUtil.getString(modelName);
     if(jsonStr != null && jsonStr.length > 0){
       //先将json字符串转json
       Map json = jsonDecode(jsonStr);
@@ -36,8 +34,7 @@ class SaveModel {
     return null;
   }
 
-  static removeModel(String modelName) async{
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    prefs.setString(modelName,"");
+  static removeModel(String modelName){
+    SpUtil.putString(modelName,"");
   }
 }
\ No newline at end of file

netrain_flutter_app/lib/zhangfeng/TestPage.dart

+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:dio/dio.dart';
+import 'dart:convert';
+
+class SampleAppPage extends StatefulWidget{
+  SampleAppPage({Key key}) : super(key: key);
+  @override
+  _SampleAppPageState createState() =>  _SampleAppPageState();
+}
+
+class _SampleAppPageState extends State<SampleAppPage>{
+  final PageController _pageController = PageController();
+
+  @override
+  void dispose() {
+    _pageController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      home: Scaffold(
+        body: PageView(
+          controller: _pageController,
+          children: <Widget>[
+            Container(
+              color: Colors.red,
+              child: Center(
+                child: ElevatedButton(
+                  onPressed: () {
+                    if (_pageController.hasClients) {
+                      _pageController.animateToPage(
+                        1,
+                        duration: const Duration(milliseconds: 400),
+                        curve: Curves.easeInOut,
+                      );
+                    }
+                  },
+                  child: const Text('Next'),
+                ),
+              ),
+            ),
+            Container(
+              color: Colors.blue,
+              child: Center(
+                child: ElevatedButton(
+                  onPressed: () {
+                    if (_pageController.hasClients) {
+                      _pageController.animateToPage(
+                        0,
+                        duration: const Duration(milliseconds: 400),
+                        curve: Curves.easeInOut,
+                      );
+                    }
+                  },
+                  child: const Text('Previous'),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file

netrain_flutter_app/lib/zhangfeng/UserModel.dart

@@ -19,11 +19,10 @@ class UserModel{
 
   static UserModel getModel(){
     if(sharedModelInstance_ == null){
-      SaveModel.getModel('UserModel').then((json) => {
+        Map json = SaveModel.getModel('UserModel');
         if(json != null){
-          sharedModelInstance_ = new UserModel.fromJson(json)
+          sharedModelInstance_ = new UserModel.fromJson(json);
         }
-      });
     }
     return sharedModelInstance_;
   }

netrain_flutter_app/pubspec.yaml

@@ -42,7 +42,7 @@ dependencies:
   dio: ^4.0.0  #网络库
   convert: ^3.0.1 #转码器
   pull_to_refresh: ^2.0.0
-  shared_preferences: ^2.0.6
+  flustars: ^2.0.1  #强大的工具类库
 
 
 dev_dependencies: