詹子聪 hace 5 años
padre
commit
c72840af4c

+ 3 - 3
app/src/main/java/com/miekir/newmvp/TestPresenter.java

@@ -23,7 +23,7 @@ public class TestPresenter extends BasePresenter {
     }
 
     public BeanLiveData<List<TestBean1>> go() {
-        final BeanLiveData<List<TestBean1>> specificLiveData = getLiveData(true);
+        final BeanLiveData<List<TestBean1>> liveData = getLiveData(true);
 
         new Thread(new Runnable() {
             @Override
@@ -38,14 +38,14 @@ public class TestPresenter extends BasePresenter {
                     TestBean1 bean = new TestBean1(3, "ViewModel Jason");
                     List<TestBean1> list = new ArrayList<>();
                     list.add(bean);
-                    specificLiveData.postSuccess(list);
+                    liveData.postSuccess(list);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
         }).start();
 
-        return specificLiveData;
+        return liveData;
     }
 
     @Override

+ 2 - 2
mvp/src/main/java/com/miekir/mvp/bean/DataResult.java

@@ -1,6 +1,6 @@
 package com.miekir.mvp.bean;
 
-import com.miekir.mvp.constant.BaseMvpResponse;
+import com.miekir.mvp.constant.MvpResponse;
 import com.miekir.mvp.model.DataSource;
 
 /**
@@ -54,7 +54,7 @@ public class DataResult<D> {
     }
 
     public boolean isSuccess() {
-        return responseCode == BaseMvpResponse.SUCCESS;
+        return responseCode == MvpResponse.SUCCESS;
     }
 
     public int getDataSource() {

+ 1 - 1
mvp/src/main/java/com/miekir/mvp/constant/BaseMvpResponse.java

@@ -7,7 +7,7 @@ package com.miekir.mvp.constant;
  * @date 2020/10/30 9:10
  * Description:
  */
-public interface BaseMvpResponse {
+public interface MvpResponse {
     int SUCCESS = 0;
     int FAIL = -1;
 }

+ 3 - 3
mvp/src/main/java/com/miekir/mvp/jetpack/BeanLiveData.java

@@ -1,7 +1,7 @@
 package com.miekir.mvp.jetpack;
 
 import com.miekir.mvp.bean.DataResult;
-import com.miekir.mvp.constant.BaseMvpResponse;
+import com.miekir.mvp.constant.MvpResponse;
 import com.miekir.mvp.presenter.BasePresenter;
 
 /**
@@ -31,11 +31,11 @@ public class BeanLiveData<D> extends MvpLiveData<DataResult<D>> {
     }
 
     public void postSuccess(D dataBean) {
-        post(BaseMvpResponse.SUCCESS, "", dataBean);
+        post(MvpResponse.SUCCESS, "", dataBean);
     }
 
     public void postFail(String message) {
-        post(BaseMvpResponse.FAIL, message, null);
+        post(MvpResponse.FAIL, message, null);
     }
 
 }

+ 1 - 2
mvp/src/main/java/com/miekir/mvp/jetpack/MvpLiveData.java

@@ -1,8 +1,7 @@
 package com.miekir.mvp.jetpack;
 
 import androidx.lifecycle.MutableLiveData;
-import com.miekir.mvp.bean.DataResult;
-import com.miekir.mvp.constant.BaseMvpResponse;
+
 import com.miekir.mvp.presenter.BasePresenter;
 
 //得到一个LiveData,用于传递Observer参数的形式,这里暂时用不到

+ 0 - 1
mvp/src/main/java/com/miekir/mvp/view/BaseMvpActivity.java

@@ -60,7 +60,6 @@ public abstract class BaseMvpActivity extends BaseActivity implements IView {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-
         ViewHelper.clearPresenters(mInjectPresenters, this);
         mDataMethodList.clear();
     }

+ 4 - 4
mvp/src/main/java/com/miekir/mvp/view/ViewHelper.java

@@ -7,11 +7,11 @@ import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 
 import com.miekir.mvp.bean.DataResult;
-import com.miekir.mvp.constant.BaseMvpResponse;
-import com.miekir.mvp.model.DataSource;
 import com.miekir.mvp.constant.DialogAction;
-import com.miekir.mvp.presenter.BasePresenter;
+import com.miekir.mvp.constant.MvpResponse;
 import com.miekir.mvp.model.DataMethod;
+import com.miekir.mvp.model.DataSource;
+import com.miekir.mvp.presenter.BasePresenter;
 import com.miekir.mvp.presenter.InjectPresenter;
 
 import java.lang.reflect.Field;
@@ -213,7 +213,7 @@ public class ViewHelper {
             }
 
             try {
-                method.invoke(object, result.getResponseCode() == BaseMvpResponse.SUCCESS, result.getMessage(), result.getBean());
+                method.invoke(object, result.getResponseCode() == MvpResponse.SUCCESS, result.getMessage(), result.getBean());
             } catch (Exception e) {
                 e.printStackTrace();
             }