From 81d390f82ebb5a2b50cdd177796f052ad3c711d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E7=9A=AE?=
 <14840170+lao-pi123@user.noreply.gitee.com>
Date: Tue, 8 Oct 2024 10:02:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A5=9E=E9=BE=99=E9=80=81=E8=B4=A2?=
 =?UTF-8?q?=E9=87=91=E8=B1=86=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=B3=E9=97=AD=E5=9B=BE=E6=A0=87=202=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BC=B9=E7=AA=97=E7=82=B9=E5=87=BB=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=92=8C=E8=BF=94=E5=9B=9E=E9=94=AE=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/dialog/DragonRuleConfirmPopup.java    |  15 ++++++++++++---
 .../src/main/res/layout/dragon_rule_popup_3.xml  |  10 ++++++++++
 .../res/mipmap-xxxhdpi/icon_dalog_closed.webp    | Bin 0 -> 1626 bytes
 .../live/dialog/DragonSendsMoneyPopup.java       |   2 ++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 common/src/main/res/mipmap-xxxhdpi/icon_dalog_closed.webp

diff --git a/common/src/main/java/com/yunbao/common/dialog/DragonRuleConfirmPopup.java b/common/src/main/java/com/yunbao/common/dialog/DragonRuleConfirmPopup.java
index 3eefa2413..e2d8d1711 100644
--- a/common/src/main/java/com/yunbao/common/dialog/DragonRuleConfirmPopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/DragonRuleConfirmPopup.java
@@ -1,6 +1,7 @@
 package com.yunbao.common.dialog;
 
 import android.content.Context;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -14,9 +15,10 @@ import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 public class DragonRuleConfirmPopup extends CenterPopupView {
-    TextView text_1;
-    TextView text_2;
-    TextView text_3;
+    private TextView text_1;
+    private TextView text_2;
+    private TextView text_3;
+    private ImageView closed_iv;
     private String mLiveUid;
     private int mGoldMoney;// 總數
     private int mMoney;// 輸入的
@@ -44,11 +46,18 @@ public class DragonRuleConfirmPopup extends CenterPopupView {
         text_1 = findViewById(R.id.text_1);
         text_2 = findViewById(R.id.text_2);
         text_3 = findViewById(R.id.text_3);
+        closed_iv = findViewById(R.id.closed_iv);
 
         text_1.setText(String.format(WordUtil.getString(R.string.dialog_jin_dou_1), mMoney));
         text_2.setText(String.format(WordUtil.getString(R.string.dialog_jin_dou_2), (mMoney/10)));
         text_3.setText(String.format(WordUtil.getString(R.string.dialog_jin_dou_3), mGoldMoney-mMoney));
 
+        ViewClicksAntiShake.clicksAntiShake(closed_iv, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                dismiss();
+            }
+        });
 
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.btn_confirm), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
diff --git a/common/src/main/res/layout/dragon_rule_popup_3.xml b/common/src/main/res/layout/dragon_rule_popup_3.xml
index 8bf28339f..1b9b516cd 100644
--- a/common/src/main/res/layout/dragon_rule_popup_3.xml
+++ b/common/src/main/res/layout/dragon_rule_popup_3.xml
@@ -15,6 +15,16 @@
             android:scaleType="fitXY"
             android:src="@mipmap/background_dragon_rule" />
 
+        <ImageView
+            android:layout_width="26dp"
+            android:layout_height="26dp"
+            android:layout_gravity="end"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:id="@+id/closed_iv"
+            android:padding="5dp"
+            android:src="@mipmap/icon_dalog_closed" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/common/src/main/res/mipmap-xxxhdpi/icon_dalog_closed.webp b/common/src/main/res/mipmap-xxxhdpi/icon_dalog_closed.webp
new file mode 100644
index 0000000000000000000000000000000000000000..2a3b56127135cd5a54e696c5b158f1a631e0ca47
GIT binary patch
literal 1626
zcmaKpc{J2(7{}kSW=mOa>blp+v^mIfng(eKWhq?@lbtbSIc70KB5Ot52qnvH5Eo@B
zI@MTX%BfK%ldKu0NyKDnB4fD9{Y}nEe{}Ej{@&;Jd7tNdp66Yh?T#LGmI2`85lcs`
zBg#!40AL7B^taE>%F3|=1}y=sL+quX6oD8)akjC9ySaP7WqAMwjc<m-Q^{-eQxB<x
z{cGAD{huoSKPVRvNX0`E0W=X5s5!JJHHg)M)_Av={nz+_n4==d5s=1F%oG=AD~JOi
z-W~J<`~SdrGDWOUhcpKWVUglqViTWEF_7qrf&LqysR^jS8Q1_z@%f=OWTa96PzwM^
zX06Bk3jnB320&wIJ%+defbs<Z=<M~_`kjz*6x_FRQjnK8bqavFn*b=e1EBg60C~@E
zImrFT-r!J56WSLE8bKfo1Ohm)14Mua1`ruTk7@*v&<h{OL-qHf8Ood5p41UIhAXRl
z`aM-YE!OIa36X;&*X5jzYQv1t2~<`npTwiVfCN-I6&EMBMJol=DJA0)i|{Ao`+~x}
zj*B)Anbee2kl77#ub59Z!Sz~W1(~TZ#1K8e7Mo7s&}X9QkSB1E9~T{h0s>s(4qLBk
zHxP8}LL>BtCvH{io(L^IWc}T823m#7`=NHco(xwD)9>*z3)TLpF)aWRBlrVJNg4?*
z!cj;Te4?c|@4fdCy(Kvi^C>#KjES7HJ`@`jKi)gLJon+Lu<{tYRh|61QjAmhSwfTN
ze5gub>4oLS#juLPv=3MzYdfd=PJ1X9hqI`4q;FK1vMp)#wO95Cj?=xBhHaxq|C%?;
zq!C-r1<T70sf<VZSbHivkmv4GXd&^e&JbE%Ck)f!_O)JQa`&vr2hQ$~QY`PPZK(3g
z`lEe^%E6+IGoKa|shN!KXQ-W5GqWuUl1{s+9rmqZ3#jM-TeK84bxCG)-%_)58?r`0
z<g$#{*w!)eFv;EN{^5MWCIdU$5``{yPe~W5eveOSLqKqls*|G0HlzN2FjyN>4WlVj
zUi21cTc4NVUDzPvCTddZ7s75??a0DlftCpxZvIGUWT~S*w6fW*s=&taISH_(tb4NS
z8D&=Ul||b3T7Y1GGy~iw$Kt2G4Mvt7awSO>IQ~d*QT2|2*_`WJpPrA{;$4{J9?2X#
z&mf<<;@MbIZuYkHpk%|6I)l$ZblW2@d+pl8>yi`^^RY6g3OwvR+UbZax#`q_&V8M)
zug@YXUseox!W|~da%PFU?|J8C^r3$F%RYqat$;b#$MNb5rJ|U3FZ1VV53f}|5{B2@
zHqO;F6=G}0&7L)+D+D)glk^%sbj>YqNuMR1<2QrsSKIm=`L1&%?U<MD2#1TUzH!H}
zw9~r&K!>Z$q--K4CN8-#(Z>e}7Ap3HZ|^m;r6n|X{8qnnWO#((Q{HDO<%X`B%ZOy1
zo(OrM25a%7bnD~!=y`M^6R|7Ysk!{|e$1raJmHh>UT&9Er9V0MUA}q0A*<d0{+A$!
zw-S2Y(i{Y~Rb#t6-rd|+!c2)*_FVcnCD%-+IPT(7pJ@uO#yY?0BiFw$!%MX2{CV+G
z%IR$F)S&3*XPI7w>hD>cgi(!l%XR^>ccO*;A!UiCJ@$7JYMR7p|5F6Fd1BtT+Ei)7
zLp?rbx9V}p{ECjR@fG_>s;p)$cRbDe@l?M-@#h2?_c4}s(@^(SPGjdk;k;QDzH2h6
zCxLfHurkcQ{lMb$D|B40f|j1Jj%bRj^~`Z|U7U%;6dJ!6oT|7OxGX(I%#}+oG^omm
zJQMb!g@f$jlJ|Zwi}CGntvykb&+T*c_IYCw(p|7cqU-ABg$56!hL!8g$f<K1KF;gn
v-<n(-O@1@j^!jFLykL?vu=Ra7v$;K1aeDY`#>qC@fmZJ~gEzml!C>HDTeXYM

literal 0
HcmV?d00001

diff --git a/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java b/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java
index aa3f39285..f07a2e84a 100644
--- a/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/DragonSendsMoneyPopup.java
@@ -71,6 +71,8 @@ public class DragonSendsMoneyPopup extends CenterPopupView {
                         if (money >= 1000) {
                             // 显示确认弹窗
                             new XPopup.Builder(getContext())
+                                    .dismissOnTouchOutside(false)
+                                    .dismissOnBackPressed(false)
                                     .asCustom(new DragonRuleConfirmPopup(getContext(),goldMoney,money,mLiveUid))
                                     .show();
                             dismiss();