From bad2b3689acb21801c7d37b038474e5fa798bdad Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 9 Aug 2023 11:01:28 +0800 Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/dialog_live_gift_popup.xml | 1 + .../icon_live_gift_gift_itle_en.png | Bin 0 -> 2454 bytes common/src/main/res/values-en-rUS/string.xml | 2 +- common/src/main/res/values/strings.xml | 2 +- .../com/yunbao/live/dialog/LiveGiftPopup.java | 9 ++++++++- .../main/res/layout/dialog_new_guard_list.xml | 4 ++-- .../src/main/res/layout/dialog_new_live_user.xml | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml index 66284053c..a489f4994 100644 --- a/common/src/main/res/layout/dialog_live_gift_popup.xml +++ b/common/src/main/res/layout/dialog_live_gift_popup.xml @@ -53,6 +53,7 @@ android:gravity="center_vertical"> 3 zSIFXhmDktRyN{*OeMH}8{#cr)NKSde`@23@F{S_ETG(np`Xoe|Gl!%i{VQ z=x|1G2LP);I#>(2F>qr6jt1ZZ0Ne($Iz#@1e;)y00RVf8%Gg?|4D-#EG9Cd95lR`? zp-#8^pnk4gR`_5HDJwyCEL8*LsADifb*c5Y;spsaID_~WGD6#Y6<{7&08TwZ@_}3O-uee%gEIa&dnfG+p&%oA=0I-!8)Q^I(z&gM70A%bSS^4xqrP0hF|c64SkqdcvZhZ)iVPXzOspf;7V5~#(?rLb ztvhlwEN;X(>ySOBbK^T>^_+pJ@>lg%)%$wn;{LI%b6EDAJtjHVhBuXN7WQD^IpD=5 zGL*kyvx@73XM8b3OA=aU?6H4VsKX5PeKHnySQc+Yl@HrQvrWi()MHS#OVt5`&&&e6 z#Va6V@r3O-w)Dds`{A`{+efy`f&R;h_SEig|snYWvA-r2#=J@Q2XdS$_nCH=$ zV$FAJz-*GKfpogVbf9o7qi`;<{aJttDV8ZnS;;gvklW%Kp;?T9_hq}iv@Zq+#h9Yc zHb`A*RMR!mSOvRaO!=}Xb*+tC*Eic;kAYiv*Xdsjm>lojEcmvd?DX+3JgXR6p6?b6 zRO71Tar&>pzz;^>6n~OOd`*HD;A8Ssh*KH9HP_6`g{cANl1|KsbfIu~fOf*c|8p+jH|>G0i_(?<$g zUz$X{kJ#x)@r=9|b^IGfqGwYTN486e^*K-@EZ$uNJ2d<$I55h&j` zG$yL=F|qv|SB0D}w8MId6qh_?W%#Dds|7~)NF#mHbSXWeZ=px!8DWJ}QQI$5r8}Yz zf!jGx`S61cd+{BU<1b7Oz87!EGr7;~@tLZNEy~cGz)`$#YF+q@PsfchNZ|Y)A}_ZL zxTr63>$5FuMV6PL27aL}J`e2Wn2W&(VI0C4@e3%NdH|aRgrd;`&J8T|l0M0@ z7^U*W`aMQ(@wC=4@FAx|$3d1M zcR&W#p@{DzX)!s%%9hjC56tHMY&lD`l^I-DTR)?^bn4tC%HF5NvZd#2@uX+$@8^V? zRge2ZNsR6H-ZJ(={`kT^wGj!43E36-q3=VY(L3+<6(h!F!wdD;D(fxKwq1FmElFW7 z`#>`v;`q6 zBHn@9Vx5*KBX7Y)6yWVlIkZys7dKKe#3wdyFIyIzzHTFR?&-H%`ysL~yussWFy_&! zWPWtS@&@9WMbQ^(y}lCa8kwf%A`(Ljo#Vc9YXg&U$|xo($Z~&G-<`@JV}cz6m7FC6cQI^pA3t2CjijaN zbP|~sJalkk83uL@@TmEgS$Dbqu{Cko(tsSv-qDd1>~z401Hn&>`-e1q+$FA^dSi$| z4i4(d0(hW$7ud!m4qAmgp?$>`pR}*|6|FpH3r*q^Z!z5`u}|SP>oR#@b%%Q7QQE0% zRgnT%5@#AVv^&MH#J*Xz=@g4}V@rzUauQ&%vbHh;27E8KGLg!njSsiuv&Gp#rEesm zeZZ}*Pwd2WW~7mYSHDMmJCe5Eq6kO255~P1W%^Au6zO~W0FMqo z9I+2&f9+!5|MXU2Xe1JmmqBDgRkR;XQ}ayO{CGrX_d^P6g!TbH4Y*D`7)vtmar6DY zjS#J`9T!C<3PW$ro>*Q_0-MO+D?wirCvJq-T;N%}LG>j;u5|-k;}~@Wu*QQ9_v`@7 zBOZddQugC3`-*Mx(Wd|zo0f@1r>&%Yu}N>?U`+I_p_4JS5jd@9Ll(XvY9;hq#*K?Uo!vQ4KQ3|nw0}Fvt>YsrFZ3TX%*B78;2m45 z4Dr98bBdvKZj(Y(wy_-nT!|f~8RK|mfFkpz9gH1Guard Contribution this week anchor are waiting at your guard! - Let\'s open up a guard for our favorite anchor + Turn on the guard for your favorite anchor! You are the current anchor\'s monthly guard \ n the guard date expires You are the current anchor\'s annual guardian \ n the guardian date expires Special gift for annual guard diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7c77c20d7..8f022b06e 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -176,7 +176,7 @@ Guard Contribution this week anchor are waiting at your guard! - Let\'s open up a guard for our favorite anchor + Turn on the guard for your favorite anchor! You are the current anchor\'s monthly guard \ n the guard date expires You are the current anchor\'s annual guardian \ n the guardian date expires Special gift for annual guard diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java index d3c6bcdf3..f071d7058 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -89,12 +89,13 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.List; +import java.util.Locale; /** * 直播间新送礼弹窗 */ public class LiveGiftPopup extends AbsDialogFragment { - private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar; + private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar, giftItle; private JSONArray liveGiftList; private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber; private RecyclerView giftTitle; @@ -163,6 +164,7 @@ public class LiveGiftPopup extends AbsDialogFragment { vipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc); vipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle); giftNumber = mRootView.findViewById(R.id.gift_number); + giftItle = mRootView.findViewById(R.id.gift_itle); liveGiftSend = mRootView.findViewById(R.id.live_gift_send); giftNumberLayout = mRootView.findViewById(R.id.gift_number_layout); mLianText = mRootView.findViewById(R.id.lian_text); @@ -317,6 +319,11 @@ public class LiveGiftPopup extends AbsDialogFragment { fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); } }); + if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { + ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle, giftItle); + } else { + ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle_en, giftItle); + } } private void initDate() { diff --git a/live/src/main/res/layout/dialog_new_guard_list.xml b/live/src/main/res/layout/dialog_new_guard_list.xml index 981a39668..75ca884bc 100644 --- a/live/src/main/res/layout/dialog_new_guard_list.xml +++ b/live/src/main/res/layout/dialog_new_guard_list.xml @@ -133,7 +133,7 @@ android:scrollHorizontally="true" android:singleLine="true" android:textColor="#A281FD" - android:textSize="14sp" /> + android:textSize="11sp" /> diff --git a/live/src/main/res/layout/dialog_new_live_user.xml b/live/src/main/res/layout/dialog_new_live_user.xml index 505984def..62162d177 100644 --- a/live/src/main/res/layout/dialog_new_live_user.xml +++ b/live/src/main/res/layout/dialog_new_live_user.xml @@ -71,7 +71,7 @@ android:layout_marginStart="1dp" android:text="@string/user_card_guard" android:textColor="#FFFFFF" - android:textSize="12sp" /> + android:textSize="10sp" />