From 24ae05c3f56ae9d2cc6242a83b392aa43374a6f1 Mon Sep 17 00:00:00 2001
From: xiaomolong <Wxl,09131989>
Date: Thu, 13 Oct 2016 11:00:39 +0800
Subject: [PATCH] update

---
 .../com/wuxiaolong/androidmvpsample/ui/BaseActivity.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java
index 2378270..fd077e8 100644
--- a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java
+++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java
@@ -91,7 +91,8 @@ public class BaseActivity extends AppCompatActivity {
         LogUtil.d("callCancel");
         if (calls.size() > 0) {
             for (Call call : calls) {
-                call.cancel();
+                if (!call.isCanceled())
+                    call.cancel();
             }
             calls.clear();
         }
@@ -117,10 +118,9 @@ public class BaseActivity extends AppCompatActivity {
 
     public void onUnsubscribe() {
         LogUtil.d("onUnsubscribe");
-        if (mCompositeSubscription != null) {
-            //取消注册，以避免内存泄露
+        //取消注册，以避免内存泄露
+        if (mCompositeSubscription != null && mCompositeSubscription.hasSubscriptions())
             mCompositeSubscription.unsubscribe();
-        }
     }
 
     public Toolbar initToolBar(String title) {