Commit f47a5a99 authored by zhang_z's avatar zhang_z

优化代码;

parent 859d7aac
......@@ -683,21 +683,11 @@ public final class ApiFactory {
}
public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, String keyword, Long skuGrpId) {
return Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, skuGrpId, keyword)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
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) {
return Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, keyword)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, keyword));
}
public static Observable<com.xingdata.zzdpos.model.Sssku> update(com.xingdata.zzdpos
......@@ -1308,4 +1298,13 @@ public final class ApiFactory {
}
public static <T> Observable<T> run(Observable<HttpMessage<T>> observable) {
return observable.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
}
}
......@@ -43,7 +43,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
}
public abstract int getLayoutId();
@Override
......@@ -62,14 +61,10 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
initView();
}
protected void initPresenter() {
if (this instanceof BaseView && this.getClass().getGenericSuperclass() instanceof
ParameterizedType
&& ((ParameterizedType) (this.getClass().getGenericSuperclass()))
.getActualTypeArguments().length > 0) {
Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass()
.getGenericSuperclass())).getActualTypeArguments()[0];
if (this instanceof BaseView && this.getClass().getGenericSuperclass() instanceof ParameterizedType
&& ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments()[0];
mPresenter = InstanceUtil.getInstance(mPresenterClass);
mPresenter.setIntent(getIntent()).setView(this).build();
}
......
......@@ -222,9 +222,7 @@ public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
}
public Long getPromotionAmt() {
return detailAmt - (detailCnt * (skuOffFlag > 0 ? skuPromotionPrice * (vip
.getVipDefDiscount() > 0 ? vip.getVipDefDiscount() : 100) / 100 :
skuPromotionPrice));
return detailAmt - (detailCnt * (skuOffFlag > 0 ? skuPromotionPrice * (vip.getVipDefDiscount() > 0 ? vip.getVipDefDiscount() : 100) / 100 : skuPromotionPrice));
}
private Saledetail() {
......
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