Merge pull request alibaba#215 from DeckeDeng/develop

DeckeDeng · web-flow · commit 3218d0082e57 · 2019-05-23T13:25:24.000+08:00
Develop
diff --git a/android/app/release/output.json b/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":{}}]
diff --git a/android/app/src/main/AndroidManifest.xml b/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>
diff --git a/app-release.apk b/app-release.apk
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/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;
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/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"
diff --git a/lib/api/api.dart b/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';//检查版本
 }
diff --git a/lib/main.dart b/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,14 +40,26 @@ 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;
         _isLoading = false;
       });
-    }).catchError((onError){
+    }).catchError((onError) {
       setState(() {
         _hasLogin = true;
         _isLoading = false;
@@ -52,24 +68,34 @@ class _MyAppState extends State<MyApp> {
     });
   }
 
-  showWelcomePage() {
-    if (_isLoading) {
-      return Container(
-        color: const Color(ThemeColor),
-        child: Center(
-          child: SpinKitPouringHourglass(color: Colors.white),
-        ),
-      );
+  _UpdateURL() async {
+    const currUrl =
+        'https://github.com/alibaba/flutter-go/raw/master/FlutterGo.apk';
+    if (await canLaunch(currUrl)) {
+      await launch(currUrl);
     } else {
-      // 判断是否已经登录
-      if (_hasLogin) {
-        return AppPage();
-      } else {
-        return LoginPage();
-      }
+      throw 'Could not launch $currUrl';
     }
   }
 
+  showWelcomePage() {
+//    if (_isLoading) {
+//      return Container(
+//        color: const Color(ThemeColor),
+//        child: Center(
+//          child: SpinKitPouringHourglass(color: Colors.white),
+//        ),
+//      );
+//    } else {
+//      // 判断是否已经登录
+//      if (_hasLogin) {
+        return AppPage();
+//      } else {
+//        return LoginPage();
+//      }
+//    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
@@ -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],
diff --git a/lib/model/user_info_cache.dart b/lib/model/user_info_cache.dart
@@ -59,4 +59,6 @@ class UserInfoControlModel {
   Future deleteAll() async{
     return await sql.deleteAll();
   }
+
+
 }
diff --git a/lib/model/version.dart b/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()}';
+  }
+}
diff --git a/lib/utils/data_utils.dart b/lib/utils/data_utils.dart
@@ -1,30 +1,53 @@
 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{
+class DataUtils {
   // 登陆获取用户信息
-  static Future<UserInfo> doLogin(Map<String,String> params) async{
+  static Future<UserInfo> doLogin(Map<String, String> params) async {
     var response = await NetUtils.post(Api.DO_LOGIN, params);
     UserInfo userInfo = UserInfo.fromJson(response['data']);
     return userInfo;
   }
 
   // 验证登陆
 
-  static Future<bool> checkLogin() async{
+  static Future<bool> checkLogin() async {
     var response = await NetUtils.get(Api.CHECK_LOGIN);
     print('验证登陆：$response');
     return response['success'];
   }
 
   // 退出登陆
-    static Future<bool> logout() async{
+  static Future<bool> logout() async {
     var response = await NetUtils.get(Api.LOGOUT);
     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;
+    }
+  }
+}
diff --git a/lib/views/first_page/first_page.dart b/lib/views/first_page/first_page.dart
@@ -26,24 +26,24 @@ class FirstPageState extends State<FirstPage> with AutomaticKeepAliveClientMixin
   bool get wantKeepAlive => true;
 
 
- @override
+  @override
   void initState() {
     super.initState();
     if (key == null) {
-       key = GlobalKey<DisclaimerMsgState>();
-       // key = const Key('__RIKEY1__');
+      key = GlobalKey<DisclaimerMsgState>();
+      // key = const Key('__RIKEY1__');
       //获取sharePre
-       _unKnow = _prefs.then((SharedPreferences prefs) {
-         return (prefs.getBool('disclaimer::Boolean') ?? false);
-       });
+      _unKnow = _prefs.then((SharedPreferences prefs) {
+        return (prefs.getBool('disclaimer::Boolean') ?? false);
+      });
 
       /// 判断是否需要弹出免责声明,已经勾选过不在显示,就不会主动弹
       _unKnow.then((bool value) {
-         new Future.delayed(const Duration(seconds: 1),(){
-           if (!value && key.currentState is DisclaimerMsgState && key.currentState.showAlertDialog is Function) {
-             key.currentState.showAlertDialog(context);
-           }
-         });
+        new Future.delayed(const Duration(seconds: 1),(){
+          if (!value && key.currentState is DisclaimerMsgState && key.currentState.showAlertDialog is Function) {
+            key.currentState.showAlertDialog(context);
+          }
+        });
       });
     }
   }
@@ -93,15 +93,15 @@ class FirstPageState extends State<FirstPage> with AutomaticKeepAliveClientMixin
       Column(
         children: <Widget>[
           Stack(
-          //alignment: const FractionalOffset(0.9, 0.1),//方法一
-          children: <Widget>[
-              Pagination(),
-              Positioned(//方法二
-              top: 10.0,
-              left: 0.0,
-              child: DisclaimerMsg(key:key,pWidget:this)
-              ),
-            ]),
+            //alignment: const FractionalOffset(0.9, 0.1),//方法一
+              children: <Widget>[
+                Pagination(),
+                Positioned(//方法二
+                    top: 10.0,
+                    left: 0.0,
+                    child: DisclaimerMsg(key:key,pWidget:this)
+                ),
+              ]),
           SizedBox(height: 1, child:Container(color: Theme.of(context).primaryColor)),
           SizedBox(height: 10),
         ],
@@ -127,7 +127,7 @@ class FirstPageState extends State<FirstPage> with AutomaticKeepAliveClientMixin
 //          SizedBox(height: 2, child:Container(color: Theme.of(context).primaryColor)),
           new Expanded(
             //child: new List(),
-            child: listComp.ListRefresh(getIndexListData,makeCard,headerView)
+              child: listComp.ListRefresh(getIndexListData,makeCard,headerView)
           )
         ]
 
diff --git a/lib/views/first_page/main_page.dart b/lib/views/first_page/main_page.dart
diff --git a/lib/views/home.dart b/lib/views/home.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1 +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":{}}]`
	`1`	`+[{"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":{}}]`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,6 @@ class Api{`
`7`	`7`	`static const String CHECK_LOGIN = BASE_URL+'checkLogin';//验证登陆`
`8`	`8`
`9`	`9`	`static const String LOGOUT = BASE_URL+'logout';//退出登陆`
	`10`	`+`
	`11`	`+ static const String VERSION = BASE_URL+'getAppVersion';//检查版本`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,6 @@ class UserInfoControlModel {`
`59`	`59`	`Future deleteAll() async{`
`60`	`60`	`return await sql.deleteAll();`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+`
`62`	`64`	`}`