From 9c32c6af2520866a1bad6f14d5c2f36040a40db3 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Mon, 29 May 2023 11:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B2=E7=9B=92=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=E8=92=99=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/dialog/LiveGiftDialogFragment.java | 14 ++++++++++---- live/src/main/res/layout/view_blind_box.xml | 18 +++++++++++++++--- .../main/res/mipmap-xxxhdpi/icon_masking.png | Bin 0 -> 3395 bytes 3 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 live/src/main/res/mipmap-xxxhdpi/icon_masking.png diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index 1590f9a31..973dc1707 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -101,7 +101,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On private ViewPager mVPWrapList; private RadioGroup mRadioGroup, mRGroupWrap; private View mLoading; - private View mArrow; + private View mArrow, iconMasking; private View mBtnSend; private View mBtnSendGroup; private View mBtnSendLian; @@ -215,6 +215,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On progressBlind1 = mRootView.findViewById(R.id.progress_blind2); progressBlind2 = mRootView.findViewById(R.id.progress_blind3); mArrow = mRootView.findViewById(R.id.arrow); + iconMasking = mRootView.findViewById(R.id.icon_masking); blindSvga = mRootView.findViewById(R.id.blind_svga); mBtnSend = mRootView.findViewById(R.id.btn_send); mBtnSendGroup = mRootView.findViewById(R.id.btn_send_group); @@ -718,7 +719,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On } else { if (isPk) { mVipGold.setVisibility(View.GONE); - }else { + } else { mVipGold.setVisibility(View.VISIBLE); } blindBox.setVisibility(View.INVISIBLE); @@ -810,10 +811,11 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On builder.setSpan(new ForegroundColorSpan(Color.parseColor("#FFF682")), dressNameIndexOf, dressNameIndexOf + dressNameSize, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); builder.setSpan(new ForegroundColorSpan(Color.parseColor("#FFF682")), individualDressingIndexOf, individualDressingIndexOf + individualDressingSize, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); blindNumber.setText(builder); + iconMasking.setAlpha(0.f); } else { int progress = Integer.parseInt(model.getThresholdValue()) - Integer.parseInt(model.getDressThresholdValue()); String msg = mContext.getString(R.string.resend_win); - msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName()); + msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName()); int dressNameIndexOf = msg.indexOf(model.getThresholdDressName()); int progressIndexOf = msg.indexOf(String.valueOf(progress)); int dressNameSize = model.getThresholdDressName().length(); @@ -828,6 +830,8 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On .append("/") .append(model.getThresholdValue()); textBlindProgress.setText(stringBuffer.toString()); + float maskingAlpha = (float) progress / Float.parseFloat(model.getThresholdValue()); + iconMasking.setAlpha(maskingAlpha); } //盲盒礼物文字跑马灯 for (int i = 0; i < model.getItemName().size(); i++) { @@ -1091,7 +1095,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On } else { int progress = Integer.parseInt(model.getThresholdValue()) - Integer.parseInt(model.getDressThresholdValue()); String msg = mContext.getString(R.string.resend_win); - msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName()); + msg = String.format(msg, String.valueOf(progress), model.getThresholdDressName()); int dressNameIndexOf = msg.indexOf(model.getThresholdDressName()); int progressIndexOf = msg.indexOf(String.valueOf(progress)); int dressNameSize = model.getThresholdDressName().length(); @@ -1106,6 +1110,8 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On .append("/") .append(model.getThresholdValue()); textBlindProgress.setText(stringBuffer.toString()); + float maskingAlpha = (float) progress / Float.parseFloat(model.getThresholdValue()); + iconMasking.setAlpha(maskingAlpha); } if (stringBuilders.size() == 0) { boxBlindHandler.postDelayed(boxBlindRunnable, 1500); diff --git a/live/src/main/res/layout/view_blind_box.xml b/live/src/main/res/layout/view_blind_box.xml index 61ba90ec6..d84c5522d 100644 --- a/live/src/main/res/layout/view_blind_box.xml +++ b/live/src/main/res/layout/view_blind_box.xml @@ -11,12 +11,24 @@ android:layout_height="86.5dp" android:background="@mipmap/bg_kirin"> - + android:layout_marginTop="51dp"> + + + + + + Px>{YgYYRCr$Por})nJ_q_Y#d$u0}@Y`+MzWANN`2UITlkfha z|9$tN0iFSM71Argz8v5cV0-6Yfpq2Et2gT<0FR*c>wZ4H*FYN15v-%ve^&rk;2O}g z0qy|?(6d0ki2{$n<#o>KeJ;?)CshQ%1j@%(=lJs;1^HBf6Sx&908KFco?NUymkaiG zg2u5vFP}F-yBFkB0G4+C7mYlQ)d z;{o>54I%&=Vnd%m7+T-~@XxpXJkLLaeJ03<0Ir0*^<|$-Y4XbI*hUmaT#1 z`KJQt^MGfdlUbiN>AL|=@LF|10FI$~|3?AjIPWz`E|iN0T;TO106FIK{9Y@u1J24< zc0juf@T}@uO+d<){U2`oK4!4?jZQyuu?;M>Jjx5aJO`q;R^tTosv0i=JOj_*T4jI= zI6rcn=h?^9*>6W5fItZZV0oK;9yyl>;4yK0=)ER=8sG}v6ip2-VDcP5>HK8hTkoUJ zyeInvA0Tp}Hc>#OCFgyfvqhPx)h3QI2{>n!co#sY88$PN!^K-w+5hkD5n$Q(7O24F zbMc=B=ztLz0rdH8%X5x#e1h42vQ4@nPJ!hVK&!8FG+!tei*IYCeZOs69)Xl?Abxk- z8em@c&B*8S&%Q4g959AuV1M1VEe{{#{A}B_r)Yfy@etr%v~74OFQyj=t+c=bV&G*z zy-2Gu`6%Kwv+Nz!o3S{1(A@BkH90m#Du zfr^>u{hcQ|3Of)41PViK*?xHg#}vCX@Ji0oZoSwhKH|fcu`vb zvTdj+H}7+9n7?NqNM4r<2ZmJ_SOFDy2Dwrr{;^Y|sd_mLaOL-=G{tEM>cccq9MJwP zh$t_w;Tr>w$PL7#_CE?e;#IjL^^vMzUL7zH2KyhSt;tf2yHh@Ec0T;!PnxH6D_SFp_@N(Qx zZRQjEB-U3EAL2TlOyff@rZ z&w+ZX-@;2HHf>e_Ts(PXw0z^Kr^5+%EO$&Fh5a}w+ece-Nb0gi1e zk-%al9!2GRwVMwU4 zRcNy&70MQM6I52da2Mdz45ixOg30x=b%bqjhDq?i7v`qq26TI?1Bj!syDQlb#HcU( zHcbEl&>$UH$PuR`yPFP<$iIogo%?nB9rJZ(1=A(+MqRBu!*m1&WIiwZL|?Wf&{Gg0 zkT?PiHNlyq*S<~jn<39|!-p|uiSHyhwy+v^m-y~No`b0AW2v;y-Q zP-$TSFWdZ$+!%MHxsfXqrtr_jV#=5xJ`E@V2QWuuj$!Uy=6PwrzK}9+7vNO)x_dk& z&G^6oL~*E+Jdj9D=@x)iAi;yxx~Ue%54m!1T})Yrey!a zB+mwj??Zus6^IThT>}%rJNL`;3Eor__qqo`r0e1dpiP*ng<3jWFA;bR#)fP%@RU{@e3fNm<_`&Ixcsht1^FS}Odo83Jt2SY`{_Q)vGkv)h zX0+^VH^%jF{2!@{dxV&Kx3nJV#xSA4*0VBhs$S{FxE6L9*RwOH+F72IvKhM{*vptG z5VOwKxgbi!mrmUnC(~{uI0u}}H)iLWmKwMl3hvA}fu5?6sjVM#9$Wf*4TbJVdpv_^ z8<Be|A z#sTE)s+`;U0DO~GIr2e*i7OI@iF(?!*M&V)Q#_r;%?rHj_mH`}C9Xc4!Vrm99cTiG z&3A7tgyn?yCKGxEY&9F>QQllE(YV)09Dzxwy8(MC=~sZ??|M^ffpy3tBW=dlj_pvU5f#5sl;_o9-k0#E1zfi+Khe!MTJv?p_>d&ZQPZ%60Kk_TyzZW?mzY*yc7Ja-n(`nt; z6^94SdkGT-=5P1H)^bY!Xjag5vMUHwWV7tnKjR&MBo)eeEZn0&|HuZA9s~!VD~L8@ ztJ3+N(;wDVNSIx9bl@<^(?4^VOqm5AC%&X2R#h*70@o7?L~t6b+!Wk~BQWX%B)K2H z%%i?urexU29h>PFOZnVAzjqqo6i^zZe`teA+nhawN$1)?oyKr(cV^lL@=GO5&8A31 zbz6$p`#i7a?M-0WY}xo^6RQqz zoh)~=)TLv0gLr-l;0j`Qtv!Se08G+K?7{RvbS;eeGUhfZ(Br*;=pP;0$GJJ+E_1i3 z{EN*gXmmik3!s4-VmDxW;?z?OZRT$4JAm|@bazF1QJrY&)C73$9lE>BXA&%?--9&F z%L-iOhfZ(Yba3~^wKM8!#dR+*&mBN)LX>i-hr}9~1O^8PC*KXPTT~OQ_Jel;+=J+* zgF%vT;~S}7@*Idxn!S8LL$ytq2(v;-#4U9xO;$I`9C}K9u)Q0Ie9Cv?Hk1+2`+pTSeNHcyjz<1)lMZ6A;63v~4%A`tl88 zNSJ!aW5}Pz-R- zB=1$+oA|(cK~9kEPbc5X-!gzJ5%gK$UZTJW>>iXOf7+jS7RK50j)XA1{w6-~>=!u; z^X%vOytjnrzwuE1OY`zlZ`jl%aR=8yWGUlf=&Q)