From ba4e3a52407806500634cf7f281263f0759c22c3 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 30 Aug 2022 15:00:28 +0800
Subject: [PATCH] =?UTF-8?q?update:=E7=9B=B4=E6=92=AD=E9=97=B4UI=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=EF=BC=9A=201=E3=80=81=E5=B7=A6=E4=B8=8A=E8=A7=92?=
=?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=90=8D=E5=8E=BB=E6=8E=89=E9=BB=84?=
=?UTF-8?q?=E6=A1=86=E5=B9=B6=E8=B0=83=E6=95=B4=E9=80=8F=E6=98=8E=E5=BA=A6?=
=?UTF-8?q?=E4=B8=BA30%=202=E3=80=81=E6=9B=B4=E6=8D=A2=E7=9B=B4=E6=92=AD?=
=?UTF-8?q?=E9=97=B4=E5=85=B3=E9=97=ADicon=E5=B9=B6=E4=BF=9D=E6=8C=81?=
=?UTF-8?q?=E5=92=8C=E8=A7=82=E4=BC=97icon=E4=B8=80=E8=87=B4=203=E3=80=81?=
=?UTF-8?q?=E5=AE=88=E6=8A=A4=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=204=E3=80=81=E6=96=B0=E4=BA=BA=E7=89=B9=E6=83=A0?=
=?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=8F=B3=E7=A7=BB=205=E3=80=81=E5=BF=AB?=
=?UTF-8?q?=E6=8D=B7=E8=AF=AD=E5=A2=9E=E5=8A=A0=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/yunbao/live/custom/RightGradual.java | 2 +-
.../yunbao/live/views/LiveRoomViewHolder.java | 5 ++-
live/src/main/res/drawable/bg_live_ico.xml | 3 +-
live/src/main/res/layout/item_fast_msg.xml | 1 +
.../main/res/layout/view_live_audience.xml | 6 ++--
live/src/main/res/layout/view_live_room.xml | 31 ++++++++----------
live/src/main/res/layout/view_wish_list.xml | 1 -
.../res/mipmap-mdpi/icon_live_close_3.png | Bin 505 -> 2543 bytes
8 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/live/src/main/java/com/yunbao/live/custom/RightGradual.java b/live/src/main/java/com/yunbao/live/custom/RightGradual.java
index 01b6ef5e1..4c25d1257 100644
--- a/live/src/main/java/com/yunbao/live/custom/RightGradual.java
+++ b/live/src/main/java/com/yunbao/live/custom/RightGradual.java
@@ -37,7 +37,7 @@ public class RightGradual extends RecyclerView.ItemDecoration {
float right=parent.getRight();
float bottom=parent.getBottom();
if(mLinearGradient==null){
- mLinearGradient=new LinearGradient(parent.getMeasuredWidth(), 0.0f, 0.0f, 0.0f, new int[]{0, Color.BLACK}, new float[]{0.0f,0.2f}, Shader.TileMode.CLAMP);
+ mLinearGradient=new LinearGradient(parent.getMeasuredWidth(), 0.0f, 0.0f, 0.0f, new int[]{0, Color.BLACK}, new float[]{0.0f,0.4f}, Shader.TileMode.CLAMP);
}
mPaint.setXfermode(mXfermode);
mPaint.setShader(mLinearGradient);
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 31c97d091..636a3bc19 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1108,7 +1108,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
String url = CommonAppConfig.HOST + path;
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
- System.out.println("url = " + url);
bundle.putString("url", url);
// bundle.putInt("height", DpUtil.dp2px(500));
bundle.putInt("show_type", 0);
@@ -1535,6 +1534,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private void setGuardIcon(LiveUserGiftBean guard) {
if (guard != null) {
nowGuardUser = guard;
+ ViewGroup.LayoutParams params = userGuard.getLayoutParams();
+ params.height=DpUtil.dp2px(30);
+ params.width=DpUtil.dp2px(30);
+ userGuard.setLayoutParams(params);
ImgLoader.displayAvatar(mContext, guard.getAvatar(), userGuard);
gift_svga.setVisibility(View.VISIBLE);
}
diff --git a/live/src/main/res/drawable/bg_live_ico.xml b/live/src/main/res/drawable/bg_live_ico.xml
index 1d16682ec..183d53890 100644
--- a/live/src/main/res/drawable/bg_live_ico.xml
+++ b/live/src/main/res/drawable/bg_live_ico.xml
@@ -1,6 +1,5 @@
-
-
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/item_fast_msg.xml b/live/src/main/res/layout/item_fast_msg.xml
index 400d66e9e..6701dbe7b 100644
--- a/live/src/main/res/layout/item_fast_msg.xml
+++ b/live/src/main/res/layout/item_fast_msg.xml
@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/room_fast_layout"
android:layout_width="wrap_content"
+ android:layout_marginEnd="10dp"
android:layout_height="wrap_content"
android:background="@drawable/bg_fast_meg">
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index a87799079..05dd53140 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -336,8 +336,7 @@
android:id="@+id/btn_msg"
android:layout_width="40dp"
android:layout_height="40dp"
- android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
+ android:layout_centerInParent="true"
android:padding="5dp"
android:src="@mipmap/messagesss" />
@@ -399,10 +398,9 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
- android:layout_marginEnd="16dp"
android:layout_toStartOf="@id/gift_image"
android:padding="4dp"
- android:visibility="gone"
+ android:visibility="visible"
android:src="@mipmap/live_icon_newpeople_en" />
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index a2c057357..d4e398523 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -195,8 +195,8 @@
-
+
-
+
diff --git a/live/src/main/res/mipmap-mdpi/icon_live_close_3.png b/live/src/main/res/mipmap-mdpi/icon_live_close_3.png
index 2026df284a56d50e6cd5a4cea9155c1a74634108..2da0a5cfee0b0ae49fda594a4a8d67c88fd0901c 100644
GIT binary patch
literal 2543
zcmVPx;sYygZRCr$PU0G}uRT%zTFQsVJl3QC+tEP)vHO7V3MhjMr7!uMD0)&@RL&6)k
z3za4w>XZ)6!J1Lf3oEcbRiDozC1j
zvk&c@WST-}&hnjqzWKLvP6D~7BodL2h;AdIOUzbd-^5hliwAv*;$
zz|A3|djtuF6r(RvAdP~;>V$OT8YQ9uA_C~P7CV84^sXYJ2L(!C5^LvxnZ$!)ekY>8
z?UHgkfWCu>vWVzDBDzzMEVCt7>ttcvc#HleqCbgfh=~5vT8WnXtpple`Gg?FkY+a*
zd{`mfKUwwhv;t@Vypo8XCZgM|>bM27hJIfsqVq&FZg#)T1{&1xkU$eoaIjJQ8Ha;T
zeiNw0Xr0mL%>)`Bx~Bxy%#_YKTnSXf?*&RR+!Zr`#w+)TaDnR`#X5s@yi^#Tn)#B+lG
z!NT#mu4+)@SAsu9Q|I&m4UnH*B9bfxlS%eBTEW%|H0a_*B1&2UbfF}%z-*d`ImsqQNxD!?=WhhiNGnPSk!=q@1l4Snbo}DX}u5TdUrhENIanN
zTEKUaskPN5djDU7Z$y?};{oj_qBVk}eu-kIY1jxPd`U!Oa!)A%4QYOPi5exE&=uXx
zjG52mv=AkrpCqCOc+?iXy;`KtK|uc?q95c;O6mV0#s|u9d-%z%a|P`T6f!RcDJRhn
z3sDlc4&+wo7os!2iaRO=8dCg%z|FV9fZW`>ABTcKsX1y5}6*KKYTaW~^3xozy5f~CIfzs?Y
zT4D)YR-NSFZF10)f`!$B)B`gDPfa!5EMMg*=hifFMmT2@ZWL8)tRTc6N4d
zEh#B^P2AYv;9z$_LBXN1u`xK-jRFzw=;&BeUS9rsLP7$hD_Uk|X0C4Dym@yh6hgq&
ztO-@Z4C6S9W?4hPY-|jaq8EtSmX?-+
zii(Oi#2}-gNF)*tg+d=}+_>>m6DCs)D`c?tz;De4l1D_3sy$`m-xYyI8-s&`=hm%T
z*V@wGg(&BpbN3UVsiTdbdit^YKuh}=au26k)ooaLkA8V
zD3lr_;=1SN<|bQPTi>mzsd0iX#9aZ#BlrQ014|*C20Cg_@X*M_#Kh&~u|BERjc>!F@wboCb%ZLz=yBAynI7WP7ape$rcyUNX!Ix+Nl(iC-hGHM*A
zk(lEjp)7=xkfCIEi5o~2=t31T425KA|}AMH+{nH(P<
z|1dQ*6JHNKUnYJK-#_p7`>yb$0jNCv?2&AgfNaWP1
zQ|;^5uMgSaYWIiM@OGHkg>)5~Yy~7cMkpWMt$gCMNno
z8<#F!`ZhN=_iY=39g1nY7_Xg)=;6}R(u^HDcHm8-U@&+-6bfOPubIg$2+z&6x3?E(
zWo4!H_4N%00s(L{R9Y)b)MF=Pl1AH+zB+acnH
z4F>0f4K2g;4F=JKw`Jyhpe@-llQrRO0(;Z(W$7lc3~X;(!lvI6;x#X;^)
z4C~IxyaaOc1AIbU-3xqxOib|j@nc0rMPzX$B_$wNL_`Ex5YE1S{kpuoys)q^Tm+Nx
z|NsA{0)~e`36+u{zhH)GtU+QuQ)j+gSQ}GevS`vgxo&oj-niK33+L5{Rz^=YWec8S
zb@d3yJ3l;K978Nl_XbCbH5u^uEX?H)ada%W|GwTWGADOS$LFbK&rLUlx=f8;SbX|R;h+t-_o~xW^B>88Q~h}oOg7Jja#d6)sqQ38@eaH_}TjV%mIb)
z0y*9_dzVyC`n-e9Y>D5&$}5bFg^mg=8wJ`vyTl~!F?t!RR+)Ov?9|p>U!r68*_}6a
z5S9pg$;?{J
e40l&N|IbqKPxdzJD&~ox!1Q$Wb6Mw<&;$TxPOW?Z