增加apifactory

app/src/main/java/com/dayu/bigfish/Constants.java

@@ -107,7 +107,7 @@ public class Constants {
     /**
      * 单表查询工单记录.
      */
-    public final static String SELECT_ORDER_LITTLE = "/api-order/" + "orders/{accountId}";
+    public final static String SELECT_ORDER_LITTLE = "/api-order/" + "orders/{id}";
     /**
      * 根据工程师id和工程师id获取今日业绩(今日收益).
      */

app/src/main/java/com/dayu/bigfish/api/APIService.java

 package com.dayu.bigfish.api;
 
 
-import com.app.annotation.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.base.BasePageBean;
 import com.dayu.bigfish.base.BaseResponse;
@@ -44,7 +43,6 @@ import retrofit2.http.Url;
 /**
  * Created by luofan on 2017/11/09.
  */
-@ApiFactory
 public interface APIService {
     /**
      * 登录
@@ -230,12 +228,11 @@ public interface APIService {
 
     /**
      * 单表查询工单记录.
-     *
-     * @param accountId
+     *处理工单时获取详情使用.
      * @return
      */
     @GET(Constants.SELECT_ORDER_LITTLE)
-    Observable<BaseResponse<OrderDetail>> queryOrderInfo(@Path("accountId") int accountId);
+    Observable<BaseResponse<OrderDetail>> queryOrderInfo(@Path("id") int id);
 
     /**
      * 获取今日业绩.

app/src/main/java/com/dayu/bigfish/api/ApiFactory.java

+package com.dayu.bigfish.api;
+
+import com.dayu.bigfish.base.BasePageBean;
+import com.dayu.bigfish.bean.AccountBalance;
+import com.dayu.bigfish.bean.AlipayInfo;
+import com.dayu.bigfish.bean.EngineerInfo;
+import com.dayu.bigfish.bean.ErrorOrder;
+import com.dayu.bigfish.bean.KaAddress;
+import com.dayu.bigfish.bean.LogsticsInfo;
+import com.dayu.bigfish.bean.NewMessage;
+import com.dayu.bigfish.bean.Order;
+import com.dayu.bigfish.bean.OrderDetail;
+import com.dayu.bigfish.bean.OrderPart;
+import com.dayu.bigfish.bean.OrderRecord;
+import com.dayu.bigfish.bean.ServerInstruction;
+import com.dayu.bigfish.bean.ShipperCompany;
+import com.dayu.bigfish.bean.Tab;
+import com.dayu.bigfish.bean.TodayAchievement;
+import com.dayu.bigfish.bean.TodayBalance;
+import com.dayu.bigfish.bean.UserInfo;
+import com.dayu.bigfish.bean.VersionInfo;
+
+import java.util.List;
+
+import io.reactivex.Observable;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+
+/**
+ * 全局model类.
+ */
+public  class ApiFactory {
+
+    public static Observable<UserInfo> login(String phone, String smsCode) {
+        return Api.getService().login(phone, smsCode).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Boolean> sendCode(String telephone, int type) {
+        return Api.getService().sendCode(telephone, type).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Boolean> modifyHead(int accoutId, String headURL) {
+        return Api.getService().modifyHead(accoutId, headURL).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Boolean> commitVersionInfo(RequestBody requestBody) {
+        return Api.getService().commitVersionInfo(requestBody).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<String> checkVersion(String packageName) {
+        return Api.getService().checkVersion(packageName).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<VersionInfo> getVersionInfo(String appId, String versionCode) {
+        return Api.getService().getVersionInfo(appId, versionCode).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<List<ErrorOrder>> getErrorOrders(int userId, int siteId) {
+        return Api.getService().getErrorOrders(userId, siteId).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Boolean> receiveOrder(int orderId, int engineerId) {
+        return Api.getService().receiveOrder(orderId, engineerId).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Boolean> subcriceTime(int orderId, String doorTime, String doorComment) {
+        return Api.getService().subcriceTime(orderId, doorTime, doorComment).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Integer> startOrder(RequestBody body) {
+        return Api.getService().startOrder(body).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Integer> startServer(RequestBody body) {
+        return Api.getService().startServer(body).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<OrderDetail> getOrderInfo(int orderId) {
+        return Api.getService().getOrderInfo(orderId).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Integer> commitOrder(RequestBody orderInfo) {
+        return Api.getService().commitOrder(orderInfo).compose(Api.applySchedulers());
+    }
+
+    public static Observable<EngineerInfo> getEngineerInfo(int accountId) {
+        return Api.getService().getEngineerInfo(accountId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<TodayBalance> getTodayBalance(int accountId) {
+        return Api.getService().getTodayBalance(accountId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<BasePageBean<AccountBalance>> getAccountBalanceList(int page, int pageSize, int accountId) {
+        return Api.getService().getAccountBalanceList(page, pageSize, accountId).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<Boolean> boundAlipay(RequestBody body) {
+        return Api.getService().boundAlipay(body).compose(Api.applySchedulers());
+    }
+
+
+    public static Observable<AlipayInfo> queryAlipay(int accountId) {
+        return Api.getService().queryAlipay(accountId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> modifyAlipay(RequestBody body) {
+        return Api.getService().modifyAlipay(body).compose(Api.applySchedulers());
+    }
+
+    public static Observable<OrderDetail> queryOrderInfo(int orderId) {
+        return Api.getService().queryOrderInfo(orderId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<TodayAchievement> getAchievement(int siteId, int engineerId) {
+        return Api.getService().getAchievement(siteId, engineerId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<OrderRecord> getOrderScore(int siteId, int engineerId) {
+        return Api.getService().getOrderScore(siteId, engineerId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> postFeedBack(RequestBody body) {
+        return Api.getService().postFeedBack(body).compose(Api.applySchedulers());
+    }
+
+    public static Observable<BasePageBean<Order>> getOrders(int state, int engineerId, int siteId, int page, int pageSize) {
+        return Api.getService().getOrders(state, engineerId, siteId, page, pageSize).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Tab> getTabNum(int userId, int siteId) {
+        return Api.getService().getTabNum(userId, siteId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<BasePageBean<NewMessage>> getHxMessage(String hxAccount, int category, int page, int pageSize) {
+        return Api.getService().getHxMessage(hxAccount, category, page, pageSize).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Integer> getHxNum(String hxAccount) {
+        return Api.getService().getHxNum(hxAccount).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> readMessage(RequestBody body) {
+        return Api.getService().readMessage(body).compose(Api.applySchedulers());
+    }
+
+    public static Observable<EngineerInfo> modifyUserInfo(RequestBody body) {
+        return Api.getService().modifyUserInfo(body).compose(Api.applySchedulers());
+    }
+
+    public static Observable<List<String>> uploadPhoto(MultipartBody.Part[] partMap) {
+        return Api.getService().uploadPhoto(partMap).compose(Api.applySchedulers());
+    }
+
+    public static Observable<List<String>> uploadPhoto(MultipartBody.Part part) {
+        return Api.getService().uploadPhoto(part).compose(Api.applySchedulers());
+    }
+
+    public static Observable<BasePageBean<ServerInstruction>> getInstruction(long id, int page, int pageSize) {
+        return Api.getService().getInstruction(id, page, pageSize).compose(Api.applySchedulers());
+    }
+
+    public static Observable<KaAddress> getKaAddress(int companyId) {
+        return Api.getService().getKaAddress(companyId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> applyPart(long spOrderId, String spComment, String createBy, long accountId) {
+        return Api.getService().applyPart(spOrderId, spComment, createBy, accountId).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> cancleApply(int partsId, String modifyBy) {
+        return Api.getService().cancleApply(partsId, modifyBy).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> returnPartSelf(RequestBody body) {
+        return Api.getService().returnPartSelf(body).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> returnPartByKA(RequestBody body) {
+        return Api.getService().returnPartByKA(body).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> receivePart(int partsId, String modifyBy) {
+        return Api.getService().receivePart(partsId, modifyBy).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> refusePart(long kaOrderSparePartsId, String reason) {
+        return Api.getService().refusePart(kaOrderSparePartsId, reason).compose(Api.applySchedulers());
+    }
+
+    public static Observable<List<OrderPart>> queryPart(long spOrderId, int sources) {
+        return Api.getService().queryPart(spOrderId, sources).compose(Api.applySchedulers());
+    }
+
+    public static Observable<Boolean> modifyPart(RequestBody body) {
+        return Api.getService().modifyPart(body).compose(Api.applySchedulers());
+    }
+
+    public static Observable<LogsticsInfo> queryLogistics(String com, String num) {
+        return Api.getService().queryLogistics(com, num).compose(Api.applySchedulers());
+    }
+
+    public static Observable<List<ShipperCompany>> queryShipperCompany() {
+        return Api.getService().queryShipperCompany().compose(Api.applySchedulers());
+    }
+}

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

@@ -37,7 +37,7 @@ public abstract class BasePresenter<V> {
      * @return
      */
 
-    public <M> Observer baseObserver(final Consumer<? super M> consumer) {
+    public <M> Observer<M> baseObserver(final Consumer<? super M> consumer) {
         return new Observer<M>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -74,7 +74,7 @@ public abstract class BasePresenter<V> {
      * @return
      */
 
-    public <M> Observer baseObserver(final Consumer<? super M> consumer, final Consumer<APIException.ResponeThrowable> tconsumer) {
+    public <M> Observer<M> baseObserver(final Consumer<? super M> consumer, final Consumer<APIException.ResponeThrowable> tconsumer) {
         return new Observer<M>() {
             @Override
             public void onSubscribe(Disposable d) {

app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsPresenter.java

@@ -4,10 +4,9 @@ import android.databinding.ObservableField;
 import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.R;
-import com.dayu.bigfish.bean.AlipayInfo;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
 import com.dayu.bigfish.utils.managers.UserManager;
@@ -43,25 +42,19 @@ public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
 
     @Override
     public void querAlipay() {
-        ApiFactory.queryAlipay(mUserId).subscribe(baseObserver(new Consumer<AlipayInfo>() {
-            @Override
-            public void accept(AlipayInfo info) throws Exception {
-                mAccount.set(info.getAlipayAccount());
-                mName.set(info.getAlipayName());
-                mPhone.set(info.getAlipayMobile());
-                mState.set(1);
-            }
+        ApiFactory.queryAlipay(mUserId).subscribe(baseObserver(info -> {
+            mAccount.set(info.getAlipayAccount());
+            mName.set(info.getAlipayName());
+            mPhone.set(info.getAlipayMobile());
+            mState.set(1);
         }));
     }
 
     @Override
     public void boundAlipay() {
-        ApiFactory.boundAlipay(mBody).subscribe(baseObserver(new Consumer<Boolean>() {
-            @Override
-            public void accept(Boolean aBoolean) throws Exception {
-                mView.showToast(R.string.comfirm_alipay_account_success);
-                mView.dumpBack();
-            }
+        ApiFactory.boundAlipay(mBody).subscribe(baseObserver(aBoolean -> {
+            mView.showToast(R.string.comfirm_alipay_account_success);
+            mView.dumpBack();
         }));
     }
 

app/src/main/java/com/dayu/bigfish/presenter/accountbalance/AccountBalancePresenter.java

@@ -4,16 +4,12 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
-import com.dayu.bigfish.base.BasePageBean;
-import com.dayu.bigfish.bean.AccountBalance;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.WithdrawalsActivity;
 import com.dayu.bigfish.utils.managers.UserManager;
 
-import io.reactivex.functions.Consumer;
-
 /**
  * Created by luofan on 2017/11/14.
  */
@@ -52,12 +48,9 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
 
     @Override
     public void getAccountBalanceList(int page, int pageSize, int accountId) {
-        ApiFactory.getAccountBalanceList(page, pageSize, accountId).subscribe(baseObserver(new Consumer<BasePageBean<AccountBalance>>() {
-            @Override
-            public void accept(BasePageBean<AccountBalance> accountBalanceBasePageBean) throws Exception {
-                datas.set(accountBalanceBasePageBean);
-                mPage++;
-            }
+        ApiFactory.getAccountBalanceList(page, pageSize, accountId).subscribe(baseObserver(accountBalances -> {
+            datas.set(accountBalances);
+            mPage++;
         }, throwable -> datas.set(Constants.FAILED)));
     }
 

app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.bean.event.RefreshApplyPart;

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

@@ -3,9 +3,8 @@ package com.dayu.bigfish.presenter.homefourtab;
 import android.databinding.ObservableField;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.MyApplication;
-import com.dayu.bigfish.bean.AlipayInfo;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.EngineerInfo;
 import com.dayu.bigfish.bean.OrderRecord;
 import com.dayu.bigfish.bean.TodayAchievement;
@@ -14,7 +13,6 @@ import com.dayu.bigfish.ui.PersonInfoActivity;
 import com.umeng.analytics.MobclickAgent;
 
 import io.reactivex.Observable;
-import io.reactivex.functions.Consumer;
 
 /**
  * Created by luofan on 2017/11/8.
@@ -29,10 +27,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
 
     @Override
     public void getAlipayAccount(int accountId) {
-        ApiFactory.queryAlipay(accountId).subscribe(baseObserver(new Consumer<AlipayInfo>() {
-            @Override
-            public void accept(AlipayInfo info) throws Exception {
-            }
+        ApiFactory.queryAlipay(accountId).subscribe(baseObserver(info -> {
         }, responeThrowable -> {
             if ("SETTLEMENT0015".equals(responeThrowable.subCode)) {
                 mView.showAlipayDialog();

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

 package com.dayu.bigfish.presenter.homeorder;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.bean.Tab;
 import com.dayu.bigfish.bean.UserInfo;

app/src/main/java/com/dayu/bigfish/presenter/kaaddress/KaAddressPresenter.java

@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.bean.KaAddress;
 

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

@@ -4,9 +4,9 @@ import android.databinding.ObservableField;
 import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.AgreementActivity;
 import com.dayu.bigfish.ui.MainActivity;
@@ -18,8 +18,6 @@ import com.hyphenate.EMCallBack;
 import com.hyphenate.chat.EMClient;
 import com.umeng.analytics.MobclickAgent;
 
-import io.reactivex.functions.Consumer;
-
 /**
  * Created by luofan on 2017/11/8.
  */
@@ -50,7 +48,7 @@ public class LoginPresenter extends LoginContract.Presenter {
         } else {
             mView.changeVoiceCodeBtn();
         }
-        ApiFactory.sendCode(userName.get(), type).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
+        ApiFactory.sendCode(userName.get(), type).subscribe(baseObserver(aBoolean -> {
             if (type == 1) {
                 mView.showToast(R.string.login_sms_success);
             } else if (type == 2) {
@@ -70,19 +68,16 @@ public class LoginPresenter extends LoginContract.Presenter {
             return;
         }
         mView.showDialog();
-        ApiFactory.login(userName.get(), password.get()).subscribe(baseObserver(new Consumer<UserInfo>() {
-            @Override
-            public void accept(UserInfo userInfo) throws Exception {
-                if (userInfo.getStatus() == 1) {
-                    loginHx(userInfo.getHxAccount(), userInfo.getHxPwd());
-                    dumpAndSave(userInfo);
-                } else if (userInfo.getStatus() == 2) {
-                    ToastUtils.showShortToast(R.string.engineer_identity_auditing);
-                    UserManager.getInstance().saveUser(userInfo);
-                } else if (userInfo.getStatus() == 3) {
-                    showLoginDialog();
-                    UserManager.getInstance().saveUser(userInfo);
-                }
+        ApiFactory.login(userName.get(), password.get()).subscribe(baseObserver(userInfo -> {
+            if (userInfo.getStatus() == 1) {
+                loginHx(userInfo.getHxAccount(), userInfo.getHxPwd());
+                dumpAndSave(userInfo);
+            } else if (userInfo.getStatus() == 2) {
+                ToastUtils.showShortToast(R.string.engineer_identity_auditing);
+                UserManager.getInstance().saveUser(userInfo);
+            } else if (userInfo.getStatus() == 3) {
+                showLoginDialog();
+                UserManager.getInstance().saveUser(userInfo);
             }
         }));
     }

app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoPresenter.java

@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.bean.LogsticsInfo;
 

app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java

@@ -3,13 +3,12 @@ package com.dayu.bigfish.presenter.main;
 import android.databinding.ObservableField;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.base.BasePageBean;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.bean.UserInfo;
-import com.dayu.bigfish.bean.VersionInfo;
 import com.dayu.bigfish.utils.AppUtils;
 import com.dayu.bigfish.utils.SPUtils;
 import com.dayu.bigfish.utils.managers.UserManager;
@@ -52,24 +51,17 @@ public class MainPresenter extends MainContract.Presenter {
 
     @Override
     public void getNewVersion(String version) {
-        ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(new Consumer<String>() {
-            @Override
-            public void accept(String s) throws Exception {
-                if (!version.equals(s)) {
-                    upgradeVersion("dayushifua_dayu", s);
-                }
+        ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(s -> {
+            if (!version.equals(s)) {
+                upgradeVersion("dayushifua_dayu", s);
             }
         }));
     }
 
     @Override
     public void upgradeVersion(String appId, String versionCode) {
-        ApiFactory.getVersionInfo(appId, versionCode).safeSubscribe(baseObserver(new Consumer<VersionInfo>() {
-            @Override
-            public void accept(VersionInfo info) throws Exception {
-                mView.showUpdateDialog(info);
-            }
-        }));
+        ApiFactory.getVersionInfo(appId, versionCode).safeSubscribe(baseObserver(
+                info -> mView.showUpdateDialog(info)));
     }
 
     @Override

app/src/main/java/com/dayu/bigfish/presenter/message/messagePresenter.java

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;

app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java

@@ -6,7 +6,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;

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

@@ -3,7 +3,7 @@ package com.dayu.bigfish.presenter.myhead;
 import android.databinding.ObservableField;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.utils.managers.UserManager;
 
@@ -51,14 +51,11 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
 
     @Override
     public void modifyHead(String path) {
-        ApiFactory.modifyHead(mAccountId, path).subscribe(baseObserver(new Consumer<Boolean>() {
-            @Override
-            public void accept(Boolean aBoolean) throws Exception {
-                headUrl.set(path);
-                mUserInfo.setHeaderImg(path);
-                UserManager.getInstance().saveUser(mUserInfo);
-                mView.deleteCacheDirFile();
-            }
+        ApiFactory.modifyHead(mAccountId, path).subscribe(baseObserver(aBoolean -> {
+            headUrl.set(path);
+            mUserInfo.setHeaderImg(path);
+            UserManager.getInstance().saveUser(mUserInfo);
+            mView.deleteCacheDirFile();
         }));
     }
 }

app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailPresenter.java

@@ -3,11 +3,8 @@ package com.dayu.bigfish.presenter.orderdetail;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
-import com.dayu.bigfish.bean.OrderDetail;
-
-import io.reactivex.functions.Consumer;
+import com.dayu.bigfish.api.ApiFactory;
 
 /**
  * Created by luofan on 2017/11/8.
@@ -27,7 +24,7 @@ public class OrderDetailPresenter extends OrderDetailContract.Presenter {
 
     @Override
     public void getOrderDetailInfo(int orderId) {
-        ApiFactory.getOrderInfo(orderId).subscribe(baseObserver((Consumer<OrderDetail>)
+        ApiFactory.getOrderInfo(orderId).subscribe(baseObserver(
                 detail -> mView.init(detail), responeThrowable -> mView.init(null)));
     }
 

app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java

@@ -4,11 +4,10 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.base.BasePageBean;
-import com.dayu.bigfish.bean.ErrorOrder;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.bean.event.RefreshTab;
@@ -21,7 +20,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
 
 import java.util.HashMap;
-import java.util.List;
 
 import io.reactivex.Observable;
 import io.reactivex.functions.Consumer;
@@ -81,7 +79,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
     @Override
     public void getErrorOrder() {
         ApiFactory.getErrorOrders(mUserId, mSiteId).subscribe(
-                baseObserver((Consumer<List<ErrorOrder>>) errorOrder -> {
+                baseObserver(errorOrder -> {
                     datas.set(errorOrder);
                     EventBus.getDefault().post(new RefreshTab(-1));
                 }, responeThrowable -> datas.set(Constants.FAILED)));

app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartPresenter.java

@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;

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

@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.bean.EngineerInfo;

app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java

@@ -7,7 +7,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;
@@ -108,12 +108,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
 
     @Override
     public void getOrderInfo(int orderId) {
-        ApiFactory.getOrderInfo(orderId).subscribe(baseObserver(new Consumer<OrderDetail>() {
-            @Override
-            public void accept(OrderDetail detail) throws Exception {
-                mDetail.set(detail);
-                mAnyContacts = detail.getAnyContacts();
-            }
+        ApiFactory.queryOrderInfo(orderId).subscribe(baseObserver(detail -> {
+            mDetail.set(detail);
+            mAnyContacts = detail.getAnyContacts();
         }));
     }
 
@@ -149,22 +146,19 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
         }
         JSONObject jsonObject = new JSONObject(params);
         RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        ApiFactory.commitOrder(body).subscribe(baseObserver(new Consumer<Integer>() {
-            @Override
-            public void accept(Integer integer) throws Exception {
-                mView.showToast(R.string.order_commite_success);
-                int status = 0;
-                if (mAnyContacts == 0) {
-                    status = ORDER_NOCONTACT_FINISH;
-                    EventBus.getDefault().post(new RefreshTab(-1));
-                } else if (mAnyContacts == 1) {
-                    status = ORDER_FINISH;
-                }
-                EventBus.getDefault().post(new OrderState(status, mPosition));
-                mOrderInfoDao.deleteByKey((long) orderId);
-                PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
-                mView.dumpBack();
+        ApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
+            mView.showToast(R.string.order_commite_success);
+            int status = 0;
+            if (mAnyContacts == 0) {
+                status = ORDER_NOCONTACT_FINISH;
+                EventBus.getDefault().post(new RefreshTab(-1));
+            } else if (mAnyContacts == 1) {
+                status = ORDER_FINISH;
             }
+            EventBus.getDefault().post(new OrderState(status, mPosition));
+            mOrderInfoDao.deleteByKey((long) orderId);
+            PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
+            mView.dumpBack();
         }));
     }
 

app/src/main/java/com/dayu/bigfish/presenter/receivingorder/ReceivingPresenter.java

@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;
@@ -60,12 +60,9 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
 
     @Override
     public void receiveOrder(int orders, int engineer) {
-        ApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(new Consumer<Boolean>() {
-            @Override
-            public void accept(Boolean aBoolean) throws Exception {
-                receiveOrderSuccess();
-            }
-        }, responeThrowable -> {
+        ApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(
+                aBoolean -> receiveOrderSuccess(),
+                responeThrowable -> {
             if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) {
                 refresh();
             }

app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartPresenter.java

@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.bean.OrderPart;
 import com.dayu.bigfish.bean.ShipperCompany;

app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionPresenter.java

@@ -4,7 +4,7 @@ import android.databinding.ObservableField;
 import android.os.Bundle;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.base.BasePageBean;
 import com.dayu.bigfish.bean.ServerInstruction;

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

@@ -8,10 +8,10 @@ import android.os.Environment;
 import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.AboutUsActivity;
 import com.dayu.bigfish.ui.CommonSubmiteActivity;
@@ -28,7 +28,6 @@ import com.umeng.analytics.MobclickAgent;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
-import io.reactivex.functions.Consumer;
 
 /**
  * Created by luofan on 2017/11/8.
@@ -79,14 +78,11 @@ public class SettingPresenter extends SettingContract.Presenter {
 
     @Override
     public void updataVersion() {
-        ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(new Consumer<String>() {
-            @Override
-            public void accept(String s) throws Exception {
-                if (s.equals(AppUtils.getPackageNum())) {
-                    mView.showToast(R.string.is_newversion);
-                } else {
-                    mView.showToast(UIUtils.getString(R.string.newversion_code) + s);
-                }
+        ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(s -> {
+            if (s.equals(AppUtils.getPackageNum())) {
+                mView.showToast(R.string.is_newversion);
+            } else {
+                mView.showToast(UIUtils.getString(R.string.newversion_code) + s);
             }
         }));
     }

app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeTimePresenter.java

@@ -6,9 +6,9 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.R;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.event.OrderState;
 import com.dayu.bigfish.bean.event.RefreshApoiment;
 import com.dayu.bigfish.bean.event.RefreshServe;
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 
 import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_DOING;
 import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
@@ -90,23 +89,20 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
 
     @Override
     public void subcribeTime(int orderId, String doorTime, String doorComment) {
-        ApiFactory.subcriceTime(orderId, doorTime, doorComment).subscribe(baseObserver(new Consumer<Boolean>() {
-            @Override
-            public void accept(Boolean aBoolean) throws Exception {
-                mView.showToast(R.string.order_commite_success);
-                if (mState == SUBCRIBE_TIME) {
-                    mView.showToast(R.string.subcribe_time_success);
-                    EventBus.getDefault().post(new RefreshTab(1));
-                    mDisposable = Observable.timer(500, TimeUnit.MILLISECONDS).subscribe(aLong -> {
-                        EventBus.getDefault().post(new RefreshApoiment(1));
-                        EventBus.getDefault().post(new RefreshServe(1));
-                        mDisposable.dispose();
-                    });
-                } else if (mState == ORDER_YUYUE || mState == ORDER_DOING) {
-                    EventBus.getDefault().post(new OrderState(ORDER_YUYUE, mPosition, mTime));
-                }
-                mView.dumpBack();
+        ApiFactory.subcriceTime(orderId, doorTime, doorComment).subscribe(baseObserver(aBoolean -> {
+            mView.showToast(R.string.order_commite_success);
+            if (mState == SUBCRIBE_TIME) {
+                mView.showToast(R.string.subcribe_time_success);
+                EventBus.getDefault().post(new RefreshTab(1));
+                mDisposable = Observable.timer(500, TimeUnit.MILLISECONDS).subscribe(aLong -> {
+                    EventBus.getDefault().post(new RefreshApoiment(1));
+                    EventBus.getDefault().post(new RefreshServe(1));
+                    mDisposable.dispose();
+                });
+            } else if (mState == ORDER_YUYUE || mState == ORDER_DOING) {
+                EventBus.getDefault().post(new OrderState(ORDER_YUYUE, mPosition, mTime));
             }
+            mView.dumpBack();
         }, responeThrowable -> {
             if ("ORDER0004".equals(responeThrowable.subCode)) {
                 if (mState == SUBCRIBE_TIME) { //刷新待预约列表并跳转到已取消

app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java

@@ -6,7 +6,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
-import com.apt.ApiFactory;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.base.BasePageBean;