Merge pull request #67 from Jiiiiiin/feature/handler_download_service_isRunning_status_not_reset_on_def_dilaog_close_btn_tap

Feature/handler download service is running status not reset on def dilaog close btn tap

Author: WVector

sample/build.gradle

@@ -31,8 +31,8 @@ dependencies {
     })
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
-//    compile project(':update-app')
-    compile project(':update-app-kotlin')
+    compile project(':update-app')
+//    compile project(':update-app-kotlin')
 
     //compile 'com.qianwen:update-app-kotlin:1.1.0'
     //okgo

sample/src/main/AndroidManifest.xml

@@ -32,8 +32,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.KotlinActivity">
-        </activity>
+        <!--<activity android:name=".ui.KotlinActivity">-->
+        <!--</activity>-->
         <activity android:name=".ui.JavaActivity">
         </activity>
 

sample/src/main/java/com/vector/appupdatedemo/ui/JavaActivity.java

@@ -80,6 +80,7 @@ public void updateApp(View view) {
                 .setActivity(this)
                 //更新地址
                 .setUpdateUrl(mUpdateUrl)
+                .dismissNotificationProgress()
                 //实现httpManager接口的对象
                 .setHttpManager(new UpdateAppHttpUtil())
 //                // 监听更新提示框相关事件

sample/src/main/java/com/vector/appupdatedemo/ui/KotlinActivity.kt

@@ -55,7 +55,7 @@ public void updateJava(View view) {
         startActivity(new Intent(this, JavaActivity.class));
     }
 
-    public void updateKotlin(View view) {
-        startActivity(new Intent(this, KotlinActivity.class));
-    }
+//    public void updateKotlin(View view) {
+//        startActivity(new Intent(this, KotlinActivity.class));
+//    }
 }

sample/src/main/java/com/vector/appupdatedemo/ui/MainActivity.java

@@ -73,6 +73,7 @@ public void onServiceDisconnected(ComponentName name) {
     private ImageView mTopIv;
     private TextView mIgnore;
     private IUpdateDialogFragmentListener mUpdateDialogFragmentListener;
+    private DownloadService.DownloadBinder mDownloadBinder;
 
     public UpdateDialogFragment setUpdateDialogFragmentListener(IUpdateDialogFragmentListener updateDialogFragmentListener) {
         this.mUpdateDialogFragmentListener = updateDialogFragmentListener;
@@ -81,7 +82,7 @@ public UpdateDialogFragment setUpdateDialogFragmentListener(IUpdateDialogFragmen
 
     public static UpdateDialogFragment newInstance(Bundle args) {
         UpdateDialogFragment fragment = new UpdateDialogFragment();
-        if(args != null) {
+        if (args != null) {
             fragment.setArguments(args);
         }
         return fragment;
@@ -297,7 +298,8 @@ public void onClick(View view) {
 //            if (mNumberProgressBar.getVisibility() == View.VISIBLE) {
 //                Toast.makeText(getApplicationContext(), "后台更新app", Toast.LENGTH_LONG).show();
 //            }
-            if(mUpdateDialogFragmentListener != null){
+            cancelDownloadService();
+            if (mUpdateDialogFragmentListener != null) {
                 // 通知用户
                 mUpdateDialogFragmentListener.onUpdateNotifyDialogCancel(mUpdateApp);
             }
@@ -308,6 +310,10 @@ public void onClick(View view) {
         }
     }
 
+    public void cancelDownloadService() {
+        mDownloadBinder.stop("取消下载");
+    }
+
     private void installApp() {
         if (AppUpdateUtils.appIsDownloaded(mUpdateApp)) {
             AppUpdateUtils.installApp(UpdateDialogFragment.this, AppUpdateUtils.getAppFile(mUpdateApp));
@@ -355,6 +361,8 @@ private void startDownloadApp(DownloadService.DownloadBinder binder) {
         // 开始下载，监听下载进度，可以用对话框显示
         if (mUpdateApp != null) {
 
+            this.mDownloadBinder = binder;
+
             binder.start(mUpdateApp, new DownloadService.DownloadCallback() {
                 @Override
                 public void onStart() {
@@ -419,8 +427,9 @@ public boolean onInstallAppAndAppOnForeground(File file) {
     public void show(FragmentManager manager, String tag) {
 
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN) {
-            if (manager.isDestroyed())
+            if (manager.isDestroyed()) {
                 return;
+            }
         }
 
         try {
@@ -436,3 +445,4 @@ public void onDestroyView() {
         super.onDestroyView();
     }
 }
+