[flutter_app_upgrade] 迁移到空安全 & 添加自定义弹窗功能 & 添加配置项防止被Google Play下架

flutter_app_upgrade/android/build.gradle

@@ -21,18 +21,35 @@ rootProject.allprojects {
     }
 }
 
+def dartEnvironmentVariables = [
+        // 是否是Google Play版, Google Play禁止App从第三方升级, 此时需要禁用掉插件中相关功能
+        // 可用通过gradle.properties配置该属性的默认值, 若不配置, 默认为false
+        flutter_app_upgrade_googlePlay: project.findProperty('flutter_app_upgrade_googlePlayDefaultValue') ?: 'false',
+]
+if (project.hasProperty('dart-defines')) {
+    dartEnvironmentVariables += project.property('dart-defines').split(',').collectEntries {
+        // def pair = new String(Base64.decoder.decode(it)).split('=')
+        def pair = URLDecoder.decode(it).split('=')
+        [(pair.first()): pair.last()]
+    }
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        main {
+            java.srcDirs += 'src/main/kotlin'
+            manifest.srcFile Boolean.parseBoolean(dartEnvironmentVariables.flutter_app_upgrade_googlePlay) ? 'src/google/AndroidManifest.xml' : 'src/main/AndroidManifest.xml'
+        }
     }
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField 'boolean', 'googlePlay', dartEnvironmentVariables.flutter_app_upgrade_googlePlay
     }
     lintOptions {
         disable 'InvalidPackage'

flutter_app_upgrade/android/src/google/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.flutter.flutter_app_upgrade">
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

flutter_app_upgrade/android/src/main/AndroidManifest.xml

@@ -2,4 +2,6 @@
   package="com.flutter.flutter_app_upgrade">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <!-- Api30+上需要这个权限才getInstallMarket方法才能正常工作, 详见: https://developer.android.com/training/package-visibility -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 </manifest>

flutter_app_upgrade/android/src/main/kotlin/com/flutter/flutter_app_upgrade/FlutterAppUpgradePlugin.kt

@@ -59,12 +59,16 @@ public class FlutterAppUpgradePlugin : FlutterPlugin, MethodCallHandler, Activit
     if (call.method == "getAppInfo") {
       getAppInfo(mContext, result)
     } else if (call.method == "getApkDownloadPath") {
-      result.success(mContext.getExternalFilesDir("").absolutePath)
+      result.success(mContext.getExternalFilesDir("")?.absolutePath)
     } else if (call.method == "install") {
-      //安装app
-      val path = call.argument<String>("path")
-      path?.also {
-        startInstall(mContext, it)
+      if (BuildConfig.googlePlay) {
+        result.error("error", "googlePlay=true, The app installation function is disabled.", null)
+      } else {
+        // 安装app
+        val path = call.argument<String>("path")
+        path?.also {
+          startInstall(mContext, it)
+        }
       }
     } else if (call.method == "getInstallMarket") {
       var packageList = getInstallMarket(call.argument<List<String>>("packages"))
@@ -124,7 +128,7 @@ public class FlutterAppUpgradePlugin : FlutterPlugin, MethodCallHandler, Activit
       if (nameEmpty || classEmpty) {
         goToMarket.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
       } else {
-        goToMarket.setClassName(marketPackageName, marketClassName)
+        goToMarket.setClassName(marketPackageName!!, marketClassName!!)
       }
       context.startActivity(goToMarket)
     } catch (e: ActivityNotFoundException) {
@@ -155,13 +159,8 @@ public class FlutterAppUpgradePlugin : FlutterPlugin, MethodCallHandler, Activit
   fun isPackageExist(context: Context, packageName: String?): Boolean {
     val manager = context.packageManager
     val intent = Intent().setPackage(packageName)
-    val infos = manager.queryIntentActivities(intent,
-            PackageManager.GET_INTENT_FILTERS)
-    return if (infos == null || infos.size < 1) {
-      false
-    } else {
-      true
-    }
+    val infos = manager.queryIntentActivities(intent, 0)
+    return infos.size > 0
   }
 
   /**

flutter_app_upgrade/example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.flutter.flutter_app_upgrade_example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

flutter_app_upgrade/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -2,6 +2,7 @@
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
+import io.flutter.Log;
 
 import io.flutter.embedding.engine.FlutterEngine;
 
@@ -12,7 +13,12 @@
  */
 @Keep
 public final class GeneratedPluginRegistrant {
+  private static final String TAG = "GeneratedPluginRegistrant";
   public static void registerWith(@NonNull FlutterEngine flutterEngine) {
-    flutterEngine.getPlugins().add(new com.flutter.flutter_app_upgrade.FlutterAppUpgradePlugin());
+    try {
+      flutterEngine.getPlugins().add(new com.flutter.flutter_app_upgrade.FlutterAppUpgradePlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin flutter_app_upgrade, com.flutter.flutter_app_upgrade.FlutterAppUpgradePlugin", e);
+    }
   }
 }

flutter_app_upgrade/example/android/gradle.properties

@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
+flutter_app_upgrade_googlePlayDefaultValue=false

flutter_app_upgrade/example/lib/main.dart

@@ -1,5 +1,6 @@
-import 'package:flutter/material.dart';
 import 'dart:async';
+
+import 'package:flutter/material.dart';
 import 'package:flutter_app_upgrade/flutter_app_upgrade.dart';
 
 void main() => runApp(MyApp());
@@ -44,7 +45,7 @@ class Home extends StatefulWidget {
 }
 
 class _HomeState extends State<Home> {
-  AppInfo _appInfo;
+  AppInfo? _appInfo;
   List<AppMarketInfo> _appMarketList = [];
   String _installMarkets = '';
 
@@ -79,6 +80,27 @@ class _HomeState extends State<Home> {
     );
   }
 
+  ///自定义界面
+  _checkAppUpgrade2() {
+    AppUpgrade.appUpgrade(context, _checkAppInfo(),
+        iosAppId: 'id88888888',
+        downloadProgress: (count, total) {
+          print('count:$count,total:$total');
+        },
+        downloadStatusChange: (DownloadStatus status, {dynamic error}) {
+          print('status:$status,error:$error');
+        },
+        dialogBuilder: (onOk) => MaterialButton(
+              onPressed: onOk,
+              padding: EdgeInsets.symmetric(horizontal: 40, vertical: 2),
+              color: Colors.blueAccent,
+              child: Text("升级",
+                  style: const TextStyle(color: Colors.white, fontSize: 16)),
+              shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(20)),
+            ));
+  }
+
   Future<AppUpgradeInfo> _checkAppInfo() async {
     //这里一般访问网络接口，将返回的数据解析成如下格式
     return Future.delayed(Duration(seconds: 1), () {
@@ -121,4 +143,4 @@ class _HomeState extends State<Home> {
       ],
     );
   }
-}
+}

flutter_app_upgrade/example/pubspec.yaml

@@ -3,7 +3,7 @@ description: Demonstrates how to use the flutter_app_upgrade plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:

flutter_app_upgrade/example/test/widget_test.dart

@@ -18,8 +18,8 @@ void main() {
     // Verify that platform version is retrieved.
     expect(
       find.byWidgetPredicate(
-        (Widget widget) => widget is Text &&
-                           widget.data.startsWith('Running on:'),
+        (Widget widget) =>
+            widget is Text && widget.data!.startsWith('Running on:'),
       ),
       findsOneWidget,
     );

flutter_app_upgrade/lib/src/app_market.dart

@@ -27,8 +27,8 @@ class AppMarket {
     return marketList;
   }
 
-  static AppMarketInfo getBuildInMarket(String packageName) {
-    AppMarketInfo _info;
+  static AppMarketInfo? getBuildInMarket(String packageName) {
+    AppMarketInfo? _info;
     buildInMarketList.forEach((f) {
       if (f.packageName == packageName) {
         _info = f;
@@ -50,6 +50,7 @@ class AppMarket {
       zte,
       qiHoo,
       tencent,
+      coolApk,
       pp,
       wanDouJia
     ];
@@ -104,6 +105,15 @@ class AppMarket {
       "com.tencent.android.qqdownloader",
       "com.tencent.pangu.link.LinkProxyActivity");
 
+  ///
+  /// 酷安
+  ///
+  static final coolApk = AppMarketInfo(
+    'cookApk',
+    'com.coolapk.market',
+    'com.coolapk.market.view.main.MainActivity',
+  );
+
   ///
   /// pp助手
   ///