创建Dialog接口参数里增加Postcard对象。

FengChenSunshine · Jun 25, 2019 · 1f74801 · 1f74801
1 parent 2f6ba8e
commit 1f74801
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/config.gradle b/config.gradle
@@ -10,8 +10,8 @@ ext {
             , versionName_dev    : "dev0.0.1"
             , versionCode_beta   : 1
             , versionName_beta   : "beta0.0.1"
-            , versionCode_release: 2
-            , versionName_release: "v1.0.1"
+            , versionCode_release: 3
+            , versionName_release: "v1.0.2"
     ]
     library = [
             junit              : "junit:junit:4.12",

diff --git a/version_update/src/main/AndroidManifest.xml b/version_update/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application>
+        <!--API24 Android7.0以上需要FileProvider-->
         <provider
             android:name="com.duanlu.upload.VersionUpdateFileProvider"
             android:authorities="${applicationId}.version_update"

diff --git a/version_update/src/main/java/com/duanlu/upload/DialogProvider.java b/version_update/src/main/java/com/duanlu/upload/DialogProvider.java
@@ -2,6 +2,7 @@
 
 import android.app.Dialog;
 import android.content.Context;
+import android.support.annotation.NonNull;
 
 /********************************
  * @name DialogProvider
@@ -16,10 +17,10 @@ public interface DialogProvider {
     /**
      * 新版本提醒Dialog，必须回调NewVersionActionCallback相关方法.
      */
-    Dialog createNewVersionDialog(Context context, NewVersionActionCallback callback);
+    Dialog createNewVersionDialog(@NonNull Context context, @NonNull Postcard postcard, @NonNull NewVersionActionCallback callback);
 
     /**
      * 下载进度Dialog,必须实现OnDownloadStatusListener方法.
      */
-    Dialog createDownloadDialog(Context context);
+    Dialog createDownloadDialog(@NonNull Context context, @NonNull Postcard postcard);
 }
diff --git a/version_update/src/main/java/com/duanlu/upload/VersionUpdate.java b/version_update/src/main/java/com/duanlu/upload/VersionUpdate.java
@@ -119,7 +119,7 @@ public void cancel() {
 
     private void ensureNewVersionDialog() {
         if (null == mNewVersionDialog && null != mDialogProvider) {
-            mNewVersionDialog = mDialogProvider.createNewVersionDialog(mContext, this);
+            mNewVersionDialog = mDialogProvider.createNewVersionDialog(mContext, mPostcard, this);
         }
         if (null == mNewVersionDialog) {
             throw new RuntimeException("NewVersionDialog is Null!");
@@ -128,7 +128,7 @@ private void ensureNewVersionDialog() {
 
     private void ensureDownloadDialog() {
         if (null == mDownloadDialog && null != mDialogProvider) {
-            mDownloadDialog = mDialogProvider.createDownloadDialog(mContext);
+            mDownloadDialog = mDialogProvider.createDownloadDialog(mContext, mPostcard);
         }
 
         if (!(mDownloadDialog instanceof OnDownloadStatusListener)) {