From 963fe2c110731cfa520bd602efd314de82d0b19b Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Thu, 4 Jul 2024 17:59:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A5=BD=E5=8F=8B=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E5=AE=88=E6=8A=A4=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/common/bean/GuardPriceModel.java | 18 + .../dialog/GuardBuyCouponTipsDialog.java | 78 ++++ .../com/yunbao/common/http/PDLiveApi.java | 2 +- .../common/http/live/LiveNetManager.java | 4 +- .../layout/dialog_guard_buy_coupon_tips.xml | 88 ++++ .../guard_buy_tips_cancel_bg.png | Bin 0 -> 27055 bytes common/src/main/res/values-zh-rHK/strings.xml | 2 + common/src/main/res/values-zh-rTW/strings.xml | 2 + common/src/main/res/values-zh/strings.xml | 2 + common/src/main/res/values/strings.xml | 2 + .../live/dialog/LiveBuyGuardDialog.java | 413 +++++++++--------- .../yunbao/main/views/MainHomeViewHolder.java | 3 - 12 files changed, 413 insertions(+), 201 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/dialog/GuardBuyCouponTipsDialog.java create mode 100644 common/src/main/res/layout/dialog_guard_buy_coupon_tips.xml create mode 100644 common/src/main/res/mipmap-xxhdpi/guard_buy_tips_cancel_bg.png diff --git a/common/src/main/java/com/yunbao/common/bean/GuardPriceModel.java b/common/src/main/java/com/yunbao/common/bean/GuardPriceModel.java index 24568f683..c93e6cdee 100644 --- 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; diff --git a/common/src/main/java/com/yunbao/common/dialog/GuardBuyCouponTipsDialog.java b/common/src/main/java/com/yunbao/common/dialog/GuardBuyCouponTipsDialog.java new file mode 100644 index 000000000..3bc277ea0 --- /dev/null +++ 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("您有一張" + + "" + content + "優惠券
" + + "開通/續費" + content + "(1個月)時，
可享" + + "" + coupon + "折" + + "優惠 (折後:" + + "" + coin + "鑽)
" + + "是否使用優惠券？"); + } else { + tips = Html.fromHtml("You have a " + + "" + content + " coupon" + + " When activating/renewing " + content + "(1 month), you can enjoy a" + + " " + coupon + "% " + + "discount (After folding:" + + "" + coin + " diamonds" + + "）Do you want to use coupons?"); + } + 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(); + } + +} diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index e0e42ce10..c0fda5d37 100644 --- 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> getGuardOpenInfo(@Query("liveuid") String liveUid); @GET("/api/public/?service=Guard.openGuard") - Observable> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream); + Observable> 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> sendMoneyLong(@Query("liveuid") String liveUid, @Query("gold_num") String goldNum); diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index 29fa05c34..5df075a35 100644 --- 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 callback) { + public void openGuard(String liveUid, String guardType, String priceKey, String stream,String coupon_type, HttpCallback 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>() { diff --git a/common/src/main/res/layout/dialog_guard_buy_coupon_tips.xml b/common/src/main/res/layout/dialog_guard_buy_coupon_tips.xml new file mode 100644 index 000000000..0c22f92be --- /dev/null +++ b/common/src/main/res/layout/dialog_guard_buy_coupon_tips.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..0820358ec2da7c99a05e2afebc6641c29d886812 GIT binary patch literal 27055 zcmV)JK)b(*P)PyA07*naRCr$1y?g9#XLTO9_xHOUUx-IU83iF)sR^Q^G^u6+Op|t|QATSzN4Z8SqkDovua z(IkK%j?X#2%eSZdUF&()v)=vg@7up~4i2#d=l6ZzzOHwzXFcokzHi_CDf#c&XP>>U z>$>Z9F7F&1?H;|f@B8l@hT-L1*S);!hHvfq{y*=!?pwN{+v&URMMK~BT{m?7&~@GT z*ZA-FN9SMkL)UkGHw;7PhjzpG-O$_dI1c}g7bvHXzn6=ZOO5A_$ByUe`Q-}!d$~k8 ze7u)E!FU~BZv0q|El2S3<&54xkH3xg_Sfj~Jmnqi(d@G074V!hgKG~k-Z11brw1;s z_*uTt-zLX>BP-UQs)xN&L5?r^M_t#Qc3t-e!!Z1RUDy47*L7d)`~Hi=F#MbS{r%rN zJw3hLb=}3AZ@&5BmEP!uJP&&QLf&)ny*~NLPk!4l46p3E?k{#-_Z?l=|M{*PzU}%O zuHQL5J?)0|(5=_&0y_8~fB_((FqLl%WA$&-M-xi{5CTm)fL%U0KoP6uWy^EuX92PD@&T-NJqLec zry($KJmI-J1tKbrGwHgsz~8`6yC=oT`vl00V?Bbc{S?QWb83On)d7^dk?r8VShHW4 z1B)XrdfdnVR;zB+_ubCUPWSxt&yQgC+ru#YKV8@TX4iH9y6^j6zvY%&e*1-a!n5Dy z8xF93mOMU{kL}AaN}yV+V9qYBGY=X87D-=ip*Gog_t;8p^|{G|Ex>7jTDkKu z9CcmyoHMbXU9DFC;O3ie9zTD>{Pzt3SReVwM_zox4LAIk-Fkh`!S&aF-^uYwcXD!U z;T9>5D09&Q4XZpPgX%kQSqSFF0Y>BDo<(&Q&O!Cae4PHcgCc#1NJ?0XoXxPznT=5o zH&7q)`i{n+oXMoHGtk9CPTU9~D^znvE32;;=6Z6m>fGKu-r*J)LY7DFOEYriubi9{!V^g87v+fJ2Nw5&?`l zQ-H(4+R_gIVFOclz{pG}qjdQ=C$@9~^ARIhiZs-LI2Rx91*qKJ-R<`F_PXaUUi_!4 zzJH|e`+s%w%{PB}tCD=35BL)WtY7$rU-+)B>u%|~?r$F)9K7P>bOfr?39IJ-fFqDr zW$A=6ZjqYCWJ#f?=Lvrh#gF3{@c~N;SX& zaAD-wXriI?<24EhkotIPOM%5T1Z)g|YeV4-gfdh{K+BID8^{ZtL?v%W)o={UU^X2E zY??cDil_1rt&`?YP==*Zb*)7iF4av6d}0igx&dn$?wj*to&q3QQUHEew~Yz7Qzeb% zDMf@+XS~nrcHQpoP6;0`A02&R7>56K*xUQ$-+S$Af8*f3@%W8%ODl5g&69KKe*Fhkzpi9kGOX9Og5sgnCJUn{hdp!RQLIn7hR9Id2hg zp~5o9=^7Rk$U;_JDQH(>>t`0a+D&CcPBtAg=L{^q4-n1;gc^o3H}MQsov#xFX3kF? z0&ijWXUOIkN3o)Obh&}Cgwc&-hwu@+oZOkUr#d0)2zg&!obs_N&lP(7+|UjG zd)IY8_Cr7PL%(~qPjc4tUr>hivp@T@FInxZ?%v(m{rh9GeEgsOR|MyZDRG2X);tda z`kJx`b``Q6YOf3o@>`xrH%BF}?}ivvyr=-eeZe4$vcrIkrbIXb%I_d)4~FWagX;w7 z>{%FSN_atAkis7V9;;}|HAR?e8WY|?O9>W)Qfqqu{15)% z5B|rq0?(Bm|AGM4r#|(mZ~F2de)(oXsd|f_u({oK=>4fy`@_!YS4FYKX-MmE!9;!T-!(D{E>$PC7gV8ka!9( zNp$hJbCWingM)+a^5x6FH>`&z*4_GvAO7JV{@MbgxT-_G?tt~lpZmF2o%G$$cSHB` zzF&32P=Y_rsK~gq4B10D$P1MghF#{BU@(Q`qonU3$Xtuia}1vWrOOatfl3#Xt9C%@ zw~}fS%J2pBJVb#;s)@DA<4xNTuO0QGIY7F)NRwmHVko5t4AnUO8@aB^XmEU@InHUE z(W2!dh=zrBf}e>|8|Z1918bYc3&!LzlimU7xmxGf09|$YMs5^UO!U+tR}|eVs+rIR zWTT?8Xkn|Nk`;T9CqzsY<6VtB##|UxjO_uhB&mSHSl@kd)vsQ6%PqHj ze)|ot{D`j`V14RSpE~%;m%j892iIM9_od61yKY#grbyUz>(Q@dc&4F1+xyYP5;n@& zDv_#J)KpPIx8M-GS+-R-@&pF(gsE(4<@2KN5$2V<6%6z{YZwdWlk#qELf({$nz}}S zsGQoptk;bBKqkeNw}^?+m?EFVvOOe#o1J+O8zZ>HkS60OtSjZ)sxj7PTW6BSNF2hEZ7&$Lgp34*Pc2FYIox+Qyc^E2`+fITHG1un$VZe@Du2z!WZ8CJV0f}It zu9i;$6BWy3IWv)pU)|ry(kITi&fj#?O+WqvKkx%%L+UmE@9P3sKmUnOeD`{1=co5} zcfa@edb)%wIK@tM1Uk>=cP>j!%-zP*$E_KOQd< ziFAgR{tW2o*Om?=z|xo{Rm|i^bXI_wWi*ob%!Qc2U;|}#N2Q2fu#^MTqKv&%c_syF z1!m?lX}8n*rvjG>fxtL7>@~oq(TXvK<8mM?{ccDXC~bAT)LdQUWRYITy>EyX3Vdc9 zr{gB^@Ze%>g*Z7m`Rp(ZZ-3qEUiUArHDXAw)gq$ghLUven*-z9UrvpmpUqaN1 zrD}!72at7I4_N|;HH-{Li3q=dlVprwkX95)-2le8#7(GSr*MNY@4qqZ38qit+qrUZ>3b{SLS-9B9;oy;W^7Kd~P5ISB<@8 z#BC9sIihJ@W-~FWN^RMrCQqmd(?mx@eF}dlqZu*;_-Z{Nvm&6Z|C<2OLq=p9rNj+G zHFE3)g3>mUEs8S_*sP02NQ+gpi@ZF!jGYrF*CX<5m-5W$EFQGVsloW>#*4jA?Sy)r zBuJ`2M~1wXJ)|}ebJU8QPz^_eu#9IJJPQZYyj3+5ZZ{2o4g88uWd24U5&y7jPrU~g~l12^A%^Vmgy)&E@+z#1neA01tKa<$rh!`S@U zuk%#9_EQGs_5f-2u$tNOz+@n`wy9ETP9Z8^)kHzLf4){~w{Yx)A1(ukgoU#&Q~)qd z2)#Z`yu$w6Dx(`ePdhT*4TeVmat+sFX3JJZwdxk2H0hh2y4sW|*w?_wwyY*ijpBC| z@QMtDV$aQHfUHw9q^fKrqKfDVxL~vhWg^V9M@$JU7H#5uWx5VWj>c$(VaI|7q|Q>U z=PyK*t8rDOQ*(Ye#jPLwZTyH*RgO`0u4rXGi^02LcAFe6e-i)`ea#%G3y;a$Bmx zm8@H$7dDi9N_{(NYoCOE8lFz>Aq{2@?zER0zgg+_ng|-78Ets#H?1}jHW7g{NU7_B ztWZ){y^~F)2*m~;1sju1fMw-EINp)6EARceOP4Nx|C`?Qrf~&{EB0?6c3l z_~ONjzqDGdUQ;)LHc!}QpY*8eYFu?TvMFtph)Kv)I+??TN{@w5k>3i|@06SK5Ott^ zpmdHSK^GCLELnpv#}im7uz`XKoo6qYL{=t=GXi8w_)BCzqecWdR4JQs({KDBv_D{4apn29>5==0*d=KJM{{tY5iklE7PONsPN8>^+%YoN!ozWB@!J5rKdiazQ z?=c?NU}V}-2V1Apnd!SC{S}#c8%RBGlClKYgvZbj#E3+ln@#h2eOwsAqvy?wT}bC} z#!A=itaiHf$;oH-&z*bi)yzq}V!$$HwfoEa`}?oCeEBG^5ml5TVr}N<)Pq&drbJdq zdlfYIk~g&JzM4%@_8Y^k)zNrOQWH7<$S0wr)5a4}V$vJs6($B=KA#O{zFV z7e$_%B4YF_DC>wq+`M-lPiqcKOF~PWd<NPT&a|o1uTky_ zrSwKkJhmp*fR zeEdILDbuzCyBd+D1Ja_quE;zBp z)EQD<+P8aoodV;DW+b@@kSXoq0gWd|b&@dh8`khBG}}iW3Du}oO}o2i?OgLISH;Xi z_^l$VLL@7(Eh1QC66;<`s*0@wlm})zNQJ$C+QjVFlaXz+HcHBfzsv{ z6lBVCwRdoE@KoRRZya-0 z%r~R6R~e74>M5)qt8|*O*(0#}zzT@R?kT@j4SV(UWVp2yHfhV%X;Sc;TBk&DSUz)O zNQxj8s+#F3F*4wgn-tO#xh5|zSuh|9sr6K`MdNLFcV|Li3G8dqHKE*FYi@)XO^ z;9|vBE$3=ble`TE93H^49uT>yyd6`6sH{-*Vj!~0ML^>ef)ROh<_4?zNE?v6)_S}Zp!i+RXEgo@wRXBBdLJV z?_-MQ3Ts;AORz}t!`U_(5zz;wcw&mC2I1*h=4>3O8~ro}Bvsnkt%jf@bY98S`1Q&i zUvRVWUaT{1)ekkB8RBbS*Hy(7oVt+INcq)Vdw^Y5C*RPsBi&dYE>9Bz6T>2bk`+sc zSw_HnlT7DTsIgwYwJHNlnR(wYrZA2)(SFx(_Qe9aaie{&fyb=tw< z#g^1RY-mO zvmE@fkA3XNR;$&MgRHXPL6f}>OTVTkI*kD=5(!mOM=<%#fnG2zJM2R?mAx&sETU^Zp_CWatoBc~!J&n8zoBsJ%Z$IA_II>iQdFlbncp zJk7IdD@n|yB%D^u2bsEH4y(N@^q*-Y=WUUzb=mkMnxl+hTbw$%>!Pr*j9x-YA4c z$@tCMlo-%43Zv7db~G!2Tw#T=f>Rfvcg$!-j-Rlhgkv`NG!v=lj0@tFM3k>wkTTIxiZ5 zkAM8*=ho}>ul9ZaJq%ZTDu~%ArsqOgLmJA!Xg6rjg3M}sk{k^4U7U0rA)yH!O@dYN zUo0H+)_4Q}C=x$XS92!kZfV*NG%r?mA6JK@$f?#l5D^N;AuE;k{enWga0?F#WN|`t z1mvob8E9l?(u$PAj6)e^y)ah0B+1I$TcBL5fi43qb2Y*0%>JcE4=;oKB^TSPfe>%o zb?ZbvTxR1x8;ZA3iHUP;hOG*;AWc<~gvbajS4)V2HVNS~+G!LqJT%qfju#;`pIF2u zIjrcT3jJ`t#pHLmkIm%)T>>ZtzVM(48_&u>nmo*%Mv=~E*X#B7z4482ytECp76R5s zA6~6?-*e&AJ`DAh~pyecd#y79KBpC@;-X9DAri&1qV9!g6fQ&FmHRdp&Z zoM+Q}44`cuX;#0dg6c{uY=H~`6+jj#v{}5W(rV>Q*#RxKO2}@L^VZ*IxUZxIa`Q!` zwIz>TWx(R(NFU@HN8|`&nF*|iZmN-UR<@$4)+8cyYprS^I2v6B4sKLECdvsdGvSv^ zYB{UDw{o?K4QFuFIqR6+MuzFJYF+)M?|0U#jok*6K7yXcuzt6oOqQAPtZ5bU$1X=Y zNgd-bbi2EI-RbG+Be&jq>pk04Z7Xg({q)nXy5WW!K6mkAW81QD8mUY@n^f21ixl9+ zLi%J3ZfKLrn7aZC&)~a!@{8sGpcHPT4A(qii?)PRRP$U!%eMX?7J1$nO9Bnr z1DMxxfG@-1B?WDIO@fjc2(ngKHuMnU88ozkC0X8e4JOQe8iO&+cOhSQ-SyqYi_gFM zjcs>dzybuL(Plnu7(cq*7NBpvG73LxRXjgc*CjUo} zS9hGzh1>iNK4y(_jfy_^E;U(gGK%pCizV_-Juybr(A0HsJ{>0X))7z2pUT-$$%Yje zTR@Nv*;&#wI`b{JhVW17YFgG|{U9@o7`Z(B6LVLQN&+3sh01(WVu(4P&$QrzQR|=Yv9;|z`!2x78Bv%MO3T^1E}Ri`4eMBZp;PyuE5)eOj1F}BErATL$}fWa#Qh*wA< zJXjb)ujnyQ(8S!(sDuH0BmJ5dHgmo}W(QTTdyORYNPS>6VmiPMun|6%oYU4* zpRJ(blRNLCn*@QX3$I$PxE$s^c3jBVC^^(5tKi~KLOYYtv3NYgwpzI1 z-WR#+dJ-*nnvVOHGe|4#nqlDH{7IZaXl#NjSCQOy6cAz+gGpz7*n~_jM-s*4dDS|a z#5yD6l>c%oW)4A~M{+WdIG>O62jw2@VFEDNwb{H4R#6NatsGQbntd?iyfR4`)Y)bz zoY4)50|IG~#S*J*VC&j*kpxaPF-_&>7#s_oaGYXBLaaG1j+UFhn1rlg5Iv8k*y9rF z!|!*)@ZE2E)0_T7^SS2)_4LzEJ+^;vaMw6b5X-lM)|nv$g-2JdKMCi)nPK?@YDv?c z*#2)+DlICBIRJNzTHDL3dTT#&*(hwB-zSTzwM-%Piop*2s$|P}Hwn!q8X}XP>jAQ| zu{AdaYAB#f|GA?N03Tr~<>TRWJx=3*uNX21lf)R9up~d#T=FLvO4+0qMAkl=~ZHji<)Iu>z*L&491`Yiv|XP<5{Z$ z4wL2#>g2j^uF<&c#uN1pdm&B4H(j}5WtJ~~_)Twm^IeMp>tj!R>}Bh7 z>)$y&@rC%#0{;_~h!LFvh#O3LFe0kx%~%kc$UEuOn_Ss6S;Nr7 zZ4i`aujCB&KILxCYypx*?f?tbPnTr0Hqz8wLxlKXG4iZURgkjhON7XJjlD zTbn{gT-kn$oI!*Vp6ZhY2eCdrJS-<)bGe%6%x0cYmi{ot;9$#8h8ZSg^Z?pb5a4&qNa(^E!Y#quNzi(CGiDApkL3J?T}jfe;Uxc~ql07*naRC(&* z9S|Djkg)I*Z5B*IZ#+@KG?@@9Po?v}=76%T1$d@e^!^Rt6=zp)>=e~3foDo5UF9(q+iY{x&+V{HdgCZ%E>KsMN{-MNrbTYC$so< z_y$e!%~yOxb@@I@WbziMY_d2NQ-q2RAmpnWMbV^CbVcZ0xBYjO(GWc?Y=z4XpiIb&{D%BO2v@%G0}Yc^0Fpl+e3M#f@up zrMTO{o3B`b1;84iiVsXhFimaMV-n;u9n=1Frg%~lT7*>8MS8HP&b5>(Gd(RJ_?2Wi zT@#i_YC>6GS}uj_J=GaRCvJ?51ScgEYpECI!i;b2d2#l|WVN$5>j82f ztdp;`vRbKA@&l?Z-j%tj9R~iQGFmqkqHgX?6csjkH{{q-Si^jp zJ+kGpAUAIabUB6bMoE7Hs(f>`id4Z~E*mwBSdHFMG**YGZzs5i6Vl;@3dVLVAT>pqo0L=$`6&vQ0W%`siv1L;>GP$Ykt?`QZR z`!QB+5k{(7dl^XeQabj7xgiY3JE{}6e2*?YM7?rBR~S3Vm+$QEjGMCl>RaFX*6*7D z))P-WapS?k!5>||bjh0o#b2fTM{c}GoyQtdr371KoXb_oQPtO-Z6GH{r!b`10K!u; z!wAnuk3n*$zvWFmS?bo%ARLFkV>EUe`N^gGR2l)$P8e97&^Vi%lD%`(gT1zX4W z!%?E8L}M)Iv@5rD%mn{o-I9&Lk;^TQ5dY^l_k5eAf}2SRawAt%7>T=sB!-AYqZ%DE!OZ;~gn?am-F4$S@c-HEx8MHNG{zS$TzJpk?%u=4 zr^lQxWwwKVf=e~-!^H!M#KB5%<+m798F?cV10N728F^##(3vuZM6z3lSgyO&Xej);@8u{0TwrA&NwJ^dyb9ek?Y6!S|x z6s|LxZn+x)DIBk+xkTnkP=?I*emGuN>%}-oIyhx^{9Ivlk%x7Oc)-ZW{~f?-f;B8A5-IdCf%Re(qU^+c=~ax$qZl|JM0i;wpP}gWrj)`! z;9v7POt5OL^vSCVMW0VuXQ(CC2msDup(YMnG`;qw#x&GZ#Y&(>F=ToP-xpo#f8vq|kM0XdG`sUIWId}3(oW9F!fDMJ1=rCMY6B`9FLM69BUTorm_ zby<^QQ|K8Ir^MV#F7#w^fCaj4VsPlJa&)0x-P9O{r5TSShc)%ZS#rAloO)@eabTh< zMPX=wnjk4OU_KB-V7kPrN!lTf?ou4Isbr>Tsy})+@NKQ6s?M2Jx>nCd&ZTSMH{bf! zxBdlM@#Bv_{^xdfc0bqk!#786psL~#_+?rNy+zKe2V_X1dZU6*2eDS_ROax*gZ)Io zrY0eF+i1KDAy$;y845a&Id!0T67dYungKmQtp)rdQ(PY|V!HA!9kR`ey!h7*tTJCC zoJ=ITbDs&8Sq^`T+>aKe;Ta>}fqY20ZmMwEmB`pUi8om*jLu8&v5^Z(AhEQP)hJwe zB*&;U3NgVVsDD8sgq7=iwYmuM${L_a02SH`mz9YrMObJt7h5IG4SiHrx+QHkYW(Qj5m@HMrOS*en-#j5`!x5Sho>WkX2JvRELDkNns{cXh6-;uxBhL z8WQWMg%KZ>LOZ5>VHzG3k#GJ=)uf>^)6NSDd%T;?zH0y1(jP6mPbynrFRi7AV`fre zL#8l30UJ|tyrCG(HiwKs@{|1CVWpySK-cWMDff(RG^#h&j{+#;xfb2Q5I{0y6AMW| zCwSsmJ1dkG6N<}DgAoV;=nDT7i#~#xWM(e_PJ5D>V>MBu3dlRnc{4D?9AifYsxGEc zR+Jp5f#(oSc6x4!Ld|4UJ$4}bW> z53W|Ld*_=)Wqw~t;i#~L<~!vuuxvN=rH7Vnq@p1dYzgarhj&Uj7>L~mnH~8UV2KDd zWi+McOZ|f zDo-@+EE+3$npk~0;hu)z#w%MT0$wde!Li!OO*E9FvEgRE5q zIDav018ZEl!;$a>%O=&139uINOG9UJs`yOeqIAY*S$7ZJ@ju@2-u|)29=mR}T79zb z`@dNpHCwl{`l@`XVBoah9cZwE#InvZk{kKuM@P4efc4_lYW2^%zJIwzb*^wO*Lg-V-pH49aU@4M zV%9fTp`J2AX&UxniqfwUkyt|-bFAjqWw$FE^Q^oWku|7(cnSs#9k)&`ThU-O zT*M$}RhRIDtXk=~Phb{O=m|AnhsjQ|cZnu9xEf63K@%iidKMR?IyME}>Z~(HKeOy+ z@-Sf?+yf9(KqY^W7E^=1VO#b{yX2IRdnUprno3b`rsp$nPoF{y(;&Jstl7NDb`-91 z+EqnRY``?j$%gD{Nu`=?nREw&wW!>wph*!x=VPi(rAUidP@w2k1B-)Ynx@`Tk~1of zc|W(4=mOIMd)e?wX0+rkY0N& zSPiZRc;SFALWn?s%25Wru4mc%f!1*kK{173Jtu62wU^MWl;u&pLzp`{S8WQigEQZ@ z=I9MEERoE{E@(ttswztN*&icD5%cM@f_csZE6>uIGt1&xj6|8e%Iv^IwP*UXQOYt( zJZ)T#Iz~KKOF)&LWI`d~F~>cOF}0iUF8P8W=N`Oqjs0*qs0jP40gJ(tqhD9w^~SEFQ32lt8) zQ4NOSi5QDNt*JSuZsZUVOjrnqykj))p&(?8E?s#-H&jPPMz!{}m!P0fc%CRHjDOB- zsb`0)2X1NG#8?Bi=jw~hA;{+NXzNf$RzSK8gI&|6Thvo8a15T+BU%?5*fi;$NUxn^ z$#AT%*R;hJ2;qsF`4>B(7Nzb^or{5fq}Bm)7l_vd!l7#ei}u5rKE&L*+$4hB)p$Qy zXSbwZoMCA*E))kfiJYphDXr_0S%`gYie5<8G%<8@6(kjQ~!-;n7{(c z6GycXv^l+;ADb9m8g>kH7K9Z=qPk?EHh5AbHe)2GVp#G`QhZ0lx-nx?*zJX>E<~pjQE`i3yojLD*Ah8wJ4TFZZ*Q+VIXe1a|Dneo z`=y=L>b0k*C$U6E3JtMRXp~l?uO(vS0s`#Mh)^+yP}LJM?~=i0+j}I-Q13~{5gMTr zjE$&BMawYX@iEg;ZoE+rY0R!m+ZyRSK`;@2i$otBDgeGY2U`m#Ez7)JCR1mc*@Gs{ z@NB^{{53I0deXlH0||&g4oQj^TyRdjvaIpt2}<|0TC@l!7*MQo6uIdGY!yn)pQ;mD zeMoW$!#GcG@G1Rqs9S|`l0Nu?lYSw0UU(ZWNyP5){BB9kOjAU@k*-#{&ovvVOEzte z3MbkjrHe{#4KXJE+h8*`Ovt&Jou#>>@V>gvn6GDN(|_=vF}R)8Zg+Zm@(=qDe&|EL zwzFFOmG$XqyIoxdP%A-5})| zB2>+&j0M+NmPLM4DYJ*C#nhPTj6^3Z&yZO>4r(YxnHl=IvnmBaW$D5;a;9B9dvwTx zK_c`+)2$H@l+XjDw1ODncwRWM5P$F4$srpcB~Vw>DtHlFl6O3&VsR_)_n`_*+dV{A zlPBXadX6O00Z{L#a8rduuv$h}Mjy?wx+HaGQMT2arvy0ma=aTy$b#KbZn(MGSQ8>+ z6$}+d+HuUU$i%m@jVbKd3(vw)RjIcF>!T%aB^!dUU?6}E@q*o(R!n=pEKlt66LPFl zsz`IF!O(T%I`5~ar~haF!4H1$->p{t%hzS%?ehOrd6+~?r-u-N1i4~yO$<7= z4dnuCZMoo7f)EiUK{yYSP-OYrEjcobWZBW4*eB{E+;Q(iAw_Eew={#>1zSmpYrs0Z zyoH0M5tp+I!my^#x&biMSxMr1YhRC_x4B}7T#rtqb%3R4Z9q+3s;LO&&}#8IVZHiR zWE}uW@s~Nz6nUBqn(#cCF%V6c_}?W;;;$c6M{KCzilj{vEQKA#9t_I3WlKEzk9en8 zh|s>%#r)i7xrw(I+^k>i%Ed8dH~40?8hf#ZFZMtAlRx=~eZTr<3xTj{C_n&@BF!sU zG0|NKV6GSk)(?Vm=LjgJ_Y8B?1{UOVyPj-6Vu`f{Z4;sq1wI$1PVD2#)S2_8B8Y6PqA8v7^4eD{R9eo|HB!o9|4DB)y-#Mb2-1+wfY z85qb_>}c&jvdiX#%9=yi%&{)Gf`@>?iO2?~izxbg?LMgiDqjCh{t-QQU`-;gpOU0X=1s*zwJ< z-2JoXrBlT{RvQtemDCCwr7M>o;H(U*%4KSvj=g!V4QzOh!~k>*{v2DEF@zRkWTJj8HGtc$s&!3Mur3-aGdE_PTx*UV~WOT{0F@ShB_WZ=# z8GDPtR5qs*bUj^@mcQVlc|L)+1$_G2nfZvnUh1S0ld0aTn$QhYHJzW%7ehD{(>CNu zv0D!eh9QHqKeEKgburpzjxUbYR8xY{Ek&@UV#%sC<#ethvNn1cl}>~&S|slb#^qn} zg`hL$g94$Wmn<@Qx>|}7JBFd66#BmHcV8|MR0ByM!4;e>TJMr;tStVApPhmkv`PC< z3NZ?Z#Lh*M>-N*#1v8xzVK%p2g3(NhWb&??^klh6wjt2apMT_$(k^5b4;$F5PVT*! zQRdT|H&qrQ)V&;4{xA15P1X?7AbH#4F8qCJ4sjxWtMe<#dAWk;+MvIS(l%E4(3vmB zgl1XqouOw%?L_l%jnH}es>;$>e?cC2UNSTNTdk(kW+Uo^u>>bkT>&sKiRvXZ0+FF} zTCQ1hpXSlAOs|_+sOnEeeYQ zq_QQKJdi-X>&|7Gj9j ziczMXGflWMKF7)$Db>3&;+N0|EQAaMOtd&sfP@*l<;J8do0=Nk-7NUvbj%?{OOHRO zji9uL(o@oed3Bh!<^Ce?0|A+BBJ7R%m~6&Pl7wvSsun)+=05+|B~Nb>O~3Zsc6^2* z_coD>e-4FO7ip@4BvgdBIb0&#|a|Ha03864X`sT=ALpf~t9vak)G%Oad>y`BmBs zWa1H^aLL^}Gn8!tT(yJ1ri8b@aaC2+op9)>LCLu#QdC#%bO#;D=Q%tfP;7)bxpKHY z2Hb?G4d>B1T(P#wPe-_9FsMmd{f2)#=rNQNn1W1lLf1ncK&(-_oS}!4Nn6YdTGT+Z z*va6)hBM($t%SX%kaa}yy?Ke~kBg3b^Uuy}(Dw#LgwzDW`b78D2Hbj(1|^A4+-;c@ zCb^QvX&c0Yrt+v2=Ke_(cbHaGXPR7?yIC(#+3wQoFZK^U_~5VY?CkuN)Agx)BXC;# z7r6zKt0He?*_8T*(%SDul;fpJ(s0FQ#Ld#H{4l&`<&$f<0SFsp*1RnsDV-<{lc4pW z!?HD0gcQPn+>-@E4Co6=Z8x*#z$j}s!BvHlSfSn1MRimh=;;o4*#F!IP# zGUPA!_v&d=ZvI44X;Lp8_l>@})N;UlOK#RIx>DG_w9-f|KegcHQBC<&j<$w}BHvBW zO?>cIG$JCbhGG+$`*?9&{g24)1%t7;PeL_>Rob%v-k)-&7;t+4hdDoT)UlOs?mPbC z?a5$_s{i6@X7$RQDhUMR?O1w=6~gjZSVIo0)Z!UKYnAvRz2Lmo56+ttmv?kFxLSGR z=z|YF_)9xGJFh(*JKd`nX?>mpnpx1*vZ@bz0u&G!AT3uR#lv7K4PFg&JQ_gIu7GM9 z6(Tq;^BrsylwGHrJ556YXK3$6z?}fBADz5cMPqDqqWOT;QfNLx0cTuXw@h{|!5Tv{ zMJ871bT7=bPqbh})iv^Xc)vNOTQlM~UZ?VIl+uPA+OdHl%Y&0t5BXGF4;Y6&xusZ zIfpVBiR6)rf=uULM4%U*NOK4lL%0`JIRHV_2xlx{4s51}&$t_*qy^L@tO?HHToMYL zxxVMT)mTtlbPg09w`4KqIRUU}9+aon7o$Aj$U;+0M6GaAJafgiCH>nJQ>bla^f75w zoDLXuRLh|A*jyroNWy}cC?_gI&cTVwUo3#g_kK=tDx%+7@V^qPO2l5IH21w70_&4C z?%n3KrN<7H*$w`AcXymic>1CKfd?LVv*Va#AcFVhO{Lziry-_NUTa&Za8jRe|&O$TmSy|zyDR| zt~>X+%a<;TJI7#AeWu=~@y*0fHyw8vTDiKg2s%qY5BW3Z&dPhKVasNgPF>jt#5|2m zH!XJd!Jd=`C1_ch$=*_aIxkR7>=RLB=KI z6mU%|yGkCVUZ2Tcl%pg09QnE_k1hVY){nV_uN-GpM9r9MInA-9-YdUxC+_(eutH-4KOHSA8-|f0#hx8JL z!w1iu*jWC7>o7@=g(hkvtjPmp&)jH@H5Z&JLP2X2FA4cB!qlYkGpt`ItN0M5BC)nR z_yNKicM7OH3hOd62xExrML|Ou8NHW-1fOcI$Em`?md(_O>IqIHujz!V{!YO}{h2>- zlAdhP0D!@22dVJjVP9;_8F@+Mq>6hIpru)1aYXmvn#83@R2Ug=&){sDUN=i!H>611 zHI$QU<+C}^1jlAwcyETWzCi88UlHglj zqe9y8V{4LBLZI!Q*`CUpY+({H@R^N($mx1tk{6&LiB%rLTMG<~q*@}n+|<0hVF~8w zF)hW%0kg46knC$Y>GM(l6fO){w`f|86`LxmvCMCKyw^bIV1whg!d#ysE~* zqB|2#18P25Inr4QLPDQLgeecuBQ&I;zn? zgRXB|laTb(o2Nm9wS%h6D1aNd<_^^B@~kG4iF^Q=2T=&XY@ivHGK6t>VeD?=E=j7V zgbAT&F*OG53Y$Pwz-2D^yQ$Y}A$75L%mCa{3|GTfjn&>X}S}SjS73FhY-_ z?u!|St(8?-nnfLwU|B_KwnajVq+E1Jy^p(y6zAD@RlOV!^6V|du*i2#qn}whdE~U5;;c0kQz)P zDTruSFb&{sBu6JBw4GEe7}ObBza?jqDv6cZgmW`Kr7w1;z*H**Iq$H9#{khq~3ctmn6CN#^IZ=slx zPGFCh>Q#e*T$yO%ZTv+^m1tRsq#mu2kTq+S0zVHF9z~>?m^BZ%7DBJg+C= z$z=wEt(%7Yo~&>Z>8}O$C7`1uL1slnm5^>QPLiz!Gx*|pR%3zSq5JN;@4e+&f8r;8 z;_nXY^)sDsRgXqFfHpGrIvy;+vosm`90(xgsdR8R7+fH09n|;*#sf;_NC~N+A)RXS zDZw&Q_9FS{sh2_y56MVfqlf?|&7kGsg?Lw;?=^U3HdncqdRbB`o(G7^}sg;n$tRNQOEBqz$QA8s9o;iO3s3|FP*=m;v@r<4` zk!svuo#)g7Yj~a@QKEL`S4ly{o|!(vm>z{>H^v5Q$uVShR$FcIQ6hxmpa8P|FDqyD zxQoyLT)t_AzU#EANH1!0Hph=XMU&?>ef^BQkddo;ey5knE#8*ziiz%qJ2sxa(!^2M z^{>D0zWZ#e`oqJ+Kerx+&-Y#T;^lDagVP`v6Bh*K^>S{S)`A)O987;m?fb#YcsU%2 zY-pzD7)+TkN5NYTs)>}y&y|-KcRxuv@;aheZdo~@Ni@mgt46AoQwwlFtPEobfMy=d z4Z+?~Zl&dV52tOkBli*c5uxMEAJ+LrVI~5?6WxeJXMMtq8f~I9*})*Ri>mLGwHUrS z^lCFC^NKKZ*BI)78we&#Aq?hb7k+nB5X;H&n4lgi8orr-*-T$I9Q9dA9^EukD=s&e zMP6H?F%0FMA~_qI5<4cdpH8#;?tEOQjG!r-LwW?xIy_4GhKB-xGZ|Ep3`?ry^5xy# z-B;an&prR1mUejm;lCZa^>?TzWrYU@f(K=138=YOJE}Q!*6ZQK1+q&|V%aq;oe_gh zWNH@6mxC&Yw^0Z4fh!DA7+ce$__1s=h}0olFTld;#!0_+;EQj1q18jT3;3N#v4z^l z<^tk*1e9{jIF*pT;+*_ig+TK)*h0OLz-AgKKpll%F!dbxI|MnX82$?w`JaGQO2B0w zDalanats&UlZM;sMWJ5`*|WOTA~BT^v#M;SH-=wEhi+Hfmm~oMP9#o|NZy>1(874-GBf6 z_w1~89y%H46ei+n4NnNKN13Xo$lprAK^2WgAlE7Z zjfX1$R@q6K`6h%Rv=vcfWnJ{(@&53v(J|aGf!doUX{(up!seZB;n};cZ!}MyDTm!a zs~VRls>3fZs3xeoVunkH4av+>unk!{+rSKt%C0wFBlO|YHMipwVItk}k6?R4) zS$C^$r6#nXa@a5@Su#d)m&~L`i3}mGO;@q^h?PTYKkT8ihtjcPhoo6hg-f}m$cIuF zL1N%YstV(Jg)l$2YuD%dU`uVG)|dbw9K;=|XyWdwCbIwpg)x5@j!Q6Z{L?$!-+TZ4 z_dk?O==}NfFFHCp{@T&eWwEAh4_O%=tARoh2?(-|6yq7)eTHipINkIUx#p6DceS&T zrbgi;M&&h+fWg)XD7)QRhr9g;Z)ZS`jLnU)sGm9|tLh+bkCbF!OP=K(4Svc!%mFam zGpneqJYJ9>r&T}9WXN7B)|&FGO&xH>^tKCV%Mp18>VQV=dd8AF;yg*=wXHu^*hJne zR3`Ez%B;(AV9-*^V>XWAxG*GOEA^>GQ_f6XlAI>En!sSjiIBa+t(SMyP1I3tMbC*A~mIef;>U2m1%3n|bj)_uTW9iO+xE``-6YcUG&{ zocKg&t7e$|up$9JyJ0d9DEg8b0SVPtuF-R_X_t;9niO8zZ6@Vi{A#IRBs>APbCN-D z>BCL>Gy>yx)4q`aT9&v%hykLAn`*Hv&~JdS*wq5zYR$7D(e#z%lUV%)U5?4tX$j|| zqhZYCS$bXfqL?Hb({zMQraY%9AIP`U6yFg@^B}PSN)p7C32K8Z83sfWo<|2$Mu=k0 z$G$gzAi_x9>EtNfbb^T=eg6Ui(cc!KP=vv_7o9aznc|u2PT~bR7eblp&PMwblfyNl zNZ}eIeP}T0@!!>IXIum8Ge3U+kH3cJ>ge2e-+kY|x4-vKj*gB~h9z<?8NKU3+@R?DHjE>igq{;$2TzYX?j2bB!EMEfz*P~4q!$CFO2+jFu}lY zuny#7vj%exC8o6?${~ICgnTEk~qn{ zDrl%W;W4V!Q+a={o*}ej^$Jutv9e&DVPMYDWVx1d6g)k$Bq`?upjKT`)})p7(m{JN~T=u9_s`v?2o@zL>LKRi7AbQ7?~ zuJ_}Ucip?$khC~5hHyU^Ywgn~X<8Woh7T9Tu>APFe7M9Y9WFHQjR6RhB2 z)SQV>_9x}QIqI@`ZXiXqNI;c0$q$FdtV!`hJ0-B(F6NGESEU(H4jMQwGO;jsJgEWJ z&y$%ylc&}GVu@jx&Lp{-Ylwri=7qIQjAUeU9$$bv5-5@v2FDdL6^5?t(3voDi{V*} z4Qe=-QU>ylG8sM>i7@bzr)xB$ZjBDCv;PZS*M0Bd;o+B?fHi)3@4fdvvg-T0;VWX@ zY-Jjt=`jS&!I&ALxwyQ6B}_ALOfjsq-L}8kHjQlwVD>vD;u}c05E(E?bE45(Uv;dpq(K6e@^aaE>BMYv z7S40Isi|X?tPZM76-oGVFL#VgNkVMGz6^k;g0ycI3b@4*gw`r~N;AG(aa)ql6;_w+ zJ0POyJ_KV#0W#YtFdk9osk#jtG-yb5!FH^2}NtHf`zB0b_w{Z#@W}ZO@1Z|A8!A;?Yie@$yBQ1q-G;B zK&c0iK?94JU}myX%#zIc6fn9x)RA$4(@eBv1jTi=3%Vr6d{|8Nsvb9rDxQrMKAD9| z2SnAE!UWope7aoGI%frB!sR|PlDPp=2y{FLQy6{!+{tS7mmfMj{Edx(HU4C8A4?zTx7%8?hD@o)Fr`5 zD2{%Ugr+tWvEBNlM=$}ihJN;g_`EY~Tzvwin?SghIiOgUjDZ97UE1+ZU^zN(lvncy z$A%S#dtqU*?N(;p8j?$i$#RZt<|a2v);z&&4YN1cz1c%aXME~`2OjtvExApEfA`&Y z|Cznrz5jPy=Y7$CwQ~!rEe4oFa?@fiH{vv)9>9Xw;*IMjG)_|Gk}mNO0RV#T-16HQ zg~cG87NQuC0HUs_P<6$-W;|FVG8kw~F`79o#m`xx13n!LWeF1IBC0;J^2UiW2uKTU zDQbwmARnW8>o-OUKK}<$GwT`3S6BH zckHzXeer1|rXj4Fy2D{PCj#g2Kh+|cQbMZB6%;M=k!J{nmuO~%ndxInIEE8Lyu>^z zJBMqSN0Q(9Ie^nVHJ!=M&Z@h3@zS3?fByXMECQ_Ypu6wB`|*Q=gLjN8kutO(vq6k* zMr%wYVAEpo>0EO|>b43(|+p{zdj>`XId{+v8#`bU7+cZd}Nd_=}N1v1=$q|EV{uuJi%{p2%v$JlO2m(+x4AIrtT7>z9HS_)0fY_ ztWHd|g*B(1iK$JJj`K>YQ3Wfsem?i)bO)_fb7jSG?{Gf|_wr8CRWG1hbU91?k1Tag z075!K^Ssr(KRW+rq`}(2G-tC&FQZ7qNA3InuwJiU`OrfT{l_x_)_CyUci(+)-}Mh- zNm^5#DCGx343DItTk6ALoaNU*nS;GOAeK2n6;%?6x#8!NK04h@sfS7x^Bms=BCQUY z#nlQaYtJv-1=b%uR{&6FrPC;cbNR@D+>K)INcPD|GZR9Vl&h$62O5D95Q(bM0ZryL zqqJuiC13QSTiLIV`Qf93fmq1L>-RWCT=8m3I% zQv4+UWURr)$_ylNe-1=BC9=%1R#WcFF#_lBsVh)aD@HQ&;5?ht8r1#a@0te}Y|nc} zCa(!YPCz-HV}PJ4p=!cC67}^!rx1z%H?T=Ue5{hOy5_!AAF#RHfb+8y^mrrz|yL* z4z*g*flsXnA(Yk_F_@~b5Ed*VX%#Zm{py7J7DaSS5*bfb+a55HHgiE+Wr3(lF0uP=i&~YB4(hgZ=&P==k`*e(=EuKex$_ zYTw;F_TBG#*CRW-yLX?Qj%&WFT13u6Y9C2PDwn3RQd!Pq?s0JL*h_iiI_*HVq168Y%>3@W7_R%$w z?IK8==QuZXqV3%?7DPgR+$8n%^z@O3AAb0rZ78s4tPT$k&;9Wq|M9Q(eg8dZ>}uio zjH8m;Q|4jqhf_+dFo+<*vuIpC*Ti50tznYqh6o6fY!{G3)Eyz3ZzV=27U2OrU9PU_ zFpSS0n<>;C+nWZX4J*N1lj_$W+;iLY{hZVefl6bn4q+H0>y^p$iD*NC;`x&cLD7)b z04oT1Od!`Egh^Mdp}f0HQ-$10sKqtbqJJvM(V03bq4;gQW+T%er)r54UssKn(>}}v zxeD>6T0JJamE0ilIM|*IVUF9_Yo)z`Q3J9YGJoj+gX(ZfRJv43ld)FzwV;HC;w{in zt9^NfP)xx#3M3e<{IwdFKOX+sxr2k(93CECx+Z`%UgVwceCKzsR;yp@y6(DZKFi?? z-LDZ?SeI>j_nhA414@2KXR1e7vF%l^!SA(0R0Gw{1T8;ftfj-qf^X=c(c)MFLFhD+IMo(qSyOy*O{`)o6ViE{RNbNSX+chBxO`*iGru1$_Fezq zJo3mR|8j{1FVjiC(mUVz&bREWcAgq1PNZ(o8IQ0007`(4cXB6nCiNzl@El&Qu=#He zj#b`_L4dyzS}h8BmGh!nAMFY`RDq{pxyd(~KtkDh7Q4??%-dCU$)HRXOj&2Jp5%xt zG6V=hj9jiDEAVd(osr$EMcNc`QmVRkL$Gf(ke5e3J-z*r4}S3JrFL;9 zz#1?5u6Mor{X0AT`%cF-vs^lCJur=B*5Aa5jR-^$QwMu?Wuy$G)}qj1J>q1;7;I$fV(^kQ)p_lDCuNdAR+NO(AHU*;V9acpawE1b(D{OZ_;2 z-YQoH##JrMb43vzP&wwXK)xUQiPkdVJDoyB9AdueoX>?FY^>qf3qu<=qo4xnD`?sUV+@W3NK`N;iC!3ytj zmgBp>b9lJ_Xa4Aqp6*xut;1TpeR?+xrDgz4IaxswdO7U`4*^&OshayH0|N#nwU&q| zVJK+BcLTRd4XD_(_*ozllvNuzbKcf(>5PkAD78|yL*V6HtOCL2$E+}+pjGv@0_j?b zV+Dtb8;gUnX;q$dm0T36V&)fraQ$Eu%@a2RW5YEtWr zMai@W55m6&Q-Q$PRYYK!R6De~NFSIQosJUN8XSu*J6zrzZ7_^5G^Z;~r0OW$IoYW$ zHJOVT*2VRls3$WEnqPbErV*%=Bz?H@zWN>!r*Y&#X z`j^H-Kcp}%M#&7hN+cqGrY-oSl`ea7S9>ODZIoPLUI#3vQ(ddDxr4vjwCmq1c>opW zE&;x#CrkdjQu$9Ab^C7F76PsSmNk=QQ41le@Db>0l35Y7hp?KH9mZ8e`)++Ye17PL zzxJUIedv#u$RmUMS@MMK^s0r51sb1pJidoSt~`8v z7oA_GC9XvpoavK^COooRE2nD&H--iJzYJrfN3LFSBr>}!5;OwZq*+Lcr$q&wWfzmy z<#Bwht+u{y6diSAH!c-tyZsD4>GA$)FiSD5__jPcvte+OU{`h z;#4=}m?n9W^~+NpK<+P0$}kr_EE>Lp5h0evR$r01ViwB7SQf3=(4;x6D9K|>b($^R zY;C6gxz54Nu&kVFULxz+VxN%}S6LutQMN?JH`?wNU z?H7PJvGPd57X#J)Gw;D7ZcFx_aifCaf~bbtk9mXP*1o*M98jr=NcQY_5HJ^i?w~T=MYnaQ~}c{p$PruD=iA zVXYxd%#%f-Dirh4%o(GrS?Dwuy+?a6@*a4Fh{@S(iQbZl4Ki*Li71M0D1%&)#9cXB zIs#gwZ4If>84O8E_|gD@+@OVqE(6^^sE8-_^NY#Z4v6sDKA%swuPJ8aYna(%#zJ$J zypm!ItEz6e5(1&qMYoF68enV#pBpyGa|5H(M4#AiKz1n7@lljsknmn^!d3N^?q70- zaPhW#8(9h0mYz{yamR+>g9TNcZX=mKnwPe{ zh{L6PXW|i=0P5Ai54`9_FM8mt)xbG3yJmoe8@%Hk?|4h!bsz5f{yLq;qyD$f1qW4* zBsaTdCHG6hZlmO<&cte0RV}*0ZnZ9osomorBUn8dG$r|>0hrb4|Q6BaD zpH>5fM`7%w*2WM9xoJ*aVSww2L^Vj6=jqNOSGQ{}3#aKk4!T!`r{%1=08<&akiRQ( zd&EVpWaGy56&nLQ?c~#gl(V8q)h}9XP|_0Q(s0C*Q*}#N5B>9fKiu``qmM3b3SAYJYmdco3YY^!jZBu{P?zL7 zT7sJOw(<%&1ga}T9+MV(eXu%o*>2M>g=U)vg*PeAKVUQzm`Ev!m1)($=xncXJ<8 z8q1zNQt}`)Awe6f`Z&!)YGxvm_#58vhI2RFbkpI%{=wZx$CvZ2CeaMf(tEI^oyB0M_h=C!`%b)V%H8QT zq#{IQwcm5QlumThHU%@I$WI4rE70F)vUHNg_0+XYQXr(rOPY*1MbpO{GX~f%r~>NZ6{tQK4 zhN!E)>vs3{yQ8Da=fComuN;2j6Q9^Rk@-sG@O1+$Jj`8p-Sz7Au>SdO=)S#XB*vkG zNlcQqRpmwF`ScU1!WI$GQ-;f&W+PlA=mDa$3{wWnu|~$IxJ4Q*zmt8k zdt@qxhFzG_ppDxyN381Dj+O{WR8~5ulKh(`CLRBh)ZMByOK?<<2|3I^P5T&a=XQ4D zse*DmaVMOQI+6fDIatEVbO{G?H)jK804pn^4t7OsQfbC`Gand*kQ_!)~yCdwVZEJ{cQL^E{U+JMqv%wysByjNx2W{i+@`{NW5ukwmV!dRgs&JvyGy zOl{4}CBk8?l6L%9g&IhhdO&D5@{6berY6lg$;wka5GdzMPJ-b?FduY(yBIw0gBZcS z#o9}GNt$3EFi+(6BC8jHY8g>a2xFQ_boPs}Ha3Bvamwufcy6hJa(FbZjLOvhG_|_6N>6iwcOf1EAU! z48fu*E&r+#g>uF;A@fdZ5U8faw1Ill1QQ3sM24TJTDrFbpg1S;mH{KZ z3#dIXfB^vMwv-R#+e-Z`R+Q{C8LK(o#UnN14lCZyah0Ud4GV(9cUmG}`g>VI1up(U*)CZxJc}tCNK>PA;;SHxL2k3^s5EqV0?fa9v zdbEqwm@uz;^cRnK`@jY4c(k!qzv|ZO)1Ml;?)-;8{Nd(?5m)&n&C_2{z`_&UamO7m z+uhy$nXc>p+rH~=OjCCBF(*b8KiW@mK-*TdSEZWNlmxoOtS!E-Jp5(3uSU{%M=XLTEgmV& zqoGVI%ydCXjwdWkV0bn+cLgf0Kqh@%J`@|beVk>$@){F$q@R@BPu;grZjOdm128fg z(Jz9iGuYHnjXaZrDDrCnTCSJoS0VtTA}&v_h$rD9s?uBv9Pch0&Z-QCp?hxC4gW{K zv-8%+9((L}uVBQk>Xbhbz`_&XdFP#fv0HUN)DQjN+TGiI#rkwTcEq~*$gBiuEh#_p zsk7#{?10AYN!bYq#oea&rD$6P;mA=jTybTt>2`Tui6kaYjPDZ@c1_JC55pH19;G;2 z9S`=W8Suowm?F~+Yu&WajOt18w6+-few<0b6b-=P6wsa$&6eeTP#$M1LvYksq0$kb zPC^)otcuE^NfS0}W;^XONc!L`%?3UnyOpg@lx+ru=NJnJ77Bwof~^NWM!$BnU~>Z2 znsQLY&Q3nEx9TLBll27q$fQ;~JKf3g@fZ5l>X%PWPJZ#ig$w`ss!-=DPW}@GEIju( zC-LOu#1YIUUz{_Mh_((3-~zjwN&cbp0Y=8@-|^m2C8?Q&f!jm{@|z zL`y|6LC>S`vVL$mzN$b4*}#Hs&{Q+bXrQ#~rV6Amm1am%J5YiGUcujBwm)c2bLOmU zgQiWuv!2qTC6$nzcK0w(##Asy!2ZomlzFKl{_duY=|3D3L}}g@qIo+sz@ma?6-UY2 zG2yO@@;TT#aP#e??Sy*}q61!7i`52XR8s>yAJ&)CsTpsgz2MuXwW{L$#dW&sjoySC z<2vi(|BjB1es#TGKfJrU`>!5<{P8be1=d`XQ@-LK!uSfHC<@H=s(2(ejNmXgaMtYabfz{iV@OgSOX+(#bAI>YT= zQAIL0$~kfbO9w3hl+-xtunEQI6dU%;M6Zq=D#Iz-8-*rgK&iTfd$=bEzznb;4{~Er z=@FmRQf5{28peX81A9y@DJ{XPnyvZgH zV5#N)C@x7*iJ1*L?WZ_B>9gbbRMySeG_EVi758NuvhjZFqoM1c>xSX?SF6>}9UUEA zc=E|7pSvbVbB!+Y4F_2IUU%Mk=ePNqTi^AcR)zSEzVH8wuIs*Se}8{98n*p!T?V%N zT?V41z<{LGQmLzhH^iAWxXzI+Q`v8o^;;c%H z@;%BiHG_s+5ZgxR7i-?zt4*OaabFgEnvlB$hZh{fw@!_0Q`Ow4d&!~!h?dhD#oG6) z^7ptd)zRgn_0aXdJq+Fd-S@+9c3t-y!!UgQ!i5XJeU0$tnqTG{8nE&6W* zhG953IXQW0*LC07_x&sSzW?_1di||^-+xQjb>GtW{qB0bzOk>jQMu-#`_p*A?JzrA z=t~WA6_{5A5b#StL7oE;1p@7pa&MD*rwm0Rj=@T%#xgwV&3`3{hYf7GN{8%mDN}^G zccVKxu9~WSRcMa%<|V^YG*&vRcUp=$fSiAcp1R@_ve{MYtCwbw literal 0 HcmV?d00001 diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index dfe78a92b..ba820bc71 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1501,4 +1501,6 @@ 短劇 完成*1 主播正在PK，稍後再試 + 使用 + 取消 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index da8b9c5ed..1f89b272c 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1500,4 +1500,6 @@ 短劇 完成*1 主播正在PK，稍後再試 + 使用 + 取消 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 2b6a58bed..415ed8c98 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1497,5 +1497,7 @@ 短劇 完成*1 主播正在PK，稍後再試 + 使用 + 取消 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 4ea97c177..6d6827531 100644 --- 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 Theater The anchor is in PK, please try again later once + Use + Cancel diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java index 9668838bf..76a4f47f7 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveBuyGuardDialog.java @@ -41,6 +41,7 @@ import com.yunbao.common.bean.GuardUserInfoModel; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.custom.LiveGuardScalePageTransformer; import com.yunbao.common.dialog.AbsDialogPopupWindow; +import com.yunbao.common.dialog.GuardBuyCouponTipsDialog; import com.yunbao.common.dialog.GuardBuyTipsDialog; import com.yunbao.common.dialog.GuardUpgradePopup; import com.yunbao.common.dialog.LiveBuyGuardSelectPopup; @@ -246,6 +247,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow { openTheGuard.setText(dataTipModel.isOpen() ? WordUtil.isNewZh() ? "續費神之守護" : "Renew God Guardian" : WordUtil.getNewString(R.string.open_the_god_guard)); } + discountPrice.setTag("1"); guardPriceModel = price.get(0); if (TextUtils.isEmpty(guardPriceModel.getDiscountPrice())) { discountPrice.setText(String.valueOf(guardPriceModel.getOriginalPrice())); @@ -308,6 +310,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow { @Override public void onLiveBuyGuardSelectListener(GuardPriceModel model) { guardPriceModel = model; + discountPrice.setTag(String.valueOf(guardPriceModel.getPriceKey())); if (TextUtils.isEmpty(guardPriceModel.getDiscountPrice())) { discountPrice.setText(String.valueOf(guardPriceModel.getOriginalPrice())); originalPrice.setVisibility(GONE); @@ -340,204 +343,22 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow { ViewClicksAntiShake.clicksAntiShake(openTheGuard, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { - if (TextUtils.equals(userInfo.getIsOpen(), "1")) { - GuardBuyTipsDialog - .showBuyOrRenewDialog(mContext, - discountPrice.getText().toString(), - dataTipModel.getGuardName(), dataTipModel.isOpen(), - mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() { - @Override - public void onCancelClick() { - dismiss(); - } - - @Override - public void onConfirmClick(Dialog dialog, String content) { - - LiveNetManager.get(activity) - .openGuard(mLiveUid, - String.valueOf(dataTipModel.getGuardType()), - String.valueOf(guardPriceModel.getPriceKey()), mStream, new HttpCallback() { - @Override - public void onSuccess(String data) { - if (TextUtils.equals(data, "22")) { - new DialogUitl.Builder(mContext) - .setView(R.layout.dialog_live_unfollow) - .setConfirmString(mContext.getString(R.string.charge)) - .setContent(mContext.getString(R.string.insufficient_balance)) - .setClickCallback(new DialogUitl.SimpleCallback() { - @Override - public void onConfirmClick(Dialog dialog, String content) { - LiveBuyGuardDialog.this.dismiss(); - ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); - } - }).build().show(); - } else { - IMLoginManager.get(mContext).setGuardType(dataTipModel.getGuardType()); - ToastUtil.show(data); - dismiss(); - if (dataTipModel.getGuardType() == 3) { - new XPopup.Builder(mContext) - .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true - .asCustom(new DragonSendsMoneyPopup(mContext, mLiveUid)) - .show(); - } - } - - } - - @Override - public void onError(String error) { - ToastUtil.show(error); - } - }); - } - }); - } else { - if (userInfo.getGuardType() > dataTipModel.getGuardType()) { - String name = "星之守護"; - switch (userInfo.getGuardType()) { - case 1: - name = WordUtil.isNewZh() ? "星之守護" : "star guardian"; - break; - case 2: - name = WordUtil.isNewZh() ? "王之守護" : "king guardian"; - break; - case 3: - name = WordUtil.isNewZh() ? "神之守護" : "god guardian"; - break; + //判断是否选择的是一个月 + if(discountPrice.getTag().equals("1")){ + GuardBuyCouponTipsDialog.showBuyOrRenewDialog(mContext, WordUtil.isNewZh() ? guardPriceModel.getCouponDiscount() : guardPriceModel.getCouponDiscountEn(), guardPriceModel.getCouponDiscountPrice(), dataTipModel.getGuardName(), new DialogUitl.SimpleCallback2() { + @Override + public void onCancelClick() { } - StringBuffer buffer = new StringBuffer(); - if (WordUtil.isNewZh()) { - buffer.append("您的【") - .append(name).append("】已過期\n").append("開通相同或更高等級守護將會保留您的守護等級").append("開通低等級守護將重新計算您的守護等級"); - } else { - buffer.append("Your [") - .append(name).append("] has expired").append("active the same or higher level of guardian will retain your guardian level").append("active lower level guardian will recalculate your guardian level"); + + @Override + public void onConfirmClick(Dialog dialog, String content) { + bugGurd(true); + dialog.dismiss(); } - GuardBuyTipsDialog - .showBuyOrRenewDialog(mContext, - null, - buffer.toString(), false, - null, -200, new DialogUitl.SimpleCallback2() { - @Override - public void onCancelClick() { - - } - - @Override - public void onConfirmClick(Dialog dialog, String content) { - GuardBuyTipsDialog - .showBuyOrRenewDialog(mContext, - discountPrice.getText().toString(), - dataTipModel.getGuardName(), dataTipModel.isOpen(), - mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() { - @Override - public void onCancelClick() { - dismiss(); - } - - @Override - public void onConfirmClick(Dialog dialog, String content) { - - LiveNetManager.get(activity) - .openGuard(mLiveUid, - String.valueOf(dataTipModel.getGuardType()), - String.valueOf(guardPriceModel.getPriceKey()), mStream, new HttpCallback() { - @Override - public void onSuccess(String data) { - if (TextUtils.equals(data, "22")) { - new DialogUitl.Builder(mContext) - .setView(R.layout.dialog_live_unfollow) - .setConfirmString(mContext.getString(R.string.charge)) - .setContent(mContext.getString(R.string.insufficient_balance)) - .setClickCallback(new DialogUitl.SimpleCallback() { - @Override - public void onConfirmClick(Dialog dialog, String content) { - LiveBuyGuardDialog.this.dismiss(); - ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); - } - }).build().show(); - } else { - IMLoginManager.get(mContext).setGuardType(dataTipModel.getGuardType()); - ToastUtil.show(data); - dismiss(); - if (dataTipModel.getGuardType() == 3) { - new XPopup.Builder(mContext) - .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true - .asCustom(new DragonSendsMoneyPopup(mContext, mLiveUid)) - .show(); - } - } - - } - - @Override - public void onError(String error) { - ToastUtil.show(error); - } - }); - } - }); - } - }); - }else { - GuardBuyTipsDialog - .showBuyOrRenewDialog(mContext, - discountPrice.getText().toString(), - dataTipModel.getGuardName(), dataTipModel.isOpen(), - mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() { - @Override - public void onCancelClick() { - dismiss(); - } - - @Override - public void onConfirmClick(Dialog dialog, String content) { - - LiveNetManager.get(activity) - .openGuard(mLiveUid, - String.valueOf(dataTipModel.getGuardType()), - String.valueOf(guardPriceModel.getPriceKey()), mStream, new HttpCallback() { - @Override - public void onSuccess(String data) { - if (TextUtils.equals(data, "22")) { - new DialogUitl.Builder(mContext) - .setView(R.layout.dialog_live_unfollow) - .setConfirmString(mContext.getString(R.string.charge)) - .setContent(mContext.getString(R.string.insufficient_balance)) - .setClickCallback(new DialogUitl.SimpleCallback() { - @Override - public void onConfirmClick(Dialog dialog, String content) { - LiveBuyGuardDialog.this.dismiss(); - ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); - } - }).build().show(); - } else { - IMLoginManager.get(mContext).setGuardType(dataTipModel.getGuardType()); - ToastUtil.show(data); - dismiss(); - if (dataTipModel.getGuardType() == 3) { - new XPopup.Builder(mContext) - .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true - .asCustom(new DragonSendsMoneyPopup(mContext, mLiveUid)) - .show(); - } - } - - } - - @Override - public void onError(String error) { - ToastUtil.show(error); - } - }); - } - }); - } - - + }); + }else{ + bugGurd(false); } switch (dataTipModel.getGuardType()) { case 1: @@ -605,6 +426,208 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow { } + private void bugGurd(boolean isCoupon) { + if (TextUtils.equals(userInfo.getIsOpen(), "1")) { + GuardBuyTipsDialog + .showBuyOrRenewDialog(mContext, + isCoupon?guardPriceModel.getCouponDiscountPrice():discountPrice.getText().toString(), + dataTipModel.getGuardName(), dataTipModel.isOpen(), + mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() { + @Override + public void onCancelClick() { + dismiss(); + } + + @Override + public void onConfirmClick(Dialog dialog, String content) { + + LiveNetManager.get(activity) + .openGuard(mLiveUid, + String.valueOf(dataTipModel.getGuardType()), + String.valueOf(guardPriceModel.getPriceKey()), mStream,isCoupon?"1":"0", new HttpCallback() { + @Override + public void onSuccess(String data) { + if (TextUtils.equals(data, "22")) { + new DialogUitl.Builder(mContext) + .setView(R.layout.dialog_live_unfollow) + .setConfirmString(mContext.getString(R.string.charge)) + .setContent(mContext.getString(R.string.insufficient_balance)) + .setClickCallback(new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + LiveBuyGuardDialog.this.dismiss(); + ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + } + }).build().show(); + } else { + IMLoginManager.get(mContext).setGuardType(dataTipModel.getGuardType()); + ToastUtil.show(data); + dismiss(); + if (dataTipModel.getGuardType() == 3) { + new XPopup.Builder(mContext) + .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true + .asCustom(new DragonSendsMoneyPopup(mContext, mLiveUid)) + .show(); + } + } + + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } + }); + } else { + if (userInfo.getGuardType() > dataTipModel.getGuardType()) { + String name = "星之守護"; + switch (userInfo.getGuardType()) { + case 1: + name = WordUtil.isNewZh() ? "星之守護" : "star guardian"; + break; + case 2: + name = WordUtil.isNewZh() ? "王之守護" : "king guardian"; + break; + case 3: + name = WordUtil.isNewZh() ? "神之守護" : "god guardian"; + break; + + } + StringBuffer buffer = new StringBuffer(); + if (WordUtil.isNewZh()) { + buffer.append("您的【") + .append(name).append("】已過期\n").append("開通相同或更高等級守護將會保留您的守護等級").append("開通低等級守護將重新計算您的守護等級"); + } else { + buffer.append("Your [") + .append(name).append("] has expired").append("active the same or higher level of guardian will retain your guardian level").append("active lower level guardian will recalculate your guardian level"); + } + GuardBuyTipsDialog + .showBuyOrRenewDialog(mContext, + null, + buffer.toString(), false, + null, -200, new DialogUitl.SimpleCallback2() { + @Override + public void onCancelClick() { + + } + + @Override + public void onConfirmClick(Dialog dialog, String content) { + GuardBuyTipsDialog + .showBuyOrRenewDialog(mContext, + isCoupon?guardPriceModel.getCouponDiscountPrice():discountPrice.getText().toString(), + dataTipModel.getGuardName(), dataTipModel.isOpen(), + mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() { + @Override + public void onCancelClick() { + dismiss(); + } + + @Override + public void onConfirmClick(Dialog dialog, String content) { + + LiveNetManager.get(activity) + .openGuard(mLiveUid, + String.valueOf(dataTipModel.getGuardType()), + String.valueOf(guardPriceModel.getPriceKey()), mStream,isCoupon?"1":"0", new HttpCallback() { + @Override + public void onSuccess(String data) { + if (TextUtils.equals(data, "22")) { + new DialogUitl.Builder(mContext) + .setView(R.layout.dialog_live_unfollow) + .setConfirmString(mContext.getString(R.string.charge)) + .setContent(mContext.getString(R.string.insufficient_balance)) + .setClickCallback(new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + LiveBuyGuardDialog.this.dismiss(); + ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + } + }).build().show(); + } else { + IMLoginManager.get(mContext).setGuardType(dataTipModel.getGuardType()); + ToastUtil.show(data); + dismiss(); + if (dataTipModel.getGuardType() == 3) { + new XPopup.Builder(mContext) + .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true + .asCustom(new DragonSendsMoneyPopup(mContext, mLiveUid)) + .show(); + } + } + + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } + }); + } + }); + }else { + GuardBuyTipsDialog + .showBuyOrRenewDialog(mContext, + isCoupon?guardPriceModel.getCouponDiscountPrice():discountPrice.getText().toString(), + dataTipModel.getGuardName(), dataTipModel.isOpen(), + mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() { + @Override + public void onCancelClick() { + dismiss(); + } + + @Override + public void onConfirmClick(Dialog dialog, String content) { + + LiveNetManager.get(activity) + .openGuard(mLiveUid, + String.valueOf(dataTipModel.getGuardType()), + String.valueOf(guardPriceModel.getPriceKey()), mStream,isCoupon?"1":"0", new HttpCallback() { + @Override + public void onSuccess(String data) { + if (TextUtils.equals(data, "22")) { + new DialogUitl.Builder(mContext) + .setView(R.layout.dialog_live_unfollow) + .setConfirmString(mContext.getString(R.string.charge)) + .setContent(mContext.getString(R.string.insufficient_balance)) + .setClickCallback(new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + LiveBuyGuardDialog.this.dismiss(); + ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation(); + } + }).build().show(); + } else { + IMLoginManager.get(mContext).setGuardType(dataTipModel.getGuardType()); + ToastUtil.show(data); + dismiss(); + if (dataTipModel.getGuardType() == 3) { + new XPopup.Builder(mContext) + .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true + .asCustom(new DragonSendsMoneyPopup(mContext, mLiveUid)) + .show(); + } + } + + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } + }); + } + + + } + } + private void closeAnimSudGameListEvent(View view) { ObjectAnimator animator = ObjectAnimator.ofFloat(view, "rotation", -90f, 0f); animator.setDuration(animDuration); diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java index 3f92eb5b5..c55dd0955 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java @@ -15,12 +15,9 @@ import com.lxj.xpopup.XPopup; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.activity.AbsActivity; -import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup; import com.yunbao.common.event.FloatWarOrderEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.RouteUtil; -import com.yunbao.live.dialog.LiveBuyGuardDialog; -import com.yunbao.live.dialog.LiveGuardDialog; import com.yunbao.live.dialog.LivePrankDialogFragment; import com.yunbao.main.R;