Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -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));
+    }
+
+
 }

app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java

@@ -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();
         }

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -296,6 +296,10 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         }
     }
 
+    /**
+     * 强制关闭dialog
+     */
+
     public void toughDismiss() {
         if (shutDown) {
             if (recLen <= 0) {

app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java

@@ -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() {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/adapter/IntegralExchangeAdapter.java

@@ -32,7 +32,7 @@ public class IntegralExchangeAdapter extends BaseAdapter<Ubound, ItemIntegralBin
                     ()) + "元\n最多使用" + item.getBoundUseNum() + "积分");
         }
         //备注
-        mViewBinding.tvGet.setText("无");
+        mViewBinding.tvGet.setText(mViewBinding.tvVip.getText().toString());
         if (item.getBoundUseStatus() != null) {
             //开通启用状态 0：正常 1 暂停 默认 0
             if (item.getBoundUseStatus() == 0) {