根据类型查询优惠

app/src/main/java/com/miekir/ym/base/ApiService.java

@@ -53,9 +53,8 @@ public interface ApiService {
 
     /**分页查询优惠券*/
     @GET("shibei/api/getCouponList")
-    Observable<BaseResponse<List<CouponBean>>> getCouponList(@Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
+    Observable<BaseResponse<List<CouponBean>>> getCouponList(@Query("couponType") int couponType, @Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
 
-    // todo
     /**根据关键字分页查询优惠券*/
     @GET("shibei/api/getCouponListByKeyword")
     Observable<BaseResponse<List<CouponBean>>> getCouponListByKeyword(@Query("keywords") String keyword, @Query("pageNum") int pageNum, @Query("pageSize") int pageSize);

app/src/main/java/com/miekir/ym/ui/home/coupon/CouponBean.java

@@ -73,7 +73,18 @@ public class CouponBean implements Serializable {
     /**
      * 当前是否被收藏
      */
-    public boolean isFavorite;
+    private Boolean isFavorite;
+
+    public Boolean getFavorite() {
+        if (isFavorite == null) {
+            return false;
+        }
+        return isFavorite;
+    }
+
+    public void setFavorite(Boolean favorite) {
+        isFavorite = favorite;
+    }
 
     public void updateData(CouponBean couponBean) {
         this.couponType = couponBean.couponType;

app/src/main/java/com/miekir/ym/ui/home/coupon/CouponFragment.java

@@ -80,7 +80,7 @@ public class CouponFragment extends BaseMvpFragment implements ICouponView<Coupo
         srl_template.setOnRefreshListener(() -> {
             mIsRefresh = true;
             mCurrentPage = PAGE_START;
-            mPresenter.getCouponData(mCurrentPage, PAGE_SIZE);
+            mPresenter.getCouponData(mCouponType, mCurrentPage, PAGE_SIZE);
         });
 
         // 加载更多
@@ -92,7 +92,7 @@ public class CouponFragment extends BaseMvpFragment implements ICouponView<Coupo
                 if (!srl_template.isRefreshing()) {
                     mIsRefresh = false;
                     srl_template.setRefreshing(true);
-                    mPresenter.getCouponData(mCurrentPage, PAGE_SIZE);
+                    mPresenter.getCouponData(mCouponType, mCurrentPage, PAGE_SIZE);
                 }
             }
         });
@@ -102,7 +102,7 @@ public class CouponFragment extends BaseMvpFragment implements ICouponView<Coupo
     protected void onLazyLoad() {
         // 获取数据
         srl_template.setRefreshing(true);
-        mPresenter.getCouponData(mCurrentPage, PAGE_SIZE);
+        mPresenter.getCouponData(mCouponType, mCurrentPage, PAGE_SIZE);
     }
 
     /**

app/src/main/java/com/miekir/ym/ui/home/coupon/CouponPresenter.java

@@ -22,7 +22,7 @@ import io.reactivex.schedulers.Schedulers;
  */
 public class CouponPresenter extends BasePresenter<ICouponView<CouponBean>> {
 
-    public void getCouponData(int pageNum, int pageSize) {
+    public void getCouponData(int couponType, int pageNum, int pageSize) {
         NetMvpObserver<List<CouponBean>> disposable = new NetMvpObserver<List<CouponBean>>() {
             @Override
             public void onSuccess(int code, List<CouponBean> result) {
@@ -43,7 +43,7 @@ public class CouponPresenter extends BasePresenter<ICouponView<CouponBean>> {
 
         RetrofitHelper.getInstance()
                 .getRequestApi(ApiService.class)
-                .getCouponList(pageNum, pageSize)
+                .getCouponList(couponType, pageNum, pageSize)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(disposable);

app/src/main/res/layout/item_coupon.xml

@@ -20,8 +20,8 @@
 
         <ImageView
             android:id="@+id/iv_coupon"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
             android:src="@mipmap/logo_gray"
             android:scaleType="centerCrop"/>