feat:增加版本控制

wanwusangzhi · wanwusangzhi · commit c1d8f5d8694d · 2019-03-09T14:18:44.000+08:00
diff --git a/assets/config.json b/assets/config.json
@@ -0,0 +1,3 @@
+{
+  "version": 1.0
+}
diff --git a/docs/widget/scrollview/customscrollview/index.md b/docs/widget/scrollview/customscrollview/index.md
@@ -22,7 +22,7 @@ CustomScrollView({
 ```
 
 ### 属性介绍
-> viewportBuilder：显示滚动组件的属性，实例CustomScrollView/SingleChildScrollView实现不同的滚动效果。
+> viewportBuilder：显示滚动组件的属性，实例CustomScrollView/SingleChildScrollView实现不同的滚动效果。  
 - CustomScrollView: 实现随滚动条，appbar向上移动效果
 - SingleChildScrollView：参考SingleChildScrollView
 
@@ -32,7 +32,8 @@ CustomScrollView({
 - SliverFixedExtentList
 - ...
 
-> SliverAppBar: 滚动标题头小组件
+> SliverAppBar: 滚动标题头小组件 
+ 
     ```
     SliverAppBar({
         Key key,
diff --git a/lib/components/baseComp.dart b/lib/components/baseComp.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:efox_flutter/store/store.dart' show Store;
+import 'package:efox_flutter/store/index.dart' show Store;
 import 'header.dart' as Header;
 
 class Index extends StatelessWidget {
diff --git a/lib/components/exampleComp.dart b/lib/components/exampleComp.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/store/models/main_state_model.dart'
     show MainStateModel;
-import 'package:efox_flutter/store/store.dart' show Store;
+import 'package:efox_flutter/store/index.dart' show Store;
 import 'package:efox_flutter/config/theme.dart' show AppTheme;
 
 class Index extends StatelessWidget {
diff --git a/lib/components/webviewComp.dart b/lib/components/webviewComp.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'header.dart' as Header;
-import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
+import 'package:flutter_webview_plugin/flutter_webview_plugin.dart' show FlutterWebviewPlugin, WebviewScaffold;
 
 class Index extends StatelessWidget {
   final String url;
diff --git a/lib/components/widgetComp.dart b/lib/components/widgetComp.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:efox_flutter/store/store.dart' show Store;
+import 'package:efox_flutter/store/index.dart' show Store;
 import 'header.dart' as Header;
 import 'package:efox_flutter/components/markdownComp.dart' as MarkDownComp;
 import 'package:efox_flutter/lang/app_translations.dart' show AppTranslations;
@@ -88,20 +88,19 @@ class IndexState extends State<Index> {
           ),
           actions: this.getActions(
             context,
-            model,
           ),
         ),
         body: this.loading ? this.renderLoading() : this.renderWidget(),
       );
     });
   }
 
-  openPage(context, model) async {
+  openPage(context) async {
     String url = this.mdUrl;
     // 加载页面
-    if (model.config.state.isPro) {
+    if (this.model.config.state.isPro) {
       FluroRouter.router.navigateTo(context,
-          '/webview?url=${Uri.encodeComponent(model.config.state.env.GithubAssetOrigin + url.replaceAll(RegExp('/index.md'), ''))}');
+          '/webview?url=${Uri.encodeComponent(this.model.config.state.env.GithubAssetOrigin + url.replaceAll(RegExp('/index.md'), ''))}');
     } else {
       // 加载本地
       String mdStr = await FileUtils.readLocaleFile(url);
@@ -123,7 +122,7 @@ class IndexState extends State<Index> {
     return mdStr;
   }
 
-  getActions(context, model) {
+  getActions(context) {
     return [
       IconButton(
         icon: Icon(
@@ -141,62 +140,17 @@ class IndexState extends State<Index> {
           Icons.code,
         ),
         onPressed: () async {
-          this.openPage(context, model);
+          this.openPage(context);
         },
       ),
       IconButton(
         icon: Icon(Icons.share),
         onPressed: () {
           final String msg =
-              model.config.state.env.GithubAssetOrigin + this.mdUrl;
+              this.model.config.state.env.GithubAssetOrigin + this.mdUrl;
           AppShare.shareText(msg);
         },
       ),
-      // PopupMenuButton(
-      //   offset: Offset(0, 80),
-      //   onSelected: (index) {
-      //     switch (index) {
-      //       case 0:
-      //         FluroRouter.router.navigateTo(
-      //           context,
-      //           '/webview?url=${Uri.encodeComponent('https://github.com/efoxTeam/flutter-ui')}',
-      //         );
-      //         break;
-      //       case 1:
-      //         FluroRouter.router.navigateTo(
-      //           context,
-      //           '/webview?url=${Uri.encodeComponent(this.originCodeUrl)}',
-      //         );
-      //         break;
-      //     }
-      //   },
-      //   itemBuilder: (context) {
-      //     return [
-      //       PopupMenuItem(
-      //         child: Row(children: [
-      //           Icon(
-      //             Icons.home,
-      //             color: Color(AppTheme.greyColor),
-      //           ),
-      //           Text("  "),
-      //           Text('Flutter-UI'),
-      //         ]),
-      //         value: 0,
-      //       ),
-      //       PopupMenuItem(
-      //         child: Row(children: [
-      //           Icon(
-      //             Icons.code,
-      //             color: Color(AppTheme.greyColor),
-      //           ),
-      //           Text("  "),
-      //           Text(this.title),
-      //         ]),
-      //         value: 1,
-      //       ),
-      //     ];
-      //   },
-      // ),
     ];
   }
 
diff --git a/lib/config/development.dart b/lib/config/development.dart
@@ -1,6 +1,7 @@
 class Config {
-  String GithubAssetOrigin =
+  String versionUrl = 'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/assets/config.json';
+  String githubAssetOrigin =
       'https://github.com/efoxTeam/flutter-ui/blob/master/';
-  String GithubMarkdownOrigin =
+  String githubMarkdownOrigin =
       'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/';
 }
diff --git a/lib/config/production.dart b/lib/config/production.dart
@@ -1,6 +1,7 @@
 class Config {
-  String GithubAssetOrigin =
+  String versionUrl = 'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/assets/config.json';
+  String githubAssetOrigin =
       'https://github.com/efoxTeam/flutter-ui/blob/master/';
-  String GithubMarkdownOrigin =
+  String githubMarkdownOrigin =
       'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/';
 }
diff --git a/lib/controller/index.dart b/lib/controller/index.dart
@@ -0,0 +1,5 @@
+import 'package:efox_flutter/store/index.dart' show model;
+
+void initState() {
+  model.dispatch('config', 'setVersion');
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -4,9 +4,9 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:efox_flutter/lang/application.dart';
 import 'package:efox_flutter/lang/app_translations_delegate.dart';
 //引用Store 层
-import 'package:efox_flutter/store/store.dart' show model, Store;
+import 'package:efox_flutter/store/index.dart' show model, Store;
 //路由
-import 'package:efox_flutter/router/index.dart';
+import 'package:efox_flutter/router/index.dart' show FluroRouter;
 //主题
 import 'package:efox_flutter/config/theme.dart' show AppTheme;
 //统计
diff --git a/lib/page/home.dart b/lib/page/home.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/lang/app_translations.dart' show AppTranslations;
-import 'package:efox_flutter/store/store.dart' show Store;
+import 'package:efox_flutter/store/index.dart' show Store;
+
+import 'package:efox_flutter/controller/index.dart' as Controller;
 
 import 'component/index.dart' as TabIndex;
 import 'mine/index.dart' as MyIndex;
@@ -18,6 +20,8 @@ class _IndexState extends State<Index> {
   void initState() {
     super.initState();
     _pageController = PageController();
+    print('init===');
+    Controller.initState();
   }
 
   @override
diff --git a/lib/page/mine/index.dart b/lib/page/mine/index.dart
@@ -12,11 +12,24 @@ class Index extends StatelessWidget {
     {
       'name': '更新版本',
       'icon': 58919, // sync
+    },
+    {
+      'name': '切换环境',
+      'icon': 57539, // import_export
     }
   ];
 
   actionsEvent(int index) {
     print('index $index');
+    switch (index) {
+      case 0: break;
+      case 1:
+        this.model.dispatch('config', 'setVersion');
+        break;break;
+      case 2:
+        this.model.dispatch('config', 'setEnv');
+        break;
+    }
   }
 
   @override
diff --git a/lib/store/http.dart b/lib/store/http.dart
@@ -1,24 +1,26 @@
-import 'package:dio/dio.dart';
+import 'package:dio/dio.dart'
+    show Dio, Options, LogInterceptor, DioError, BaseOptions;
 
-Future<dynamic> get(url, [data = const {}]) async {
-  Dio dio = new Dio(); // with default Options
-  // dio.interceptors
-  //     .add(InterceptorsWrapper(onRequest: (RequestOptions requestOptions) {
-  //   return dio.resolve('sfs');
-  // }));
+Dio getDio([Options options]) {
+  Dio dio = new Dio(BaseOptions(
+    connectTimeout: 5000,
+    receiveTimeout: 5000,
+  )); // with default Options
   dio.interceptors.add(LogInterceptor(responseBody: true));
+  return
+  dio;
+}
+
+Future<dynamic> get(url, [data = const {}]) async {
   try {
-    return await dio.get(url).then((res) => res.data);
-  } on DioError catch(e) {
+    return await getDio().get(url).then((res) {
+      return res.data;
+    });
+  } on DioError catch (e) {
     return e.response;
   }
 }
 
 Future post(url, [data = const {}, params = const {}]) async {
-  Dio dio = new Dio(); // with default Options
-  // dio.interceptors
-  //     .add(InterceptorsWrapper(onRequest: (RequestOptions requestOptions) {
-  //   return dio.resolve('sfs');
-  // }));
-  return dio.post(url, data: data, queryParameters: params);
+  return getDio().post(url, data: data, queryParameters: params);
 }
diff --git a/lib/store/index.dart b/lib/store/index.dart
@@ -1,9 +1,9 @@
-import 'package:scoped_model/scoped_model.dart';
-import './models/main_state_model.dart';
-export './models/main_state_model.dart';
+import 'package:scoped_model/scoped_model.dart' show ScopedModel, ScopedModelDescendant;
+import './models/main_state_model.dart' show MainStateModel;
+//export './models/main_state_model.dart';
 
 /**
- * import 'package:efox_flutter/store/store.dart' as Store
+ * import 'package:efox_flutter/store/index.dart' as Store
  * Store.model.config.state.isPro
  */
 class Store {
@@ -23,3 +23,6 @@ class Store {
         builder: builder, child: child, rebuildOnChange: rebuildOnChange);
   }
 }
+
+MainStateModel model = MainStateModel();
+
diff --git a/lib/store/models/config_state_model.dart b/lib/store/models/config_state_model.dart
@@ -1,7 +1,10 @@
 import 'package:efox_flutter/config/index.dart' as Config;
+import 'package:efox_flutter/store/index.dart' show model;
+import 'package:efox_flutter/utils/loadAsset.dart' show loadAssets;
 
 class ConfigInfo {
   bool isPro = Config.isPro;
+  String version = '1.0';
   dynamic env = Config.env;
 }
 
@@ -10,13 +13,27 @@ ConfigInfo _appConfigInfo = new ConfigInfo();
 class ConfigModel {
   get state => _appConfigInfo;
 
-  methods(name, payload) {
+  dynamic getVersion () async {
+    print('version ${model.config.state.env.versionUrl}');
+    String _version = await loadAssets(model.config.state.env.versionUrl).then((res) {
+      return res['version'] ?? '1.0';
+    }).catchError((err) {
+      return '1.0';
+    });
+    print('_version ${_version}');
+    return _version;
+  }
+
+  methods(name, payload) async {
     print('payload= $payload');
 
     switch (name) {
       case 'setEnv':
         _appConfigInfo.isPro = !_appConfigInfo.isPro;
         break;
+      case 'setVersion':
+        _appConfigInfo.version = await this.getVersion();
+        break;
     }
   }
 }
diff --git a/lib/store/models/main_state_model.dart b/lib/store/models/main_state_model.dart
@@ -6,7 +6,7 @@ import 'config_state_model.dart' show ConfigModel;
  * get state: model.modelName.state.xxx
  * dispatch method: model.dispatch('modelName', 'methodsName', payload)
  * 
- * import 'package:efox_flutter/store/store.dart' as Store
+ * import 'package:efox_flutter/store/index.dart' as Store
  * Store.model.config.state.isPro
  */
 
@@ -31,4 +31,4 @@ class MainStateModel extends Model with UserModel {
   }
 }
 
-MainStateModel model = MainStateModel();
+//MainStateModel model = MainStateModel();
diff --git a/lib/utils/loadAsset.dart b/lib/utils/loadAsset.dart
@@ -1,13 +1,21 @@
-import 'package:efox_flutter/store/store.dart' as Store;
+import 'package:efox_flutter/store/index.dart' show model;
 import 'package:efox_flutter/store/http.dart' as Http;
 import 'file.dart' as FileUtil;
 
 Future<dynamic> loadMarkdownAssets(path) async {
-  if (!Store.model.config.state.isPro) {
+  if (!model.config.state.isPro) {
     return FileUtil.readLocaleFile(path);
   }
-  String url = Store.model.config.state.env.GithubMarkdownOrigin + path;
+  String url = model.config.state.env.githubMarkdownOrigin + path + '?v=${model.config.state.version}';
   return Http.get(url).then((res) {
     return res;
   });
 }
+
+
+Future<dynamic> loadAssets(path) async {
+  return Http.get(path).then((res) {
+    return res;
+  });
+}
+
