Merge branch 'master' of http://git.naiterui.com/zouzhisheng/netrain_flutter_app

* 'master' of http://git.naiterui.com/zouzhisheng/netrain_flutter_app:
  MVVM的ViewModel拿到接口了，等待解析
  修改颜色使用方式，增加扩展方法，扩展了长度单位的使用方法
  调整按钮顺序
  完善首页demo
  首页demo
  listview练习  刷新练习
  bottomNavigationBar、底部导航栏切换，权重比布局
  view model？

netrain_flutter_app/lib/common/AppColors.dart

+import 'package:flutter/material.dart';
+
 /// 项目颜色配置
 class AppColors{
   /// 标题背景颜色
-  static const titleBackgroundColor = 0xffffffff;
+  static const titleBackgroundColor = Color(0xffffffff);
   /// 主色
-  static const mainColor = 0xff2893FF;
+  static const mainColor = Color(0xff2893FF);
   /// hint颜色
-  static const hintText = 0xffb4b4b4;
+  static const hintText = Color(0xffb4b4b4);
   /// 输入框字体颜色
-  static const EditTextColor = 0xff333333;
+  static const EditTextColor = Color(0xff333333);
+  static const color_999 = Color(0xff999999);
   /// 页面背景颜色
-  static const scaffoldBackgroundColor = 0xffffffff;
+  static const scaffoldBackgroundColor = Color(0xffffffff);
   /// 分割线颜色
-  static const dividerColor = 0xffeeeeee;
+  static const dividerColor = Color(0xffeeeeee);
   /// 控件禁用时的颜色
-  static const disabledColor = 0xffdddddd;
+  static const disabledColor = Color(0xffdddddd);
+
+  static const blue_bg_color = Color(0xFF2893FF);
+
+  static const blue_bg_color2 = Color(0xFFEEF9FF);
+
+  static const text_default_color = Color(0xff666666);
+
+  static const white_transparent_50 = Color(0x8CFFFFFF);
 }
\ No newline at end of file

netrain_flutter_app/lib/common/Ext.dart

+import 'package:flustars/flustars.dart';
+import 'package:flutter/material.dart';
+
+extension IntValue on int{
+  /// 返回根据屏幕宽高适配后尺寸（单位 dp or pt）
+  double dp(){
+    return toDouble().dp();
+  }
+
+  /// 返回间距，应用于四个位置：top，bottom，left，right
+  EdgeInsets spacingAll(){
+    return EdgeInsets.all(dp());
+  }
+  EdgeInsets spacingLeft(){
+    return EdgeInsets.only(left: dp());
+  }
+  EdgeInsets spacingRight(){
+    return EdgeInsets.only(right: dp());
+  }
+  EdgeInsets spacingTop(){
+    return EdgeInsets.only(top: dp());
+  }
+  EdgeInsets spacingBottom(){
+    return EdgeInsets.only(bottom: dp());
+  }
+  EdgeInsets spacingVertical(){
+    return EdgeInsets.symmetric(vertical: dp());
+  }
+  EdgeInsets spacingHorizontal(){
+    return EdgeInsets.symmetric(horizontal: dp());
+  }
+}
+
+extension DoubleValue on double{
+  /// 返回根据屏幕宽高适配后尺寸（单位 dp or pt）
+  double dp(){
+    return ScreenUtil.getInstance().getAdapterSize(this);
+  }
+
+  EdgeInsets spacingAll(){
+    return EdgeInsets.all(dp());
+  }
+  EdgeInsets spacingLeft(){
+    return EdgeInsets.only(left: dp());
+  }
+  EdgeInsets spacingRight(){
+    return EdgeInsets.only(right: dp());
+  }
+  EdgeInsets spacingTop(){
+    return EdgeInsets.only(top: dp());
+  }
+  EdgeInsets spacingBottom(){
+    return EdgeInsets.only(bottom: dp());
+  }
+  EdgeInsets spacingVertical(){
+    return EdgeInsets.symmetric(vertical: dp());
+  }
+  EdgeInsets spacingHorizontal(){
+    return EdgeInsets.symmetric(horizontal: dp());
+  }
+}

netrain_flutter_app/lib/common/Images.dart

@@ -21,4 +21,23 @@ class Images{
   static const ic_login_button = "${imagesPath}login_button.png";
   static const ic_doctor_avatar = "${imagesPath}ic_doctor_avatar.png";
   static const lake = "${imagesPath}lake.png";
+  static const ic_bottom_01 = "${imagesPath}nav_01.png";
+  static const ic_bottom_02 = "${imagesPath}nav_02.png";
+  static const ic_bottom_03 = "${imagesPath}nav_03.png";
+  static const ic_bottom_03_true = "${imagesPath}nav_03_true.png";
+  static const ic_friend = "${imagesPath}ic_friend.png";
+  static const ic_prescription_home = "${imagesPath}ic_prescription_home.png";
+  static const ic_code = "${imagesPath}ic_code.png";
+  static const ic_more_white_little = "${imagesPath}ic_more_white_little.png";
+  static const img_home_pharmacy = "${imagesPath}img_home_pharmacy.png";
+  static const img_home_treatment = "${imagesPath}img_home_treatment.png";
+  static const ic_home_list = "${imagesPath}ic_home_list.png";
+  static const img_blank_nomessage = "${imagesPath}img_blank_nomessage.png";
+  static const tab_home_normal = "${imagesPath}tab_home_normal.png";
+  static const tab_home_selected = "${imagesPath}tab_home_selected.png";
+  static const tab_my_normal = "${imagesPath}tab_my_normal.png";
+  static const tab_my_selected = "${imagesPath}tab_my_selected.png";
+  static const tab_patient_normal = "${imagesPath}tab_patient_normal.png";
+  static const tab_patient_selected = "${imagesPath}tab_patient_selected.png";
+
 }
\ No newline at end of file

netrain_flutter_app/lib/douwen/Demo2.dart

+import 'package:flutter/material.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:flutter/widgets.dart';
+import 'package:netrain_flutter_app/douwen/custom/BaseView.dart';
+import 'package:netrain_flutter_app/douwen/custom/BaseViewModel.dart';
+
+class Demo2 extends BaseView {
+  Demo2() : super(BaseViewModel()) {
+    builder = (context, value, child) => Container(
+            child: Column(
+          children: [
+            Row(
+              children: [
+                _item("setNormal", () {
+                  viewModel.setNormal();
+                }),
+                _item("setEmpty", () {
+                  viewModel.setEmpty();
+                }),
+                _item("setError", () {
+                  viewModel.setError();
+                }),
+              ],
+            ),
+            setReplaceView(Row(
+              children: [
+                ValueListenableBuilder(
+                    valueListenable: viewModel.num,
+                    builder: (context, value, child) =>
+                        Text("点击了${viewModel.num.value}次")),
+                ElevatedButton(
+                    onPressed: () {
+                      viewModel.click();
+                    },
+                    child: Text("点击"))
+              ],
+            )),
+          ],
+        ));
+  }
+
+  _item(String title, VoidCallback onPressed) {
+    return Container(
+      child: RaisedButton(
+        onPressed: onPressed,
+        child: Text(title),
+      ),
+    );
+  }
+}

netrain_flutter_app/lib/douwen/custom/BaseView.dart

+import 'package:flutter/widgets.dart';
+import 'package:netrain_flutter_app/douwen/custom/BaseViewModel.dart';
+import 'package:provider/provider.dart';
+
+import 'EmptyPage.dart';
+import 'ErrorPage.dart';
+import 'ViewState.dart';
+
+class BaseView extends StatefulWidget {
+  BaseViewModel viewModel;
+  Widget Function(BuildContext context, BaseViewModel value, Widget child)
+      builder;
+  Widget _mReplaceView;
+  Widget emptyView = EmptyPage();
+  Widget errorView = ErrorPage();
+
+  BaseView(this.viewModel) {
+  }
+
+
+  Widget setReplaceView(Widget replaceView) {
+    _mReplaceView = replaceView;
+    switch (viewModel.viewState ?? ViewState.Normal) {
+      case ViewState.Normal:
+        return _mReplaceView;
+      case ViewState.Empty:
+        return emptyView;
+      case ViewState.Error:
+        return errorView;
+      case ViewState.Loading:
+        return _mReplaceView;
+      default:
+        return _mReplaceView;
+    }
+  }
+
+  @override
+  State<StatefulWidget> createState() {
+    return _BaseViewState();
+  }
+}
+
+class _BaseViewState extends State<BaseView> {
+  BaseViewModel viewModel;
+
+  @override
+  void initState() {
+    viewModel = widget.viewModel;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (content) => viewModel,
+      child: Consumer<BaseViewModel>(
+        builder: widget.builder,
+      ),
+    );
+  }
+}

netrain_flutter_app/lib/douwen/custom/BaseViewModel.dart

+import 'package:flutter/widgets.dart';
+
+import 'ViewState.dart';
+
+class BaseViewModel with ChangeNotifier {
+  var _viewState;
+  var num = ValueNotifier<int>(0);
+
+  set viewState(ViewState viewState) => setViewState(viewState);
+  get viewState => _viewState;
+
+  void click() {
+    num.value = (num.value ?? 0) + 1;
+    num.notifyListeners();
+  }
+
+  void setNormal() {
+    viewState = ViewState.Normal;
+  }
+
+  void setEmpty() {
+    viewState = ViewState.Empty;
+  }
+
+  void setLoading() {
+    viewState = ViewState.Loading;
+  }
+
+  void setError() {
+    viewState = ViewState.Error;
+  }
+
+  setViewState(ViewState viewState) {
+    if (_viewState == viewState) {
+      return;
+    }
+    _viewState = viewState;
+    notifyListeners();
+  }
+}

netrain_flutter_app/lib/douwen/custom/EmptyPage.dart

+import 'package:flutter/widgets.dart';
+
+class EmptyPage extends Container{
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Container(
+        child: Text("This is EmptyView"),
+      ),
+    );
+  }
+}
\ No newline at end of file

netrain_flutter_app/lib/douwen/custom/ErrorPage.dart

+import 'package:flutter/widgets.dart';
+
+class ErrorPage extends Container{
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Container(
+        child: Text("This is ErrorView"),
+      ),
+    );
+  }
+}
\ No newline at end of file

netrain_flutter_app/lib/douwen/custom/ViewState.dart

+enum ViewState { Normal, Empty, Error, Loading }

netrain_flutter_app/lib/douwen/dwMain.dart

 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:netrain_flutter_app/common/Images.dart';
+import 'package:netrain_flutter_app/douwen/custom/BaseView.dart';
+import 'package:netrain_flutter_app/douwen/custom/BaseViewModel.dart';
 
+import 'Demo2.dart';
 import 'secondpage.dart';
 
 void main() {
@@ -14,6 +17,8 @@ void main() {
 
 class MyApp extends StatelessWidget {
   // This widget is the root of your application.
+  BaseViewModel viewModel = BaseViewModel();
+
   @override
   Widget build(BuildContext context) {
     return WillPopScope(
@@ -24,14 +29,16 @@ class MyApp extends StatelessWidget {
             primarySwatch: Colors.blue,
             visualDensity: VisualDensity.adaptivePlatformDensity,
           ),
-          home: Scaffold(
-            appBar: AppBar(
-              title: Text("路由"),
-            ),
-            body: RouterNavigator(title: 'Flutter Demo Home Page'),
-          ),
+          initialRoute: "key1",
           routes: <String, WidgetBuilder>{
-            "key1": (context) => MyApp(),
+            "key1": (context) =>
+                Scaffold(
+                    body: Scaffold(
+                      appBar: AppBar(
+                        title: Text("这个是标题"),
+                      ),
+                      body:Demo2(),
+                    )),
             "key2": (context) => Second()
           },
         ),
@@ -40,34 +47,6 @@ class MyApp extends StatelessWidget {
           return true;
         });
   }
-}
-
-class RouterNavigator extends StatefulWidget {
-  RouterNavigator({Key key, this.title}) : super(key: key);
-  final String title;
-
-  @override
-  _RouterNavigatorState createState() => _RouterNavigatorState();
-}
-
-class _RouterNavigatorState extends State<RouterNavigator> {
-  bool byName = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      child: Column(
-        children: [
-          _item("跳转", () async {
-            var result = await Navigator.pushNamed(context, "key2",
-                arguments: "this is value");
-            print("返回值：$result");
-          }),
-          Image.asset(Images.bg_my_01)
-        ],
-      ),
-    );
-  }
 
   _item(String title, VoidCallback onPressed) {
     return Container(

netrain_flutter_app/lib/douwen/secondpage.dart

@@ -39,7 +39,10 @@ class _RouterNavigatorState extends State<RouterNavigator> {
       child: Column(
         children: [
           _item("跳转", () {
-            Navigator.popUntil(context,ModalRoute.withName("/"));
+            Navigator.of(context).popUntil(ModalRoute.withName("key1"));
+          }),
+          _item("跳转", () {
+            Navigator.pushNamed(context,"key2");
           })
         ],
       ),

netrain_flutter_app/lib/jishuaishuai/MVVMDemo/ModelDemo.dart

+import 'package:dio/dio.dart';
+
+class ApiPostSomeUrl {
+
+  /**
+   * 登录方法
+   * id 参数
+   */
+  dynamic get(String curNum) async {
+    return await Dio().get(
+      "http://swyy.cying.com.cn/common/preheat",
+      queryParameters: {
+        "curNum": curNum,
+      },
+    );
+  }
+}
\ No newline at end of file

netrain_flutter_app/lib/jishuaishuai/MVVMDemo/ViewDemo.dart

+import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/jishuaishuai/MVVMDemo/ViewModelDemo.dart';
+import 'package:provider/provider.dart';
+
+
+class MVVMViewDemo extends StatefulWidget {
+  MVVMViewDemo({Key key}) : super(key: key);
+
+  @override
+  _MVVMViewDemoState createState() {
+    return _MVVMViewDemoState();
+  }
+}
+
+class _MVVMViewDemoState extends State<MVVMViewDemo> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("MVVM模式"),
+      ),
+      body: ElevatedButton(
+        child: Text("点击调用get请求"),
+        onPressed: ()async{
+          context.read<ViewModelGet>().get("1");
+        },
+      ),
+    );
+  }
+}
\ No newline at end of file

netrain_flutter_app/lib/jishuaishuai/MVVMDemo/ViewModelDemo.dart

+import 'ModelDemo.dart';
+import 'package:flutter/material.dart';
+import 'dart:convert' as JSON;
+
+class ViewModelGet extends ChangeNotifier{
+  ApiPostSomeUrl _model = ApiPostSomeUrl();
+  void get(String curNum) async{
+    var result = await _model.get(curNum);
+    print(result);
+    // Map<,Object>map =JSON.jsonDecode(result);
+    List list = JSON.jsonDecode(result);
+    print(list);
+
+  }
+}
\ No newline at end of file

netrain_flutter_app/lib/jishuaishuai/fifthVC.dart

+
+
+import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/jishuaishuai/MVVMDemo/ViewDemo.dart';
+
+class fifthDemo extends StatefulWidget {
+  // fifthDemo({Key key}) : super(key: key);
+
+  @override
+  _fifthDemoState createState() {
+    return _fifthDemoState();
+  }
+}
+
+class _fifthDemoState extends State<fifthDemo> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("第五个页面"),
+      ),
+      body: fifthListViewDemo(),
+    );
+  }
+}
+
+class fifthListViewDemo extends StatefulWidget {
+  // fifthListViewDemo({Key key}) : super(key: key);
+
+  @override
+  _fifthListViewDemoState createState() {
+    return _fifthListViewDemoState();
+  }
+}
+
+class _fifthListViewDemoState extends State<fifthListViewDemo> {
+
+  List<int>listArr = List();
+
+  @override
+  void initState() {
+    super.initState();
+    for(var i = 0; i<100 ;i++){
+      listArr.add(i);
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scrollbar(
+    child: RefreshIndicator(
+      child: ListView.builder(itemBuilder:(BuildContext context, int index){
+        if (index == 2) {
+
+        }
+        return Container(
+          child: Flex(
+            direction: Axis.vertical,
+            children: [
+              Text(listArr[index].toString()),
+              ElevatedButton(onPressed: (){
+                Navigator.of(context).push(MaterialPageRoute(
+                    builder: (context){
+                     return MVVMViewDemo();
+                    }
+                ));
+              }, child:Text("点击进入MVVM设计模式页面") ),
+              Container(
+                width: 100,
+                height: 300,
+                color: Colors.orange,
+              )
+
+            ],
+          ),
+        );
+      }),
+      onRefresh: _onRefresh,
+    ),
+    );
+
+  }
+
+  Future _onRefresh() async {
+    await Future.delayed(
+      Duration(seconds: 2),
+          () {
+        print("object");
+      },
+    );
+    return "";
+  }
+}
\ No newline at end of file

netrain_flutter_app/lib/jishuaishuai/firstVC.dart

+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:netrain_flutter_app/common/Images.dart';
 import 'secondVC.dart';
 
 
+
+
 class jssPageDemo  extends StatelessWidget {
   // const ({Key? key}) : super(key: key)
 
@@ -91,14 +94,17 @@ class buttonDemo  extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: [
+        //改用ElevatedButton
         RaisedButton(
             onPressed: (){},
             child:Text("漂浮按钮")
         ),
+        //改用 TextButton
         FlatButton(
             onPressed: (){},
             child: Text("扁平按钮")
         ),
+        //改用 TextButton
         FlatButton.icon(
           onPressed: (){},
           icon: Icon(Icons.outbound),
@@ -106,6 +112,7 @@ class buttonDemo  extends StatelessWidget {
           color: Colors.black,
           textColor: Colors.white,
         ),
+        //改用 OutlinedButton
         OutlineButton(onPressed: (){},
           child: Text("边框按钮"),
         ),
@@ -135,6 +142,9 @@ class imageiconDemo extends StatelessWidget {
         // fit: BoxFit.fitWidth
         // ),
         Image.asset(Images.ic_my_info),
+        ElevatedButton(onPressed: (){
+          apiGet();
+        }, child: Text("测试点击事件请求"))
 
       ],
     );
@@ -144,3 +154,10 @@ class imageiconDemo extends StatelessWidget {
   }
 }
 
+
+class  apiGet{
+
+  var result =  Dio().get("http://api.td0f7/cn:8083/dio/dio/test?id=1");
+
+
+}
\ No newline at end of file

netrain_flutter_app/lib/jishuaishuai/fourthVC.dart

+import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/jishuaishuai/fifthVC.dart';
+
+class fourthDemo extends StatefulWidget {
+  fourthDemo({Key key}) : super(key: key);
+
+  @override
+  _fourthDemoState createState() {
+    return _fourthDemoState();
+  }
+}
+
+class _fourthDemoState extends State<fourthDemo> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scaffold(
+        appBar: AppBar(
+          title: Text("jss测试第四个页面"),
+        ),
+        body: someDemo());
+  }
+}
+
+class someDemo extends StatefulWidget {
+  someDemo({Key key}) : super(key: key);
+
+  @override
+  _someDemoState createState() {
+    return _someDemoState();
+  }
+}
+
+class _someDemoState extends State<someDemo> {
+  List<int> listArrData = List();
+
+  @override
+  void initState() {
+    super.initState();
+    for (var i = 0; i < 100; i++) {
+      listArrData.add(i);
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scrollbar(
+        child: RefreshIndicator(
+      child: ListView(
+        //y轴
+        scrollDirection: Axis.vertical,
+        children: listArrData
+            .map((e) => Container(
+                  width: 200,
+                  height: 100,
+                  child: Flex(
+                    direction: Axis.vertical,
+                    children: [
+                      Text(e.toString()),
+                      ElevatedButton(
+                          onPressed: () {
+                            Navigator.of(context).push(MaterialPageRoute(builder: (context){
+                              return fifthDemo();
+                            }));
+                          },
+                          child: Text("点击进入第5个页面"))
+                    ],
+                  ),
+                  decoration: BoxDecoration(
+                    color: Colors.red,
+                  ),
+                  //旋转跳跃我闭着眼
+                  // transform: Matrix4.rotationZ(0.5),
+                ))
+            .toList(),
+      ),
+      onRefresh: _onRefresh,
+    ));
+  }
+
+  Future _onRefresh() async {
+    await Future.delayed(
+      Duration(seconds: 2),
+      () {
+        print("object");
+      },
+    );
+    return "";
+  }
+}

netrain_flutter_app/lib/jishuaishuai/secondVC.dart

-
-
 import 'package:flutter/material.dart';
 import 'package:netrain_flutter_app/common/Images.dart';
 import 'thirdVC.dart';
-class twoVCdemo  extends StatelessWidget {
+
+class twoVCdemo extends StatelessWidget {
   // const ({Key? key}) : super(key: key);
 
   @override
@@ -12,20 +11,21 @@ class twoVCdemo  extends StatelessWidget {
 
       appBar: AppBar(
         title: Text("jssDemo第二个页面的标题"),
+
       ),
+
       body: Column(
         children: [
           ElevatedButton(
-            child: Text("第二页面的按钮，跳转带参数过去"),
-            onPressed:() {
-
+            child: Text("传参数进入第三个页面"),
+            onPressed: () {
               Navigator.of(context).push(MaterialPageRoute(
-                builder: (context){
+                builder: (context) {
                   return nextViewDemo();
                 },
                 settings: RouteSettings(
                   name: "我是传过去的",
-                  arguments:"参数，是对象类型",
+                  arguments: "参数，是对象类型",
                 ),
                 //是否有返回
                 maintainState: false,
@@ -35,12 +35,34 @@ class twoVCdemo  extends StatelessWidget {
               );
             },
 
-
           ),
-          Flex(direction:Axis.horizontal,
+
+          Flex(
+            direction: Axis.horizontal,
             children: [
-              Image.asset(Images.ic_home_normal,alignment: Alignment.center,),
-              
+              Image.asset(Images.ic_home_normal, alignment: Alignment.center,),
+              Align(
+                alignment:Alignment(-0.5,0.5),
+
+                child: Stack(
+                  alignment: AlignmentDirectional.center,
+                  children: [
+                    Container(
+                      width: 100,
+                      height: 30,
+                      color: Colors.orange,
+                    ),
+                    Container(
+                      color: Colors.red,
+                      child: Text("点击进入"),
+                    ),
+                    Positioned(
+                        right: 0,
+                        top: 5,
+                        child: Image.asset(Images.ic_home_normal)),
+                  ],
+                ),
+              )
             ],
 
           )

netrain_flutter_app/lib/jishuaishuai/thirdVC.dart

 import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/jishuaishuai/fourthVC.dart';
 
 
 class nextViewDemo extends StatelessWidget {
@@ -7,27 +8,151 @@ class nextViewDemo extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: Colors.black26,
       appBar: AppBar(
         title: Text("jss测试第三界面"),
 
       ),
-      body: Column(
+      body: Container(
+        child:  Flex(
+          direction: Axis.vertical,
+          children: [
 
-        children: [
-          ElevatedButton(
+            ElevatedButton(
 
-            onPressed: () {
-            Navigator.of(context).pop(
-                "我传过来值了，这是一个对象类型"
-            );
-          },
-            child: Text("点击返回传值"),
-          ),
+              onPressed: () {
+                Navigator.of(context).pop(
+                    "我传过来值了，这是一个对象类型"
+                );
+              },
+              child: Text("点击返回传值"),
+            ),
+            ElevatedButton(onPressed: () {
+              Navigator.of(context).push(MaterialPageRoute(
+                builder:(context){
+                  return fourthDemo();
+                },
+               settings: RouteSettings(
+                 name: "thirdVC"
+               )
 
-        ],
-      ),
+              )
+
+              );
+            }, child: Container(
+              child: Text("点击进入第四个页面"),
+            )
+            ),
+            listViewDemo(),
+            WarpDemo(),
+
+          ],
+        ),
+      )
+
+
+
+    );
+  }
+}
+
+class listViewDemo extends StatefulWidget {
+  listViewDemo({Key key}) : super(key: key);
+
+  @override
+  _listViewDemoState createState() {
+    return _listViewDemoState(
+
+    );
+  }
+}
+
+class _listViewDemoState extends State<listViewDemo> {
+  @override
+  void initState() {
+    super.initState();
+    //创建时
+  }
+
+  @override
+  void dispose() {
+    //销毁时
+    super.dispose();
+  }
 
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Container(
+      width: 600,
+      height: 300,
+      color: Colors.grey,
+      child:Align(
+        alignment:Alignment(-0.5,0.5),
+        child: Stack(
+          alignment: AlignmentDirectional.topStart,
+          children: [
+
+            Container(
+              width: 100,
+              height: 100,
+              color: Colors.orange,
+            ),
+            Positioned(
+                left: 20,
+                right: 30,
+                top: 10,
+                bottom: 20,
+                child: Container(
+                  color: Colors.red,
+            )),
+          ],
+        ),
+      )
+    );
+  }
+}
+
+class WarpDemo extends StatefulWidget {
+  WarpDemo({Key key}) : super(key: key);
+
+  @override
+  _WarpDemoState createState() {
+    return _WarpDemoState();
+  }
+}
+
+class _WarpDemoState extends State<WarpDemo> {
+  List<int>listArr = List();
+
+  @override
+  void initState() {
+    super.initState();
+    for(var i = 0;i < 10;i++){
+      listArr.add(i);
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Wrap(
+      // spacing: 10.0,
+      runAlignment: WrapAlignment.center,
+      // runSpacing: 1,
+      children: listArr.map((e) => Container(
+        height: 100,
+        width: 100,
+        child: Text(e.toString()),
+        color: Colors.blue,
+      )).toList(
 
+      )
     );
   }
 }
\ No newline at end of file

netrain_flutter_app/lib/laishanqi/layout_page.dart

@@ -137,7 +137,7 @@ class _LayoutGroupState extends State<LayoutPage> {
                 ),
               ),
               FractionallySizedBox(
-                widthFactor: 0.5,
+                widthFactor: 1,
                 child: Container(
                   decoration: BoxDecoration(color: Colors.grey),
                   child: Text('屏幕的二分之一'),

netrain_flutter_app/lib/laishanqi/netrain/DoctorMain.dart

+import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/common/AppColors.dart';
+import 'package:netrain_flutter_app/common/Images.dart';
+import 'package:netrain_flutter_app/laishanqi/netrain/maintab/DoctorHomePage.dart';
+
+class doctorMainPage extends StatefulWidget {
+  @override
+  _doctorMainPageState createState() {
+    return _doctorMainPageState();
+  }
+}
+
+class _doctorMainPageState extends State<doctorMainPage> {
+  var currentIndex = 0;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      bottomNavigationBar: Container(
+        height: 50,
+        child: BottomNavigationBar(
+          backgroundColor: Colors.white,
+          selectedItemColor: AppColors.mainColor,
+          unselectedItemColor: AppColors.hintText,
+          selectedFontSize: 10,
+          unselectedFontSize: 10,
+          currentIndex: currentIndex,
+          onTap: (index) {
+            setState(() {
+              currentIndex = index;
+            });
+          },
+          items: [
+            BottomNavigationBarItem(
+                activeIcon: Image.asset(Images.tab_home_selected,width: 20,height: 20,),
+                icon: Image.asset(Images.tab_home_normal,width: 20,height: 20),
+                label: "首页"),
+            BottomNavigationBarItem(
+                activeIcon: Image.asset(Images.tab_patient_selected,width: 20,height: 20),
+                icon: Image.asset(Images.tab_patient_normal,width: 20,height: 20),
+                label: "患者"),
+            BottomNavigationBarItem(
+                activeIcon: Image.asset(Images.tab_my_selected,width: 20,height: 20),
+                icon: Image.asset(Images.tab_my_normal,width: 20,height: 20),
+                label: "我的"),
+          ],
+        ),
+      ),
+      body: showBody(),
+    );
+  }
+
+  Widget showBody() {
+    if (currentIndex == 0) {
+      return DoctorHomePage();
+    } else if (currentIndex == 1) {
+      return Text("222");
+    } else {
+      return Text("33333");
+    }
+  }
+}

netrain_flutter_app/lib/laishanqi/netrain/DoctorHomePage.dart → netrain_flutter_app/lib/laishanqi/netrain/prescription/PharmacyPage.dart

 import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/common/Ext.dart';
 
-class DoctorHomePage extends StatefulWidget {
+class PharmacyPage extends StatefulWidget {
 
   @override
-  _DoctorHomePageState createState() => _DoctorHomePageState();
+  _PharmacyPageState createState() {
+    return _PharmacyPageState();
+  }
 }
 
-class _DoctorHomePageState extends State<DoctorHomePage>{
-
+class _PharmacyPageState extends State<PharmacyPage> {
   @override
   void initState() {
     super.initState();
@@ -20,6 +22,7 @@ class _DoctorHomePageState extends State<DoctorHomePage>{
 
   @override
   Widget build(BuildContext context) {
-    return Container();
+    // TODO: implement build
+    return null;
   }
-}
+}
\ No newline at end of file

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

 import 'package:flutter/material.dart';
 import 'package:netrain_flutter_app/common/AppColors.dart';
-import 'package:netrain_flutter_app/douwen/dwMain.dart';
 
 /**
  * 注册页
@@ -96,7 +95,7 @@ class _RegisterState extends State {
                   Text(
                     "密码由9-16位大小写字母、数字加特殊符号组成",
                     style:
-                    TextStyle(color: Color(AppColors.mainColor), fontSize: 12),
+                    TextStyle(color: AppColors.mainColor, fontSize: 12),
                   ),
                   Container(
                     margin: EdgeInsets.only(top: 20),
@@ -106,9 +105,9 @@ class _RegisterState extends State {
                           backgroundColor:
                           MaterialStateProperty.resolveWith((states) {
                             if (states.contains(MaterialState.disabled)) {
-                              return Color(AppColors.disabledColor);
+                              return AppColors.disabledColor;
                             }
-                            return Color(AppColors.mainColor);
+                            return AppColors.mainColor;
                           }),
                         ),
                         child: Text(
@@ -123,6 +122,7 @@ class _RegisterState extends State {
   }
 
   onRegisterClick() {
+    Navigator.pushNamed(context, "doctor_MainPage");
     if(_formKey.currentState.validate()){
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("请求注册")));
     }
@@ -203,11 +203,11 @@ class _RegisterState extends State {
         enabledBorder: UnderlineInputBorder(
           // 默认状态的下划线边框
             borderSide:
-            BorderSide(color: Color(AppColors.dividerColor), width: 0.5)),
+            BorderSide(color: AppColors.dividerColor, width: 0.5)),
         focusedBorder: UnderlineInputBorder(
           // 输入框获取焦点后
             borderSide:
-            BorderSide(color: Color(AppColors.mainColor), width: 0.5)),
+            BorderSide(color: AppColors.mainColor, width: 0.5)),
         errorBorder: UnderlineInputBorder(
           // 错误的时候
             borderSide: BorderSide(color: Colors.red, width: 0.5)),

netrain_flutter_app/lib/main.dart

+
+import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:netrain_flutter_app/jishuaishuai/MVVMDemo/ViewDemo.dart';
+import 'package:netrain_flutter_app/jishuaishuai/MVVMDemo/ViewModelDemo.dart';
+import 'package:netrain_flutter_app/xuehao/BottomNavpage.dart';
 import 'package:netrain_flutter_app/xuehao/car_details.dart';
 import 'package:netrain_flutter_app/common/AppColors.dart';
 import 'package:netrain_flutter_app/xuehao/grid_page.dart';
 import 'package:netrain_flutter_app/xuehao/list_page.dart';
+import 'package:provider/provider.dart';
 
 import 'laishanqi/Stateful_page.dart';
 import 'laishanqi/Stateless_page.dart';
 import 'laishanqi/layout_page.dart';
+import 'laishanqi/netrain/DoctorMain.dart';
+import 'laishanqi/netrain/maintab/DoctorHomePage.dart';
 import 'laishanqi/netrain/user/loginPage.dart';
 import 'laishanqi/netrain/user/RegisterPage.dart';
 import 'laishanqi/photo.dart';
@@ -20,32 +30,57 @@ import 'zhangfeng/LayoutDemo.dart';
 
 import 'jishuaishuai/firstVC.dart';
 
-
-
 void main() {
-  runApp(MyApp());
+  runApp(
+      MultiProvider(
+        providers: [
+          ChangeNotifierProvider(
+            create: (context) => ViewModelGet(),
+          )
+        ],
+        child: MyApp(),
+
+      )
+  );
   // runApp(Login());
   // runApp(TestPage());
   UserModel.getModel();
 
-  print("启动");
+  print("启动"
+  );
 }
+
 class MyApp extends StatelessWidget {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
+    setDesignWHD(375, 812);
+    // 设置状态栏为透明
+    SystemUiOverlayStyle systemUiOverlayStyle =
+    SystemUiOverlayStyle(statusBarColor: Colors.transparent);
+    SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
+
     return WillPopScope(
         child: MaterialApp(
           title: 'Flutter Demo',
           initialRoute: "main",
           theme: ThemeData(
-            primaryColor: Color(AppColors.titleBackgroundColor),
-            hintColor: Color(AppColors.hintText),
-            accentColor: Color(AppColors.mainColor),
-            dividerColor: Color(AppColors.dividerColor),
-            scaffoldBackgroundColor: Color(AppColors.scaffoldBackgroundColor),
+            primaryColor: AppColors.titleBackgroundColor,
+            hintColor: AppColors.hintText,
+            accentColor: AppColors.mainColor,
+            dividerColor: AppColors.dividerColor,
+            scaffoldBackgroundColor: AppColors.scaffoldBackgroundColor,
             visualDensity: VisualDensity.adaptivePlatformDensity,
           ),
+          localizationsDelegates: [
+            GlobalMaterialLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+          ],
+          supportedLocales: [
+            const Locale('zh', 'CN'),
+            const Locale('en', 'US'),
+          ],
+
           routes: <String, WidgetBuilder>{
             "less": (context) => LessGroupPage(),
             "ful": (context) => FulGroupPage(),
@@ -53,31 +88,32 @@ class MyApp extends StatelessWidget {
             "photo": (context) => PhotoApp(),
             "register": (context) => RegisterPage(),
             "login": (context) => LoginPage(),
-            "listPage":(context) => List_Page(),
-            "CustomTabPage":(context) => TabBarPage(),
-            "LoginRequestPage":(context) => LoginRequestPage(),
-            "PageView":(context) => SampleAppPage(),
-            "LayoutDemo":(context) => LayoutDemo(),
-            "main": (context) => mainPage(),
-            "firstVC":(context) => jssPageDemo(),
-            "car_details":(context) =>CarDetailsPage(),
-            "student":(context) => jssPageDemo(),
-            "car_details":(context) =>CarDetailsPage(),
-            "grid_page":(context) =>GridPage()
+            "listPage": (context) => List_Page(),
+            "CustomTabPage": (context) => TabBarPage(),
+            "LoginRequestPage": (context) => LoginRequestPage(),
+            "PageView": (context) => SampleAppPage(),
+            "LayoutDemo": (context) => LayoutDemo(),
+            "main": (context) => mainPage(context),
+            "firstVC": (context) => jssPageDemo(),
+            "car_details": (context) => CarDetailsPage(),
+            "student": (context) => jssPageDemo(),
+            "grid_page": (context) => GridPage(),
+            "doctorHome": (context) => DoctorHomePage(),
+            "bottom_page": (context) => BottomNavPage(),
+            "doctor_MainPage": (context) => doctorMainPage(),
           },
         ),
         onWillPop: () async {
           Fluttertoast.showToast(msg: "退出");
           return true;
         });
-
   }
-
 }
-Widget mainPage(){
+
+Widget mainPage(BuildContext context) {
   return Scaffold(
     appBar: AppBar(
-      title: Text("路由"),
+      title: Text("NetRain Flutter学习计划"),
     ),
     body: RouterNavigator(title: 'Flutter Demo Home Page'),
   );
@@ -97,42 +133,53 @@ class _RouterNavigatorState extends State<RouterNavigator> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      child: Column(
-        children: [
-          SwitchListTile(
-              title: Text('${byName ? '' : '不'}通过路由名跳转'),
-              value: byName,
-              onChanged: (value) {
-                setState(() {
-                  byName = value;
-                });
-              }),
-          _item("less页面", LessGroupPage(), 'less'),
-          _item("ful页面", FulGroupPage(), 'ful'),
-          _item("layout页面", LayoutPage(), 'layout'),
-          _item("拍照页面", PhotoApp(), 'photo'),
-          _item("登陆", LoginPage(), 'login'),
-          _item("登录网络请求", LoginRequestPage(), 'LoginRequestPage'),
-          _item("CustomTabPage",TabBarPage(),'CustomTabPage'),
-          _item("PageView",SampleAppPage(),'PageView'),
-          _item("LayoutDemo", LayoutDemo(), 'LayoutDemo'),
-          _item("listview页面",List_Page(),'listPage'),
-          _item("jssDemo", jssPageDemo(), 'firstVC'),
-          _item("jssDemo", jssPageDemo(), 'student'),
-          _item("gridView",GridPage(),'grid_page')
-        ],
+      child: Container(
+        margin: EdgeInsets.only(left: 10, right: 10),
+        child: Wrap(
+          spacing: 10,
+          children: [
+            SwitchListTile(
+                title: Text('${byName ? '' : '不'}通过路由名跳转'),
+                value: byName,
+                onChanged: (value) {
+                  setState(() {
+                    byName = value;
+                  });
+                }),
+            _item("登陆", LoginPage(), 'login',context),
+            _item("首页", LessGroupPage(), 'doctor_MainPage',context),
+            _item("less页面", LessGroupPage(), 'less',context),
+            _item("ful页面", FulGroupPage(), 'ful',context),
+            _item("layout页面", LayoutPage(), 'layout',context),
+            _item("拍照页面", PhotoApp(), 'photo',context),
+            _item("登录网络请求", LoginRequestPage(), 'LoginRequestPage',context),
+            _item("CustomTabPage", TabBarPage(), 'CustomTabPage',context),
+            _item("PageView", SampleAppPage(), 'PageView',context),
+            _item("LayoutDemo", LayoutDemo(), 'LayoutDemo',context),
+            _item("listview页面", List_Page(), 'listPage',context),
+            _item("jssDemo", jssPageDemo(), 'firstVC',context),
+            _item("jssDemo", jssPageDemo(), 'student',context),
+            _item("gridView", GridPage(), 'grid_page',context),
+            _item("BottomNav", BottomNavPage(), 'bottom_page',context),
+          ],
+        ),
       ),
     );
   }
 
-  _item(String title, page, String routeName) {
+  _item(String title, page, String routeName ,BuildContext context) {
     return Container(
       child: ElevatedButton(
         onPressed: () {
+          // Navigator.of(context).push(route)
           if (byName) {
             Navigator.pushNamed(context, routeName);
           } else {
-            Navigator.push(context,MaterialPageRoute(builder: (context) => page,));
+            Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => page,
+                ));
           }
         },
         child: Text(title),
@@ -140,4 +187,3 @@ class _RouterNavigatorState extends State<RouterNavigator> {
     );
   }
 }
-

netrain_flutter_app/lib/xuehao/BottomNavpage.dart

+import 'package:flutter/material.dart';
+import 'package:netrain_flutter_app/common/AppColors.dart';
+import 'package:netrain_flutter_app/common/Images.dart';
+
+/**
+ * @author xuehao
+ * on 2021/7/14
+ */
+class BottomNavPage extends StatefulWidget {
+  BottomNavPage({Key key}) : super(key: key);
+
+  @override
+  _BottomNavPageState createState() => _BottomNavPageState();
+}
+
+class _BottomNavPageState extends State<BottomNavPage> {
+  int _index = 0;
+
+  @override
+  Widget build(BuildContext context) {
+    List<BottomNavigationBarItem> _bottomNavigationbar = [
+      BottomNavigationBarItem(
+        title: Text("工作站"),
+        icon: Image.asset(Images.ic_bottom_01),
+      ),
+      BottomNavigationBarItem(
+        title: Text("消息"),
+        icon: Image.asset(Images.ic_bottom_02),
+      ),
+      BottomNavigationBarItem(
+        //显示的字样
+        title: Text("我的"),
+        //未选中时的图片
+        icon: Image.asset(Images.ic_bottom_03),
+        //选中后的图片
+        activeIcon: Image.asset(Images.ic_bottom_03_true),
+      ),
+    ];
+
+    List<Widget> _widgetItems = [
+      HomePage(),
+      MsgPage(),
+      UserCenter(),
+    ];
+
+    return new MaterialApp(
+      title: "bottom_page",
+      home: Scaffold(
+          bottomNavigationBar: BottomNavigationBar(
+            items: _bottomNavigationbar,
+            type: BottomNavigationBarType.fixed,
+            currentIndex: _index,
+            onTap: (index) {
+              _changePage(index);
+            },
+          ),
+          body: _widgetItems[_index]),
+    );
+  }
+
+  _changePage(int index) {
+    setState(() {
+      _index = index;
+    });
+  }
+}
+
+class HomePage extends StatefulWidget {
+  HomePage({Key key}) : super(key: key);
+
+  @override
+  _HomePageState createState() {
+    return _HomePageState();
+  }
+}
+
+class _HomePageState extends State<HomePage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: (AppColors.blue_bg_color),
+        title: Text(
+          "基本信息",
+          style: TextStyle(
+            fontSize: 16,
+          ),
+        ),
+        centerTitle: true,
+        leading: GestureDetector(
+          onTap: () {
+            Navigator.pop(context);
+          },
+          child: Icon(Icons.arrow_back_ios),
+        ),
+        actions: [
+          Container(
+            margin: EdgeInsets.fromLTRB(0, 0, 10, 0),
+            alignment: Alignment.centerRight,
+            child: Text(
+              "稍后提交",
+              textAlign: TextAlign.center,
+            ),
+          )
+        ],
+      ),
+      body: new Column(children: [
+        Container(
+          height: 80,
+          color: (AppColors.blue_bg_color),
+          child: Column(
+            children: [
+              Spacer(),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  SizedBox(width: 54),
+                  Container(
+                    alignment: Alignment.center,
+                    height: 22,
+                    width: 22,
+                    child: Text(
+                      "1",
+                      style: TextStyle(color: (AppColors.blue_bg_color)),
+                    ),
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(11.0),
+                      color: Colors.white,
+                    ),
+                  ),
+                  Spacer(),
+                  Container(
+                    alignment: Alignment.center,
+                    height: 22,
+                    width: 22,
+                    child: Text(
+                      "2",
+                      style: TextStyle(color: (AppColors.blue_bg_color)),
+                    ),
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(11.0),
+                      color: (AppColors.white_transparent_50),
+                    ),
+                  ),
+                  Spacer(),
+                  Container(
+                    alignment: Alignment.center,
+                    height: 22,
+                    width: 22,
+                    child: Text(
+                      "3",
+                      style: TextStyle(color: (AppColors.blue_bg_color)),
+                    ),
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(11.0),
+                      color: (AppColors.white_transparent_50),
+                    ),
+                  ),
+                  SizedBox(width: 54),
+                ],
+              ),
+              SizedBox(height: 8),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  SizedBox(width: 41),
+                  Text(
+                    "基本信息",
+                    style: TextStyle(color: Colors.white, fontSize: 12),
+                  ),
+                  Spacer(),
+                  Text(
+                    "提交证件",
+                    style: TextStyle(
+                        color: (AppColors.white_transparent_50),
+                        fontSize: 12),
+                  ),
+                  Spacer(),
+                  Text(
+                    "审核完毕",
+                    style: TextStyle(
+                        color: (AppColors.white_transparent_50),
+                        fontSize: 12),
+                  ),
+                  SizedBox(width: 41),
+                ],
+              ),
+              Spacer(),
+            ],
+          ),
+        ),
+        Container(
+          margin: EdgeInsets.all(16),
+          padding: EdgeInsets.fromLTRB(0, 0, 0, 16),
+          decoration: BoxDecoration(
+            color: (AppColors.blue_bg_color2),
+            borderRadius: BorderRadius.circular(4.0),
+          ),
+          child: Column(
+            children: [
+              Container(
+                child: Text(
+                  "您完成所有认证资料，并完成互联网医院认证备案后，杏联医生工作室将为您提供以下功能:",
+                  style: TextStyle(
+                      fontSize: 12, color: AppColors.text_default_color),
+                ),
+                margin: EdgeInsets.all(10),
+              ),
+              Row(
+                children: <Widget>[
+                  Expanded(
+                    child: Container(
+                      padding: EdgeInsets.fromLTRB(20, 0, 20, 0),
+                      child: Row(
+                        children: [
+                          Column(
+                            children: [
+                              Text(
+                                "邀请患者",
+                                style: TextStyle(
+                                    fontSize: 16,
+                                    color: (AppColors.EditTextColor),
+                                    fontWeight: FontWeight.bold),
+                              ),
+                              Text(
+                                "专属二维码",
+                                style: TextStyle(
+                                    color: (AppColors.text_default_color),
+                                    fontSize: 12
+                                ),
+                              )
+                            ],
+                          ),
+                          SizedBox(width: 16),
+                          Image.asset(Images.ic_friend)
+                        ],
+                      ),
+                    ),
+                    flex: 1,
+                  ),
+                  Expanded(
+                    child: Container(
+                      child: Row(
+                        children: [
+                          Column(
+                            children: [
+                              Text(
+                                "电子处方权",
+                                style: TextStyle(
+                                    fontSize: 16,
+                                    color: AppColors.EditTextColor,
+                                    fontWeight: FontWeight.bold),
+                              ),
+                              Text(
+                                "建立自己的诊室",
+                                style: TextStyle(
+                                    color: AppColors.text_default_color,
+                                    fontSize: 12
+                                ),
+                              )
+                            ],
+                          ),
+                          SizedBox(width: 16),
+                          Image.asset(Images.ic_prescription_home)
+                        ],
+                      ),
+                    ),
+                    flex: 1,
+                  ),
+                ],
+              ),
+            ],
+          ),
+        )
+      ]),
+    );
+  }
+}
+
+class MsgPage extends StatefulWidget {
+  MsgPage({Key key}) : super(key: key);
+
+  @override
+  _MsgPageState createState() {
+    return _MsgPageState();
+  }
+}
+
+class _MsgPageState extends State<MsgPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Text("消息"),
+    );
+  }
+}
+
+class UserCenter extends StatefulWidget {
+  UserCenter({Key key}) : super(key: key);
+
+  @override
+  _UserCenterState createState() {
+    return _UserCenterState();
+  }
+}
+
+class _UserCenterState extends State<UserCenter> {
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Text("个人中心"),
+    );
+  }
+}

netrain_flutter_app/lib/xuehao/paint/CirclePainter.dart

+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class CirclePainter extends CustomPainter {
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    var paint = new Paint();
+    paint.isAntiAlias = true;
+    paint.strokeWidth = 0.0;
+    paint.color = Colors.white;
+    paint.invertColors = false;
+    canvas.drawCircle(
+        Offset(size.width / 2, size.height / 2), size.height / 2, paint);
+  }
+
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) {
+    return true;
+  }
+
+}

netrain_flutter_app/pubspec.yaml

@@ -24,6 +24,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  flutter_localizations:
+    sdk: flutter
 
   test_package:
     path: ../test_package
@@ -43,6 +45,8 @@ dependencies:
   convert: ^3.0.1 #转码器
   pull_to_refresh: ^2.0.0
   flustars: ^2.0.1  #强大的工具类库
+  shared_preferences: ^2.0.6
+  provider: ^4.1.0
 
 
 dev_dependencies: