Skip to content

T
TangKuPos
Commit a9d348f0 authored by 王海's avatar 王海
Browse files
Options

代码优化 待测试

parent b96cf7a4
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 502 deletions
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ a9d348f0
...@@ -39,11 +39,7 @@ import io.realm.RealmObject; ...@@ -39,11 +39,7 @@ import io.realm.RealmObject;
* @author Zhangzhen * @author Zhangzhen
*/ */
public final class ApiFactory { public final class ApiFactory {
public static class Test { public static class Test {
/** /**
* 发送验证码 * 发送验证码
* *
...@@ -54,22 +50,13 @@ public final class ApiFactory { ...@@ -54,22 +50,13 @@ public final class ApiFactory {
public static Observable<Object> sendSms(String recvMobile, String sign, int startWay) { public static Observable<Object> sendSms(String recvMobile, String sign, int startWay) {
switch (startWay) { switch (startWay) {
case 1: { case 1: {
return Api.getInstance().service.sendSms(recvMobile, sign) return run(Api.getInstance().service.sendSms(recvMobile, sign));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
case 2: { case 2: {
return Api.getInstance().service.signUpSmsSend(recvMobile, sign) return run(Api.getInstance().service.signUpSmsSend(recvMobile, sign));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
return null; return null;
} }
/** /**
...@@ -79,11 +66,8 @@ public final class ApiFactory { ...@@ -79,11 +66,8 @@ public final class ApiFactory {
* @param smsCheck 验证码 * @param smsCheck 验证码
* @return * @return
*/ */
public static Observable<Object> checkSms(String recvMobile, String smsCheck) { public static Observable<Object> checkSms(String recvMobile, String smsCheck) {
return Api.getInstance().service.smscheck(recvMobile, smsCheck).onErrorReturn(new return run(Api.getInstance().service.smscheck(recvMobile, smsCheck));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -100,17 +84,11 @@ public final class ApiFactory { ...@@ -100,17 +84,11 @@ public final class ApiFactory {
* @param smsCode 验证码 * @param smsCode 验证码
* @return * @return
*/ */
public static Observable<Object> rigister(String operMobile, String loginPwd, String public static Observable<Object> rigister(String operMobile, String loginPwd, String
merName, String operName, String shopName, int cityCountyId, String cityAddress, merName, String operName, String shopName, int cityCountyId, String cityAddress,
String sn, String String sn, String modelNo, String smsCode) {
modelNo, String smsCode) { return run(Api.getInstance().service.register(operMobile, loginPwd, merName, operName,
return Api.getInstance().service.register(operMobile, loginPwd, merName, operName, shopName, 0, cityCountyId, cityAddress, sn, modelNo, smsCode));
shopName, 0,
cityCountyId, cityAddress, sn, modelNo, smsCode).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers
.mainThread());
} }
...@@ -120,9 +98,7 @@ public final class ApiFactory { ...@@ -120,9 +98,7 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<String> logout() { public static Observable<String> logout() {
return Api.getInstance().service.logout().onErrorReturn return run(Api.getInstance().service.logout());
(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -136,9 +112,7 @@ public final class ApiFactory { ...@@ -136,9 +112,7 @@ public final class ApiFactory {
*/ */
public static Observable<LoginReturnBean> signBefore(String userName, String userPasswd, public static Observable<LoginReturnBean> signBefore(String userName, String userPasswd,
String model, String sn) { String model, String sn) {
return Api.getInstance().service.sign(userName, userPasswd, model, sn).onErrorReturn return run(Api.getInstance().service.sign(userName, userPasswd, model, sn));
(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()).retryWhen(new RetryHelper(3));
} }
/** /**
...@@ -146,12 +120,9 @@ public final class ApiFactory { ...@@ -146,12 +120,9 @@ public final class ApiFactory {
* *
* @return * @return
*/ */
public static Observable<String> deviceRegister() { public static Observable<String> deviceRegister() {
return Api.getInstance().service.deviceRegister(SystemUtil.getDeviceSN(), SystemUtil return run(Api.getInstance().service.deviceRegister(SystemUtil.getDeviceSN(), SystemUtil
.getDeviceModel()).onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<> .getDeviceModel()));
()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
/** /**
...@@ -163,9 +134,7 @@ public final class ApiFactory { ...@@ -163,9 +134,7 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<String> forget(String phone, String pwd, String smscode) { public static Observable<String> forget(String phone, String pwd, String smscode) {
return Api.getInstance().service.forget(phone, pwd, smscode).onErrorReturn(new return run(Api.getInstance().service.forget(phone, pwd, smscode));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -177,18 +146,14 @@ public final class ApiFactory { ...@@ -177,18 +146,14 @@ public final class ApiFactory {
*/ */
public static Observable<Integer> isShowBtn(String sn, String model) { public static Observable<Integer> isShowBtn(String sn, String model) {
return Api.getInstance().service.isShowSignUpBtn(sn, model).onErrorReturn(new return run(Api.getInstance().service.isShowSignUpBtn(sn, model));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
* 获取当前登录的用户旗下的门店款台信息 * 获取当前登录的用户旗下的门店款台信息
*/ */
public static Observable<UserStoreInfo> getUserStoreInfo() { public static Observable<UserStoreInfo> getUserStoreInfo() {
return Api.getInstance().service.getUserStoreInfo().onErrorReturn(new ErrorFilter<>() return run(Api.getInstance().service.getUserStoreInfo());
).map(new ResultFilter<>()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers
.mainThread()).retryWhen(new RetryHelper(3));
} }
/** /**
...@@ -201,9 +166,7 @@ public final class ApiFactory { ...@@ -201,9 +166,7 @@ public final class ApiFactory {
*/ */
public static Observable<Object> addStore(String shopName, String cityCountyId, String public static Observable<Object> addStore(String shopName, String cityCountyId, String
cityAddress) { cityAddress) {
return Api.getInstance().service.addStore(shopName, cityCountyId, cityAddress) return run(Api.getInstance().service.addStore(shopName, cityCountyId, cityAddress));
.onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn
(Schedulers.io()).observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -213,10 +176,7 @@ public final class ApiFactory { ...@@ -213,10 +176,7 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<Object> addCounter(long shopMapId) { public static Observable<Object> addCounter(long shopMapId) {
return Api.getInstance().service.addCounter(shopMapId, SystemUtil.getDeviceSN()) return run(Api.getInstance().service.addCounter(shopMapId, SystemUtil.getDeviceSN()));
.onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -227,10 +187,7 @@ public final class ApiFactory { ...@@ -227,10 +187,7 @@ public final class ApiFactory {
*/ */
public static Observable<Object> bindCounter(long casherId) { public static Observable<Object> bindCounter(long casherId) {
return Api.getInstance().service.bindCounter(casherId, SystemUtil.getDeviceSN()) return run(Api.getInstance().service.bindCounter(casherId, SystemUtil.getDeviceSN()));
.onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -242,10 +199,8 @@ public final class ApiFactory { ...@@ -242,10 +199,8 @@ public final class ApiFactory {
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(int pageNulmber, int public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(int pageNulmber, int
pageSize, String orderStatus, int payType) { pageSize, String orderStatus, int payType) {
return Api.getInstance().service.getSaleOrder(pageNulmber, pageSize, orderStatus, return run(Api.getInstance().service.getSaleOrder(pageNulmber, pageSize, orderStatus,
payType).onErrorReturn(new payType));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -257,10 +212,8 @@ public final class ApiFactory { ...@@ -257,10 +212,8 @@ public final class ApiFactory {
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(int pageNulmber, int public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(int pageNulmber, int
pageSize, String orderStatus, String orderNo, String wd) { pageSize, String orderStatus, String orderNo, String wd) {
return Api.getInstance().service.getSaleOrder(pageNulmber, pageSize, orderStatus, return run(Api.getInstance().service.getSaleOrder(pageNulmber, pageSize, orderStatus,
orderNo, wd).onErrorReturn(new orderNo, wd));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
...@@ -272,13 +225,9 @@ public final class ApiFactory { ...@@ -272,13 +225,9 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList
(String orderStatus, int pageNulmber, int (String orderStatus, int pageNulmber, int pageSize, long startDate, long endDate) {
pageSize, long startDate, long endDate) { return run(Api.getInstance().service.getSaleOrder(orderStatus, pageNulmber, pageSize,
return Api.getInstance().service.getSaleOrder(orderStatus, pageNulmber, pageSize, startDate, endDate));
startDate,
endDate).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -288,9 +237,7 @@ public final class ApiFactory { ...@@ -288,9 +237,7 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<com.xingdata.zzdpos.model.Saleorder> getSaleOrderDetail(String orderId) { public static Observable<com.xingdata.zzdpos.model.Saleorder> getSaleOrderDetail(String orderId) {
return Api.getInstance().service.getOrderDetail(orderId).onErrorReturn(new return run(Api.getInstance().service.getOrderDetail(orderId));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
...@@ -301,9 +248,7 @@ public final class ApiFactory { ...@@ -301,9 +248,7 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<String> returnOrder(String orderId) { public static Observable<String> returnOrder(String orderId) {
return Api.getInstance().service.returnOrder(orderId).onErrorReturn(new ErrorFilter<> return run(Api.getInstance().service.returnOrder(orderId));
()).map(new ResultFilter<>()).subscribeOn(Schedulers.io()).observeOn
(AndroidSchedulers.mainThread());
} }
...@@ -422,11 +367,7 @@ public final class ApiFactory { ...@@ -422,11 +367,7 @@ public final class ApiFactory {
} }
public static Observable<List<Category>> queryAll(Category category) { public static Observable<List<Category>> queryAll(Category category) {
return Api.getInstance().service.queryAll(category) return run(Api.getInstance().service.queryAll(category));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
...@@ -435,11 +376,7 @@ public final class ApiFactory { ...@@ -435,11 +376,7 @@ public final class ApiFactory {
public static Observable<Pager<com.xingdata.zzdpos.model.Smt>> queryAll(int pageSize, int public static Observable<Pager<com.xingdata.zzdpos.model.Smt>> queryAll(int pageSize, int
pageNumber) { pageNumber) {
return Api.getInstance().service.querySmt(pageSize, pageNumber) return run(Api.getInstance().service.querySmt(pageSize, pageNumber));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
...@@ -447,79 +384,46 @@ public final class ApiFactory { ...@@ -447,79 +384,46 @@ public final class ApiFactory {
public static class Ussku { public static class Ussku {
public static Observable<Pager<com.xingdata.zzdpos.model.Ussku>> usskuQuery(int pageNum, public static Observable<Pager<com.xingdata.zzdpos.model.Ussku>> usskuQuery(int pageNum,
String keyword) { String keyword) {
return Api.getInstance().service.usskuQuery(keyword, C.PRODUCT.PAGE_SIZE, pageNum) return run(Api.getInstance().service.usskuQuery(keyword, C.PRODUCT.PAGE_SIZE, pageNum));
.onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Ussku> usskuDetail(String id) { public static Observable<com.xingdata.zzdpos.model.Ussku> usskuDetail(String id) {
return Api.getInstance().service.usskuDetail(id).onErrorReturn(new return run(Api.getInstance().service.usskuDetail(id));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> usskuAddMis(UsskuParam usskuParam) { public static Observable<String> usskuAddMis(UsskuParam usskuParam) {
return Api.getInstance().service.usskuAddMis(usskuParam).onErrorReturn(new return run(Api.getInstance().service.usskuAddMis(usskuParam));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> usskuDelete(String id) { public static Observable<String> usskuDelete(String id) {
return Api.getInstance().service.usskuDelete(id).onErrorReturn(new return run(Api.getInstance().service.usskuDelete(id));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> usskuUpdate(UsskuParam usskuParam) { public static Observable<String> usskuUpdate(UsskuParam usskuParam) {
return Api.getInstance().service.usskuUpdate(usskuParam).onErrorReturn(new return run(Api.getInstance().service.usskuUpdate(usskuParam));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class TRULE { public static class TRULE {
public static Observable<Pager<Trule>> truleQuery() { public static Observable<Pager<Trule>> truleQuery() {
return Api.getInstance().service.truleQuery(System.currentTimeMillis() + "") return run(Api.getInstance().service.truleQuery(System.currentTimeMillis() + ""));
.onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Trule>> truleQueryByVipId(long vipId) { public static Observable<Pager<Trule>> truleQueryByVipId(long vipId) {
return Api.getInstance().service.truleQueryByVipId(vipId) return run(Api.getInstance().service.truleQueryByVipId(vipId));
.onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> truleDetail(String id) { public static Observable<String> truleDetail(String id) {
return Api.getInstance().service.truleDetail(id).onErrorReturn(new return run(Api.getInstance().service.truleDetail(id));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> truleAdd(Trule trule) { public static Observable<String> truleAdd(Trule trule) {
return Api.getInstance().service.truleAdd(trule).onErrorReturn(new return run(Api.getInstance().service.truleAdd(trule));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> truleUpdate(Trule trule) { public static Observable<String> truleUpdate(Trule trule) {
return Api.getInstance().service.truleUpdate(trule).onErrorReturn(new return run(Api.getInstance().service.truleUpdate(trule));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
...@@ -527,40 +431,25 @@ public final class ApiFactory { ...@@ -527,40 +431,25 @@ public final class ApiFactory {
public static class Gbounds { public static class Gbounds {
public static Observable<Pager<Gbound>> query(int pageSize, int public static Observable<Pager<Gbound>> query(int pageSize, int
pageNumber) { pageNumber) {
return Api.getInstance().service.gboundQuery(pageSize, pageNumber).onErrorReturn(new return run(Api.getInstance().service.gboundQuery(pageSize, pageNumber));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> add(Gbound gbound) { public static Observable<String> add(Gbound gbound) {
return Api.getInstance().service.gBoundAdd(gbound).onErrorReturn(new return run(Api.getInstance().service.gBoundAdd(gbound));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> update(Gbound gbound) { public static Observable<String> update(Gbound gbound) {
return Api.getInstance().service.gBoundUpdate(gbound).onErrorReturn(new return run(Api.getInstance().service.gBoundUpdate(gbound));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class Ubounds { public static class Ubounds {
public static Observable<Pager<Ubound>> query() { public static Observable<Pager<Ubound>> query() {
return Api.getInstance().service.uBoundQuery().onErrorReturn(new return run(Api.getInstance().service.uBoundQuery());
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Ubound> update(Ubound ubound) { public static Observable<Ubound> update(Ubound ubound) {
return Api.getInstance().service.uBoundUpdate(ubound).onErrorReturn(new return run(Api.getInstance().service.uBoundUpdate(ubound));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
...@@ -578,43 +467,25 @@ public final class ApiFactory { ...@@ -578,43 +467,25 @@ public final class ApiFactory {
public static class Feed { public static class Feed {
public static Observable<Object> addFeed(com.xingdata.zzdpos.model.Feed feed) { public static Observable<Object> addFeed(com.xingdata.zzdpos.model.Feed feed) {
return Api.getInstance().service.addFeed(feed) return run(Api.getInstance().service.addFeed(feed));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
public static class Saleorder { public static class Saleorder {
public static Observable<String> addOrderMis(com.xingdata.zzdpos.model.Saleorder.Param public static Observable<String> addOrderMis(com.xingdata.zzdpos.model.Saleorder.Param
saleorderParam) { saleorderParam) {
return Api.getInstance().service.addOrderMis(saleorderParam) return run(Api.getInstance().service.addOrderMis(saleorderParam));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata
.zzdpos.model.Saleorder.Pay saleorderPay) { .zzdpos.model.Saleorder.Pay saleorderPay) {
return Api.getInstance().service.addOrderPayMis(saleorderPay) return run(Api.getInstance().service.addOrderPayMis(saleorderPay));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>>
querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) { querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) {
return Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber, pageSize) return run(Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber,
.onErrorReturn(new ErrorFilter<>()) pageSize));
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
...@@ -634,91 +505,59 @@ public final class ApiFactory { ...@@ -634,91 +505,59 @@ public final class ApiFactory {
public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int
size, int usedFlag) { size, int usedFlag) {
return Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList"). return run(Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList"));
onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn
(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int public static Observable<Pager<com.xingdata.zzdpos.model.Ticket>> query(int num, int
size, int usedFlag, long startDate, long endDate) { size, int usedFlag, long startDate, long endDate) {
return Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList", return run(Api.getInstance().service.queryTicket(num, size, usedFlag, "ticketIsList",
startDate, endDate). startDate, endDate));
onErrorReturn(new ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn
(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
public static Observable<String> batchSend(String birthdayType, String vipLevel, Long public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
vipId, Long truleId) { vipId, Long truleId) {
return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, return run(Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
truleId, null) truleId, null));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> batchSendBefor(String birthdayType, String vipLevel, Long public static Observable<String> batchSendBefor(String birthdayType, String vipLevel, Long
vipId, Long truleId) { vipId, Long truleId) {
return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, return run(Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
truleId, "true") truleId, "true"));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class Sssku { public static class Sssku {
public static Observable<Pager<com.xingdata.zzdpos.model.Ossku>> getOtherShopSsku(String keycode, int pageNumber, int pageSize) { public static Observable<Pager<com.xingdata.zzdpos.model.Ossku>> getOtherShopSsku(String keycode, int pageNumber, int pageSize) {
return Api.getInstance().service.queryOtherShop(keycode, pageNumber, pageSize) return run(Api.getInstance().service.queryOtherShop(keycode, pageNumber, pageSize));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, String keyword, Long skuGrpId) { public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum,
return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, skuGrpId, keyword)); String keyword, Long skuGrpId) {
return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE,
skuGrpId, keyword));
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, String keyword) { public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum,
String keyword) {
return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, keyword)); return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, keyword));
} }
public static Observable<com.xingdata.zzdpos.model.Sssku> update(com.xingdata.zzdpos public static Observable<com.xingdata.zzdpos.model.Sssku> update(com.xingdata.zzdpos
.model.Sssku .model.Sssku
sssku) { sssku) {
return Api.getInstance().service.updateSssku(sssku) return run(Api.getInstance().service.updateSssku(sssku));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Sssku> addSssku(com.xingdata.zzdpos public static Observable<com.xingdata.zzdpos.model.Sssku> addSssku(com.xingdata.zzdpos
.model.Sssku .model.Sssku
sssku) { sssku) {
return Api.getInstance().service.addSssku(sssku) return run(Api.getInstance().service.addSssku(sssku));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Sssku> detailSssku(Long id) { public static Observable<com.xingdata.zzdpos.model.Sssku> detailSssku(Long id) {
return Api.getInstance().service.detailSssku(id) return run(Api.getInstance().service.detailSssku(id));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
...@@ -732,11 +571,7 @@ public final class ApiFactory { ...@@ -732,11 +571,7 @@ public final class ApiFactory {
.model .model
.CsDetail .CsDetail
csDetail) { csDetail) {
return Api.getInstance().service.addCsDetail(csDetail) return run(Api.getInstance().service.addCsDetail(csDetail));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
...@@ -747,11 +582,7 @@ public final class ApiFactory { ...@@ -747,11 +582,7 @@ public final class ApiFactory {
* 添加库存盘点记录 * 添加库存盘点记录
*/ */
public static Observable<com.xingdata.zzdpos.model.Cs> addCs() { public static Observable<com.xingdata.zzdpos.model.Cs> addCs() {
return Api.getInstance().service.addCs() return run(Api.getInstance().service.addCs());
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
...@@ -759,22 +590,14 @@ public final class ApiFactory { ...@@ -759,22 +590,14 @@ public final class ApiFactory {
* 查询库存盘点记录详情 * 查询库存盘点记录详情
*/ */
public static Observable<com.xingdata.zzdpos.model.Cs> getCsDetail(int id) { public static Observable<com.xingdata.zzdpos.model.Cs> getCsDetail(int id) {
return Api.getInstance().service.getCsDetail(id) return run(Api.getInstance().service.getCsDetail(id));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
* 删除库存盘点记录 * 删除库存盘点记录
*/ */
public static Observable<Object> delCsDetail(int id, String csNo) { public static Observable<Object> delCsDetail(int id, String csNo) {
return Api.getInstance().service.delCsDetail(id, csNo) return run(Api.getInstance().service.delCsDetail(id, csNo));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -788,10 +611,8 @@ public final class ApiFactory { ...@@ -788,10 +611,8 @@ public final class ApiFactory {
int pageSize, int pageSize,
long startDate, long startDate,
long endDate) { long endDate) {
return Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate, return run(Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate,
endDate).onErrorReturn(new endDate));
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -802,11 +623,8 @@ public final class ApiFactory { ...@@ -802,11 +623,8 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber, public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber,
int pageSize int pageSize) {
) { return run(Api.getInstance().service.querCsList(pageNulmber, pageSize));
return Api.getInstance().service.querCsList(pageNulmber, pageSize).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
...@@ -816,11 +634,7 @@ public final class ApiFactory { ...@@ -816,11 +634,7 @@ public final class ApiFactory {
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Notice>> queryNotice(int pageNum, public static Observable<Pager<com.xingdata.zzdpos.model.Notice>> queryNotice(int pageNum,
int pageSize) { int pageSize) {
return Api.getInstance().service.queryNotice(pageNum, pageSize) return run(Api.getInstance().service.queryNotice(pageNum, pageSize));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
...@@ -831,22 +645,15 @@ public final class ApiFactory { ...@@ -831,22 +645,15 @@ public final class ApiFactory {
public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int
pageSize, long startDate, pageSize, long startDate,
long endDate) { long endDate) {
return Api.getInstance().service.queryRecharge(pageNum, pageSize, startDate, endDate) return run(Api.getInstance().service.queryRecharge(pageNum, pageSize, startDate,
.onErrorReturn(new ErrorFilter<>()) endDate));
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
* 查询充值记录 * 查询充值记录
*/ */
public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int pageSize) { public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int pageSize) {
return Api.getInstance().service.queryRecharge(pageNum, pageSize) return run(Api.getInstance().service.queryRecharge(pageNum, pageSize));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -854,11 +661,7 @@ public final class ApiFactory { ...@@ -854,11 +661,7 @@ public final class ApiFactory {
*/ */
public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId, int pageNum, public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId, int pageNum,
int pageSize) { int pageSize) {
return Api.getInstance().service.queryRecharge(vipId, pageNum, pageSize) return run(Api.getInstance().service.queryRecharge(vipId, pageNum, pageSize));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
...@@ -868,11 +671,7 @@ public final class ApiFactory { ...@@ -868,11 +671,7 @@ public final class ApiFactory {
* 查询统计详情 * 查询统计详情
*/ */
public static Observable<com.xingdata.zzdpos.model.Sta> querySta() { public static Observable<com.xingdata.zzdpos.model.Sta> querySta() {
return Api.getInstance().service.querySta() return run(Api.getInstance().service.querySta());
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
...@@ -884,22 +683,14 @@ public final class ApiFactory { ...@@ -884,22 +683,14 @@ public final class ApiFactory {
*/ */
public static Observable<String> addPsb(com.xingdata.zzdpos.model public static Observable<String> addPsb(com.xingdata.zzdpos.model
.Psb psb) { .Psb psb) {
return Api.getInstance().service.addPsb(psb) return run(Api.getInstance().service.addPsb(psb));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
* 订货修改 * 订货修改
*/ */
public static Observable<Object> updatePsb(com.xingdata.zzdpos.model.Psb psb) { public static Observable<Object> updatePsb(com.xingdata.zzdpos.model.Psb psb) {
return Api.getInstance().service.updatePsb(psb) return run(Api.getInstance().service.updatePsb(psb));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
...@@ -907,11 +698,7 @@ public final class ApiFactory { ...@@ -907,11 +698,7 @@ public final class ApiFactory {
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Psb>> queryPsb(int pageNum, public static Observable<Pager<com.xingdata.zzdpos.model.Psb>> queryPsb(int pageNum,
int pageSize) { int pageSize) {
return Api.getInstance().service.queryPsb(pageNum, pageSize) return run(Api.getInstance().service.queryPsb(pageNum, pageSize));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
...@@ -920,22 +707,14 @@ public final class ApiFactory { ...@@ -920,22 +707,14 @@ public final class ApiFactory {
*/ */
public static Observable<com.xingdata.zzdpos.model.Psb> queryPsbDetail(String psbNo, long public static Observable<com.xingdata.zzdpos.model.Psb> queryPsbDetail(String psbNo, long
id) { id) {
return Api.getInstance().service.queryPsbDetail(psbNo, id) return run(Api.getInstance().service.queryPsbDetail(psbNo, id));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
/** /**
* 订货订单确认收货 * 订货订单确认收货
*/ */
public static Observable<Object> confirmRPsb(String psbNo) { public static Observable<Object> confirmRPsb(String psbNo) {
return Api.getInstance().service.confirmRPsb(psbNo) return run(Api.getInstance().service.confirmRPsb(psbNo));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
...@@ -943,125 +722,61 @@ public final class ApiFactory { ...@@ -943,125 +722,61 @@ public final class ApiFactory {
* 预补货列表 * 预补货列表
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> preOrder() { public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> preOrder() {
return Api.getInstance().service.preOrder() return run(Api.getInstance().service.preOrder());
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
} }
} }
public static class Sskugrp { public static class Sskugrp {
public static Observable<Pager<com.xingdata.zzdpos.model.Sskugrp>> querySskugrp() { public static Observable<Pager<com.xingdata.zzdpos.model.Sskugrp>> querySskugrp() {
return Api.getInstance().service.querySskugrp() return run(Api.getInstance().service.querySskugrp());
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> add(com.xingdata.zzdpos.model.Sskugrp sskugrp) { public static Observable<String> add(com.xingdata.zzdpos.model.Sskugrp sskugrp) {
return Api.getInstance().service.addSskugrp(sskugrp) return run(Api.getInstance().service.addSskugrp(sskugrp));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> update(com.xingdata.zzdpos.model.Sskugrp sskugrp) { public static Observable<String> update(com.xingdata.zzdpos.model.Sskugrp sskugrp) {
return Api.getInstance().service.updateSskugrp(sskugrp) return run(Api.getInstance().service.updateSskugrp(sskugrp));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> delete(Long skuGrpId) { public static Observable<String> delete(Long skuGrpId) {
return Api.getInstance().service.deleteSskugrp(skuGrpId) return run(Api.getInstance().service.deleteSskugrp(skuGrpId));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class User { public static class User {
public static Observable<Vip> queryUserDetailByKeyword(String keyword) { public static Observable<Vip> queryUserDetailByKeyword(String keyword) {
return Api.getInstance().service.detailUser(keyword) return run(Api.getInstance().service.detailUser(keyword));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Vip>> queryUserDetailByWD(String keyword) { public static Observable<Pager<Vip>> queryUserDetailByWD(String keyword) {
return Api.getInstance().service.queryDetailByWD(keyword, 0, 200) return run(Api.getInstance().service.queryDetailByWD(keyword, 0, 200));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Vip>> queryUserDetailByWD(String keyword, int pageNumber) { public static Observable<Pager<Vip>> queryUserDetailByWD(String keyword, int pageNumber) {
return Api.getInstance().service.queryDetailByWD(keyword, pageNumber, 12) return run(Api.getInstance().service.queryDetailByWD(keyword, pageNumber, 12));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Vip>> getVipList(int pageNumber, String vipLevel) { public static Observable<Pager<Vip>> getVipList(int pageNumber, String vipLevel) {
if (vipLevel == null) { if (vipLevel == null) {
return Api.getInstance().service.getAllVipList(pageNumber, 12) return run(Api.getInstance().service.getAllVipList(pageNumber, 12));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} else { } else {
return Api.getInstance().service.getVipList(vipLevel, pageNumber, 12) return run(Api.getInstance().service.getVipList(vipLevel, pageNumber, 12));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static Observable<Vip> addVip(Vip user) { public static Observable<Vip> addVip(Vip user) {
return Api.getInstance().service.addVip(user) return run(Api.getInstance().service.addVip(user));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Vip> updateVip(Vip user) { public static Observable<Vip> updateVip(Vip user) {
return Api.getInstance().service.updateVip(user) return run(Api.getInstance().service.updateVip(user));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Vip>> getVipNumber() { public static Observable<Pager<Vip>> getVipNumber() {
return Api.getInstance().service.getVipList(1, 1) return run(Api.getInstance().service.getVipList(1, 1));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
...@@ -1069,21 +784,12 @@ public final class ApiFactory { ...@@ -1069,21 +784,12 @@ public final class ApiFactory {
public static class Recard { public static class Recard {
public static Observable<Boolean> checkPwd(Long vipId, String cardNo, String pwd) { public static Observable<Boolean> checkPwd(Long vipId, String cardNo, String pwd) {
return Api.getInstance().service.checkPwd(vipId, cardNo, EncryptUtils.encryptMD5ToString(pwd)) return run(Api.getInstance().service.checkPwd(vipId, cardNo, EncryptUtils
.onErrorReturn(new ErrorFilter<>()) .encryptMD5ToString(pwd)));
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Vip> fullVip(Long vipId, Long amtPay, Long amtSend) { public static Observable<Vip> fullVip(Long vipId, Long amtPay, Long amtSend) {
return Api.getInstance().service.fullVip(vipId, amtPay, amtSend) return run(Api.getInstance().service.fullVip(vipId, amtPay, amtSend));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
// public static Observable<Pager<VipRechargeOrder>> queryCard(Long vipId) { // public static Observable<Pager<VipRechargeOrder>> queryCard(Long vipId) {
...@@ -1099,12 +805,7 @@ public final class ApiFactory { ...@@ -1099,12 +805,7 @@ public final class ApiFactory {
public static class Ms { public static class Ms {
public static Observable<Pager<com.xingdata.zzdpos.model.Ms>> query(int pageNum, int public static Observable<Pager<com.xingdata.zzdpos.model.Ms>> query(int pageNum, int
pageSize, String keyword) { pageSize, String keyword) {
return Api.getInstance().service.queryMs(pageNum, pageSize, keyword) return run(Api.getInstance().service.queryMs(pageNum, pageSize, keyword));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Ms>> query(int pageNum) { public static Observable<Pager<com.xingdata.zzdpos.model.Ms>> query(int pageNum) {
...@@ -1113,33 +814,18 @@ public final class ApiFactory { ...@@ -1113,33 +814,18 @@ public final class ApiFactory {
public static Observable<com.xingdata.zzdpos.model.Ms> detail(long id) { public static Observable<com.xingdata.zzdpos.model.Ms> detail(long id) {
return Api.getInstance().service.detailMs(id) return run(Api.getInstance().service.detailMs(id));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Ms> update(com.xingdata.zzdpos.model public static Observable<com.xingdata.zzdpos.model.Ms> update(com.xingdata.zzdpos.model
.Ms ms) { .Ms ms) {
return Api.getInstance().service.updateMs(ms) return run(Api.getInstance().service.updateMs(ms));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms
ms) { ms) {
return Api.getInstance().service.addMs(ms) return run(Api.getInstance().service.addMs(ms));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
...@@ -1148,12 +834,7 @@ public final class ApiFactory { ...@@ -1148,12 +834,7 @@ public final class ApiFactory {
.model .model
.Level .Level
level) { level) {
return Api.getInstance().service.addVipLevel(level) return run(Api.getInstance().service.addVipLevel(level));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Level> updateVipLevel(com.xingdata public static Observable<com.xingdata.zzdpos.model.Level> updateVipLevel(com.xingdata
...@@ -1161,83 +842,43 @@ public final class ApiFactory { ...@@ -1161,83 +842,43 @@ public final class ApiFactory {
.model .model
.Level .Level
level) { level) {
return Api.getInstance().service.updateVipLevel(level) return run(Api.getInstance().service.updateVipLevel(level));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Level>> getVipLevelList(int pageNumber, int pageSize) { public static Observable<Pager<com.xingdata.zzdpos.model.Level>> getVipLevelList(int pageNumber, int pageSize) {
return Api.getInstance().service.getVipLevelList(pageNumber, pageSize) return run(Api.getInstance().service.getVipLevelList(pageNumber, pageSize));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class Cor { public static class Cor {
public static Observable<List<com.xingdata.zzdpos.model.Cor>> queryAll() { public static Observable<List<com.xingdata.zzdpos.model.Cor>> queryAll() {
return Api.getInstance().service.queryAllCor() return run(Api.getInstance().service.queryAllCor());
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class Scsku { public static class Scsku {
public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> queryScsku(String barcode) { public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> queryScsku(String barcode) {
return Api.getInstance().service.queryScsku(barcode) return run(Api.getInstance().service.queryScsku(barcode));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class MsCard { public static class MsCard {
public static Observable<Mscard> addMsCard(Mscard m) { public static Observable<Mscard> addMsCard(Mscard m) {
return Api.getInstance().service.addMscard(m) return run(Api.getInstance().service.addMscard(m));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Mscard> updteMsCard(Mscard m) { public static Observable<Mscard> updteMsCard(Mscard m) {
return Api.getInstance().service.updateMscard(m) return run(Api.getInstance().service.updateMscard(m));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Mscard>> mscardQuery(long vipId) { public static Observable<Pager<Mscard>> mscardQuery(long vipId) {
return Api.getInstance().service.mscardQuery(vipId) return run(Api.getInstance().service.mscardQuery(vipId));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Mscard>> mscardQuery() { public static Observable<Pager<Mscard>> mscardQuery() {
return Api.getInstance().service.mscardQuery() return run(Api.getInstance().service.mscardQuery());
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
...@@ -1245,56 +886,30 @@ public final class ApiFactory { ...@@ -1245,56 +886,30 @@ public final class ApiFactory {
public static class Oper { public static class Oper {
public static Observable<com.xingdata.zzdpos.model.Oper> addOper(com.xingdata.zzdpos.model public static Observable<com.xingdata.zzdpos.model.Oper> addOper(com.xingdata.zzdpos.model
.Oper oper) { .Oper oper) {
return Api.getInstance().service.addOper(oper) return run(Api.getInstance().service.addOper(oper));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Oper> updateOper(com.xingdata.zzdpos public static Observable<com.xingdata.zzdpos.model.Oper> updateOper(com.xingdata.zzdpos
.model.Oper .model.Oper
oper) { oper) {
return Api.getInstance().service.updateOper(oper) return run(Api.getInstance().service.updateOper(oper));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<String> deleteOper(Long id) { public static Observable<String> deleteOper(Long id) {
return Api.getInstance().service.deleteOper(id) return run(Api.getInstance().service.deleteOper(id));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Oper>> queryOper(String wd) { public static Observable<Pager<com.xingdata.zzdpos.model.Oper>> queryOper(String wd) {
return Api.getInstance().service.queryOper(wd) return run(Api.getInstance().service.queryOper(wd));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
public static class Ver { public static class Ver {
public static Observable<com.xingdata.zzdpos.model.Ver> getLastVer() { public static Observable<com.xingdata.zzdpos.model.Ver> getLastVer() {
return Api.getInstance().service.getLastVer(SystemUtil.getDeviceSN()) return run(Api.getInstance().service.getLastVer(SystemUtil.getDeviceSN()));
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} }
} }
......
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 to comment