将mvp替换成mvvm

app/src/main/java/com/dayu/bigfish/base/BaseActivity.java

 package com.dayu.bigfish.base;
 
+import android.content.Intent;
 import android.databinding.ViewDataBinding;
+import android.os.Bundle;
 
 import com.dayu.bigfish.BR;
+import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.utils.InstanceUtil;
 import com.dayu.bigfish.utils.ProgressUtil;
 import com.dayu.bigfish.utils.ToastUtils;
@@ -43,6 +46,7 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
         }
         mDisposable.dispose();
     }
+
     public void showToast(String msg) {
         ToastUtils.showShortToast(msg);
     }
@@ -66,4 +70,34 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
     public void dumbBack() {
         mActivity.finish();
     }
+
+    public void startActivity(Class cls) {
+        mActivity.startActivity(new Intent(mActivity, cls));
+    }
+
+    public void startActivity(Class<?> clz, Bundle bundle) {
+        Intent intent = new Intent(mActivity, clz);
+        if (bundle != null) {
+            intent.putExtra(Constants.BUNDLE, bundle);
+        }
+        mActivity.startActivity(intent);
+    }
+
+    public void startActivityForReult(Class<?> clz, int requestCode) {
+        mActivity.startActivityForResult(new Intent(mActivity, clz), requestCode);
+    }
+
+    public void startActvityAndFinish(Class<?> clz) {
+        mActivity.startActivity(new Intent(mActivity, clz));
+        mActivity.finish();
+    }
+
+    public void startActivityAndFinish(Class<?> clz, Bundle bundle) {
+        Intent intent = new Intent(mActivity, clz);
+        if (bundle != null) {
+            intent.putExtra(Constants.BUNDLE, bundle);
+        }
+        mActivity.startActivity(intent);
+        mActivity.finish();
+    }
 }

app/src/main/java/com/dayu/bigfish/base/BaseFragment.java

 package com.dayu.bigfish.base;
 
+import android.content.Intent;
 import android.databinding.ViewDataBinding;
+import android.os.Bundle;
 
 import com.dayu.bigfish.BR;
+import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.utils.InstanceUtil;
 import com.dayu.bigfish.utils.ProgressUtil;
 import com.dayu.bigfish.utils.ToastUtils;
@@ -48,12 +51,42 @@ public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBi
     public void showDialog() {
         ProgressUtil.startLoad(mActivity);
     }
+
     public void showDialog(String str) {
-        ProgressUtil.startLoad(mActivity,str);
+        ProgressUtil.startLoad(mActivity, str);
     }
 
     public void hideDialog() {
         ProgressUtil.stopLoad();
     }
 
+    public void startActivity(Class cls) {
+        mActivity.startActivity(new Intent(mActivity, cls));
+    }
+
+    public void startActivity(Class<?> clz, Bundle bundle) {
+        Intent intent = new Intent(mActivity, clz);
+        if (bundle != null) {
+            intent.putExtra(Constants.BUNDLE, bundle);
+        }
+        mActivity.startActivity(intent);
+    }
+
+    public void startActivityForReult(Class<?> clz, int requestCode) {
+        mActivity.startActivityForResult(new Intent(mActivity, clz), requestCode);
+    }
+
+    public void startActvityAndFinish(Class<?> clz) {
+        mActivity.startActivity(new Intent(mActivity, clz));
+        mActivity.finish();
+    }
+
+    public void startActivityAndFinish(Class<?> clz, Bundle bundle) {
+        Intent intent = new Intent(mActivity, clz);
+        if (bundle != null) {
+            intent.putExtra(Constants.BUNDLE, bundle);
+        }
+        mActivity.startActivity(intent);
+        mActivity.finish();
+    }
 }

app/src/main/java/com/dayu/bigfish/base/BasePresenter.java

@@ -2,7 +2,6 @@ package com.dayu.bigfish.base;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Bundle;
 import android.util.Log;
 
 import com.dayu.bigfish.Constants;
@@ -152,9 +151,6 @@ public abstract class BasePresenter<V> {
                 EMClient.getInstance().logout(true);
                 UserManager.getInstance().clearUserInfo();
                 Intent Intents = new Intent(mActivity, LoginActivity.class);
-                Intents.setFlags(
-                        Intent.FLAG_ACTIVITY_CLEAR_TASK |
-                                Intent.FLAG_ACTIVITY_NEW_TASK);
                 mActivity.startActivity(Intents);
             }
             dialog.dismiss();
@@ -170,62 +166,4 @@ public abstract class BasePresenter<V> {
             ((BaseActivity) mView).dumbBack();
         }
     }
-
-    /**
-     * 跳转页面
-     *
-     * @param clz 所跳转的目的Activity类
-     */
-    public void startActivity(Class<?> clz) {
-        mActivity.startActivity(new Intent(mActivity, clz));
-    }
-
-
-    /**
-     * 跳转页面
-     *
-     * @param clz    所跳转的目的Activity类
-     * @param bundle 跳转所携带的信息
-     */
-    public void startActivity(Class<?> clz, Bundle bundle) {
-        Intent intent = new Intent(mActivity, clz);
-        if (bundle != null) {
-            intent.putExtra(Constants.BUNDLE, bundle);
-        }
-        mActivity.startActivity(intent);
-    }
-
-    /**
-     * 跳转页面
-     *
-     * @param clz 所跳转的目的Activity类
-     */
-    public void startActivityForReult(Class<?> clz, int requestCode) {
-        mActivity.startActivityForResult(new Intent(mActivity, clz), requestCode);
-    }
-
-    /**
-     * 跳转页面
-     *
-     * @param clz 所跳转的目的Activity类
-     */
-    public void startActvityAndFinish(Class<?> clz) {
-        mActivity.startActivity(new Intent(mActivity, clz));
-        mActivity.finish();
-    }
-
-    /**
-     * 跳转页面
-     *
-     * @param clz    所跳转的目的Activity类
-     * @param bundle 跳转所携带的信息
-     */
-    public void startActivityAndFinish(Class<?> clz, Bundle bundle) {
-        Intent intent = new Intent(mActivity, clz);
-        if (bundle != null) {
-            intent.putExtra(Constants.BUNDLE, bundle);
-        }
-        mActivity.startActivity(intent);
-        mActivity.finish();
-    }
 }

app/src/main/java/com/dayu/bigfish/base/BaseView.java

 package com.dayu.bigfish.base;
 
+import android.os.Bundle;
 import android.support.annotation.StringRes;
 
 /**
@@ -16,4 +17,13 @@ public interface BaseView {
 
     void hideDialog();
 
+    void startActivity(Class cls);
+
+    void startActivity(Class<?> clz, Bundle bundle);
+
+    void startActvityAndFinish(Class<?> clz);
+
+    void startActivityForReult(Class<?> clz, int requestCode);
+
+    void startActivityAndFinish(Class<?> clz, Bundle bundle);
 }

app/src/main/java/com/dayu/bigfish/presenter/feedback/FeedBackPresenter.java

@@ -37,11 +37,11 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
     @Override
     public void comFirmSuggist() {
         if (TextUtils.isEmpty(mComment.get())) {
-            mView.showToast(mActivity.getString(R.string.input_feedback));
+            mView.showToast(R.string.input_feedback);
             return;
         }
         if (UtilsUserAccountMatcher.containsEmoji(mComment.get())) {
-            ToastUtils.showShortToast(mActivity.getString(R.string.no_emoij));
+            ToastUtils.showShortToast(R.string.no_emoij);
             return;
         }
         HashMap<String, Object> params = new HashMap<>();
@@ -57,7 +57,7 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
         ApiFactory.postFeedBack(body).subscribe(baseObserver(new Consumer<Boolean>() {
             @Override
             public void accept(Boolean aBoolean) throws Exception {
-                mView.showToast(mActivity.getString(R.string.commite_success));
+                mView.showToast(R.string.commite_success);
                 mActivity.finish();
             }
         }));

app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomePersonPresenter.java

@@ -72,7 +72,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
 
     @Override
     public void dumpToPersonalInfo() {
-        startActivity(PersonInfoActivity.class);
+        mView.startActivity(PersonInfoActivity.class);
     }
 
 }

app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java

@@ -52,7 +52,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
 
     @Override
     public void dumpToOrderRecordActivity() {
-        startActivity(OrderRecordActivity.class);
+        mView.startActivity(OrderRecordActivity.class);
     }
 
 

app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java

@@ -112,7 +112,7 @@ public class LoginPresenter extends LoginContract.Presenter {
     private void showLoginDialog() {
         mView.showLoginDialog((dialog, confirm) -> {
             if (confirm) {
-                startActivity(PersonInfoActivity.class);
+                mView.startActivity(PersonInfoActivity.class);
             }
         });
     }
@@ -120,11 +120,11 @@ public class LoginPresenter extends LoginContract.Presenter {
     @Override
     public void dumpAndSave(UserInfo info) {
         UserManager.getInstance().saveUser(info);
-        startActvityAndFinish(MainActivity.class);
+        mView.startActvityAndFinish(MainActivity.class);
     }
 
     @Override
     public void dumpAgreement() {
-        startActivity(AgreementActivity.class);
+        mView.startActivity(AgreementActivity.class);
     }
 }

app/src/main/java/com/dayu/bigfish/presenter/myhead/MyHeadContract.java

@@ -12,6 +12,11 @@ public interface MyHeadContract {
     interface View extends BaseView {
         void showPicDialog();
 
+        /**
+         * 清除图片缓存.
+         */
+        void deleteCacheDirFile();
+
     }
 
     abstract class Presenter extends BasePresenter<View> {

app/src/main/java/com/dayu/bigfish/presenter/myhead/MyHeadPresenter.java

@@ -6,7 +6,6 @@ import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.utils.managers.UserManager;
-import com.luck.picture.lib.tools.PictureFileUtils;
 
 import java.io.File;
 import java.util.List;
@@ -58,7 +57,7 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
                 headUrl.set(path);
                 mUserInfo.setHeaderImg(path);
                 UserManager.getInstance().saveUser(mUserInfo);
-                PictureFileUtils.deleteCacheDirFile(mActivity);
+                mView.deleteCacheDirFile();
             }
         }));
     }

app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java

@@ -32,7 +32,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
 
     @Override
     public void dumpToHeader() {
-        startActivityForReult(MyHeaderIvActivity.class, 1);
+        mView.startActivityForReult(MyHeaderIvActivity.class, 1);
     }
 
     @Override
@@ -40,7 +40,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
         if (info.get().getAduitStatus() == 3) {
             Bundle bundle = new Bundle();
             bundle.putSerializable(Constants.ENGINEERINFO, info.get());
-            startActivity(ModifyPersonInfoActivity.class, bundle);
+            mView.startActivity(ModifyPersonInfoActivity.class, bundle);
         }
     }
 

app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java

@@ -130,12 +130,12 @@ public class SettingPresenter extends SettingContract.Presenter {
 
     @Override
     public void dumpToAboutus() {
-        startActivity(AboutUsActivity.class);
+        mView.startActivity(AboutUsActivity.class);
     }
 
     @Override
     public void dumpToFeed() {
-        startActivity(FeedBackActivity.class);
+        mView.startActivity(FeedBackActivity.class);
     }
 
 }

app/src/main/java/com/dayu/bigfish/ui/MyHeaderIvActivity.java

@@ -14,6 +14,7 @@ import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.config.PictureMimeType;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.luck.picture.lib.tools.PictureFileUtils;
 
 import java.io.File;
 import java.util.List;
@@ -60,6 +61,11 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
         selector.forResult(PictureConfig.CHOOSE_REQUEST);
     }
 
+    @Override
+    public void deleteCacheDirFile() {
+        PictureFileUtils.deleteCacheDirFile(mActivity);
+    }
+
     private String getPath() {
         String path = Environment.getExternalStorageDirectory() + "/dayu/image/";
         File file = new File(path);