Merge pull request #215 from DeckeDeng/develop

Develop

android/app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.0.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

android/app/src/main/AndroidManifest.xml

@@ -10,10 +10,11 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.MODE_WORLD_READABLE"/>
     <uses-permission android:name="android.permission.MODE_WORLD_WRITEABLE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="fluttergo"
+        android:label="FlutterGo"
         android:icon="@mipmap/ic_launcher_logo">
         <activity
             android:name=".MainActivity"
@@ -34,5 +35,32 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+
+        <provider
+            android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider"
+            android:authorities="${applicationId}.flutter_downloader.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
+
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:enabled="false"
+            android:exported="false" />
+
+        <provider
+            android:name="vn.hunghd.flutterdownloader.FlutterDownloaderInitializer"
+            android:authorities="${applicationId}.flutter-downloader-init"
+            android:exported="false">
+            <meta-data
+                android:name="vn.hunghd.flutterdownloader.MAX_CONCURRENT_TASKS"
+                android:value="5" />
+        </provider>
+
     </application>
 </manifest>

ios/Runner.xcodeproj/project.pbxproj

@@ -222,6 +222,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				C38E5EAE601417DA9DF11753 /* [CP] Embed Pods Frameworks */,
+				2432F011A7D713E4BFB3DC88 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -300,6 +301,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		2432F011A7D713E4BFB3DC88 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/flutter_downloader/FlutterDownloaderDatabase.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FlutterDownloaderDatabase.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -42,7 +42,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

lib/api/api.dart

@@ -7,4 +7,6 @@ class Api{
   static const String CHECK_LOGIN = BASE_URL+'checkLogin';//验证登陆
   
   static const String LOGOUT = BASE_URL+'logout';//退出登陆
+
+  static const String VERSION = BASE_URL+'getAppVersion';//检查版本
 }

lib/main.dart

@@ -1,6 +1,10 @@
+import 'dart:async';
+import 'dart:core';
+
 import 'package:flutter/material.dart';
 import 'package:fluro/fluro.dart';
 import 'package:flutter/rendering.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'routers/routers.dart';
 import 'routers/application.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -36,8 +40,20 @@ class _MyAppState extends State<MyApp> {
   bool _isLoading = true;
 
   @override
-  void initState() {
+  Future initState() {
     super.initState();
+    var platformAandroid =
+        (Theme.of(context).platform == TargetPlatform.android);
+    DataUtils.checkVersion({'name': 'FlutterGo'}).then((bool) {
+      print("返回值back ${bool}");
+      if (platformAandroid && bool) {
+        setState(() {});
+        _UpdateURL();
+      }
+    }).catchError((onError) {
+      print('获取失败:$onError');
+    });
+
     DataUtils.checkLogin().then((hasLogin) {
       setState(() {
         _hasLogin = hasLogin;
@@ -52,22 +68,32 @@ class _MyAppState extends State<MyApp> {
     });
   }
 
+  _UpdateURL() async {
+    const currUrl =
+        'https://github.com/alibaba/flutter-go/raw/master/FlutterGo.apk';
+    if (await canLaunch(currUrl)) {
+      await launch(currUrl);
+    } else {
+      throw 'Could not launch $currUrl';
+    }
+  }
+
   showWelcomePage() {
-    if (_isLoading) {
+//    if (_isLoading) {
-      return Container(
+//      return Container(
-        color: const Color(ThemeColor),
+//        color: const Color(ThemeColor),
-        child: Center(
+//        child: Center(
-          child: SpinKitPouringHourglass(color: Colors.white),
+//          child: SpinKitPouringHourglass(color: Colors.white),
-        ),
+//        ),
-      );
+//      );
-    } else {
+//    } else {
-      // 判断是否已经登录
+//      // 判断是否已经登录
-      if (_hasLogin) {
+//      if (_hasLogin) {
         return AppPage();
-      } else {
+//      } else {
-        return LoginPage();
+//        return LoginPage();
-      }
+//      }
-    }
+//    }
   }
 
   @override
@@ -88,6 +114,7 @@ class _MyAppState extends State<MyApp> {
         ),
       ),
       home: new Scaffold(body: showWelcomePage()),
+      //去掉debug logo
       debugShowCheckedModeBanner: false,
       onGenerateRoute: Application.router.generator,
       navigatorObservers: <NavigatorObserver>[Analytics.observer],

lib/model/user_info_cache.dart

@@ -59,4 +59,6 @@ class UserInfoControlModel {
   Future deleteAll() async{
     return await sql.deleteAll();
   }
+
+
 }

lib/model/version.dart

@@ -0,0 +1,29 @@
+class Data {
+  String version;
+  String name;
+
+  Data.fromJson(Map<String, dynamic> json)
+      : version = json['version'],
+        name = json['name'];
+
+  @override
+  String toString() {
+    return 'name: $name ,version: $version';
+  }
+}
+
+class Version {
+  Data data;
+  int status;
+  bool success;
+
+  Version.formJson(Map<String, dynamic> json)
+      : status = json['status'],
+        success = json['success'],
+        data = Data.fromJson(json['data']);
+
+  @override
+  String toString() {
+    return 'status: $status ,success: $success,date: ${data.toString()}';
+  }
+}

lib/utils/data_utils.dart

@@ -1,10 +1,13 @@
 import 'dart:async' show Future;
 
+import 'package:flutter_go/model/version.dart';
+import 'package:package_info/package_info.dart';
+import 'package:url_launcher/url_launcher.dart';
+
 import './net_utils.dart';
 import '../model/user_info.dart';
 import 'package:flutter_go/api/api.dart';
 
-
 class DataUtils {
   // 登陆获取用户信息
   static Future<UserInfo> doLogin(Map<String, String> params) async {
@@ -27,4 +30,24 @@ class DataUtils{
     print('退出登陆 $response');
     return response['success'];
   }
+
+  /**
+   * {"status":200,"data":{"version":"0.0.2","name":"FlutterGo"},"success":true}
+   */
+  // 检查版本
+  static Future<bool> checkVersion(Map<String, String> params) async {
+    var response = await NetUtils.get(Api.VERSION, params);
+    Version version = Version.formJson(response);
+    var currVersion = version.data.version;
+    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    var localVersion = packageInfo.version;
+    //相同=0、大于=1、小于=-1
+//    localVersion = '0.0.2';
+//    currVersion = '1.0.6';
+    if (currVersion.compareTo(localVersion) == 1) {
+      return true;
+    } else {
+      return false;
+    }
+  }
 }

lib/views/home.dart

@@ -24,6 +24,7 @@ import 'package:flutter_go/resources/widget_name_to_icon.dart';
 const int ThemeColor = 0xFFC91B3A;
 
 class AppPage extends StatefulWidget {
+
   @override
   State<StatefulWidget> createState() {
     return _MyHomePageState();
@@ -32,6 +33,7 @@ class AppPage extends StatefulWidget {
 
 class _MyHomePageState extends State<AppPage>
     with SingleTickerProviderStateMixin {
+
   SpUtil sp;
   WidgetControlModel widgetControl = new WidgetControlModel();
   SearchHistoryList searchHistoryList;
@@ -40,10 +42,10 @@ class _MyHomePageState extends State<AppPage>
   List<Widget> list = List();
   int _currentIndex = 0;
   static List tabData = [
-    {'text': '业界动态', 'icon': Icon(Icons.language)},
+//    {'text': '业界动态', 'icon': Icon(Icons.language)},
     {'text': 'WIDGET', 'icon': Icon(Icons.extension)},
     {'text': '组件收藏', 'icon': Icon(Icons.favorite)},
-    {'text': '关于手册', 'icon': Icon(Icons.import_contacts)}
+    {'text': '关于手册', 'icon': Icon(Icons.import_contacts)},
   ];
 
   List<BottomNavigationBarItem> myTabs = [];
@@ -62,7 +64,7 @@ class _MyHomePageState extends State<AppPage>
     }
     list
 //      ..add(FirstPage())
-      ..add(MainPage())
+//      ..add(MainPage())
       ..add(WidgetPage(Provider.db))
       ..add(CollectionPage())
       ..add(FourthPage());
@@ -118,10 +120,10 @@ class _MyHomePageState extends State<AppPage>
   }
 
   renderAppBar(BuildContext context, Widget widget, int index) {
-    print('renderAppBar=====>>>>>>${index}');
+//    print('renderAppBar=====>>>>>>${index}');
-    if(index == 0) {
+//    if (index == 0) {
-      return null;
+//      return null;
-    }
+//    }
     return AppBar(title: buildSearchInput(context));
   }
 

pubspec.lock

@@ -5,105 +5,105 @@ packages:
     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.2.0"
+    version: "2.0.8"
   bloc:
     dependency: "direct main"
     description:
       name: bloc
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.0"
   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"
   city_pickers:
     dependency: "direct main"
     description:
       name: city_pickers
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.4"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
   cookie_jar:
     dependency: "direct main"
     description:
       name: cookie_jar
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.16.0"
   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"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
   event_bus:
     dependency: "direct main"
     description:
       name: event_bus
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   firebase_analytics:
     dependency: "direct main"
     description:
       name: firebase_analytics
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0+1"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.4"
   fluro:
     dependency: "direct main"
     description:
       name: fluro
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.0"
   flutter:
@@ -115,21 +115,28 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_bloc
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.11.1"
+  flutter_downloader:
+    dependency: "direct main"
+    description:
+      name: flutter_downloader
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.7"
   flutter_markdown:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
   flutter_spinkit:
     dependency: "direct main"
     description:
       name: flutter_spinkit
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
   flutter_test:
@@ -141,98 +148,119 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_webview_plugin
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.5"
   html:
     dependency: "direct main"
     description:
       name: html
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.14.0+2"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.0+2"
+    version: "0.6.0+3"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.15.7"
   lpinyin:
     dependency: transitive
     description:
       name: lpinyin
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.7"
   markdown:
     dependency: transitive
     description:
       name: markdown
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.5"
+    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"
+  open_file:
+    dependency: "direct main"
+    description:
+      name: open_file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1+2"
+  package_info:
+    dependency: "direct main"
+    description:
+      name: package_info
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.0+3"
   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: "direct main"
     description:
       name: path_provider
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.4.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.1"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.21.0"
   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:
@@ -244,79 +272,79 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.5.4"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.5"
   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: "2.0.0"
+    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"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.2"
   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"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.0.2"
   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"
 sdks:
-  dart: ">=2.2.0 <3.0.0"
+  dart: ">=2.1.0 <3.0.0"
   flutter: ">=1.2.1 <2.0.0"

pubspec.yaml

@@ -7,7 +7,7 @@ description: flutter_go
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 1.0.0
+version: 1.0.6
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"
@@ -28,7 +28,6 @@ dependencies:
   # 本地存储、收藏功能
   shared_preferences: ^0.4.3
   flutter_spinkit: "^3.1.0"
-  path_provider: ^1.0.0
   dio: ^2.0.15
   flutter_webview_plugin: ^0.3.4
   cookie_jar: ^1.0.0
@@ -41,6 +40,11 @@ dependencies:
   flutter_bloc: ^0.11.1
   bloc: ^0.12.0
   html: ^0.14.0+2
+  flutter_downloader: ^1.1.7
+  path_provider: ^1.1.0
+  permission_handler: ^3.0.0
+  open_file: ^2.0.1+2
+  package_info: ^0.4.0+3
 
 dev_dependencies:
   flutter_test: