Merge branch 'dev_use_discounts'

# Conflicts:
#	common/src/main/res/values/strings.xml

common/src/main/java/com/yunbao/common/bean/DiscountsModel.java

@@ -0,0 +1,109 @@
+package com.yunbao.common.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 优惠卷
+ */
+public class DiscountsModel extends BaseModel {
+    //------------------贵族--------------------
+    public static final int TYPE_VISCOUNT=1;//子爵
+    public static final int TYPE_MARQUIS=2;//侯爵
+    public static final int TYPE_DUKE=3;//公爵
+    public static final int TYPE_KING=4;//国王
+    public static final int TYPE_EMPEROR=5;//皇帝
+    //------------------守护--------------------
+    public static final int TYPE_WEEKS=6;//周守护
+    public static final int TYPE_MONTH=7;//月守护
+    public static final int TYPE_YEARS=8;//月守护
+
+    @SerializedName("userCouponId")
+    private int userCouponID;
+    @SerializedName("num")
+    private int num;
+    @SerializedName("endTime")
+    private long endTime;
+    @SerializedName("img")
+    private String img;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("discount")
+    private double discount;
+    @SerializedName("describe")
+    private String describe;
+
+    public DiscountsModel() {
+    }
+
+    public int getUserCouponID() {
+        return userCouponID;
+    }
+
+    public void setUserCouponID(int userCouponID) {
+        this.userCouponID = userCouponID;
+    }
+
+    public int getNum() {
+        return num;
+    }
+
+    public void setNum(int num) {
+        this.num = num;
+    }
+
+    public long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(long endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(double discount) {
+        this.discount = discount;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "DiscountsModel{" +
+                "userCouponID=" + userCouponID +
+                ", num=" + num +
+                ", endTime=" + endTime +
+                ", img='" + img + '\'' +
+                ", name='" + name + '\'' +
+                ", discount=" + discount +
+                ", describe='" + describe + '\'' +
+                '}';
+    }
+}

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -7,6 +7,7 @@ import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.CheckLiveModel;
 import com.yunbao.common.bean.ContributeModel;
 import com.yunbao.common.bean.CustomSidebarInfoModel;
+import com.yunbao.common.bean.DiscountsModel;
 import com.yunbao.common.bean.EnterRoomNewModel;
 import com.yunbao.common.bean.FaceBookUpModel;
 import com.yunbao.common.bean.HourRank;
@@ -671,5 +672,11 @@ public interface PDLiveApi {
             @Query("type") int type,
             @Query("list") String list
     );
-
+    /**
+     * 获取折扣卷信息
+     */
+    @GET("/api/public/?service=Coupon.getUserCoupon")
+    Observable<ResponseModel<List<DiscountsModel>>> getDiscountInfo(
+            @Query("type") int type
+    );
 }

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -10,6 +10,7 @@ import com.yunbao.common.bean.ActiveModel;
 import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.CheckLiveModel;
 import com.yunbao.common.bean.CustomSidebarInfoModel;
+import com.yunbao.common.bean.DiscountsModel;
 import com.yunbao.common.bean.EnterRoomNewModel;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.LinkMicUserBean;
@@ -1357,6 +1358,27 @@ public class LiveNetManager {
                     }
                 }).isDisposed();
     }
+    public void getDiscountInfo(int type,HttpCallback<List<DiscountsModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getDiscountInfo(type)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<DiscountsModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<DiscountsModel>> wishListGiftConfModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(wishListGiftConfModelResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
 
     /**
      * 直播间取消网络请求

common/src/main/java/com/yunbao/common/utils/ToastUtil.java

@@ -3,6 +3,7 @@ package com.yunbao.common.utils;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
@@ -13,6 +14,7 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.yunbao.common.BuildConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.R;
 
@@ -76,7 +78,16 @@ public class ToastUtil {
         dialog.show();
         new Handler(Looper.getMainLooper()).postDelayed(dialog::dismiss, delayMillis);
     }
-
+    public static void showDebug(String s){
+        if(BuildConfig.DEBUG){
+            show(s);
+        }
+    }
+    public static void showDebug(int s){
+        if(BuildConfig.DEBUG){
+            show(s);
+        }
+    }
     public static void show(String s) {
         if (TextUtils.isEmpty(s)) {
             return;

common/src/main/res/values/strings.xml

@@ -1109,5 +1109,8 @@
     <string name="replacement_reset_confirmed_cancel3">当前心愿单未保存</string>
     <string name="replacement_reset_confirmed_cancel4">不保存</string>
 
+    <string name="live_use_discount_content">您有一張%s，是否使用？使用後開通花費鉆石%s，返還金豆%s</string>
+    <string name="live_use_discount_no">不使用</string>
+    <string name="live_use_discount_yes">使用</string>
 
 </resources>