From d07439efcfadf6c51a635db0068b8d83dec4064d Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Wed, 9 Aug 2023 13:53:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=BB=E6=92=AD=E7=AB=AF=E7=82=B9?= =?UTF-8?q?=E7=A4=BC=E7=89=A9=E5=A2=99=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../background_skip_unselect_button.png | Bin 0 -> 15028 bytes .../yunbao/live/dialog/GiftWallItemPopup.java | 11 +++++++++++ .../live/views/GiftAlreadyWallFragment.java | 7 +++++++ 3 files changed, 18 insertions(+) create mode 100644 common/src/main/res/drawable/background_skip_unselect_button.png diff --git a/common/src/main/res/drawable/background_skip_unselect_button.png b/common/src/main/res/drawable/background_skip_unselect_button.png new file mode 100644 index 0000000000000000000000000000000000000000..0b0bb68b78852fd8aaa4cd6a134d2ffaa8faf8f6 GIT binary patch literal 15028 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%0AT7vD|>33R#f$MKu< z-3N)BQPY-RzvAR1K{TYFR_$;uny#n_;p_FL>$Qi-ru6pclUV^ch2p6f8#=XhUDi7w z@0rr_rsK2J{NgsQRDl2D*g&PH7^vn8-Q+AM^(f3vl67u!rdpEZZp`6yJ0%{bbN<2d z^_3WPq(?gVdb`8A6V+8li3>!u%$_snhIbZ%coqrX5O2DR|0=^LV-!0&*6?4WlpzVt zUBiJ2wcFB;$~@d509xkZ0VF|FfCMEuW#|W>h|U)>wGI&XvbFco5|B@9T^oy7r%_pH z*HmDmf;&a^jn_4qji23K2=Zf5qEMNWqQUT$t&(N7eaFU>Lv&sRn?PUPJU;unnnaZtCe{}r~w z$;nC6r8=jDN}3SQ%#c49b@kCeNo@%@-%Za43+n>qmiKQeRdn_Eu$xjU}fi;?pOEXicjPJ<> zBr)*LkWz}poJmmG%9k2O1Vtu4EBh@ zK$y}PdlV0;@x7yjZRCrbdwGSP*hitptFpHgC67S*sBwI$4ih~f&$kC)>-+x|zqNAX zrog+F!vL2V2QC)&fRn_Wy`fF_AS#@WAmAll0iYKfe5#=YR^7-0QIQUhO+ z|B4wPhgFH@MZ177Ly7rA&kO4Mxdf|h%9NCu7sTA=W~^dSdnyrL;3%%n+ihdOS4n@v zn>1JV9?5cz*Nn(isJMl&CpxPIc3+;E?kN3Xn#v8YT`6Re`HlT;rPudrgYFD$2ZRgt z%ibU6WM(#7y1Sn!=KMP=imC+dm;4+J`gdv!5D#Q+U0v(*jA4@}IC31MU%>6GKLtnN>nL?v3HsBX}T;y0Ws;6v*d>39Pc#~)j z&ex0vr-DpqDc{k_5}`tNXLo<6_*Clq`v(U88+3AVdN?i2a8CEcEEv2T0Jk^)=4%#6 z?7y=H?l#M3^I4*!-@G_)FkjXws3`E?J!J)bYoq8>&E0fA%g;5l6mVx;=GQ1l6eVi* zM^j`BcexQS=L+C{;pBsV(>6saBGzUK=R!%Hjh1!nb!ehezD;$*0ustc{YBa?)!rt& zQ_AX8zY`+)w?--2j>89aWIFE1|JkQczgBMXGC5uP!^uV>knntnQ!i?}UnL9j)ua8a zr4vFFw&b^4wj@UmPan2fP9NPeO;j%M18ItxlYzB5EfPtBFrMT|AdWWaFWleMA%dTI zbl%p~^S`9ya|>?wK4C3WGIs;(yVyU?N--F)E?u796)6(6-k)s1vllg(uv=P??MQxO z+`2}@27@_esDvppk|U11*`M&VeWU!~0IC3MU$GDVM%=L;bX0-#{oi7%^zsq+78Mme zY<5LbE&~{^tpb2meE__g?p37Vhmu|aS;I=;cu;)X{R}9>TqoE5WWiAyD!9U3yq^^5 z2+zVPQ1-EI?ad$yU$V9J;KU3Ii8HyM7 zyMgP@od@)+OY+Za#^>2`HXy@xTt@EhkL}p7dvhS*XaT@527vgnM0KxO=G^bua`9+A4pxpB){u=r<2) zhuu80$-)70V?v5>Z;yVqY9^Bf*rC0~07!6g`MZIEO=a&7t1?Cb&*}11h4gi>9EGm5ip~$BHN=kM$ z7Ut(oQu?jjf%G_TP24gC&iBZPpNQkA%T)8em@~@v;<5We<)r@TU!tGRCA_+P#u9)#rCoH9M71VGx6Qy>9jtJrC=r)um^Dt zM6wzvvd#?3C6xq{VI^Av;1)bqo_fyf)HAM*X`D589(dlA^lhJe{6A3p8h+k!dSt5g z`ovZ$7Y`3l0bp*d1KCFT4_BRk{`_HaS*UZm4x4NZgjXXHdJ60E^77_@{GA{G5pjWR z0u9Zh@F3*qR(<{?hVjKSkSeq4W_9!S?A2hj^oM9x8=W7XxeDl&9T)5uI(4ywdlI`1 z0y&GRDYx>zGBJ@D1TkD99Z%MXuM1p_BRXd~z!|0Y$17aW@lK z4okn40F#u+)61GMjZn(V4_C~fXpPLcG!q+Iy%iPP)Bb#=D!%Hk-ft+m;?=3~9Vh12 zXFr)l5qp07F52y6IoI=@kx?{;Jr$(1ApgLEf29o}(RY(g@0x+M9nX=eJu)f8p~PQ- z#GRTaQ@F0t(r+Gvp`p}UTTe*2@C?LrdFH6OiVI>dRiWJ6jJ!{xG=R*$zbJC>o{u0D zSo}N`V!PRc7T;tTt9+hOiz-}n+23OnxFT=AYodGs&{3gQG>Lp)GX0N_SSMK-x2<*} zWD|Q3yP=-Fx*-ylQI+Nt-x{;_%6GwQKNDK?RzgEM7-4Ctv?Wp-i!F)15=ns=C`j)L z<2I{2ne;Mv)ypow{0YMqHtHL_)2;V}WJJKe|I_mjW}L8P`FQ1mqppbwz{=ABpwJRb zMC79Se=R$o%u!qAO$X`9FC&swg%GULBWj{cy0napi+)Ed9Z{2*v%m52@oHsdWxPOx zPA#SF8%NqtkH&LtJl<*tA^Fw5Jtf>$dTvNf>+!ePWXS=~I$>@K67x7Ul^C4IoHf-X zk}>QbS|2Y0HC^>{++R!mrbGkle|=jt*z1p8v1C9(t*zT>+4U=V>wQ6nz-5yHjsk#g ze@SKxJC9lk$YcRR#4vzFe3n0KWhn+&DNhs@e^b%;rYI+K()XMR=tS5ff}&Q)8k?GU z)6>#0ruzDJKn{atVADMSxFU0&5?RVclfHk{fzjIoZDjV>X0I54<$FSJune}0Ya~X# ziEMPr4D0_;OI$^qVwrwnD&&d@AT+S(N_IHs(?%Yw&A1p6QKqSE38ccE&b@Rvw*|BD z{Au#)<}@Mr^F6kKG`W!RFg()?CMDvxP+wj9V*gAo>!E4Ght>(4#KG;l-oC=@FPe$^}Qn)-yvw zLZZ!S%lmAquSk2lRUwlA<Z|6=2pBPgkFHmzo5>0giPo0=r=2TlLE z`vOes`KaDE9%?*8=_;WKQH(!@Rl-Fyf~>v6s}x|6Z|a2I0_RL(1}`^1o_LryXDb)b zE88*l3gtLu5l~D%ohvw;Mifdg&<}2Tc=}TGR58!AXiUj0q^ IE3?r51D`2+2mk;8 literal 0 HcmV?d00001 diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java index e0c8e79dd..e07a3d1a3 100644 --- a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java @@ -2,6 +2,7 @@ package com.yunbao.live.dialog; import android.content.Context; +import android.graphics.Color; import android.widget.ImageView; import android.widget.TextView; @@ -9,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.cardview.widget.CardView; import com.lxj.xpopup.core.CenterPopupView; +import com.yunbao.common.CommonAppConfig; import com.yunbao.common.R; import com.yunbao.common.bean.GiftWallGiftDetail; import com.yunbao.common.bean.GiftWallModel; @@ -28,6 +30,7 @@ public class GiftWallItemPopup extends CenterPopupView { private GiftWallModel giftWallModel; private boolean unlit; private String mLiveUid, mStream; + private boolean isAnchor = false; public GiftWallItemPopup(@NonNull Context context, GiftWallModel giftWallModel, boolean unlit, String mLiveUid, String mStream) { @@ -36,6 +39,9 @@ public class GiftWallItemPopup extends CenterPopupView { this.unlit = unlit; this.mLiveUid = mLiveUid; this.mStream = mStream; + if (this.mLiveUid.equals(CommonAppConfig.getInstance().getUid())) { + isAnchor = true; + } } @Override @@ -60,6 +66,11 @@ public class GiftWallItemPopup extends CenterPopupView { } else { giftDetailsBtn.setText(getContext().getText(R.string.instant_light)); } + if(isAnchor){ + giftDetailsBtn.setBackgroundResource(R.drawable.background_skip_unselect_button); + giftDetailsBtn.setEnabled(false); + giftDetailsBtn.setTextColor(Color.parseColor("#F2F2F2")); + } ImgLoader.display(getContext(), giftWallModel.getGifticon(), giftImg); giftDetails.setText(giftWallModel.getGiftname()); price.setText(giftWallModel.getNeedcoin()); diff --git a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java index 0eb6d30d1..060ab069a 100644 --- a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java +++ b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java @@ -1,5 +1,6 @@ package com.yunbao.live.views; +import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -11,6 +12,7 @@ import android.widget.TextView; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.yunbao.common.CommonAppConfig; import com.yunbao.common.R; import com.yunbao.common.adapter.GiftAlreadyWallAdapter; import com.yunbao.common.bean.GiftAlreadyWallModel; @@ -60,6 +62,11 @@ public class GiftAlreadyWallFragment extends BaseFragment { alreadyWallAdapter = new GiftAlreadyWallAdapter(); alreadyList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false)); alreadyList.setAdapter(alreadyWallAdapter); + if(mLiveUid.equals(CommonAppConfig.getInstance().getUid())){ + instantLight.setBackgroundResource(R.drawable.background_skip_unselect_button); + instantLight.setEnabled(false); + instantLight.setTextColor(Color.parseColor("#F2F2F2")); + } if (isAnchor) { unlitIconHint.setText(getContext().getString(R.string.unlit_icon_hint)); } else {