1、好友邀请守护内容修改

2024-07-04 17:59:56 +08:00
parent 9dd3619049
commit 963fe2c110
12 changed files with 413 additions and 201 deletions
--- a/common/src/main/java/com/yunbao/common/bean/GuardPriceModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/GuardPriceModel.java
@@ -22,6 +22,24 @@ public class GuardPriceModel extends BaseModel {
    private String discount;
    @SerializedName("price_key")
    private int priceKey;
+    @SerializedName("coupon_discount")
+    private String couponDiscount;
+    @SerializedName("coupon_discount_en")
+    private String couponDiscountEn;
+    @SerializedName("coupon_discount_price")
+    private String couponDiscountPrice;
+
+    public String getCouponDiscount() {
+        return couponDiscount;
+    }
+
+    public String getCouponDiscountEn() {
+        return couponDiscountEn;
+    }
+
+    public String getCouponDiscountPrice() {
+        return couponDiscountPrice;
+    }

    public String getOpeningTime() {
        return openingTime;
--- a/common/src/main/java/com/yunbao/common/dialog/GuardBuyCouponTipsDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GuardBuyCouponTipsDialog.java
@@ -0,0 +1,78 @@
+package com.yunbao.common.dialog;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.text.Html;
+import android.text.Spanned;
+import android.view.View;
+import android.widget.TextView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.utils.DialogUitl;
+import com.yunbao.common.utils.WordUtil;
+
+public class GuardBuyCouponTipsDialog {
+
+    /**
+     * @param context
+     * @param coin           钻石
+     * @param content        购买类型名称
+     * @param simpleCallback
+     */
+    public static void showBuyOrRenewDialog(Context context, String coupon, String coin, String content,
+                                            DialogUitl.SimpleCallback simpleCallback) {
+        if (context instanceof Activity) {
+            if (((Activity) context).isDestroyed() || ((Activity) context).isFinishing()) {
+                return;
+            }
+        }
+
+        final Dialog dialog = new Dialog(context, R.style.dialog2);
+        dialog.setContentView(R.layout.dialog_guard_buy_coupon_tips);
+        dialog.setCancelable(true);
+        dialog.setCanceledOnTouchOutside(true);
+        TextView btn_confirm = dialog.findViewById(R.id.btn_confirm);
+        TextView content2 = dialog.findViewById(R.id.content2);
+
+        Spanned tips;
+        if (WordUtil.isNewZh()) {
+            tips = Html.fromHtml("<font color='#FFE0BF'>您有一張</font>"
+                    + "<font color='#FF9937'>" + content + "優惠券</font><br>"
+                    + "<font color='#FFE0BF'>開通/續費" + content + "(1個月)時，</font><br><font color='#FFE0BF'>可享</font>"
+                    + "<strong><font color='#FF9937'>" + coupon + "折</font></strong>"
+                    + "<font color='#FFE0BF'>優惠 (折後:</font>"
+                    + "<font color='#FF9937'>" + coin + "鑽</font>)<br>"
+                    + "<font color='#FFE0BF'>是否使用優惠券？</font>");
+        } else {
+            tips = Html.fromHtml("<font color='#FFE0BF'>You have a </font>"
+                    + "<font color='#FF9937'>" + content + " coupon</font>"
+                    + "<font color='#FFE0BF'> When activating/renewing " + content + "(1 month), you can enjoy a</font>"
+                    + "<strong><font color='#FF9937'> " + coupon + "% </font></strong>"
+                    + "<font color='#FFE0BF'>discount (After folding:</font>"
+                    + "<font color='#FF9937'>" + coin + " diamonds</font>"
+                    + "<font color='#FFE0BF'>）Do you want to use coupons?</font>");
+        }
+        content2.setText(tips);
+        dialog.findViewById(R.id.btn_cancel).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        dialog.findViewById(R.id.btn_cancel1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dialog.dismiss();
+            }
+        });
+        btn_confirm.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                simpleCallback.onConfirmClick(dialog, "");
+            }
+        });
+        dialog.show();
+    }
+
+}
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -1194,7 +1194,7 @@ public interface PDLiveApi {
    Observable<ResponseModel<GuardGetGuardOpenInfoModel>> getGuardOpenInfo(@Query("liveuid") String liveUid);

    @GET("/api/public/?service=Guard.openGuard")
-    Observable<ResponseModel<Object>> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream);
+    Observable<ResponseModel<Object>> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream,@Query("coupon_type") String coupon_type);

    @GET("/api/public/?service=Guard.sendMoneyLong")
    Observable<ResponseModel<Object>> sendMoneyLong(@Query("liveuid") String liveUid, @Query("gold_num") String goldNum);
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -3014,9 +3014,9 @@ public class LiveNetManager {

    }

-    public void openGuard(String liveUid, String guardType, String priceKey, String stream, HttpCallback<String> callback) {
+    public void openGuard(String liveUid, String guardType, String priceKey, String stream,String coupon_type, HttpCallback<String> callback) {
        API.get().pdLiveApi(mContext)
-                .openGuard(liveUid, guardType, priceKey, stream)
+                .openGuard(liveUid, guardType, priceKey, stream,coupon_type)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Consumer<ResponseModel<Object>>() {
--- a/common/src/main/res/layout/dialog_guard_buy_coupon_tips.xml
+++ b/common/src/main/res/layout/dialog_guard_buy_coupon_tips.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="310dp"
+    android:layout_height="260dp"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="243dp"
+        android:background="@drawable/guard_buy_tips_bg">
+
+        <ImageView
+            android:id="@+id/btn_cancel"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:src="@mipmap/icon_guard_buy_tips_close" />
+
+        <com.flyjingfish.gradienttextviewlib.GradientTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:letterSpacing="0.1"
+            android:text="@string/dialog_tip"
+            android:textSize="22dp"
+            app:gradient_angle="45"
+            app:gradient_endColor="#F9E1AE"
+            app:gradient_startColor="#C28413" />
+
+        <TextView
+            android:id="@+id/content2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:letterSpacing="0.1"
+            android:text="@string/current_guard_expires"
+            android:textColor="#FFE0BF"
+            android:textSize="14dp" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:layout_centerHorizontal="true"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/btn_cancel1"
+            android:layout_width="100dp"
+            android:gravity="center"
+            android:layout_height="38dp"
+            android:textColor="#F7F7F7"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:background="@mipmap/guard_buy_tips_cancel_bg"
+            android:letterSpacing="0.1"
+            android:text="@string/live_guard_buy_coupon_tips_cancel" />
+
+        <TextView
+            android:layout_marginLeft="40dp"
+            android:id="@+id/btn_confirm"
+            android:layout_width="100dp"
+            android:gravity="center"
+            android:layout_height="38dp"
+            android:textColor="#893D0D"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:background="@drawable/guard_buy_tips_sure_bg"
+            android:letterSpacing="0.1"
+            android:text="@string/live_guard_buy_coupon_tips_use" />
+
+    </LinearLayout>
+
+
+
+</RelativeLayout>
--- a/common/src/main/res/mipmap-xxhdpi/guard_buy_tips_cancel_bg.png
+++ b/common/src/main/res/mipmap-xxhdpi/guard_buy_tips_cancel_bg.png
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1501,4 +1501,6 @@
    <string name="main_type_theater">短劇</string>
    <string name="prank_complete">完成*1</string>
    <string name="pking_over">主播正在PK，稍後再試</string>
+    <string name="live_guard_buy_coupon_tips_use">使用</string>
+    <string name="live_guard_buy_coupon_tips_cancel">取消</string>
 </resources>
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1500,4 +1500,6 @@
    <string name="main_type_theater">短劇</string>
    <string name="prank_complete">完成*1</string>
    <string name="pking_over">主播正在PK，稍後再試</string>
+    <string name="live_guard_buy_coupon_tips_use">使用</string>
+    <string name="live_guard_buy_coupon_tips_cancel">取消</string>
 </resources>
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1497,5 +1497,7 @@
    <string name="main_type_theater">短劇</string>
    <string name="prank_complete">完成*1</string>
    <string name="pking_over">主播正在PK，稍後再試</string>
+    <string name="live_guard_buy_coupon_tips_use">使用</string>
+    <string name="live_guard_buy_coupon_tips_cancel">取消</string>

 </resources>
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1506,4 +1506,6 @@ Limited ride And limited avatar frame</string>
    <string name="main_type_theater" >Theater</string>
    <string name="pking_over">The anchor is in PK, please try again later</string>
    <string name="prank_complete">once</string>
+    <string name="live_guard_buy_coupon_tips_use">Use</string>
+    <string name="live_guard_buy_coupon_tips_cancel">Cancel</string>
 </resources>