Skip to content

android / dayu

Go to a project
Commit f9ba29ea by 罗翻
Options

增加apiFactory

parent 8bc16ee5
Inline Side-by-side
Showing with 527 additions and 430 deletions
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -107,7 +107,7 @@ public class Constants { ...@@ -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获取今日业绩(今日收益). * 根据工程师id和工程师id获取今日业绩(今日收益).
*/ */
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
package com.dayu.bigfish.api; package com.dayu.bigfish.api;
import com.app.annotation.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.base.BaseResponse; import com.dayu.bigfish.base.BaseResponse;
...@@ -44,7 +43,6 @@ import retrofit2.http.Url; ...@@ -44,7 +43,6 @@ import retrofit2.http.Url;
/** /**
* Created by luofan on 2017/11/09. * Created by luofan on 2017/11/09.
*/ */
@ApiFactory
public interface APIService { public interface APIService {
/** /**
* 登录 * 登录
...@@ -231,11 +229,11 @@ public interface APIService { ...@@ -231,11 +229,11 @@ public interface APIService {
/** /**
* 单表查询工单记录. * 单表查询工单记录.
* *
* @param accountId * @param id
* @return * @return
*/ */
@GET(Constants.SELECT_ORDER_LITTLE) @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; package com.dayu.bigfish.api;
import android.support.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.base.BaseResponse; import com.dayu.bigfish.base.BaseResponse;
...@@ -32,101 +30,71 @@ import retrofit2.converter.gson.GsonConverterFactory; ...@@ -32,101 +30,71 @@ import retrofit2.converter.gson.GsonConverterFactory;
* Created by luofan on 2017/11/09. * Created by luofan on 2017/11/09.
*/ */
public class Api { public class Api {
private static APIService service; private static Retrofit mRetrofit;
private static Retrofit retrofit;
private static final int DEFAULT_TIMEOUT = 60; private static final int DEFAULT_TIMEOUT = 60;
private static Retrofit downloadRetrofit; private static Retrofit mDownloadRetrofit;
public static APIService getService() { /**
service = getRetrofit().create(APIService.class); * 普通retrofit.
return service; *
* @return
*/
public static <T> T getService(Class<T> cls) {
return getmRetrofit().create(cls);
} }
private static Retrofit getRetrofit() { /**
if (retrofit == null) { * 下载的retrofit.
Gson gson = new GsonBuilder() *
.setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ") * @return
.create(); */
HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(m -> LogUtils.i("request", m)); public static <T> T getDownloadService(Class<T> cls) {
httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); return getmDownloadRetrofit().create(cls);
TokenInterceptord tokenInterceptord = new TokenInterceptord();
OkHttpClient okHttpClient = 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() { private static Retrofit getmRetrofit() {
if (downloadRetrofit == null) { if (mRetrofit == null) {
Gson gson = new GsonBuilder() mRetrofit = getRetrofit("");
.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 {
Response response = chain.proceed(chain.request());
return response
.newBuilder()
.body(new FileResponseBody(response.body()))//将自定义的ResposeBody设置给它
.build();
}
})
.build();
downloadRetrofit = new Retrofit.Builder()
.client(okHttpClient)
.baseUrl(Constants.BASE_URL)
.addConverterFactory(GsonConverterFactory.create(gson))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
} }
return mRetrofit;
return downloadRetrofit.create(APIService.class);
} }
/** private static Retrofit getmDownloadRetrofit() {
* 对网络接口返回的Response进行分割操作 if (mDownloadRetrofit == null) {
* mDownloadRetrofit = getRetrofit("download");
* @param response }
* @param <T> return mDownloadRetrofit;
* @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();
}
});
} }
private static Retrofit getRetrofit(String type) {
Gson gson = new GsonBuilder()
.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.Builder build = new OkHttpClient.Builder()
.addInterceptor(httpLoggingInterceptor)
.addInterceptor(tokenInterceptord)
.readTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
.writeTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
.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();
});
}
return new Retrofit.Builder()
.client(build.build())
.baseUrl(Constants.BASE_URL)
.addConverterFactory(GsonConverterFactory.create(gson))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
}
/** /**
* 统一加上token. * 统一加上token.
...@@ -145,7 +113,6 @@ public class Api { ...@@ -145,7 +113,6 @@ public class Api {
.build(); .build();
} }
} }
// Log.d("request_header", request.headers().toString());
return chain.proceed(request); return chain.proceed(request);
} }
} }
...@@ -155,6 +122,7 @@ public class Api { ...@@ -155,6 +122,7 @@ public class Api {
return (ObservableTransformer<BaseResponse<T>, T>) transformer; return (ObservableTransformer<BaseResponse<T>, T>) transformer;
} }
final static ObservableTransformer transformer = new ObservableTransformer() { final static ObservableTransformer transformer = new ObservableTransformer() {
@Override @Override
public ObservableSource apply(Observable upstream) { public ObservableSource apply(Observable upstream) {
...@@ -164,4 +132,31 @@ public class Api { ...@@ -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 0 → 100644
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; ...@@ -4,10 +4,9 @@ import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; 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.bean.UserInfo;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher; import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
...@@ -16,12 +15,12 @@ import org.json.JSONObject; ...@@ -16,12 +15,12 @@ import org.json.JSONObject;
import java.util.HashMap; import java.util.HashMap;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
/** /**
* Created by luofan on 2017/11/14. * Created by luofan
* on 2017/11/14.
*/ */
@InstanceFactory @InstanceFactory
public class WithdrawalsPresenter extends WithdrawalsContract.Presenter { public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
...@@ -43,36 +42,27 @@ public class WithdrawalsPresenter extends WithdrawalsContract.Presenter { ...@@ -43,36 +42,27 @@ public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
@Override @Override
public void querAlipay() { public void querAlipay() {
ApiFactory.queryAlipay(mUserId).subscribe(baseObserver(new Consumer<AlipayInfo>() { ApiFactory.queryAlipay(mUserId).subscribe(baseObserver(info -> {
@Override mAccount.set(info.getAlipayAccount());
public void accept(AlipayInfo info) throws Exception { mName.set(info.getAlipayName());
mAccount.set(info.getAlipayAccount()); mPhone.set(info.getAlipayMobile());
mName.set(info.getAlipayName()); mState.set(1);
mPhone.set(info.getAlipayMobile());
mState.set(1);
}
})); }));
} }
@Override @Override
public void boundAlipay() { public void boundAlipay() {
ApiFactory.boundAlipay(mBody).subscribe(baseObserver(new Consumer<Boolean>() { ApiFactory.boundAlipay(mBody).subscribe(baseObserver(aBoolean -> {
@Override mView.showToast(R.string.comfirm_alipay_account_success);
public void accept(Boolean aBoolean) throws Exception { mView.dumpBack();
mView.showToast(R.string.comfirm_alipay_account_success);
mView.dumpBack();
}
})); }));
} }
@Override @Override
public void modifyAlipay() { public void modifyAlipay() {
ApiFactory.modifyAlipay(mBody).subscribe(baseObserver(new Consumer<Boolean>() { ApiFactory.modifyAlipay(mBody).subscribe(baseObserver(aBoolean -> {
@Override mView.showToast(R.string.modify_alipay_account_success);
public void accept(Boolean aBoolean) throws Exception { mView.dumpBack();
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; ...@@ -4,18 +4,15 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.WithdrawalsActivity; import com.dayu.bigfish.ui.WithdrawalsActivity;
import com.dayu.bigfish.utils.managers.UserManager; 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 @InstanceFactory
public class AccountBalancePresenter extends AccountBalanceContract.Presenter { public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
...@@ -52,12 +49,10 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter { ...@@ -52,12 +49,10 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
@Override @Override
public void getAccountBalanceList(int page, int pageSize, int accountId) { public void getAccountBalanceList(int page, int pageSize, int accountId) {
ApiFactory.getAccountBalanceList(page, pageSize, accountId).subscribe(baseObserver(new Consumer<BasePageBean<AccountBalance>>() { ApiFactory.getAccountBalanceList(page, pageSize, accountId).subscribe(baseObserver(
@Override accountBalanceBasePageBean -> {
public void accept(BasePageBean<AccountBalance> accountBalanceBasePageBean) throws Exception { datas.set(accountBalanceBasePageBean);
datas.set(accountBalanceBasePageBean); mPage++;
mPage++;
}
}, throwable -> datas.set(Constants.FAILED))); }, throwable -> datas.set(Constants.FAILED)));
} }
......
app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java
...@@ -5,9 +5,9 @@ import android.os.Bundle; ...@@ -5,9 +5,9 @@ import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.event.RefreshApplyPart; import com.dayu.bigfish.bean.event.RefreshApplyPart;
import com.dayu.bigfish.utils.ToastUtils; import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.utils.UIUtils; import com.dayu.bigfish.utils.UIUtils;
...@@ -19,7 +19,6 @@ import org.json.JSONObject; ...@@ -19,7 +19,6 @@ import org.json.JSONObject;
import java.util.HashMap; import java.util.HashMap;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
...@@ -104,25 +103,23 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter { ...@@ -104,25 +103,23 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
params.put("suggestName", mUserName); params.put("suggestName", mUserName);
JSONObject jsonObject = new JSONObject(params); JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.postFeedBack(body).subscribe(baseObserver((Consumer<Boolean>) ApiFactory.postFeedBack(body).subscribe(baseObserver(aBoolean -> {
aBoolean -> { mView.showToast(R.string.commite_success);
mView.showToast(R.string.commite_success); mView.dumpBack();
mView.dumpBack(); }));
}));
} }
@Override @Override
public void applyPart() { public void applyPart() {
ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver((Consumer<Boolean>) ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver(
aBoolean -> { aBoolean -> {mView.dumpBack();
mView.dumpBack(); EventBus.getDefault().post(new RefreshApplyPart(1));
EventBus.getDefault().post(new RefreshApplyPart(1)); }));
}));
} }
@Override @Override
public void refusePart() { public void refusePart() {
ApiFactory.refusePart(mPartId, mComment.get()).subscribe(baseObserver((Consumer<Boolean>) ApiFactory.refusePart(mPartId, mComment.get()).subscribe(baseObserver(
aBoolean -> { aBoolean -> {
mView.dumpBack(); mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1)); 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; ...@@ -3,9 +3,8 @@ package com.dayu.bigfish.presenter.homefourtab;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.MyApplication; 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.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord; import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement; import com.dayu.bigfish.bean.TodayAchievement;
...@@ -14,10 +13,10 @@ import com.dayu.bigfish.ui.PersonInfoActivity; ...@@ -14,10 +13,10 @@ import com.dayu.bigfish.ui.PersonInfoActivity;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class HomePersonPresenter extends HomeFourContract.Presenter { public class HomePersonPresenter extends HomeFourContract.Presenter {
...@@ -29,10 +28,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter { ...@@ -29,10 +28,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
@Override @Override
public void getAlipayAccount(int accountId) { public void getAlipayAccount(int accountId) {
ApiFactory.queryAlipay(accountId).subscribe(baseObserver(new Consumer<AlipayInfo>() { ApiFactory.queryAlipay(accountId).subscribe(baseObserver(info -> {
@Override
public void accept(AlipayInfo info) throws Exception {
}
}, responeThrowable -> { }, responeThrowable -> {
if ("SETTLEMENT0015".equals(responeThrowable.subCode)) { if ("SETTLEMENT0015".equals(responeThrowable.subCode)) {
mView.showAlipayDialog(); mView.showAlipayDialog();
......
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderContract.java
...@@ -3,6 +3,7 @@ package com.dayu.bigfish.presenter.homeorder; ...@@ -3,6 +3,7 @@ package com.dayu.bigfish.presenter.homeorder;
import com.dayu.bigfish.base.BasePresenter; import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView; import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.bean.Tab;
/** /**
* Created by luo on 2016/8/4. * Created by luo on 2016/8/4.
...@@ -10,7 +11,7 @@ import com.dayu.bigfish.base.BaseView; ...@@ -10,7 +11,7 @@ import com.dayu.bigfish.base.BaseView;
public interface HomeOrderContract { public interface HomeOrderContract {
interface View extends BaseView { interface View extends BaseView {
void setTabNum(Tab tab, int myTabIndex);
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
......
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java
package com.dayu.bigfish.presenter.homeorder; package com.dayu.bigfish.presenter.homeorder;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.Tab; import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.OrderRecordActivity; import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent; 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 @InstanceFactory
public class HomeOrderPresenter extends HomeOrderContract.Presenter { public class HomeOrderPresenter extends HomeOrderContract.Presenter {
...@@ -37,19 +35,16 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter { ...@@ -37,19 +35,16 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override @Override
public void getTabNum(int userId, int siteId) { public void getTabNum(int userId, int siteId) {
ApiFactory.getTabNum(userId, siteId).subscribe(baseObserver(new Consumer<Tab>() { ApiFactory.getTabNum(userId, siteId).subscribe(baseObserver(
@Override tab -> mView.setTabNum(tab, mIndex),
public void accept(Tab tab) throws Exception { responeThrowable -> {
((HomeOrderFragment) mView).setTabNum(tab, mIndex); Tab tab = new Tab();
} tab.setCanceled(0);
}, responeThrowable -> { tab.setError(0);
Tab tab = new Tab(); tab.setPendingservice(0);
tab.setCanceled(0); tab.setReservation(0);
tab.setError(0); mView.setTabNum(tab, mIndex);
tab.setPendingservice(0); }));
tab.setReservation(0);
((HomeOrderFragment) mView).setTabNum(tab, mIndex);
}));
} }
@Override @Override
......
app/src/main/java/com/dayu/bigfish/presenter/kaaddress/KaAddressPresenter.java
...@@ -4,12 +4,10 @@ import android.databinding.ObservableField; ...@@ -4,12 +4,10 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.KaAddress; import com.dayu.bigfish.bean.KaAddress;
import io.reactivex.functions.Consumer;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan on 2017/11/8.
*/ */
...@@ -28,7 +26,6 @@ public class KaAddressPresenter extends KaAddressContract.Presenter { ...@@ -28,7 +26,6 @@ public class KaAddressPresenter extends KaAddressContract.Presenter {
@Override @Override
public void getKaAddress() { public void getKaAddress() {
ApiFactory.getKaAddress(mId).subscribe(baseObserver((Consumer<KaAddress>) ApiFactory.getKaAddress(mId).subscribe(baseObserver(kaAddress -> data.set(kaAddress)));
kaAddress -> data.set(kaAddress)));
} }
} }
app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java
...@@ -4,9 +4,9 @@ import android.databinding.ObservableField; ...@@ -4,9 +4,9 @@ import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.AgreementActivity; import com.dayu.bigfish.ui.AgreementActivity;
import com.dayu.bigfish.ui.MainActivity; import com.dayu.bigfish.ui.MainActivity;
...@@ -18,10 +18,9 @@ import com.hyphenate.EMCallBack; ...@@ -18,10 +18,9 @@ import com.hyphenate.EMCallBack;
import com.hyphenate.chat.EMClient; import com.hyphenate.chat.EMClient;
import com.umeng.analytics.MobclickAgent; 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 @InstanceFactory
...@@ -50,7 +49,7 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -50,7 +49,7 @@ public class LoginPresenter extends LoginContract.Presenter {
} else { } else {
mView.changeVoiceCodeBtn(); mView.changeVoiceCodeBtn();
} }
ApiFactory.sendCode(userName.get(), type).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> { ApiFactory.sendCode(userName.get(), type).subscribe(baseObserver(aBoolean -> {
if (type == 1) { if (type == 1) {
mView.showToast(R.string.login_sms_success); mView.showToast(R.string.login_sms_success);
} else if (type == 2) { } else if (type == 2) {
...@@ -70,19 +69,16 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -70,19 +69,16 @@ public class LoginPresenter extends LoginContract.Presenter {
return; return;
} }
mView.showDialog(); mView.showDialog();
ApiFactory.login(userName.get(), password.get()).subscribe(baseObserver(new Consumer<UserInfo>() { ApiFactory.login(userName.get(), password.get()).subscribe(baseObserver(userInfo -> {
@Override if (userInfo.getStatus() == 1) {
public void accept(UserInfo userInfo) throws Exception { loginHx(userInfo.getHxAccount(), userInfo.getHxPwd());
if (userInfo.getStatus() == 1) { dumpAndSave(userInfo);
loginHx(userInfo.getHxAccount(), userInfo.getHxPwd()); } else if (userInfo.getStatus() == 2) {
dumpAndSave(userInfo); ToastUtils.showShortToast(R.string.engineer_identity_auditing);
} else if (userInfo.getStatus() == 2) { UserManager.getInstance().saveUser(userInfo);
ToastUtils.showShortToast(R.string.engineer_identity_auditing); } else if (userInfo.getStatus() == 3) {
UserManager.getInstance().saveUser(userInfo); showLoginDialog();
} else if (userInfo.getStatus() == 3) { UserManager.getInstance().saveUser(userInfo);
showLoginDialog();
UserManager.getInstance().saveUser(userInfo);
}
} }
})); }));
} }
......
app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoPresenter.java
...@@ -4,14 +4,12 @@ import android.databinding.ObservableField; ...@@ -4,14 +4,12 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.bean.LogsticsInfo; import com.dayu.bigfish.api.ApiFactory;
import io.reactivex.functions.Consumer;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter { public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
...@@ -48,7 +46,7 @@ public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter { ...@@ -48,7 +46,7 @@ public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
@Override @Override
public void queryLogisticsInfo() { public void queryLogisticsInfo() {
ApiFactory.queryLogistics(mShipperCode, mCourierNum).subscribe(baseObserver((Consumer<LogsticsInfo>) ApiFactory.queryLogistics(mShipperCode, mCourierNum).subscribe(baseObserver(
logsticsInfo -> { logsticsInfo -> {
datas.set(logsticsInfo.getLogistics()); datas.set(logsticsInfo.getLogistics());
headData.set(logsticsInfo); headData.set(logsticsInfo);
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
...@@ -3,13 +3,10 @@ package com.dayu.bigfish.presenter.main; ...@@ -3,13 +3,10 @@ package com.dayu.bigfish.presenter.main;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; 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.bean.UserInfo;
import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.utils.AppUtils; import com.dayu.bigfish.utils.AppUtils;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
...@@ -17,12 +14,12 @@ 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.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class MainPresenter extends MainContract.Presenter { public class MainPresenter extends MainContract.Presenter {
...@@ -52,24 +49,17 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -52,24 +49,17 @@ public class MainPresenter extends MainContract.Presenter {
@Override @Override
public void getNewVersion(String version) { public void getNewVersion(String version) {
ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(new Consumer<String>() { ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(s -> {
@Override if (!version.equals(s)) {
public void accept(String s) throws Exception { upgradeVersion("dayushifua_dayu", s);
if (!version.equals(s)) {
upgradeVersion("dayushifua_dayu", s);
}
} }
})); }));
} }
@Override @Override
public void upgradeVersion(String appId, String versionCode) { public void upgradeVersion(String appId, String versionCode) {
ApiFactory.getVersionInfo(appId, versionCode).safeSubscribe(baseObserver(new Consumer<VersionInfo>() { ApiFactory.getVersionInfo(appId, versionCode).safeSubscribe(baseObserver(
@Override info -> mView.showUpdateDialog(info)));
public void accept(VersionInfo info) throws Exception {
mView.showUpdateDialog(info);
}
}));
} }
@Override @Override
...@@ -87,32 +77,21 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -87,32 +77,21 @@ public class MainPresenter extends MainContract.Presenter {
e.printStackTrace(); e.printStackTrace();
} }
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.commitVersionInfo(requestBody).subscribe(baseObserver(new Consumer<Boolean>() { ApiFactory.commitVersionInfo(requestBody).subscribe(baseObserver(
@Override aBoolean -> SPUtils.put(Constants.OLD_PAKAGENUM, MyApplication.getAppContext().getPackageName())));
public void accept(Boolean aBoolean) throws Exception {
SPUtils.put(Constants.OLD_PAKAGENUM, MyApplication.getAppContext().getPackageName());
}
}));
} }
@Override @Override
public void getReceiveOrder(int state, int userId, int siteId, int pagerId, int pagerSize) { 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>>() { ApiFactory.getOrders(state, userId, siteId, pagerId, pagerSize).subscribe(baseObserver(
@Override orders -> tabRecive.set(orders.getTotalRows() + "")));
public void accept(BasePageBean<Order> orders) throws Exception {
tabRecive.set(orders.getTotalRows() + "");
}
}));
} }
@Override @Override
public void getHxNum(String accountId) { public void getHxNum(String accountId) {
ApiFactory.getHxNum(accountId).subscribe(baseObserver(new Consumer<Integer>() { ApiFactory.getHxNum(accountId).subscribe(baseObserver(integer -> {
@Override if (integer.intValue() > 0) {
public void accept(Integer integer) throws Exception { mView.isShowRedIcon(true);
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; ...@@ -5,11 +5,10 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; 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.NewMessage;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.MessageDetailActivity; import com.dayu.bigfish.ui.MessageDetailActivity;
...@@ -24,14 +23,14 @@ import org.json.JSONObject; ...@@ -24,14 +23,14 @@ import org.json.JSONObject;
import java.text.ParseException; import java.text.ParseException;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO; 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 @InstanceFactory
public class messagePresenter extends messageContract.Presenter { public class messagePresenter extends messageContract.Presenter {
...@@ -66,13 +65,11 @@ public class messagePresenter extends messageContract.Presenter { ...@@ -66,13 +65,11 @@ public class messagePresenter extends messageContract.Presenter {
@Override @Override
public void getHxMessage(String hxUserId, int category, int page, int pageSize) { public void getHxMessage(String hxUserId, int category, int page, int pageSize) {
ApiFactory.getHxMessage(hxUserId, category, page, pageSize).subscribe(baseObserver(new Consumer<BasePageBean<NewMessage>>() { ApiFactory.getHxMessage(hxUserId, category, page, pageSize).subscribe(baseObserver(
@Override messageBasePageBean -> {
public void accept(BasePageBean<NewMessage> messageBasePageBean) throws Exception { data.set(messageBasePageBean);
data.set(messageBasePageBean); mPage++;
mPage++; }, throwable -> data.set(Constants.FAILED)));
}
}, throwable -> data.set(Constants.FAILED)));
} }
@Override @Override
...@@ -85,8 +82,7 @@ public class messagePresenter extends messageContract.Presenter { ...@@ -85,8 +82,7 @@ public class messagePresenter extends messageContract.Presenter {
e.printStackTrace(); e.printStackTrace();
} }
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); 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 @Override
......
app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java
...@@ -6,10 +6,10 @@ import android.os.Bundle; ...@@ -6,10 +6,10 @@ import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.EngineerInfo; import com.dayu.bigfish.bean.EngineerInfo;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
...@@ -17,15 +17,14 @@ import org.json.JSONObject; ...@@ -17,15 +17,14 @@ import org.json.JSONObject;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
/** /**
* Created by luofan on 2017/11/14. * Created by luofan
* on 2017/11/14.
*/ */
@InstanceFactory @InstanceFactory
public class ModifyPersonPresenter extends ModifyPersonContract.Presenter { public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
...@@ -92,14 +91,11 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter { ...@@ -92,14 +91,11 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
MultipartBody.Part body = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile); MultipartBody.Part body = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile);
mView.showDialog(); mView.showDialog();
ApiFactory.uploadPhoto(body).subscribe(baseObserver(new Consumer<List<String>>() { ApiFactory.uploadPhoto(body).subscribe(baseObserver(list -> {
@Override if (list != null && list.size() > 0) {
public void accept(List<String> list) throws Exception { modifyUserInfo(mRealName.get(), mIdentity.get(), list.get(0));
if (list != null && list.size() > 0) { } else {
modifyUserInfo(mRealName.get(), mIdentity.get(), list.get(0)); mView.showToast("修改头像失败");
} else {
mView.showToast("修改头像失败");
}
} }
})); }));
} }
...@@ -113,14 +109,11 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter { ...@@ -113,14 +109,11 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
params.put("identityUrl", identityUrl); params.put("identityUrl", identityUrl);
JSONObject jsonObject = new JSONObject(params); JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.modifyUserInfo(body).subscribe(baseObserver(new Consumer<EngineerInfo>() { ApiFactory.modifyUserInfo(body).subscribe(baseObserver(engineerInfo -> {
@Override mRealName.set(engineerInfo.getRealName());
public void accept(EngineerInfo engineerInfo) throws Exception { mIdentity.set(engineerInfo.getIdentity());
mRealName.set(engineerInfo.getRealName()); mIdentityUrl.set(engineerInfo.getIdentityUrl());
mIdentity.set(engineerInfo.getIdentity()); mView.showTip();
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; ...@@ -3,12 +3,11 @@ package com.dayu.bigfish.presenter.myhead;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import com.app.annotation.apt.InstanceFactory; 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.bean.UserInfo;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import java.io.File; import java.io.File;
import java.util.List;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
...@@ -16,7 +15,8 @@ import okhttp3.MultipartBody; ...@@ -16,7 +15,8 @@ import okhttp3.MultipartBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
/** /**
* Created by luofan on 2017/11/14. * Created by luofan
* on 2017/11/14.
*/ */
@InstanceFactory @InstanceFactory
public class MyHeadPresenter extends MyHeadContract.Presenter { public class MyHeadPresenter extends MyHeadContract.Presenter {
...@@ -37,14 +37,11 @@ public class MyHeadPresenter extends MyHeadContract.Presenter { ...@@ -37,14 +37,11 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file); RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
MultipartBody.Part body = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile); MultipartBody.Part body = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile);
mView.showDialog(); mView.showDialog();
ApiFactory.uploadPhoto(body).subscribe(baseObserver(new Consumer<List<String>>() { ApiFactory.uploadPhoto(body).subscribe(baseObserver(list -> {
@Override if (list != null && list.size() > 0) {
public void accept(List<String> list) throws Exception { modifyHead(list.get(0));
if (list != null && list.size() > 0) { } else {
modifyHead(list.get(0)); mView.showToast("修改头像失败");
} else {
mView.showToast("修改头像失败");
}
} }
})); }));
} }
......
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailPresenter.java
...@@ -3,14 +3,12 @@ package com.dayu.bigfish.presenter.orderdetail; ...@@ -3,14 +3,12 @@ package com.dayu.bigfish.presenter.orderdetail;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.api.ApiFactory;
import io.reactivex.functions.Consumer;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class OrderDetailPresenter extends OrderDetailContract.Presenter { public class OrderDetailPresenter extends OrderDetailContract.Presenter {
...@@ -27,7 +25,7 @@ public class OrderDetailPresenter extends OrderDetailContract.Presenter { ...@@ -27,7 +25,7 @@ public class OrderDetailPresenter extends OrderDetailContract.Presenter {
@Override @Override
public void getOrderDetailInfo(int orderId) { 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))); 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; ...@@ -4,12 +4,9 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.event.RefreshTab; import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
...@@ -21,15 +18,14 @@ import org.greenrobot.eventbus.EventBus; ...@@ -21,15 +18,14 @@ import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class OrderDoingPresenter extends orderDoingContract.Presenter { public class OrderDoingPresenter extends orderDoingContract.Presenter {
...@@ -70,8 +66,8 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -70,8 +66,8 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override @Override
public void getOrders(int state, int userId, int siteId, int page, int pageSize) { public void getOrders(int state, int userId, int siteId, int page, int pageSize) {
ApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe( ApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
baseObserver((Consumer<BasePageBean<Order>>) orderBasePageBean -> { orderBasePageBean -> {
datas.set(orderBasePageBean); datas.set(orderBasePageBean);
mPage++; mPage++;
EventBus.getDefault().post(new RefreshTab(-1)); EventBus.getDefault().post(new RefreshTab(-1));
...@@ -81,7 +77,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -81,7 +77,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override @Override
public void getErrorOrder() { public void getErrorOrder() {
ApiFactory.getErrorOrders(mUserId, mSiteId).subscribe( ApiFactory.getErrorOrders(mUserId, mSiteId).subscribe(
baseObserver((Consumer<List<ErrorOrder>>) errorOrder -> { baseObserver( errorOrder -> {
datas.set(errorOrder); datas.set(errorOrder);
EventBus.getDefault().post(new RefreshTab(-1)); EventBus.getDefault().post(new RefreshTab(-1));
}, responeThrowable -> datas.set(Constants.FAILED))); }, responeThrowable -> datas.set(Constants.FAILED)));
......
app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartPresenter.java
...@@ -4,10 +4,10 @@ import android.databinding.ObservableField; ...@@ -4,10 +4,10 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderPart; import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.ui.CommonSubmiteActivity; import com.dayu.bigfish.ui.CommonSubmiteActivity;
...@@ -17,10 +17,7 @@ import com.dayu.bigfish.utils.UIUtils; ...@@ -17,10 +17,7 @@ import com.dayu.bigfish.utils.UIUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
/** /**
* Created by luofan * Created by luofan
...@@ -63,9 +60,7 @@ public class OrderPartPresenter extends OrderPartContract.Presenter { ...@@ -63,9 +60,7 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
@Override @Override
public void queryPartList() { public void queryPartList() {
ApiFactory.queryPart(mOrderId, mType).subscribe(baseObserver( ApiFactory.queryPart(mOrderId, mType).subscribe(baseObserver(
(Consumer<List<OrderPart>>) orderPart -> { orderPart -> datas.set(orderPart)
datas.set(orderPart);
}
, responeThrowable -> datas.set(Constants.FAILED))); , responeThrowable -> datas.set(Constants.FAILED)));
} }
......
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java
...@@ -4,9 +4,9 @@ import android.databinding.ObservableField; ...@@ -4,9 +4,9 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.EngineerInfo; import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.ModifyPersonInfoActivity; import com.dayu.bigfish.ui.ModifyPersonInfoActivity;
...@@ -14,10 +14,9 @@ import com.dayu.bigfish.ui.MyHeaderIvActivity; ...@@ -14,10 +14,9 @@ import com.dayu.bigfish.ui.MyHeaderIvActivity;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent; 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 @InstanceFactory
public class PersonInfoPresenter extends PersonInfoContract.Presenter { public class PersonInfoPresenter extends PersonInfoContract.Presenter {
...@@ -50,11 +49,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter { ...@@ -50,11 +49,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
@Override @Override
public void queryInfo(int accountId) { public void queryInfo(int accountId) {
ApiFactory.getEngineerInfo(accountId).subscribe(baseObserver(new Consumer<EngineerInfo>() { ApiFactory.getEngineerInfo(accountId).subscribe(baseObserver(
@Override engineerInfo -> info.set(engineerInfo)));
public void accept(EngineerInfo engineerInfo) throws Exception {
info.set(engineerInfo);
}
}));
} }
} }
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
...@@ -7,10 +7,10 @@ import android.os.Bundle; ...@@ -7,10 +7,10 @@ import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.event.OrderState; import com.dayu.bigfish.bean.event.OrderState;
...@@ -33,7 +33,6 @@ import java.util.ArrayList; ...@@ -33,7 +33,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
...@@ -42,7 +41,8 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_FINISH; ...@@ -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; 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 @InstanceFactory
public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
...@@ -108,12 +108,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -108,12 +108,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
@Override @Override
public void getOrderInfo(int orderId) { public void getOrderInfo(int orderId) {
ApiFactory.getOrderInfo(orderId).subscribe(baseObserver(new Consumer<OrderDetail>() { ApiFactory.queryOrderInfo(orderId).subscribe(baseObserver(detail -> {
@Override mDetail.set(detail);
public void accept(OrderDetail detail) throws Exception { mAnyContacts = detail.getAnyContacts();
mDetail.set(detail);
mAnyContacts = detail.getAnyContacts();
}
})); }));
} }
...@@ -149,22 +146,19 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -149,22 +146,19 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
} }
JSONObject jsonObject = new JSONObject(params); JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.commitOrder(body).subscribe(baseObserver(new Consumer<Integer>() { ApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
@Override mView.showToast(R.string.order_commite_success);
public void accept(Integer integer) throws Exception { int status = 0;
mView.showToast(R.string.order_commite_success); if (mAnyContacts == 0) {
int status = 0; status = ORDER_NOCONTACT_FINISH;
if (mAnyContacts == 0) { EventBus.getDefault().post(new RefreshTab(-1));
status = ORDER_NOCONTACT_FINISH; } else if (mAnyContacts == 1) {
EventBus.getDefault().post(new RefreshTab(-1)); status = ORDER_FINISH;
} else if (mAnyContacts == 1) {
status = ORDER_FINISH;
}
EventBus.getDefault().post(new OrderState(status, mPosition));
mOrderInfoDao.deleteByKey((long) orderId);
PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
mView.dumpBack();
} }
EventBus.getDefault().post(new OrderState(status, mPosition));
mOrderInfoDao.deleteByKey((long) orderId);
PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
mView.dumpBack();
})); }));
} }
...@@ -184,16 +178,13 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -184,16 +178,13 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile); MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile);
part[i] = body; part[i] = body;
} }
ApiFactory.uploadPhoto(part).subscribe(baseObserver(new Consumer<List<String>>() { ApiFactory.uploadPhoto(part).subscribe(baseObserver(list -> {
@Override OrderInfo info = mOrderField.get();
public void accept(List<String> list) throws Exception { commitOrder(list, mOrderId, info.getServerRecord(),
OrderInfo info = mOrderField.get(); mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
commitOrder(list, mOrderId, info.getServerRecord(), info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(), mImages.clear();
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice()); PictureFileUtils.deleteCacheDirFile(MyApplication.getContext());
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; ...@@ -4,10 +4,10 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order; import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
...@@ -25,10 +25,10 @@ import java.util.concurrent.TimeUnit; ...@@ -25,10 +25,10 @@ import java.util.concurrent.TimeUnit;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; 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 @InstanceFactory
public class ReceivingPresenter extends ReceivingContract.Presenter { public class ReceivingPresenter extends ReceivingContract.Presenter {
...@@ -50,22 +50,15 @@ public class ReceivingPresenter extends ReceivingContract.Presenter { ...@@ -50,22 +50,15 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
@Override @Override
public void getOrders(int state, int page, int pageSize, int siteId, int userId) { 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>>() { ApiFactory.getOrders(state, page, pageSize, siteId, userId).subscribe(baseObserver(
@Override orderBasePageBean -> getOrderSuccess(orderBasePageBean),
public void accept(BasePageBean<Order> orderBasePageBean) throws Exception { throwable -> datas.set(Constants.FAILED)));
getOrderSuccess(orderBasePageBean);
}
}, throwable -> datas.set(Constants.FAILED)));
} }
@Override @Override
public void receiveOrder(int orders, int engineer) { public void receiveOrder(int orders, int engineer) {
ApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(new Consumer<Boolean>() { ApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(
@Override aBoolean -> receiveOrderSuccess(), responeThrowable -> {
public void accept(Boolean aBoolean) throws Exception {
receiveOrderSuccess();
}
}, responeThrowable -> {
if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) { if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) {
refresh(); refresh();
} }
......
app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartPresenter.java
...@@ -4,8 +4,8 @@ import android.databinding.ObservableField; ...@@ -4,8 +4,8 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderPart; import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.bean.ShipperCompany; import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
...@@ -20,12 +20,12 @@ import org.json.JSONObject; ...@@ -20,12 +20,12 @@ import org.json.JSONObject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class ReturnPartPresenter extends ReturnPartContract.Presenter { public class ReturnPartPresenter extends ReturnPartContract.Presenter {
...@@ -85,17 +85,17 @@ 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()); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
if (mType == Constants.BYKA) { if (mType == Constants.BYKA) {
ApiFactory.returnPartByKA(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> { ApiFactory.returnPartByKA(requestBody).subscribe(baseObserver(aBoolean -> {
mView.dumpBack(); mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1)); EventBus.getDefault().post(new RefreshApplyPart(1));
})); }));
} else if (mType == Constants.BYMYSELF) { } else if (mType == Constants.BYMYSELF) {
ApiFactory.returnPartSelf(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> { ApiFactory.returnPartSelf(requestBody).subscribe(baseObserver(aBoolean -> {
mView.dumpBack(); mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1)); EventBus.getDefault().post(new RefreshApplyPart(1));
})); }));
} else if (mType == Constants.BY_MODIFY_PART) { } else if (mType == Constants.BY_MODIFY_PART) {
ApiFactory.modifyPart(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> { ApiFactory.modifyPart(requestBody).subscribe(baseObserver(aBoolean -> {
mView.dumpBack(); mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1)); 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; ...@@ -4,8 +4,8 @@ import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.ServerInstruction; import com.dayu.bigfish.bean.ServerInstruction;
import com.dayu.bigfish.ui.WebViewActivity; import com.dayu.bigfish.ui.WebViewActivity;
...@@ -34,7 +34,8 @@ public class ServerInstructionPresenter extends ServerInstructionContract.Presen ...@@ -34,7 +34,8 @@ public class ServerInstructionPresenter extends ServerInstructionContract.Presen
@Override @Override
public void getInstructs() { 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++; mPage++;
mDatas.set(datas); mDatas.set(datas);
})); }));
......
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
...@@ -8,10 +8,10 @@ import android.os.Environment; ...@@ -8,10 +8,10 @@ import android.os.Environment;
import android.text.TextUtils; import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.AboutUsActivity; import com.dayu.bigfish.ui.AboutUsActivity;
import com.dayu.bigfish.ui.CommonSubmiteActivity; import com.dayu.bigfish.ui.CommonSubmiteActivity;
...@@ -28,10 +28,10 @@ import com.umeng.analytics.MobclickAgent; ...@@ -28,10 +28,10 @@ import com.umeng.analytics.MobclickAgent;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Consumer;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class SettingPresenter extends SettingContract.Presenter { public class SettingPresenter extends SettingContract.Presenter {
...@@ -79,14 +79,11 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -79,14 +79,11 @@ public class SettingPresenter extends SettingContract.Presenter {
@Override @Override
public void updataVersion() { public void updataVersion() {
ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(new Consumer<String>() { ApiFactory.checkVersion("dayushifua_dayu").subscribe(baseObserver(s -> {
@Override if (s.equals(AppUtils.getPackageNum())) {
public void accept(String s) throws Exception { mView.showToast(R.string.is_newversion);
if (s.equals(AppUtils.getPackageNum())) { } else {
mView.showToast(R.string.is_newversion); mView.showToast(UIUtils.getString(R.string.newversion_code) + s);
} 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; ...@@ -6,9 +6,9 @@ import android.text.TextUtils;
import android.view.View; import android.view.View;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.event.OrderState; import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshApoiment; import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshServe; import com.dayu.bigfish.bean.event.RefreshServe;
...@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; ...@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; 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_DOING;
import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE; import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
...@@ -35,7 +34,8 @@ import static com.dayu.bigfish.utils.UtilsDate.LONG_DATE_FORMAT; ...@@ -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; 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 @InstanceFactory
public class SubcribeTimePresenter extends SubcribeContract.Presenter { public class SubcribeTimePresenter extends SubcribeContract.Presenter {
...@@ -90,23 +90,20 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter { ...@@ -90,23 +90,20 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
@Override @Override
public void subcribeTime(int orderId, String doorTime, String doorComment) { public void subcribeTime(int orderId, String doorTime, String doorComment) {
ApiFactory.subcriceTime(orderId, doorTime, doorComment).subscribe(baseObserver(new Consumer<Boolean>() { ApiFactory.subcriceTime(orderId, doorTime, doorComment).subscribe(baseObserver(aBoolean -> {
@Override mView.showToast(R.string.order_commite_success);
public void accept(Boolean aBoolean) throws Exception { if (mState == SUBCRIBE_TIME) {
mView.showToast(R.string.order_commite_success); mView.showToast(R.string.subcribe_time_success);
if (mState == SUBCRIBE_TIME) { EventBus.getDefault().post(new RefreshTab(1));
mView.showToast(R.string.subcribe_time_success); mDisposable = Observable.timer(500, TimeUnit.MILLISECONDS).subscribe(aLong -> {
EventBus.getDefault().post(new RefreshTab(1)); EventBus.getDefault().post(new RefreshApoiment(1));
mDisposable = Observable.timer(500, TimeUnit.MILLISECONDS).subscribe(aLong -> { EventBus.getDefault().post(new RefreshServe(1));
EventBus.getDefault().post(new RefreshApoiment(1)); mDisposable.dispose();
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));
} else if (mState == ORDER_YUYUE || mState == ORDER_DOING) {
EventBus.getDefault().post(new OrderState(ORDER_YUYUE, mPosition, mTime));
}
mView.dumpBack();
} }
mView.dumpBack();
}, responeThrowable -> { }, responeThrowable -> {
if ("ORDER0004".equals(responeThrowable.subCode)) { if ("ORDER0004".equals(responeThrowable.subCode)) {
if (mState == SUBCRIBE_TIME) { //刷新待预约列表并跳转到已取消 if (mState == SUBCRIBE_TIME) { //刷新待预约列表并跳转到已取消
......
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java
...@@ -6,10 +6,9 @@ import android.os.Bundle; ...@@ -6,10 +6,9 @@ import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication; 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.Order;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
...@@ -20,10 +19,9 @@ import com.umeng.analytics.MobclickAgent; ...@@ -20,10 +19,9 @@ import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.reactivex.functions.Consumer;
/** /**
* Created by luofan on 2017/11/8. * Created by luofan
* on 2017/11/8.
*/ */
@InstanceFactory @InstanceFactory
public class OrderRecordPresenter extends OrderRecordContract.Presenter { public class OrderRecordPresenter extends OrderRecordContract.Presenter {
...@@ -50,12 +48,10 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter { ...@@ -50,12 +48,10 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
@Override @Override
public void getOrders(int state, int engineerId, int siteId, int page, int pageSize) { 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>>() { ApiFactory.getOrders(state, engineerId, siteId, page, pageSize).subscribe(baseObserver(
@Override orderBasePageBean -> {
public void accept(BasePageBean<Order> orderBasePageBean) throws Exception { datas.set(orderBasePageBean);
datas.set(orderBasePageBean); mPage++;
mPage++;
}
}, throwable -> datas.set(Constants.FAILED))); }, throwable -> datas.set(Constants.FAILED)));
} }
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java
...@@ -29,7 +29,6 @@ import java.util.HashMap; ...@@ -29,7 +29,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import io.reactivex.android.schedulers.AndroidSchedulers; 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.FORMAT_ONE;
import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO; import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
...@@ -274,14 +273,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -274,14 +273,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (mItem.getSubStatus() == 1) { if (mItem.getSubStatus() == 1) {
mPresenter.startOrder(mItem.getId(), latitude, longitude) mPresenter.startOrder(mItem.getId(), latitude, longitude)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(new Consumer<Integer>() { .subscribe(mPresenter.baseObserver(integer -> {
@Override LocationUtils.stop();
public void accept(Integer integer) throws Exception { ProgressUtil.stopLoad();
LocationUtils.stop(); mItem.setSubStatus(2);
ProgressUtil.stopLoad(); mBind.tvItemProcess.setText(mContext.getString(R.string.begain_server));
mItem.setSubStatus(2);
mBind.tvItemProcess.setText(mContext.getString(R.string.begain_server));
}
}, responeThrowable -> { }, responeThrowable -> {
if ("ORDER0005".equals(responeThrowable.subCode)) { if ("ORDER0005".equals(responeThrowable.subCode)) {
EventBus.getDefault().post(new RefreshTab(3)); EventBus.getDefault().post(new RefreshTab(3));
...@@ -292,16 +288,13 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -292,16 +288,13 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (mItem.getSubStatus() == 2) { } else if (mItem.getSubStatus() == 2) {
mPresenter.startServer(mItem.getId(), latitude, longitude) mPresenter.startServer(mItem.getId(), latitude, longitude)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(mPresenter.baseObserver(new Consumer<Integer>() { .subscribe(mPresenter.baseObserver(integer -> {
@Override LocationUtils.stop();
public void accept(Integer integer) throws Exception { ProgressUtil.stopLoad();
LocationUtils.stop(); mItem.setStatus(4);
ProgressUtil.stopLoad(); mItem.setSubStatus(integer);
mItem.setStatus(4); mBind.tvItemProcess.setText(mContext.getString(R.string.process_order));
mItem.setSubStatus(integer); mBind.itemUpdataTime.setText(mContext.getString(R.string.need_again_door));
mBind.tvItemProcess.setText(mContext.getString(R.string.process_order));
mBind.itemUpdataTime.setText(mContext.getString(R.string.need_again_door));
}
}, responeThrowable -> { }, responeThrowable -> {
if ("ORDER0006".equals(responeThrowable.subCode)) { if ("ORDER0006".equals(responeThrowable.subCode)) {
EventBus.getDefault().post(new RefreshTab(3)); 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 ...@@ -179,7 +179,7 @@ public class OrderPartAdapter extends CoreAdapter<OrderPart, ItemApplyPartLayout
, (dialog, confirm) -> { , (dialog, confirm) -> {
if (confirm) { if (confirm) {
presenter.cancleApply(part.getId()).subscribe( presenter.cancleApply(part.getId()).subscribe(
presenter.baseObserver((Consumer<Boolean>) aBoolean -> { presenter.baseObserver( aBoolean -> {
part.setStatus(Constants.CANCEL); part.setStatus(Constants.CANCEL);
notifyDataSetChanged(); notifyDataSetChanged();
})); }));
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java
...@@ -164,6 +164,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -164,6 +164,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
/** /**
* 将网络请求到的数据展示到tab上 * 将网络请求到的数据展示到tab上
*/ */
@Override
public void setTabNum(Tab tab, int myTabIndex) { public void setTabNum(Tab tab, int myTabIndex) {
String[] tabNum = new String[]{tab.getReservation() + "", tab.getPendingservice() + "", String[] tabNum = new String[]{tab.getReservation() + "", tab.getPendingservice() + "",
tab.getError() + "", tab.getCanceled() + ""}; 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; ...@@ -2,6 +2,7 @@ package com.dayu.bigfish.utils.managers;
import android.content.Context; import android.content.Context;
import com.dayu.bigfish.api.APIService;
import com.dayu.bigfish.api.Api; import com.dayu.bigfish.api.Api;
import com.dayu.bigfish.ui.listener.onDownloadListener; import com.dayu.bigfish.ui.listener.onDownloadListener;
...@@ -13,6 +14,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; ...@@ -13,6 +14,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import okhttp3.ResponseBody;
import okio.BufferedSink; import okio.BufferedSink;
import okio.BufferedSource; import okio.BufferedSource;
import okio.Okio; import okio.Okio;
...@@ -32,8 +34,8 @@ public class DownloadManager { ...@@ -32,8 +34,8 @@ public class DownloadManager {
* @param cd 订阅关系集合，在数据传输完毕时解除订阅 * @param cd 订阅关系集合，在数据传输完毕时解除订阅
*/ */
public static void download(final Context context, final String url, final String apkPath, final CompositeDisposable cd, onDownloadListener listener) { public static void download(final Context context, final String url, final String apkPath, final CompositeDisposable cd, onDownloadListener listener) {
Api.getDownloadRetrofit().download(url) Api.getDownloadService(APIService.class).download(url)
.map(responseBody -> responseBody.source()) .map(ResponseBody::source)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.doOnNext(bufferedSource -> { .doOnNext(bufferedSource -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment