From 32d68b8a9f4f459ceaba3921bbc885b60eaec906 Mon Sep 17 00:00:00 2001
From: xiaomolong <Wxl,09131989>
Date: Wed, 19 Oct 2016 14:42:42 +0800
Subject: [PATCH] update

---
 .../androidmvpsample/mvp/main/BaseView.java          | 12 ++++++++++++
 .../androidmvpsample/mvp/main/MainView.java          |  6 +-----
 .../androidmvpsample/mvp/other/MvpActivity.java      |  8 ++++++++
 .../wuxiaolong/androidmvpsample/ui/BaseActivity.java |  9 +--------
 .../wuxiaolong/androidmvpsample/ui/MainActivity.java | 11 -----------
 5 files changed, 22 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/BaseView.java

diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/BaseView.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/BaseView.java
new file mode 100644
index 0000000..abf8699
--- /dev/null
+++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/BaseView.java
@@ -0,0 +1,12 @@
+package com.wuxiaolong.androidmvpsample.mvp.main;
+
+/**
+ * Created by Administrator
+ * on 2016/10/19.
+ */
+
+public interface BaseView {
+    void showLoading();
+
+    void hideLoading();
+}
diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/MainView.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/MainView.java
index 4977aff..ac40185 100644
--- a/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/MainView.java
+++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/main/MainView.java
@@ -8,14 +8,10 @@ package com.wuxiaolong.androidmvpsample.mvp.main;
  * 微信公众号：吴小龙同学
  * 个人博客：http://wuxiaolong.me/
  */
-public interface MainView {
+public interface MainView extends BaseView{
 
     void getDataSuccess(MainModel model);
 
     void getDataFail(String msg);
 
-
-    void showLoading();
-
-    void hideLoading();
 }
diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/other/MvpActivity.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/other/MvpActivity.java
index 8fa320c..fe3c6da 100644
--- a/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/other/MvpActivity.java
+++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/other/MvpActivity.java
@@ -30,4 +30,12 @@ public abstract class MvpActivity<P extends BasePresenter> extends BaseActivity
             mvpPresenter.detachView();
         }
     }
+
+    public void showLoading() {
+        showProgressDialog();
+    }
+
+    public void hideLoading() {
+        dismissProgressDialog();
+    }
 }
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 fd077e8..ddeb22d 100644
--- a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java
+++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java
@@ -2,7 +2,6 @@ package com.wuxiaolong.androidmvpsample.ui;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
-import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -67,11 +66,6 @@ public class BaseActivity extends AppCompatActivity {
 
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
 
     @Override
     protected void onDestroy() {
@@ -88,8 +82,7 @@ public class BaseActivity extends AppCompatActivity {
     }
 
     private void callCancel() {
-        LogUtil.d("callCancel");
-        if (calls.size() > 0) {
+        if (calls != null && calls.size() > 0) {
             for (Call call : calls) {
                 if (!call.isCanceled())
                     call.cancel();
diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java
index 1d81d81..8fc7474 100644
--- a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java
+++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java
@@ -59,17 +59,6 @@ public class MainActivity extends MvpActivity<MainPresenter> implements MainView
     }
 
 
-    @Override
-    public void showLoading() {
-        showProgressDialog();
-    }
-
-    @Override
-    public void hideLoading() {
-        dismissProgressDialog();
-    }
-
-
     @OnClick({R.id.button0, R.id.button1, R.id.button2})
     public void onClick(View view) {
         switch (view.getId()) {