优化路由，优化组件加载方式

docs/widget/scrollview/gridview/code.md

@@ -0,0 +1,22 @@
+### ***GridView***
+
+> GridView可创建一个二维的网格布局
+```
+
+ GridView({
+  Key key,
+  Axis scrollDirection: Axis.vertical,
+  bool reverse: false,
+  ScrollController controller,
+  bool primary,
+  ScrollPhysics physics,
+  bool shrinkWrap: false,
+  EdgeInsetsGeometry padding,
+  @required SliverGridDelegate gridDelegate,
+  bool addAutomaticKeepAlives: true,
+  bool addRepaintBoundaries: true,
+  bool addSemanticIndexes: true,
+  double cacheExtent,
+  List<Widget> children: const [],
+  int semanticChildCount
+})

docs/widget/scrollview/gridview/index.md

@@ -1,22 +1,48 @@
-### ***GridView***
-
-> GridView可创建一个二维的网格布局
 ```
 
- GridView({
-  Key key,
-  Axis scrollDirection: Axis.vertical,
-  bool reverse: false,
-  ScrollController controller,
-  bool primary,
-  ScrollPhysics physics,
-  bool shrinkWrap: false,
-  EdgeInsetsGeometry padding,
-  @required SliverGridDelegate gridDelegate,
-  bool addAutomaticKeepAlives: true,
-  bool addRepaintBoundaries: true,
-  bool addSemanticIndexes: true,
-  double cacheExtent,
-  List<Widget> children: const [],
-  int semanticChildCount
-})
+class _DemoState extends State<Demo> {
+  bool loading = true;
+  String ___MD___ = _mdUrl;
+
+  @override
+  void initState() {
+    super.initState();
+    this.initMd();
+  }
+
+  initMd() async {
+    String mdStr = await FileUtils.readLocaleFile(___MD___);
+    setState(() {
+      this.___MD___ = mdStr;
+      loading = false;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WidgetComp(
+      name: Demo.name,
+      codeUrl: Demo.codeUrl,
+      mdUrl: Demo.mdUrl,
+      loading: loading,
+      modelChild: (context, child, model) {
+        return [
+          ___MD___,
+          Container(
+            color: Colors.teal.shade700,
+            alignment: Alignment.center,
+            child: Text(
+              'Hello WorldHello WorldHello  WorldHello WorldHello World',
+              style: Theme.of(context)
+                  .textTheme
+                  .display1
+                  .copyWith(color: Colors.white),
+            ),
+          ),
+        ];
+      },
+    );
+  }
+}
+
+```

lib/components/baseComp.dart

@@ -15,7 +15,11 @@ class BaseComp extends StatelessWidget {
           appBar: AppBar(
             title: Text(this.title),
           ),
-          body: this.child(context, child, model),
+          body: ListView(
+            children: [
+              this.child(context, child, model)
+            ],
+          ),
         );
       }
     );

lib/components/webviewComp.dart

@@ -11,7 +11,7 @@ class WebViewComp extends StatelessWidget {
     return WebviewScaffold(
       url: this.url,
       appBar: new AppBar(
-        title: new Text("Widget webview"),
+        title: new Text("Webview"),
       ),
     );
   }

lib/components/widgetLodingComp.dart

@@ -2,21 +2,25 @@ import 'package:flutter/material.dart';
 import 'package:efox_flutter/store/STORE.dart';
 import 'package:efox_flutter/components/markdownComp.dart';
 import 'package:efox_flutter/lang/app_translations.dart';
+import 'package:efox_flutter/components/baseComp.dart';
+import 'package:efox_flutter/utils/file.dart' as FileUtils;
 import 'package:efox_flutter/router/index.dart' show FluroRouter;
 
 class WidgetComp extends StatelessWidget {
   final List<Widget> _bodyList = [];
   final dynamic modelChild;
   final String codeUrl;
-  final String title;
+  final String mdUrl;
+  final String name;
   final bool loading;
 
   WidgetComp({
     Key key,
-    this.title,
+    this.name,
     @required this.modelChild,
     this.loading,
     this.codeUrl,
+    this.mdUrl,
   }) : super(key: key);
 
   @override
@@ -32,7 +36,7 @@ class WidgetComp extends StatelessWidget {
       });
       return Scaffold(
         appBar: AppBar(
-          title: Text(this.title),
+          title: Text(this.name),
           actions: <Widget>[
             IconButton(
               icon: Icon(
@@ -46,8 +50,18 @@ class WidgetComp extends StatelessWidget {
               icon: Icon(
                 Icons.code,
               ),
-              onPressed: () {
-                print('prs');
+              onPressed: () async {
+                String mdStr = await FileUtils.readLocaleFile(this.mdUrl);
+                Navigator.of(context).push(MaterialPageRoute(
+                  builder: (BuildContext context) {
+                    return BaseComp(
+                      title: this.name,
+                      child: (context, child, model) {
+                        return MarkDownComp(mdStr);
+                      }
+                    );
+                  }
+                ));
               },
             ),
           ],

lib/main.dart

@@ -7,12 +7,11 @@ import 'package:efox_flutter/lang/app_translations_delegate.dart';
 import 'package:efox_flutter/store/store.dart';
 //路由
 import 'package:efox_flutter/router/index.dart';
-import 'package:fluro/fluro.dart';
 void main() => runApp(MainApp());
 
 class MainApp extends StatefulWidget {
   MainApp() {
-    FluroRouter.initRouter(Router());
+    FluroRouter.initRouter();
   }
   @override
   MainAppState createState() => MainAppState();

lib/page/tabbar/index.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/lang/app_translations.dart';
-import 'dart:convert';
-import 'package:flutter/services.dart' show rootBundle;
-import 'package:efox_flutter/store/objects/widget_list.dart';
 import 'package:efox_flutter/router/index.dart';
+import 'package:efox_flutter/widget/index.dart' as WidgetRoot;
 
 class ComponentsPage extends StatefulWidget {
   _ComponentsPageState createState() => _ComponentsPageState();
@@ -16,18 +14,7 @@ class _ComponentsPageState extends State<ComponentsPage>
   @override
   initState() {
     super.initState();
-    getWidgetList().then((res) {
-      setState(() {
-        mapList = res.list;
-      });
-    });
-  }
-
-  getWidgetList() async {
-    String widgetString = await rootBundle
-        .loadString('assets/json/widget_list.json', cache: false);
-    var _tmpMap = new WidgetListInfo.fromJson(json.decode(widgetString));
-    return _tmpMap;
+    this.mapList = WidgetRoot.getAllWidgets(); 
   }
 
   /**
@@ -75,7 +62,7 @@ class _ComponentsPageState extends State<ComponentsPage>
                         color: Colors.deepOrange,
                       ),
                       onPressed: () {
-                        FluroRouter.router.navigateTo(context, '/scrollview_gridview');
+                        FluroRouter.router.navigateTo(context, _tmpWidgetList[index].routerName);
                       },
                     ),
                     Text(_tmpWidgetList[index].name),

lib/router/index.dart

@@ -2,16 +2,14 @@ import 'package:flutter/widgets.dart';
 import 'package:fluro/fluro.dart';
 //首页
 import 'package:efox_flutter/page/home.dart';
-
-import 'package:flutter/material.dart';
+import 'package:efox_flutter/widget/index.dart' as WidgetConfig;
 import 'handles.dart';
-import 'scrollview/index.dart' as scrollview;
 
 class FluroRouter {
   static Router router;
 
-  static Router initRouter(Router router) {
-    FluroRouter.router = router;
+  static Router initRouter() {
+    FluroRouter.router = Router();
     router.define(
       '/',
       handler: Handler(
@@ -23,7 +21,18 @@ class FluroRouter {
 
     router.define('/webview', handler: webviewHandler);
 
-    scrollview.initRouter(router);
+    // 组件
+    WidgetConfig.getAllWidgets().forEach((widgetListInfo) {
+      widgetListInfo.widgetList.forEach((widgetInfo) {
+        router.define(
+          widgetInfo.routerName,
+          handler: Handler(
+              handlerFunc: (BuildContext context, Map<String, List> params) {
+            return widgetInfo.widget;
+          }),
+        );
+      });
+    });
     return router;
   }
 }

lib/router/scrollview/index.dart

@@ -1,20 +1,20 @@
 import 'package:flutter/material.dart';
-import 'package:efox_flutter/widget/scrollview/gridview/gridview.dart';
+import 'package:efox_flutter/widget/scrollview/gridview/index.dart' as GridViewDemo;
 import 'package:fluro/fluro.dart';
 
 const nameSpaces = '/scrollview_';
 const gridview = nameSpaces + 'gridview';
 
 const routerMaps = {
-  gridview: '/widget/scrollview/gridview/gridview',
+  gridview: '/widget/scrollview/gridview/index',
 };
 
 void initRouter(router) {
   router.define(
     gridview,
     handler: Handler(
       handlerFunc: (BuildContext context, Map<String, dynamic> params) {
-        return GridViewDemo();
+        return GridViewDemo.Demo();
       },
     ),
   );

lib/store/objects/widget_list.dart → lib/store/objects/widget_info.dart

@@ -1,12 +1,19 @@
+import 'package:flutter/widgets.dart';
 class ItemInfo extends Object {
   int code;
   String name;
-  String key;
+  String routerName;
+  Widget widget;
+  String webviewTitle;
+
+  ItemInfo({this.code, this.name, this.routerName, this.widget, this.webviewTitle});
 
   ItemInfo.fromJson(Map<String, dynamic> json) {
     code = json['code'];
     name = json['name'];
-    key = json['key'];
+    widget = json['widget'];
+    routerName = json['routerName'];
+    webviewTitle = json['webviewTitle'];
   }
 }
 
@@ -15,6 +22,8 @@ class ItemListInfo {
   int code;
   List widgetList;
 
+  ItemListInfo({ this.typeName, this.code, this.widgetList});
+
   ItemListInfo.fromJson(Map<String, dynamic> json) {
     typeName = json['typeName'];
     code = json['code'];

lib/widget/index.dart

@@ -0,0 +1,7 @@
+import 'scrollview/index.dart' as ScrollView;
+
+List getAllWidgets() {
+  List routerMap =[];
+  routerMap.addAll(ScrollView.widgetMap);
+  return routerMap;
+}