Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java

@@ -308,6 +308,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             if (mPageNum == 1 && mSkuGrpId == 0L)
                                 mView.loadSsskuCount(ssskuPager.getTotalRow());
                             mView.loadSkus(ssskuPager, mPageNum == 1);
+                        }, throwable -> {
                         })
         );
     }
@@ -320,7 +321,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
         mCompositeDisposable.add(
                 ApiFactory.Sssku.querySssku(mSearchPageNum, mKeyword)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(ssskuPager -> mView.loadSearchResult(ssskuPager, mSearchPageNum == 1))
+                        .subscribe(ssskuPager -> mView.loadSearchResult(ssskuPager, mSearchPageNum == 1), throwable -> {
+                        })
         );
     }
 
@@ -331,6 +333,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
         mCompositeDisposable.add(
                 ApiFactory.Sskugrp.querySskugrp().subscribe(sskugrpPager -> {
                             mView.loadSkugrps(sskugrpPager.getList());
+                        }, throwable -> {
                         }
                 )
         );
@@ -341,7 +344,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
      */
     private void getReplenish() {
         mCompositeDisposable.add(
-                ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()))
+                ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()), throwable -> {
+                })
         );
     }
 
@@ -350,7 +354,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
      */
     private void getCor() {
         mCompositeDisposable.add(
-                ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors))
+                ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors), throwable -> {
+                })
         );
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeGiftView.java

@@ -92,6 +92,7 @@ public class TypeGiftView<Sku extends BaseSku> extends BaseTypeView<ViewTypeGift
         if (sku != null) {
             mViewBinding.setName(sku.getSpuName());
             mViewBinding.setPrice(ConvertUtil.fenToYuan(sku.getSkuRetailPrice1(), true));
+            mViewBinding.tvProductPic.setImageURI(sku.getSpuImg());
             mViewBinding.llProduct.setVisibility(View.VISIBLE);
         } else {
             mViewBinding.llProduct.setVisibility(View.GONE);