add 购买守护使用优惠卷

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

@@ -19,7 +19,7 @@ public class DiscountsModel extends BaseModel {
     public static final int TYPE_MONTH=7;//月守护
     public static final int TYPE_YEARS=8;//月守护
 
-    @SerializedName("userCouponID")
+    @SerializedName("userCouponId")
     private int userCouponID;
     @SerializedName("num")
     private int num;

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

@@ -1104,6 +1104,8 @@
     <string name="replacement_reset_confirmed_hint">重置後將會清空當前心願單列表\n無論心願單是否完成</string>
     <string name="replacement_reset_confirmed_sure">確定重置</string>
     <string name="replacement_reset_confirmed_cancel">返回列表</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>