merge & fix conflict

lib/main.dart

 import 'package:flutter/material.dart';
-<<<<<<< HEAD
 import 'battery.dart';
 import 'assetsChannel.dart';
 import 'layoutTest.dart';
@@ -27,31 +26,6 @@ class MyApp extends StatelessWidget {
 
   Widget batteryChannelPage(BuildContext context) {
     return PlatformChannel();
-=======
-import 'package:hybrid_stack_manager/router.dart';
-import 'package:hybrid_stack_manager/hybrid_stack_manager.dart';
-import 'package:hybrid_stack_manager/router_option.dart';
-import 'app_config.dart';
-import 'my_app.dart';
-
-//void main() {
-//  debugPaintSizeEnabled = false; //打开视觉调试开关
-//  return runApp(_widgetForRoute(window.defaultRouteName));
-//
-//}
-
-void main() async {
-  AppConfig.sharedInstance();
-  HybridStackManagerPlugin plugin =
-      HybridStackManagerPlugin.hybridStackManagerPlugin;
-  Map args = await plugin.getMainEntryParams();
-  runApp(new MyApp());
-  if (args != null && args["url"] != null) {
-    RouterOption routeOption = new RouterOption(
-        url: args["url"], query: args["query"], params: args["params"]);
-    Router.sharedInstance().pushPageWithOptionsFromFlutter(
-        routeOption: routeOption, animated: false);
->>>>>>> dev
   }
 
   Widget assetsChannelPage(BuildContext context) {
@@ -67,7 +41,6 @@ void main() async {
   }
 }
 
-<<<<<<< HEAD
 class MyHomePage extends StatefulWidget {
   MyHomePage({Key key, this.title}) : super(key: key);
 
@@ -134,6 +107,4 @@ class _MyHomePageState extends State<MyHomePage> {
     );
   }
 }
-=======
 
->>>>>>> dev

lib/services/ALServers.dart

@@ -14,7 +14,6 @@ class ALServers {
   static const int ConnetTimeOut = 5000; // 连接超时
   static const int ReceiveTimeOut = 3000; // 接收超时
 
-
   static const String API_SETTING_COUNTRYLIST = '/api/v1/countries';//国家列表
   static const String API_LOGOUT = '/api/account/logout'; // 注销
   static const String API_ACCOUNT_LOGIN_PWD ='/api/account/login_pwd';// 账号密码登录
@@ -22,8 +21,6 @@ class ALServers {
   static const String API_ACCOUNT_REGISTER = '/api/account/register';// 用户注册
   static const String API_ACCOUNT_GETVFC = '/api/account/get_vfc';// 获取验证码
   static const String API_ACCOUNT_THIRDPART = '/api/account/thirdparty_login'; // 三方账户登录
-
-
   // HOST
 }
 // HOST

pubspec.lock

@@ -5,80 +5,79 @@ packages:
     dependency: transitive
     description:
       name: archive
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.1"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   cookie_jar:
     dependency: transitive
     description:
       name: cookie_jar
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.6"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.2"
-<<<<<<< HEAD
-  event_bus:
+  dio:
     dependency: "direct main"
     description:
-      name: event_bus
+      name: dio
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "2.0.10"
   fluro:
     dependency: "direct main"
     description:
@@ -86,15 +85,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.0"
-=======
-  dio:
-    dependency: "direct main"
-    description:
-      name: dio
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.10"
->>>>>>> dev
   flutter:
     dependency: "direct main"
     description: flutter
@@ -109,70 +99,70 @@ packages:
     dependency: "direct main"
     description:
       name: hybrid_stack_manager
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.1"
   image:
     dependency: transitive
     description:
       name: image
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.7"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.3+1"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.2"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.3"
   sky_engine:
@@ -184,63 +174,63 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.8"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.3.1"
 sdks:

pubspec.yaml

@@ -23,17 +23,12 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
-<<<<<<< HEAD
-  event_bus: ^1.0.1
   fluro: ^1.3.4
-=======
   hybrid_stack_manager: 0.1.1
   json_annotation: ^2.0.0
-  #  网络
   dio: ^2.0.0
-  # 数据存储
   shared_preferences: ^0.4.2
->>>>>>> dev
+  # event_bus: ^1.0.1
 
 dev_dependencies:
   flutter_test: