Merge branch 'dev_androidx'

Author: AlexLiuSheng

build.gradle

@@ -1,6 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = "1.4.0"
+
     repositories {
         jcenter()
         maven {
@@ -10,6 +12,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
 //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 //        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 //        classpath 'me.tatarka:gradle-retrolambda:3.2.5'

library/build.gradle

@@ -1,7 +1,9 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+//    buildToolsVersion "29.0.3"
     resourcePrefix "versionchecklib"
     defaultConfig {
         minSdkVersion 14
@@ -24,7 +26,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    compileOnly 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.squareup.okhttp3:okhttp:4.3.1'
     implementation 'org.greenrobot:eventbus:3.1.1'
 

library/src/main/AndroidManifest.xml

@@ -39,7 +39,7 @@
             android:name=".core.MyService"
             android:enabled="true"
 
-            android:exported="true" />
+            android:exported="false" />
         <service
             android:name=".v2.ui.VersionService"
             android:exported="false"

library/src/main/java/com/allenliu/versionchecklib/callback/DownloadListener.java

@@ -6,7 +6,7 @@
  * Created by allenliu on 2017/8/16.
  */
 
-public interface DownloadListener {
+public interface DownloadListener  {
     void onCheckerDownloading(int progress);
     void onCheckerDownloadSuccess(File file);
     void onCheckerDownloadFail();

library/src/main/java/com/allenliu/versionchecklib/core/VersionDialogActivity.java

@@ -371,4 +371,5 @@ public void showCustomDialog() {
 
     }
 
+
 }

library/src/main/java/com/allenliu/versionchecklib/utils/FileHelper.java

@@ -1,12 +1,13 @@
 package com.allenliu.versionchecklib.utils;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.Environment;
 
-import java.io.File;
-
 import androidx.annotation.NonNull;
 
+import java.io.File;
+
 public class FileHelper {
     @Deprecated
     public static String getDownloadApkCachePath() {
@@ -30,7 +31,11 @@ public static String getDownloadApkCachePath() {
     public static String getDownloadApkCachePath(Context context) {
         String appCachePath;
         if (checkSDCard()) {
-            appCachePath = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + "/AllenVersionPath/";
+            if (Build.VERSION.SDK_INT >= 29) {
+                appCachePath = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + "/AllenVersionPath/";
+            } else {
+                appCachePath = context.getExternalCacheDir() + "/AllenVersionPath/";
+            }
 
         } else {
             appCachePath = context.getFilesDir().getAbsolutePath() + "/AllenVersionPath/";

library/src/main/java/com/allenliu/versionchecklib/v2/builder/BuilderManager.java

@@ -0,0 +1,71 @@
+package com.allenliu.versionchecklib.v2.builder
+
+import android.content.Context
+import com.allenliu.versionchecklib.R
+import com.allenliu.versionchecklib.core.DownloadManager
+import com.allenliu.versionchecklib.utils.ALog
+import com.allenliu.versionchecklib.v2.AllenVersionChecker
+import java.io.File
+
+/**
+ *    @author : shengliu7
+ *    @e-mail : shengliu7@iflytek.com
+ *    @date   : 2020/12/19 12:34 PM
+ *    @desc   :
+ *
+ */
+object BuilderManager {
+    private var downloadBuilder: DownloadBuilder? = null
+    lateinit var context: Context
+    fun getDownloadBuilder(): DownloadBuilder? {
+        return downloadBuilder
+    }
+
+    fun init(context: Context, downloadBuilder: DownloadBuilder): BuilderManager {
+        this.context = context
+        this.downloadBuilder = downloadBuilder
+        return this
+    }
+
+    fun destroy() {
+        downloadBuilder = null
+    }
+
+    /**
+     * 验证安装包是否存在，并且在安装成功情况下删除安装包
+     */
+    fun checkAndDeleteAPK() {
+        doWhenNotNull {
+            //判断versioncode与当前版本不一样的apk是否存在，存在删除安装包
+            try {
+                val downloadPath: String = downloadAPKPath + context.getString(R.string.versionchecklib_download_apkname, context.packageName)
+                if (!DownloadManager.checkAPKIsExists(context, downloadPath)) {
+                    ALog.e("删除本地apk")
+                    File(downloadPath).delete()
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+
+    }
+
+    fun checkForceUpdate() {
+        doWhenNotNull {
+            forceUpdateListener?.onShouldForceUpdate()
+        }
+    }
+
+    fun <T> doWhenNotNull(nullBlock: (() -> T)? = null, block: DownloadBuilder.() -> T): T? {
+        val builder = downloadBuilder
+        if (builder != null) {
+            return builder.block()
+
+        } else {
+            nullBlock?.invoke()
+            AllenVersionChecker.getInstance().cancelAllMission()
+        }
+        return null
+    }
+
+}

library/src/main/java/com/allenliu/versionchecklib/v2/builder/BuilderManager.kt

@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.os.Environment;
 
 import androidx.annotation.NonNull;
 
@@ -307,11 +306,7 @@ public DownloadBuilder setDirectDownload(boolean directDownload) {
         return this;
     }
 
-    public void executeMission(Context context) {
-        if (apkName == null) {
-            apkName = context.getApplicationContext().getPackageName();
-        }
-
+    private void setupDefaultNotificationIcon(Context context) {
         if (notificationBuilder.getIcon() == 0) {
             final PackageManager pm = context.getPackageManager();
             final ApplicationInfo applicationInfo;
@@ -323,6 +318,14 @@ public void executeMission(Context context) {
                 e.printStackTrace();
             }
         }
+    }
+
+    public void executeMission(Context context) {
+        if (apkName == null) {
+            //https://github.com/AlexLiuSheng/CheckVersionLib/issues/338
+            apkName = context.getApplicationContext().getPackageName().replaceAll("\\.", "");
+        }
+        setupDefaultNotificationIcon(context);
         //fix path permission
         setupDownloadPath(context);
 //        downloadAPKPath=context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS).getPath() + "/";
@@ -342,7 +345,7 @@ private void setupDownloadPath(Context context) {
     }
 
     public void download(Context context) {
-        VersionService.enqueueWork(context.getApplicationContext(), this);
+        VersionService.Companion.enqueueWork(context.getApplicationContext(), this);
     }
 
     private boolean checkWhetherNeedRequestVersion() {
@@ -352,21 +355,4 @@ private boolean checkWhetherNeedRequestVersion() {
             return false;
     }
 
-    public void destory() {
-        setCustomDownloadFailedListener(null);
-        setCustomDownloadingDialogListener(null);
-        setCustomVersionDialogListener(null);
-        setForceUpdateListener(null);
-        setApkDownloadListener(null);
-        setOnCancelListener(null);
-        setReadyDownloadCommitClickListener(null);
-        setDownloadFailedCommitClickListener(null);
-        setReadyDownloadCancelListener(null);
-        setDownloadingCancelListener(null);
-        setDownloadFailedCancelListener(null);
-
-        if (getRequestVersionBuilder() != null)
-            getRequestVersionBuilder().destory();
-        requestVersionBuilder = null;
-    }
 }

library/src/main/java/com/allenliu/versionchecklib/v2/builder/DownloadBuilder.java

@@ -70,8 +70,6 @@ public DownloadBuilder request(RequestVersionListener requestVersionListener) {
         return new DownloadBuilder(this, null);
     }
 
-    public void destory() {
-        requestVersionListener = null;
-    }
+
 
 }

library/src/main/java/com/allenliu/versionchecklib/v2/builder/RequestVersionBuilder.java

@@ -0,0 +1,13 @@
+package com.allenliu.versionchecklib.v2.callback
+
+import com.allenliu.versionchecklib.callback.DownloadListener
+
+/**
+ *    @author : shengliu7
+ *    @e-mail : shengliu7@iflytek.com
+ *    @date   : 2020/12/19 2:51 PM
+ *    @desc   :
+ *
+ */
+interface DownloadListenerKt : DownloadListener, LifecycleListener {
+}

library/src/main/java/com/allenliu/versionchecklib/v2/builder/VersionCheckBinder.java

@@ -0,0 +1,16 @@
+package com.allenliu.versionchecklib.v2.callback
+
+import com.allenliu.versionchecklib.v2.builder.BuilderManager
+
+/**
+ *    @author : shengliu7
+ *    @e-mail : shengliu7@iflytek.com
+ *    @date   : 2020/12/19 2:18 PM
+ *    @desc   :
+ *
+ */
+interface LifecycleListener {
+    fun isDisposed() =
+            BuilderManager.getDownloadBuilder() == null
+
+}

library/src/main/java/com/allenliu/versionchecklib/v2/callback/DownloadListenerKt.kt

@@ -9,7 +9,7 @@
  * Created by allenliu on 2018/1/12.
  */
 
-public interface RequestVersionListener {
+public interface RequestVersionListener  {
     /**
      * @param result the result string of request
      * @return developer should return version bundle ,to use when showing UI page,could be null