From 2c56322b1c357186f226889f268c0873701f0cc1 Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Fri, 16 Aug 2024 16:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E8=B2=B4=E6=97=8F?=
=?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../res/layout/dialog_live_interaction.xml | 2 +-
.../icon_interaction_leave_p.png | Bin 0 -> 6416 bytes
.../live/adapter/UserMoreInfoAdapter.java | 3 +
.../dialog/LiveInteractionDialogFragment.java | 4 +-
.../dialog/LiveUserMoreDialogFragment.java | 43 +-
.../main/res/drawable/bg_live_push_time.xml | 2 +-
.../main/res/layout/dialog_user_more_list.xml | 27 +-
.../main/res/layout/view_ry_live_anchor.xml | 536 +++++++++---------
8 files changed, 316 insertions(+), 301 deletions(-)
create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_interaction_leave_p.png
diff --git a/common/src/main/res/layout/dialog_live_interaction.xml b/common/src/main/res/layout/dialog_live_interaction.xml
index b5711499a..9ab43f338 100644
--- a/common/src/main/res/layout/dialog_live_interaction.xml
+++ b/common/src/main/res/layout/dialog_live_interaction.xml
@@ -270,7 +270,7 @@
+ android:src="@mipmap/icon_interaction_beauty" />
Py2%1J~)RCr$Poe7L2S9yTzbzR+6J?+`PyQh0*c6P^JycR3uB?nQ&t_V>qg&@UY
zgB@Wd*cfpoQA8Aoz*#VfQ3#GvAR)mx93hZR90?*w6l7RIkRvcjc4a%e%+Ai$(|1qL
z^z>18W&UyXq^GxM`>N`GHB%+6c2`~X>b?Jc^}pl)-~S`xh+Mj^BZ45Be_RAX(96rq
zjN9#|MNy?`!!Vkz>zX7%Uc1RY;PQR8>_;k`!5%l{Pju#QFJo@vzCZ*`7lM5NMe~p}}{xKB{27|h;-vN_eyJ(t0JI&+q)HgOZ
z3MWsVlyD#3um*AF
z$`w8miG&qJq5Bo+QNCZ2BoQH$JAVAQFits)4WNq`FS;Im^ijXA>j6jO42}TL^ZCii
z$qFc^!AlwZ$*};W>pHu>z8;cg+3U=82Jbw0(pY5F>-Bnm95%O+1GKcXG|6#XK$c~4
zIMF#zw@QGfX|-Cd7Ehcwu{BD`j0_;y5WI2YMv&t;7`A${dXG{Nhv8kIjq3IK#>tZ>
zi=&!gj|3pt%1EVB5t1Y)G))`JSbZ1(>7@-Wm&>K9>UJWL0F#L2wl&KEGVE6gS(bNw
zaGYy25};{X35UaL-~eFd8!ZJ0;0c97GvIV(Wh0!jJ4*nj3W-Ew*-D5k>sZ*|@%#Pp
zqi%{AH{9TUyRos6IdkSr&5F8M0?@+3g3s-CM;v&p=(54eWLY*73Wc@@d-~v~Oa}`+UA>
zgb+BgI~S%BFneNc3P8?k3sYJSsFs-!4Gj=%66W*yX=k6uUJx1kM61JYHVy?4m?u)H
z6fD(wdx_7fEl5Du^;#m4NDpK77z&_FCKCd83}?k*xGg&j1-t@JUV6UI~ojT!&HuaELJ)jV|@txSj!m
zb6W_ZV6O!`_t{qhx~>c^aE$9iLOP4N@=gyrwZUk)VrCjG88%qFuh!Tm!&0Z$d
zJpq)<#
z>HzsI9#5rG&#)}(wxVtj^eLH4zLlaVc<-L8i=rq`q|@oAn<*Boc(;{h0zf25mZQ;V
zzAHe6kMoS3eSH9+cs%|HMNuDYZ?GgukLC0EubHh4K=b(h{$J!c?$hn>R21ctJMoY{
zvjdiGqp*R`(918symJ2h`F#N!ZqY!Ci;ED8Ic&Cot^7hdmCbQnXmWD$3kac;ZNKZX
zEI*mg=l{m6IvK;(13Txg9&6P+M)`}Io11U1R;#d*>ALS`R-Mc)2inMST&_LW$G!%^
zf@N)OE#`8$Y&(3l3eM;A-Mur3{wzTdkq%nnv4w?&FZq1Fp}Y%V*ow#Fzs$1ir#iq>
zlqBgrg+k$f%i-vH!u~_UaJ2}Wc)2&(P
zA?;MZW#f83Y)`~uu@pjRZ(Cv?K*eHl3RYi(ev#vBc(*!-LZOo^%RWsIM7*t@f~IMo
zU0GRqs@Kkj++WFL@x*uzA6a9`%9(LZHFy8&WD--J*TFo_UvQ(09syN
zeibD38z%_8z8lmjMNtezQ5-DGNs@#tKDRq1B9kOJ&$8^3M(WFbuTm7{&m~EEt{sT>
z`oId0W!ax&80G^V>MBW+^l?Q|e%PfPMUtd#RaJLWJ%N_A6HrrAQwz;`&>ldr`f|J7
z(QaRIuN`dVeX=Y|;c)m3EX$rJN%E{Qzv*Q%3?~k(4*t;VJ0SnXnx<(#QWWJog+k#w
zb_h&iY$~pwK7D$37~2DAb#*n4`|7Kicq9^ud=4S>`fl37N{G!YTi12iTlx0Yt5@F<
z2n0CXwUOKHt_6d^^*w-$<@+4usW4M8W|ze<3>ORrzlacewb^CkP@b;q*Gr|+gSgwy
zATUED61lkt5Ln*bZg&!A6$)m6P$={mNs_;gLuXr62US)7u}~;{L{(KwqpJ>6f0%zN
zijsmn9lJwVsZ{dS>ve2n8bXC9CnwK(z1}Yq1hFq%FnqPLEdQ+}NlUt}OC*W45+zhs
zB_RDcP17?jm+KLi%XO-)GnGc8@wQT_^a8FQG)yG~LCDR|&sTNt)H8l`xBBR-_km{*LD5-*RNlH
zXkual+dU*OuEt`q0;G||I>rxZACBX~e!u?*ZFE0ZDwW>5wY8-IKz6*0WV@bFC$s}-Cb#L9!sTC$8qfl!^h?~
zDT=z-(kbKElMnBhSU%ha&^wF8;tvlAKtJVnyZ^ck
zppUMstUQA=Km|EwvIL
z=scLDA3Js|z%b061VIQ}TU*yfQEZHA@@iLr;6rn{TpMV4c{xVYv=3J!s+9nN5F(Mt
zdr6YKU<@DNX_pa2@u^HE^DThLYK>%PfM}ZD0u3}R2!e-U7%bCJS_KfeWyE5!_tP}}
zu1*tOUDv-=sZ>5$uh-M6s;X9jWM_aN&NRY3c!CuG0X(5l=(Qe?=WDlHCF!~j=gIz|
z(P(_RTrL-_7}o3x5XcSOYS7Bc${fz;m8<}$(P-4?=H@=>a=BpW>UM#H-OI8pe`;}Y
z@j0{23w8zw!r`IC#YOPa!*(;y3V^EBYW2=L@B9Wr=-w8302GK&3Z9J}&u?j(_SJH^
z{8XdSD4R8;*%=_%MF%?=tUj>4tO96$e*POSm#Y<^)$Q%=2R$CoIf|lwgCK}k9Uzny
zMNvLqEEb=YBuN-nd)pZxkdFh<|5I`^pU?lQBuRCj&o}AydcoD=(E}g?55nv9di@X5
z>GU;^$1|`Gi35-388NsXG2%%gMLiSC?>kA7eB=O)qUyT7A_&3<
z(&_Yny4~)9Qh?eOAmbd~sx6%A&Gw1z1dy)li@975hAA=-2>cpJk`Ew+<`3BO$*8LO
z`Fg$nFPod2#eOEu?d91Spja%n>r_wX^Z8j^qq16M%IIK?FDZ%wOY=9ABnd{=PWCP6
z?{C)Y^{3#_->xxn$iSI)1*r8{57q|@tpKQ2tJUV`=f7fvi0Ng{3*MT`jYi|iLZR?2
zI4wFXIL(*Z6`>OYI3_;k5kUTp3KnJpl@0t6>A
z;_-M9`|vJS0AzgmS|AWOvlG_uvu(+QHC@-&6-D_(CX@N5nZwlq6LL72YO8Z$0R6u3
zE=x;GZi=E3{TKnw{t^!=&nkeL5c&Q7Q!LB=lFQ|q)ig~(2>qm7E3Kf
z1R7irgf&Qqxo1tz<#KbfEbj~6G%84L_Z}+&YR*B7WFp`Py=&{TYPdQq8t9e~chIm@
zDwSxB4uJzaP3yPW`#`v~&90MZ*hf2c>Qs7n8>1=AY&OfQs+z#fCT3_L$h>o;qH`#U
z^7z`?8g|h+KwG=r?o2c3%07pvn>TOXh1&^LBfQH)48wf1MROdg_(1V^{B>@(`!Cz#
z16^ESU;n}==3)J4H^vZwQ0`;FxR$+$sEi
z|8bt@|FzWzM^)9!g+k%IilRtn?FtVn*g>Cz=>pi%!r|~=kR;g}BatYV%Rg_V$+SAM
ze$Ukh18SvGSwD5^)OJUJzWd$pQYTNIoW<>{hBMeRGc#Xpi_)s7s`_jullc$?KN!ZK
z*|P-AyHRfj^oqq|e@N5x!>vW@y8isNYu6qaHkX-s)qSO;uIZj|O*jV?4+H|Q@pwEC
zCwgDZKwZ}tR8@UO5QLw&TrS8{f%OG(q7gz2!!XBbn*J?>&|Pg6mK%-6gOKe9w-32%
z!Z~ONu0h9-N~C&C(=O%nd5BcsmuI8ZUkwbmT~l5{C14o4`|i83Ou7qs;QfC8-@9C{
z_OI4z`HiG}P1CMcDwT(7wOV5&FYMzbFc)21T+;e|FEJd)&EXn&6DHNs
zX!H#_L;o7xp6FkpH?eeu8-fkRE%RsBMESm|3!+UAIdzwVI-UMNQan0m2
z9uNl_H+nqt4pdvv;XG%el9sF;e!&@B|NPR03m0zL
z_vw2M)O=uVZOz|ydSS5IIZt6P0bSRN$z*b)mx}hJftm$nv)SXY)!s|N&OP>&0C<2N
zKYo1mpk@2O8VDXtr_-Du2ua-BUhUacc-C5$6Y<
zvKbg4c-g|jLWt-20InII2NB3odInBe)M~ZT{QP`j&~^_65LoO}sZ<;xw3qLE(26+E
zja~xXEbYD2XefZ-1>iT7OeT{!24?6*07vy62#~P0wzhWm>{)pj84L{&yc}F$L!rpth!UI6&m{`DPs7q0vAv=v%CWOz-H0g#{na^KoZoW>y!OQw~Jc;CVh3
z3WfI0wVP40=>Qqad!NVSfi#iMg@FWM&f|8wvu49%`ViJCD`Pl|IX*<=B?#cz*w{#$
zIc&AI$Px|Ie1Wq%8$UdiN@eBr>C=)`HL(<+<`O>`41(PZy8xb62^EKOVV@@)4zHQD
z+B&FBmIDMYhRw!EBoZb`a>AKhTZsgId)Gt60zx*mS`;YpTd{V+FjhPBS!Zp3MZ!+smRp4&PS05uzV>Cz?gzWeSAY;A2#
zTHSEFl@D_rp6541p-_HY!&N7lVWENAD+Xqea5x;oHD2H-;WL7fi?LWNix9GGM|sdT
zVF^&PF-CkMpUdUi4RUo9bO9Dom(ksYzl^L+K{)vNXM
z=g(smoxT^?Yza`aVPIdoeEBkY&pr2e1VQkrs_KI?`?!Jx(1@Z)uq<0=7-sXu7hi0g
zJ9kdSeVDo(NVW#3Q^OV)7w?c|nddkThB;{8?$_SS*JSoR2FSa^6G@U{E|=Rnefso)
z0V~aZ|0v2Ei(p65Fwjmg`G)L1JkK)_1s;5oNRp&gRo#to1lph(s;2ed-Rjp0Busi)
z_LWU^k|bqSRb>VCA81;xR;waKQBptQQo6kxx8DyfK<$DCpp0Wo@V6_I$B|%p$Ie#4$sU00000 {
} else {
mRanksIcon.addView(rankImage, 0);
}
+ }else if(type.equals("6")){
+ L.e("type==6");
}
if (bean.getDress() != null && bean.getDress().getAvatar_frame() != null) {
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java
index 0e609ddb9..3810f3063 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java
@@ -130,10 +130,10 @@ public class LiveInteractionDialogFragment extends AbsDialogFragment implements
findViewById(R.id.live_tool_game).setOnClickListener(this);
if (leave == 0) {
- ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_leave);
+ ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_interaction_leave);
((TextView) mLeaveView.findViewById(R.id.live_tool_leave_text)).setText(mContext.getString(R.string.live_zslk));
} else {
- ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_leave_p);
+ ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_interaction_leave_p);
((TextView) mLeaveView.findViewById(R.id.live_tool_leave_text)).setText(mContext.getString(R.string.live_zslk1));
}
mLiveRoomHandler = new LiveRoomHandler();
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
index cc589f42e..2f3294c59 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
@@ -61,7 +61,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
private LiveGuardInfo mLiveGuardInfo;
public eightbitlab.com.blurview.BlurView blurView;
- public TextView audience_btn, guard_btn, fans_btn, tags, btn, gz_view, dayRank, weekRank, title;
+ public TextView audience_btn,guard_btn, fans_btn, tags, btn, gz_view, dayRank, weekRank, title;
private LinearLayout tabs;
private ConstraintLayout noMoreLayout;
private TextView noMoreText;
@@ -155,6 +155,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
audience_btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ noble = false;
Tips = "1";
Up();
type = "guanzhong";
@@ -198,7 +199,17 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
type = "weekRank";
mRefreshView.initData();
});
-
+ gz_view.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ noble = true;
+ Tips = "1";
+ Up();
+ userMoreInfoAdapter.setNoble(true);
+ type = "guanzhong";
+ mRefreshView.initData();
+ }
+ });
mRefreshView = mRootView.findViewById(R.id.refreshView);
view_no = mRootView.findViewById(R.id.view_no);
userMoreInfoAdapter = new UserMoreInfoAdapter(mContext, LiveUserMoreDialogFragment.this);
@@ -237,7 +248,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
mRefreshView.setVisibility(View.GONE);
}
}
-
}
@Override
@@ -335,18 +345,13 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
});
mRefreshView.initData();
if (noble) {
- tabs.setVisibility(View.GONE);
- title.setVisibility(View.VISIBLE);
- title.setText(R.string.noble);
userMoreInfoAdapter.setNoble(true);
- } else {
+ } else {
if (isOnly) {
tabs.setVisibility(View.GONE);
title.setVisibility(View.GONE);
}
}
-
-
}
@Override
@@ -372,20 +377,25 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
noMoreText.setVisibility(View.GONE);
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mRefreshView.getLayoutParams();
params.bottomMargin = DpUtil.dp2px(65);
- if (Tips.equals("1")) {
+ if(noble){
tags.setText(R.string.enjoy_a_lot);
btn.setBackgroundResource(R.mipmap.btn_openvip);
btn.setText(R.string.live_ktgz);
- setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank);
- gz_view.setVisibility(View.GONE);
+ setTextColor(gz_view,audience_btn, guard_btn, fans_btn, weekRank, dayRank);
+ userMoreInfoAdapter.type = "1";
+ type = "guanzhong";
+ }else if (Tips.equals("1")) {
+ tags.setText(R.string.enjoy_a_lot);
+ btn.setBackgroundResource(R.mipmap.btn_openvip);
+ btn.setText(R.string.live_ktgz);
+ setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank,gz_view);
userMoreInfoAdapter.type = "1";
type = "guanzhong";
} else if (Tips.equals("2")) {
tags.setText(R.string.guard_for_your);
btn.setBackgroundResource(R.mipmap.btn_openprotection);
btn.setText(R.string.daemon_list);
- setTextColor(guard_btn, audience_btn, fans_btn, dayRank, weekRank);
- gz_view.setVisibility(View.GONE);
+ setTextColor(guard_btn, audience_btn, fans_btn, dayRank, weekRank,gz_view);
userMoreInfoAdapter.type = "2";
no_more.setImageResource(R.mipmap.ic_guard_not);
noMoreText.setText(R.string.waiting_for_you);
@@ -395,8 +405,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
tags.setText(R.string.favorite_host_fan);
btn.setText(R.string.Join_a_fan_club);
btn.setBackgroundResource(R.mipmap.btn_joinfans);
- setTextColor(fans_btn, audience_btn, guard_btn, dayRank, weekRank);
- gz_view.setVisibility(View.GONE);
+ setTextColor(fans_btn, audience_btn, guard_btn, dayRank, weekRank,gz_view);
userMoreInfoAdapter.type = "3";
type = "fans";
no_more.setImageResource(R.mipmap.bixin);
@@ -406,7 +415,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
bottom_msg.setVisibility(View.GONE);
type = "dayRank";
setTextColor(dayRank, audience_btn, guard_btn, fans_btn, gz_view, weekRank);
- gz_view.setVisibility(View.GONE);
no_more.setImageResource(R.drawable.img_rank_empty);
noMoreText.setText(R.string.no_more_day_rank);
noMoreText.setVisibility(View.VISIBLE);
@@ -415,7 +423,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
userMoreInfoAdapter.type = "5";
bottom_msg.setVisibility(View.GONE);
type = "weekRank";
- gz_view.setVisibility(View.GONE);
no_more.setImageResource(R.drawable.img_rank_empty);
noMoreText.setText(R.string.no_more_day_rank);
setTextColor(weekRank, audience_btn, guard_btn, fans_btn, gz_view, dayRank);
diff --git a/live/src/main/res/drawable/bg_live_push_time.xml b/live/src/main/res/drawable/bg_live_push_time.xml
index 0147b988e..4fda455a2 100644
--- a/live/src/main/res/drawable/bg_live_push_time.xml
+++ b/live/src/main/res/drawable/bg_live_push_time.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_user_more_list.xml b/live/src/main/res/layout/dialog_user_more_list.xml
index 1b39eafbf..ed4733010 100644
--- a/live/src/main/res/layout/dialog_user_more_list.xml
+++ b/live/src/main/res/layout/dialog_user_more_list.xml
@@ -42,7 +42,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="@string/day_rank"
- android:textColor="#fff6f7fb"
+ android:textColor="#ff646464"
android:textSize="16sp" />
+
+
-
-
-
+
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:gravity="bottom"
+ android:layout_height="match_parent">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="40dp"
+ android:background="@mipmap/btn_big_blue"
+ android:gravity="center"
+ android:orientation="vertical">
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:text="@string/start_pk"
+ android:textColor="#ffffffff"
+ android:textSize="12sp" />
+ android:id="@+id/btn_dr_pk_nub"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/number_of_remaining_times"
+ android:textColor="#ffe1e1e1"
+ android:textSize="8sp" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file