增加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 {
     /**
      * 登录
@@ -231,11 +229,11 @@ public interface APIService {
     /**
      * 单表查询工单记录.
      *
-     * @param accountId
+     * @param id
      * @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/Api.java

 package com.dayu.bigfish.api;
 
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.base.BaseResponse;
@@ -32,102 +30,72 @@ import retrofit2.converter.gson.GsonConverterFactory;
  * Created by luofan on 2017/11/09.
  */
 public class Api {
-    private static APIService service;
-    private static Retrofit retrofit;
+    private static Retrofit mRetrofit;
     private static final int DEFAULT_TIMEOUT = 60;
-    private static Retrofit downloadRetrofit;
+    private static Retrofit mDownloadRetrofit;
 
-    public static APIService getService() {
-        service = getRetrofit().create(APIService.class);
-        return service;
+    /**
+     * 普通retrofit.
+     *
+     * @return
+     */
+    public static <T> T getService(Class<T> cls) {
+        return getmRetrofit().create(cls);
+    }
+
+    /**
+     * 下载的retrofit.
+     *
+     * @return
+     */
+    public static <T> T getDownloadService(Class<T> cls) {
+        return getmDownloadRetrofit().create(cls);
+    }
+
+    private static Retrofit getmRetrofit() {
+        if (mRetrofit == null) {
+            mRetrofit = getRetrofit("");
+        }
+        return mRetrofit;
+    }
+
+    private static Retrofit getmDownloadRetrofit() {
+        if (mDownloadRetrofit == null) {
+            mDownloadRetrofit = getRetrofit("download");
+        }
+        return mDownloadRetrofit;
     }
 
-    private static Retrofit getRetrofit() {
-        if (retrofit == null) {
+    private static Retrofit getRetrofit(String type) {
         Gson gson = new GsonBuilder()
-                    .setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+                .setDateFormat("yyyy-MM-dd'T'HH:mm:ss")
                 .create();
         HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(m -> LogUtils.i("request", m));
         httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
         TokenInterceptord tokenInterceptord = new TokenInterceptord();
-            OkHttpClient okHttpClient = new OkHttpClient.Builder()
+        OkHttpClient.Builder build = new OkHttpClient.Builder()
                 .addInterceptor(httpLoggingInterceptor)
                 .addInterceptor(tokenInterceptord)
                 .readTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
                 .writeTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
-                    .connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
-                    .build();
-            retrofit = new Retrofit.Builder()
-                    .client(okHttpClient)
-                    .baseUrl(Constants.BASE_URL)
-                    .addConverterFactory(GsonConverterFactory.create(gson))
-                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                    .build();
-        }
-        return retrofit;
-    }
-
-    public static APIService getDownloadRetrofit() {
-        if (downloadRetrofit == null) {
-            Gson gson = new GsonBuilder()
-                    .setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
-                    .create();
-            HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(m -> Log.i("retrofit", m));
-            httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
-            OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                    .addInterceptor(httpLoggingInterceptor)
-                    .connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
-                    .readTimeout(600, TimeUnit.SECONDS)
-                    .writeTimeout(600, TimeUnit.SECONDS)
-                    .addNetworkInterceptor(new Interceptor() {
-                        @Override
-                        public Response intercept(@NonNull Chain chain) throws IOException {
+                .connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS);
+        if ("download".equals(type)) {
+            build.addNetworkInterceptor(chain -> {
                 Response response = chain.proceed(chain.request());
                 return response
                         .newBuilder()
                         .body(new FileResponseBody(response.body()))//将自定义的ResposeBody设置给它
                         .build();
+            });
         }
-                    })
-                    .build();
-
-            downloadRetrofit = new Retrofit.Builder()
-                    .client(okHttpClient)
+        return new Retrofit.Builder()
+                .client(build.build())
                 .baseUrl(Constants.BASE_URL)
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .build();
     }
 
-        return downloadRetrofit.create(APIService.class);
-    }
-
-    /**
-     * 对网络接口返回的Response进行分割操作
-     *
-     * @param response
-     * @param <T>
-     * @return
-     */
-    public static <T> Observable<T> flatResponse(final BaseResponse<T> response) {
-        return Observable.create(e -> {
-            if (response.isSuccess()) {
-                if (!e.isDisposed()) {
-                    e.onNext(response.getData());
-                }
-            } else {
-                if (!e.isDisposed()) {
-                    e.onError(new ServerException(response.getSubCode(), response.getMsg()));
-                }
-                return;
-            }
-            if (!e.isDisposed()) {
-                e.onComplete();
-            }
-        });
-    }
-
-
     /**
      * 统一加上token.
      */
@@ -145,7 +113,6 @@ public class Api {
                             .build();
                 }
             }
-//            Log.d("request_header", request.headers().toString());
             return chain.proceed(request);
         }
     }
@@ -155,6 +122,7 @@ public class Api {
         return (ObservableTransformer<BaseResponse<T>, T>) transformer;
     }
 
+
     final static ObservableTransformer transformer = new ObservableTransformer() {
         @Override
         public ObservableSource apply(Observable upstream) {
@@ -164,4 +132,31 @@ public class Api {
         }
     };
 
+
+    /**
+     * 对网络接口返回的Response进行分割操作
+     *
+     * @param response
+     * @param <T>
+     * @return
+     */
+    public static <T> Observable<T> flatResponse(final BaseResponse<T> response) {
+        return Observable.create(e -> {
+            if (response.isSuccess()) {
+                if (!e.isDisposed()) {
+                    e.onNext(response.getData());
+                }
+            } else {
+                if (!e.isDisposed()) {
+                    e.onError(new ServerException(response.getSubCode(), response.getMsg()));
+                }
+                return;
+            }
+            if (!e.isDisposed()) {
+                e.onComplete();
+            }
+        });
+    }
+
+
 }

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

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;
@@ -16,12 +15,12 @@ import org.json.JSONObject;
 
 import java.util.HashMap;
 
-import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
 /**
- * Created by luofan on 2017/11/14.
+ * Created by luofan
+ * on 2017/11/14.
  */
 @InstanceFactory
 public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
@@ -43,36 +42,27 @@ 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 {
+        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 {
+        ApiFactory.boundAlipay(mBody).subscribe(baseObserver(aBoolean -> {
             mView.showToast(R.string.comfirm_alipay_account_success);
             mView.dumpBack();
-            }
         }));
     }
 
     @Override
     public void modifyAlipay() {
-        ApiFactory.modifyAlipay(mBody).subscribe(baseObserver(new Consumer<Boolean>() {
-            @Override
-            public void accept(Boolean aBoolean) throws Exception {
+        ApiFactory.modifyAlipay(mBody).subscribe(baseObserver(aBoolean -> {
              mView.showToast(R.string.modify_alipay_account_success);
             mView.dumpBack();
-            }
         }));
     }
 

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

@@ -4,18 +4,15 @@ 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.
+ * Created by luofan
+ * on 2017/11/14.
  */
 @InstanceFactory
 public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
@@ -52,12 +49,10 @@ 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 {
+        ApiFactory.getAccountBalanceList(page, pageSize, accountId).subscribe(baseObserver(
+                accountBalanceBasePageBean -> {
             datas.set(accountBalanceBasePageBean);
             mPage++;
-            }
         }, throwable -> datas.set(Constants.FAILED)));
     }
 

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

@@ -5,9 +5,9 @@ import android.os.Bundle;
 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.api.ApiFactory;
 import com.dayu.bigfish.bean.event.RefreshApplyPart;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.dayu.bigfish.utils.UIUtils;
@@ -19,7 +19,6 @@ import org.json.JSONObject;
 
 import java.util.HashMap;
 
-import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
@@ -104,8 +103,7 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
         params.put("suggestName", mUserName);
         JSONObject jsonObject = new JSONObject(params);
         RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        ApiFactory.postFeedBack(body).subscribe(baseObserver((Consumer<Boolean>)
-                aBoolean -> {
+        ApiFactory.postFeedBack(body).subscribe(baseObserver(aBoolean -> {
             mView.showToast(R.string.commite_success);
             mView.dumpBack();
         }));
@@ -113,16 +111,15 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
 
     @Override
     public void applyPart() {
-        ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver((Consumer<Boolean>)
-                aBoolean -> {
-                    mView.dumpBack();
+        ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver(
+                aBoolean -> {mView.dumpBack();
             EventBus.getDefault().post(new RefreshApplyPart(1));
         }));
     }
 
     @Override
     public void refusePart() {
-        ApiFactory.refusePart(mPartId, mComment.get()).subscribe(baseObserver((Consumer<Boolean>)
+        ApiFactory.refusePart(mPartId, mComment.get()).subscribe(baseObserver(
                 aBoolean -> {
                     mView.dumpBack();
                     EventBus.getDefault().post(new RefreshApplyPart(1));

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,10 +13,10 @@ 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.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class HomePersonPresenter extends HomeFourContract.Presenter {
@@ -29,10 +28,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/HomeOrderContract.java

@@ -3,6 +3,7 @@ package com.dayu.bigfish.presenter.homeorder;
 
 import com.dayu.bigfish.base.BasePresenter;
 import com.dayu.bigfish.base.BaseView;
+import com.dayu.bigfish.bean.Tab;
 
 /**
  * Created by luo on 2016/8/4.
@@ -10,7 +11,7 @@ import com.dayu.bigfish.base.BaseView;
 public interface HomeOrderContract {
 
     interface View extends BaseView {
-
+        void setTabNum(Tab tab, int myTabIndex);
     }
 
     abstract class Presenter extends BasePresenter<View> {

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.MyApplication;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.Tab;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.OrderRecordActivity;
-import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
 import com.dayu.bigfish.utils.managers.UserManager;
 import com.umeng.analytics.MobclickAgent;
 
-import io.reactivex.functions.Consumer;
-
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@@ -37,18 +35,15 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
 
     @Override
     public void getTabNum(int userId, int siteId) {
-        ApiFactory.getTabNum(userId, siteId).subscribe(baseObserver(new Consumer<Tab>() {
-            @Override
-            public void accept(Tab tab) throws Exception {
-                ((HomeOrderFragment) mView).setTabNum(tab, mIndex);
-            }
-        }, responeThrowable -> {
+        ApiFactory.getTabNum(userId, siteId).subscribe(baseObserver(
+                tab -> mView.setTabNum(tab, mIndex),
+                responeThrowable -> {
                     Tab tab = new Tab();
                     tab.setCanceled(0);
                     tab.setError(0);
                     tab.setPendingservice(0);
                     tab.setReservation(0);
-            ((HomeOrderFragment) mView).setTabNum(tab, mIndex);
+                    mView.setTabNum(tab, mIndex);
                 }));
     }
 

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

@@ -4,12 +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.api.ApiFactory;
 import com.dayu.bigfish.bean.KaAddress;
 
-import io.reactivex.functions.Consumer;
-
 /**
  * Created by luofan on 2017/11/8.
  */
@@ -28,7 +26,6 @@ public class KaAddressPresenter extends KaAddressContract.Presenter {
 
     @Override
     public void getKaAddress() {
-        ApiFactory.getKaAddress(mId).subscribe(baseObserver((Consumer<KaAddress>)
-                kaAddress -> data.set(kaAddress)));
+        ApiFactory.getKaAddress(mId).subscribe(baseObserver(kaAddress -> data.set(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,10 +18,9 @@ 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.
+ * Created by luofan
+ * on 2017/11/8.
  */
 
 @InstanceFactory
@@ -50,7 +49,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,9 +69,7 @@ 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 {
+        ApiFactory.login(userName.get(), password.get()).subscribe(baseObserver(userInfo -> {
             if (userInfo.getStatus() == 1) {
                 loginHx(userInfo.getHxAccount(), userInfo.getHxPwd());
                 dumpAndSave(userInfo);
@@ -83,7 +80,6 @@ public class LoginPresenter extends LoginContract.Presenter {
                 showLoginDialog();
                 UserManager.getInstance().saveUser(userInfo);
             }
-            }
         }));
     }
 

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

@@ -4,14 +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.bean.LogsticsInfo;
-
-import io.reactivex.functions.Consumer;
+import com.dayu.bigfish.api.ApiFactory;
 
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
@@ -48,7 +46,7 @@ public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
 
     @Override
     public void queryLogisticsInfo() {
-        ApiFactory.queryLogistics(mShipperCode, mCourierNum).subscribe(baseObserver((Consumer<LogsticsInfo>)
+        ApiFactory.queryLogistics(mShipperCode, mCourierNum).subscribe(baseObserver(
                         logsticsInfo -> {
                             datas.set(logsticsInfo.getLogistics());
                             headData.set(logsticsInfo);

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

@@ -3,13 +3,10 @@ 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.base.BasePageBean;
-import com.dayu.bigfish.bean.Order;
+import com.dayu.bigfish.api.ApiFactory;
 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;
@@ -17,12 +14,12 @@ import com.dayu.bigfish.utils.managers.UserManager;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class MainPresenter extends MainContract.Presenter {
@@ -52,24 +49,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 {
+        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
@@ -87,33 +77,22 @@ public class MainPresenter extends MainContract.Presenter {
             e.printStackTrace();
         }
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        ApiFactory.commitVersionInfo(requestBody).subscribe(baseObserver(new Consumer<Boolean>() {
-            @Override
-            public void accept(Boolean aBoolean) throws Exception {
-                SPUtils.put(Constants.OLD_PAKAGENUM, MyApplication.getAppContext().getPackageName());
-            }
-        }));
+        ApiFactory.commitVersionInfo(requestBody).subscribe(baseObserver(
+                aBoolean -> SPUtils.put(Constants.OLD_PAKAGENUM, MyApplication.getAppContext().getPackageName())));
     }
 
     @Override
     public void getReceiveOrder(int state, int userId, int siteId, int pagerId, int pagerSize) {
-        ApiFactory.getOrders(state, userId, siteId, pagerId, pagerSize).subscribe(baseObserver(new Consumer<BasePageBean<Order>>() {
-            @Override
-            public void accept(BasePageBean<Order> orders) throws Exception {
-                tabRecive.set(orders.getTotalRows() + "");
-            }
-        }));
+        ApiFactory.getOrders(state, userId, siteId, pagerId, pagerSize).subscribe(baseObserver(
+                orders -> tabRecive.set(orders.getTotalRows() + "")));
     }
 
     @Override
     public void getHxNum(String accountId) {
-        ApiFactory.getHxNum(accountId).subscribe(baseObserver(new Consumer<Integer>() {
-            @Override
-            public void accept(Integer integer) throws Exception {
+        ApiFactory.getHxNum(accountId).subscribe(baseObserver(integer -> {
             if (integer.intValue() > 0) {
                 mView.isShowRedIcon(true);
             }
-            }
         }));
     }
 

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

@@ -5,11 +5,10 @@ import android.os.Bundle;
 import android.view.View;
 
 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.base.BasePageBean;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.NewMessage;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.MessageDetailActivity;
@@ -24,14 +23,14 @@ import org.json.JSONObject;
 
 import java.text.ParseException;
 
-import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
 import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
 
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class messagePresenter extends messageContract.Presenter {
@@ -66,12 +65,10 @@ public class messagePresenter extends messageContract.Presenter {
 
     @Override
     public void getHxMessage(String hxUserId, int category, int page, int pageSize) {
-        ApiFactory.getHxMessage(hxUserId, category, page, pageSize).subscribe(baseObserver(new Consumer<BasePageBean<NewMessage>>() {
-            @Override
-            public void accept(BasePageBean<NewMessage> messageBasePageBean) throws Exception {
+        ApiFactory.getHxMessage(hxUserId, category, page, pageSize).subscribe(baseObserver(
+                messageBasePageBean -> {
                     data.set(messageBasePageBean);
                     mPage++;
-            }
                 }, throwable -> data.set(Constants.FAILED)));
     }
 
@@ -85,8 +82,7 @@ public class messagePresenter extends messageContract.Presenter {
             e.printStackTrace();
         }
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        ApiFactory.readMessage(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
-        }));
+        ApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> {}));
     }
 
     @Override

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

@@ -6,10 +6,10 @@ import android.os.Bundle;
 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.EngineerInfo;
 import com.umeng.analytics.MobclickAgent;
 
@@ -17,15 +17,14 @@ import org.json.JSONObject;
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.List;
 
-import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 /**
- * Created by luofan on 2017/11/14.
+ * Created by luofan
+ * on 2017/11/14.
  */
 @InstanceFactory
 public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
@@ -92,15 +91,12 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
         RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
         MultipartBody.Part body = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile);
         mView.showDialog();
-        ApiFactory.uploadPhoto(body).subscribe(baseObserver(new Consumer<List<String>>() {
-            @Override
-            public void accept(List<String> list) throws Exception {
+        ApiFactory.uploadPhoto(body).subscribe(baseObserver(list -> {
             if (list != null && list.size() > 0) {
                 modifyUserInfo(mRealName.get(), mIdentity.get(), list.get(0));
             } else {
                 mView.showToast("修改头像失败");
             }
-            }
         }));
     }
 
@@ -113,14 +109,11 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
         params.put("identityUrl", identityUrl);
         JSONObject jsonObject = new JSONObject(params);
         RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        ApiFactory.modifyUserInfo(body).subscribe(baseObserver(new Consumer<EngineerInfo>() {
-            @Override
-            public void accept(EngineerInfo engineerInfo) throws Exception {
+        ApiFactory.modifyUserInfo(body).subscribe(baseObserver(engineerInfo -> {
             mRealName.set(engineerInfo.getRealName());
             mIdentity.set(engineerInfo.getIdentity());
             mIdentityUrl.set(engineerInfo.getIdentityUrl());
             mView.showTip();
-            }
         }));
     }
 

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

@@ -3,12 +3,11 @@ 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;
 
 import java.io.File;
-import java.util.List;
 
 import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
@@ -16,7 +15,8 @@ import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 /**
- * Created by luofan on 2017/11/14.
+ * Created by luofan
+ * on 2017/11/14.
  */
 @InstanceFactory
 public class MyHeadPresenter extends MyHeadContract.Presenter {
@@ -37,15 +37,12 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
         RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
         MultipartBody.Part body = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile);
         mView.showDialog();
-        ApiFactory.uploadPhoto(body).subscribe(baseObserver(new Consumer<List<String>>() {
-            @Override
-            public void accept(List<String> list) throws Exception {
+        ApiFactory.uploadPhoto(body).subscribe(baseObserver(list -> {
             if (list != null && list.size() > 0) {
                 modifyHead(list.get(0));
             } else {
                 mView.showToast("修改头像失败");
             }
-            }
         }));
     }
 

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

@@ -3,14 +3,12 @@ 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.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class OrderDetailPresenter extends OrderDetailContract.Presenter {
@@ -27,7 +25,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,12 +4,9 @@ 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.base.BasePageBean;
-import com.dayu.bigfish.bean.ErrorOrder;
-import com.dayu.bigfish.bean.Order;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.bean.event.RefreshTab;
 import com.dayu.bigfish.ui.OrderDetailsActivity;
@@ -21,15 +18,14 @@ 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;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class OrderDoingPresenter extends orderDoingContract.Presenter {
@@ -70,8 +66,8 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
 
     @Override
     public void getOrders(int state, int userId, int siteId, int page, int pageSize) {
-        ApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(
-                baseObserver((Consumer<BasePageBean<Order>>) orderBasePageBean -> {
+        ApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
+                orderBasePageBean -> {
                     datas.set(orderBasePageBean);
                     mPage++;
                     EventBus.getDefault().post(new RefreshTab(-1));
@@ -81,7 +77,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,10 +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.R;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.bean.OrderPart;
 import com.dayu.bigfish.ui.CommonSubmiteActivity;
@@ -17,10 +17,7 @@ import com.dayu.bigfish.utils.UIUtils;
 import com.dayu.bigfish.utils.managers.UserManager;
 import com.umeng.analytics.MobclickAgent;
 
-import java.util.List;
-
 import io.reactivex.Observable;
-import io.reactivex.functions.Consumer;
 
 /**
  * Created by luofan
@@ -63,9 +60,7 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
     @Override
     public void queryPartList() {
         ApiFactory.queryPart(mOrderId, mType).subscribe(baseObserver(
-                (Consumer<List<OrderPart>>) orderPart -> {
-                    datas.set(orderPart);
-                }
+                orderPart -> datas.set(orderPart)
                 , responeThrowable -> datas.set(Constants.FAILED)));
     }
 

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

@@ -4,9 +4,9 @@ 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.bean.EngineerInfo;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.ModifyPersonInfoActivity;
@@ -14,10 +14,9 @@ import com.dayu.bigfish.ui.MyHeaderIvActivity;
 import com.dayu.bigfish.utils.managers.UserManager;
 import com.umeng.analytics.MobclickAgent;
 
-import io.reactivex.functions.Consumer;
-
 /**
- * Created by luofan on 2017/11/14.
+ * Created by luofan
+ * on 2017/11/14.
  */
 @InstanceFactory
 public class PersonInfoPresenter extends PersonInfoContract.Presenter {
@@ -50,11 +49,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
 
     @Override
     public void queryInfo(int accountId) {
-        ApiFactory.getEngineerInfo(accountId).subscribe(baseObserver(new Consumer<EngineerInfo>() {
-            @Override
-            public void accept(EngineerInfo engineerInfo) throws Exception {
-                info.set(engineerInfo);
-            }
-        }));
+        ApiFactory.getEngineerInfo(accountId).subscribe(baseObserver(
+                engineerInfo -> info.set(engineerInfo)));
     }
 }

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

@@ -7,10 +7,10 @@ import android.os.Bundle;
 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.OrderDetail;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.bean.event.OrderState;
@@ -33,7 +33,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -42,7 +41,8 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_FINISH;
 import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_NOCONTACT_FINISH;
 
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
@@ -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 {
+        ApiFactory.queryOrderInfo(orderId).subscribe(baseObserver(detail -> {
             mDetail.set(detail);
             mAnyContacts = detail.getAnyContacts();
-            }
         }));
     }
 
@@ -149,9 +146,7 @@ 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 {
+        ApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
             mView.showToast(R.string.order_commite_success);
             int status = 0;
             if (mAnyContacts == 0) {
@@ -164,7 +159,6 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
             mOrderInfoDao.deleteByKey((long) orderId);
             PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
             mView.dumpBack();
-            }
         }));
     }
 
@@ -184,16 +178,13 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
                     MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile);
             part[i] = body;
         }
-        ApiFactory.uploadPhoto(part).subscribe(baseObserver(new Consumer<List<String>>() {
-            @Override
-            public void accept(List<String> list) throws Exception {
+        ApiFactory.uploadPhoto(part).subscribe(baseObserver(list -> {
             OrderInfo info = mOrderField.get();
             commitOrder(list, mOrderId, info.getServerRecord(),
                     mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
                     info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
             mImages.clear();
             PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
-            }
         }));
     }
 

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

@@ -4,10 +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.R;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.base.BasePageBean;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.bean.UserInfo;
@@ -25,10 +25,10 @@ import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class ReceivingPresenter extends ReceivingContract.Presenter {
@@ -50,22 +50,15 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
 
     @Override
     public void getOrders(int state, int page, int pageSize, int siteId, int userId) {
-        ApiFactory.getOrders(state, page, pageSize, siteId, userId).subscribe(baseObserver(new Consumer<BasePageBean<Order>>() {
-            @Override
-            public void accept(BasePageBean<Order> orderBasePageBean) throws Exception {
-                getOrderSuccess(orderBasePageBean);
-            }
-        }, throwable -> datas.set(Constants.FAILED)));
+        ApiFactory.getOrders(state, page, pageSize, siteId, userId).subscribe(baseObserver(
+                orderBasePageBean -> getOrderSuccess(orderBasePageBean),
+                throwable -> datas.set(Constants.FAILED)));
     }
 
     @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,8 +4,8 @@ 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.api.ApiFactory;
 import com.dayu.bigfish.bean.OrderPart;
 import com.dayu.bigfish.bean.ShipperCompany;
 import com.dayu.bigfish.bean.UserInfo;
@@ -20,12 +20,12 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class ReturnPartPresenter extends ReturnPartContract.Presenter {
@@ -85,17 +85,17 @@ public class ReturnPartPresenter extends ReturnPartContract.Presenter {
         }
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
         if (mType == Constants.BYKA) {
-            ApiFactory.returnPartByKA(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
+            ApiFactory.returnPartByKA(requestBody).subscribe(baseObserver(aBoolean -> {
                 mView.dumpBack();
                 EventBus.getDefault().post(new RefreshApplyPart(1));
             }));
         } else if (mType == Constants.BYMYSELF) {
-            ApiFactory.returnPartSelf(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
+            ApiFactory.returnPartSelf(requestBody).subscribe(baseObserver(aBoolean -> {
                 mView.dumpBack();
                 EventBus.getDefault().post(new RefreshApplyPart(1));
             }));
         } else if (mType == Constants.BY_MODIFY_PART) {
-            ApiFactory.modifyPart(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
+            ApiFactory.modifyPart(requestBody).subscribe(baseObserver(aBoolean -> {
                 mView.dumpBack();
                 EventBus.getDefault().post(new RefreshApplyPart(1));
             }));

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

@@ -4,8 +4,8 @@ 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.api.ApiFactory;
 import com.dayu.bigfish.base.BasePageBean;
 import com.dayu.bigfish.bean.ServerInstruction;
 import com.dayu.bigfish.ui.WebViewActivity;
@@ -34,7 +34,8 @@ public class ServerInstructionPresenter extends ServerInstructionContract.Presen
 
     @Override
     public void getInstructs() {
-        ApiFactory.getInstruction(mSpuId, mPage, Constants.PAGESIZE).subscribe(baseObserver((BasePageBean<ServerInstruction> datas) -> {
+        ApiFactory.getInstruction(mSpuId, mPage, Constants.PAGESIZE).subscribe(baseObserver(
+                (BasePageBean<ServerInstruction> datas) -> {
                     mPage++;
                     mDatas.set(datas);
                 }));

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,10 +28,10 @@ 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.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class SettingPresenter extends SettingContract.Presenter {
@@ -79,15 +79,12 @@ 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 {
+        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;
@@ -35,7 +34,8 @@ import static com.dayu.bigfish.utils.UtilsDate.LONG_DATE_FORMAT;
 import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
 
 /**
- * Created by luofan on 2017/11/16.
+ * Created by luofan
+ * on 2017/11/16.
  */
 @InstanceFactory
 public class SubcribeTimePresenter extends SubcribeContract.Presenter {
@@ -90,9 +90,7 @@ 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 {
+        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);
@@ -106,7 +104,6 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
                 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,10 +6,9 @@ import android.os.Bundle;
 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.base.BasePageBean;
+import com.dayu.bigfish.api.ApiFactory;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.OrderDetailsActivity;
@@ -20,10 +19,9 @@ import com.umeng.analytics.MobclickAgent;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.functions.Consumer;
-
 /**
- * Created by luofan on 2017/11/8.
+ * Created by luofan
+ * on 2017/11/8.
  */
 @InstanceFactory
 public class OrderRecordPresenter extends OrderRecordContract.Presenter {
@@ -50,12 +48,10 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
 
     @Override
     public void getOrders(int state, int engineerId, int siteId, int page, int pageSize) {
-        ApiFactory.getOrders(state, engineerId, siteId, page, pageSize).subscribe(baseObserver(new Consumer<BasePageBean<Order>>() {
-            @Override
-            public void accept(BasePageBean<Order> orderBasePageBean) throws Exception {
+        ApiFactory.getOrders(state, engineerId, siteId, page, pageSize).subscribe(baseObserver(
+                orderBasePageBean -> {
             datas.set(orderBasePageBean);
             mPage++;
-            }
         }, throwable -> datas.set(Constants.FAILED)));
     }
 

app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java

@@ -29,7 +29,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
 
 import static com.dayu.bigfish.utils.UtilsDate.FORMAT_ONE;
 import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
@@ -274,14 +273,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
                     if (mItem.getSubStatus() == 1) {
                         mPresenter.startOrder(mItem.getId(), latitude, longitude)
                                 .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe(mPresenter.baseObserver(new Consumer<Integer>() {
-                                    @Override
-                                    public void accept(Integer integer) throws Exception {
+                                .subscribe(mPresenter.baseObserver(integer -> {
                                     LocationUtils.stop();
                                     ProgressUtil.stopLoad();
                                     mItem.setSubStatus(2);
                                     mBind.tvItemProcess.setText(mContext.getString(R.string.begain_server));
-                                    }
                                 }, responeThrowable -> {
                                     if ("ORDER0005".equals(responeThrowable.subCode)) {
                                         EventBus.getDefault().post(new RefreshTab(3));
@@ -292,16 +288,13 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
                     } else if (mItem.getSubStatus() == 2) {
                         mPresenter.startServer(mItem.getId(), latitude, longitude)
                                 .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe(mPresenter.baseObserver(new Consumer<Integer>() {
-                                    @Override
-                                    public void accept(Integer integer) throws Exception {
+                                .subscribe(mPresenter.baseObserver(integer -> {
                                     LocationUtils.stop();
                                     ProgressUtil.stopLoad();
                                     mItem.setStatus(4);
                                     mItem.setSubStatus(integer);
                                     mBind.tvItemProcess.setText(mContext.getString(R.string.process_order));
                                     mBind.itemUpdataTime.setText(mContext.getString(R.string.need_again_door));
-                                    }
                                 }, responeThrowable -> {
                                     if ("ORDER0006".equals(responeThrowable.subCode)) {
                                         EventBus.getDefault().post(new RefreshTab(3));

app/src/main/java/com/dayu/bigfish/ui/adapter/OrderPartAdapter.java

@@ -179,7 +179,7 @@ public class OrderPartAdapter extends CoreAdapter<OrderPart, ItemApplyPartLayout
                 , (dialog, confirm) -> {
             if (confirm) {
                 presenter.cancleApply(part.getId()).subscribe(
-                        presenter.baseObserver((Consumer<Boolean>) aBoolean -> {
+                        presenter.baseObserver( aBoolean -> {
                             part.setStatus(Constants.CANCEL);
                             notifyDataSetChanged();
                         }));

app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java

@@ -164,6 +164,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
     /**
      * 将网络请求到的数据展示到tab上
      */
+    @Override
     public void setTabNum(Tab tab, int myTabIndex) {
         String[] tabNum = new String[]{tab.getReservation() + "", tab.getPendingservice() + "",
                 tab.getError() + "", tab.getCanceled() + ""};

app/src/main/java/com/dayu/bigfish/utils/managers/DownloadManager.java

@@ -2,6 +2,7 @@ package com.dayu.bigfish.utils.managers;
 
 import android.content.Context;
 
+import com.dayu.bigfish.api.APIService;
 import com.dayu.bigfish.api.Api;
 import com.dayu.bigfish.ui.listener.onDownloadListener;
 
@@ -13,6 +14,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
+import okhttp3.ResponseBody;
 import okio.BufferedSink;
 import okio.BufferedSource;
 import okio.Okio;
@@ -32,8 +34,8 @@ public class DownloadManager {
      * @param cd      订阅关系集合，在数据传输完毕时解除订阅
      */
     public static void download(final Context context, final String url, final String apkPath, final CompositeDisposable cd, onDownloadListener listener) {
-        Api.getDownloadRetrofit().download(url)
-                .map(responseBody -> responseBody.source())
+        Api.getDownloadService(APIService.class).download(url)
+                .map(ResponseBody::source)
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
                 .doOnNext(bufferedSource -> {