增加下载兼容，可以通过跳转静态网页的方式进行更新

Author: xuexiangjys

xupdate-lib/src/main/java/com/xuexiang/xupdate/proxy/impl/DefaultUpdateDownloader.java

@@ -17,8 +17,12 @@
 package com.xuexiang.xupdate.proxy.impl;
 
 import android.content.ComponentName;
+import android.content.Intent;
 import android.content.ServiceConnection;
+import android.net.Uri;
 import android.os.IBinder;
+import android.text.TextUtils;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -27,6 +31,7 @@
 import com.xuexiang.xupdate.proxy.IUpdateDownloader;
 import com.xuexiang.xupdate.service.DownloadService;
 import com.xuexiang.xupdate.service.OnFileDownloadListener;
+import com.xuexiang.xupdate.utils.UpdateUtils;
 
 /**
  * 默认版本更新下载器
@@ -50,6 +55,57 @@ public class DefaultUpdateDownloader implements IUpdateDownloader {
 
     @Override
     public void startDownload(final @NonNull UpdateEntity updateEntity, final @Nullable OnFileDownloadListener downloadListener) {
+        if (isDownloadUrl(updateEntity)) {
+            startDownloadService(updateEntity, downloadListener);
+        } else {
+            startOpenHtml(updateEntity, downloadListener);
+        }
+    }
+
+    /**
+     * 地址是否是下载地址，需要开启下载服务进行下载【可以根据自己的逻辑进行重写】
+     *
+     * @param updateEntity 版本更新信息
+     * @return 地址是否是下载地址
+     */
+    protected boolean isDownloadUrl(@NonNull UpdateEntity updateEntity) {
+        return isApkDownloadUrl(updateEntity) || !isStaticHtmlUrl(updateEntity);
+    }
+
+    /**
+     * 地址是否是apk的下载地址
+     *
+     * @param updateEntity 版本更新信息
+     * @return 地址是否是apk的下载地址
+     */
+    protected boolean isApkDownloadUrl(@NonNull UpdateEntity updateEntity) {
+        String downloadUrl = updateEntity.getDownloadUrl();
+        return !TextUtils.isEmpty(downloadUrl) && downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1).endsWith(".apk");
+    }
+
+    /**
+     * 地址是否是静态网页
+     *
+     * @param updateEntity 版本更新信息
+     * @return 地址是否是静态网页
+     */
+    protected boolean isStaticHtmlUrl(@NonNull UpdateEntity updateEntity) {
+        String downloadUrl = updateEntity.getDownloadUrl();
+        if (TextUtils.isEmpty(downloadUrl)) {
+            return false;
+        }
+        String urlContent = downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1);
+        return urlContent.contains(".htm") || urlContent.contains(".shtm");
+    }
+
+
+    /**
+     * 开启下载服务
+     *
+     * @param updateEntity     版本更新信息
+     * @param downloadListener 下载监听
+     */
+    protected void startDownloadService(@NonNull final UpdateEntity updateEntity, @Nullable final OnFileDownloadListener downloadListener) {
         DownloadService.bindService(mServiceConnection = new ServiceConnection() {
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
@@ -64,11 +120,33 @@ public void onServiceDisconnected(ComponentName name) {
         });
     }
 
+    /**
+     * 使用系统的api打开网页
+     *
+     * @param updateEntity     版本更新信息
+     * @param downloadListener 监听回调
+     */
+    protected void startOpenHtml(@NonNull UpdateEntity updateEntity, @Nullable OnFileDownloadListener downloadListener) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(updateEntity.getDownloadUrl()));
+        boolean result = UpdateUtils.startActivity(intent);
+        if (downloadListener != null) {
+            if (result) {
+                // 强制更新的话，不能关闭更新弹窗
+                if (!updateEntity.isForce()) {
+                    downloadListener.onCompleted(null);
+                }
+            } else {
+                downloadListener.onError(null);
+            }
+        }
+    }
+
     /**
      * 开始下载
-     * @param binder
-     * @param updateEntity
-     * @param downloadListener
+     *
+     * @param binder           下载服务绑定
+     * @param updateEntity     版本更新信息
+     * @param downloadListener 下载监听
      */
     private void startDownload(DownloadService.DownloadBinder binder, @NonNull UpdateEntity updateEntity, @Nullable OnFileDownloadListener downloadListener) {
         mDownloadBinder = binder;

xupdate-lib/src/main/java/com/xuexiang/xupdate/utils/UpdateUtils.java

@@ -18,7 +18,9 @@
 
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -40,6 +42,7 @@
 import com.xuexiang.xupdate.XUpdate;
 import com.xuexiang.xupdate._XUpdate;
 import com.xuexiang.xupdate.entity.UpdateEntity;
+import com.xuexiang.xupdate.logs.UpdateLog;
 import com.xuexiang.xupdate.proxy.IUpdateProxy;
 
 import java.io.File;
@@ -440,4 +443,28 @@ public static boolean isMainThread() {
         return Looper.getMainLooper() == Looper.myLooper();
     }
 
+    /**
+     * 页面跳转
+     *
+     * @param intent 跳转意图
+     */
+    public static boolean startActivity(final Intent intent) {
+        if (intent == null) {
+            UpdateLog.e("[startActivity failed]: intent == null");
+            return false;
+        }
+        if (XUpdate.getContext().getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null) {
+            try {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                XUpdate.getContext().startActivity(intent);
+                return true;
+            } catch (ActivityNotFoundException e) {
+                e.printStackTrace();
+                UpdateLog.e(e);
+            }
+        } else {
+            UpdateLog.e("[resolveActivity failed]: " + (intent.getComponent() != null ? intent.getComponent().getClassName() : intent.getAction()) + " do not register in manifest");
+        }
+        return false;
+    }
 }