From eba7cb1ab8e2508ce03b9e1d347c226d62570097 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Tue, 10 Sep 2024 17:49:37 +0800 Subject: [PATCH] =?UTF-8?q?6.8.2=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=83=A8=E5=88=86UI=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/tmp/full-r8-config.txt | 13 +- .../res/mipmap-hdpi/icon_live_close_4.png | Bin 0 -> 1551 bytes .../res/mipmap-hdpi/live_users_more_2.png | Bin 0 -> 2423 bytes .../main/res/mipmap-mdpi/ic_expend_down.png | Bin 0 -> 377 bytes .../src/main/res/mipmap-mdpi/ic_expend_up.png | Bin 0 -> 366 bytes .../res/mipmap-xhdpi/icon_live_close_4.png | Bin 0 -> 1777 bytes .../res/mipmap-xhdpi/live_users_more_2.png | Bin 0 -> 2676 bytes .../main/res/mipmap-xxhdpi/ic_expend_down.png | Bin 0 -> 1009 bytes .../main/res/mipmap-xxhdpi/ic_expend_up.png | Bin 0 -> 950 bytes .../res/mipmap-xxxhdpi/ic_expend_down.png | Bin 0 -> 455 bytes .../main/res/mipmap-xxxhdpi/ic_expend_up.png | Bin 0 -> 433 bytes .../yunbao/live/adapter/LiveUserAdapter.java | 5 +- .../yunbao/live/views/LiveRoomViewHolder.java | 21 +- live/src/main/res/drawable/bg_live_add.xml | 15 + .../src/main/res/drawable/bg_live_item_an.xml | 4 +- live/src/main/res/layout/item_live_user.xml | 7 +- live/src/main/res/layout/item_live_user1.xml | 48 +++ live/src/main/res/layout/view_live_room.xml | 310 +++++++++--------- live/src/main/res/layout/view_live_room1.xml | 179 ++++++++++ 19 files changed, 429 insertions(+), 173 deletions(-) create mode 100644 common/src/main/res/mipmap-hdpi/icon_live_close_4.png create mode 100644 common/src/main/res/mipmap-hdpi/live_users_more_2.png create mode 100644 common/src/main/res/mipmap-mdpi/ic_expend_down.png create mode 100644 common/src/main/res/mipmap-mdpi/ic_expend_up.png create mode 100644 common/src/main/res/mipmap-xhdpi/icon_live_close_4.png create mode 100644 common/src/main/res/mipmap-xhdpi/live_users_more_2.png create mode 100644 common/src/main/res/mipmap-xxhdpi/ic_expend_down.png create mode 100644 common/src/main/res/mipmap-xxhdpi/ic_expend_up.png create mode 100644 common/src/main/res/mipmap-xxxhdpi/ic_expend_down.png create mode 100644 common/src/main/res/mipmap-xxxhdpi/ic_expend_up.png create mode 100644 live/src/main/res/drawable/bg_live_add.xml create mode 100644 live/src/main/res/layout/item_live_user1.xml create mode 100644 live/src/main/res/layout/view_live_room1.xml diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index f80ae5cc7..d9e5d6f57 100644 --- a/app/tmp/full-r8-config.txt +++ b/app/tmp/full-r8-config.txt @@ -419,8 +419,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.qiniu.**{public ();} -ignorewarnings + # End of content from D:\AndroidProject\pandorapanL\app\proguard-rules.pro -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt -keep class androidx.core.app.CoreComponentFactory { (); } -keep class androidx.core.content.FileProvider { (); } -keep class androidx.core.content.FileProvider4Utils { (); } @@ -1093,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keepclassmembers class * { *** videoEditClick(android.view.View); } -# End of content from D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt # Generated keep rule for Lifecycle observer adapter. -if class com.lxj.xpopup.core.BasePopupView { @@ -1156,9 +1157,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt -keepattributes *Annotation* diff --git a/common/src/main/res/mipmap-hdpi/icon_live_close_4.png b/common/src/main/res/mipmap-hdpi/icon_live_close_4.png new file mode 100644 index 0000000000000000000000000000000000000000..8797a432fa6646ff33d69ceb050b8f5d1ffda75c GIT binary patch literal 1551 zcmV+q2JrcbP)Px)$w@>(RA@uhS#L;WRTMvObo^I}W&W8#sc|aH%@6iL#$nA5eGpMhAu*&flSDy+ z3WY^$KBU8rr6q#+?UYiqYrQgh7a&CHG8Fi&RPH_m%+ z)SV9KfZjRxchCLZbAI<+j>0n)5k(PEJP|!iL~%qE>;D@^M2v{sMC2l(BO*E=qJN0U zLquMsQ^TSAfg>9w2=ZDQPudVpqPgeR)xTTG5~)nWkP`l zZ$Sqfwu>?xQqTo_7q!zsClb*U7ll-0o?Arpx7hr_KqJDBKS033)W3*DTnscgj0j&O zC4$8VR6)e=;rL0=I1D;}N{fI%`yc@DW?)u12|AUCv{KT}1+EBzL`L~jm@^P`3=utZ zPI)-oH3H|4M8v~UAn0r&dMI4)=lFf(aM0u!G!7rQjID@NLt* zNT8M!lRN&TPw@IKKqI=K29%o|<2N=o-czg933YXKpDr#gq7Vej`&bxfx7(W&5)vM* zsHphJYPCYD$~9jm!6Z;_IDm5Pi0Aq5IF5^QI2<=L8cn-D>h}SUiHYHCHd}LccJ^zG zv40yH8eSe58QGRQp?|y`6QKHm&vM0(cWP?ta#>kf7ozBJI2N^9ZHGuvVit?#mAt&X zx3H@l8yjC16ck)@I-PRo17@(o7ir{W$WAfw9x@nKtM%2~+}t<(fUf7~=YQ^UxddOH zsi~X?RKuMtqmBB#_L2B zJw85uxw5jdOQljJY;SKb>h<~#r_+hj97x`%s@3X8TrSsLv)SBcHk+Z?!UYW1UO3598sZb*WA*j*X?=Zt=J@#dCpnJe+-~<@ z-QC^qm`tXhWaRRYZ~*$!8C617TwI(uGc)s9TwGiR4xZQR^|ZFOzTV&8|0_5i5{?}BqseFLP#>U!HQc?^akH_WpdR-_yJkKAPOs1Beo}R5UqK7N&?19FM!C*+7oSgh1 zH8r(}F~%<~E%n%Jw$1wb`Y!PL@bK_fQ&ZEsqoboJDBFFH zf!agqy^!~KJl`|Myelg!SB*yFSEp>dcVc3~SXo*531iID*w|P#JUr}>5ZRMMj#VE1 zkxoQuGM#vbhKBO8va-@jOG|G`_%1&lOJHF|NNySL&<>BB$(w^GO6Lug{x~8J--qS?+gYHiwy`igg zpM|0t{{taL+_CDoK`j6P002ovPDHLkV1oDx B?u`Hd literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-hdpi/live_users_more_2.png b/common/src/main/res/mipmap-hdpi/live_users_more_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ab6d053a5ebfeda3499da81f7641db6839c87b1d GIT binary patch literal 2423 zcmV--35fQIP)Px;F-b&0RA@uZSq)5+=^g*~ZKbWP!Uha%t4^#R=ndsgCnHmP8XbbUQ*@dN40W?R zPuQ08Zl_W316X2+pd(IQWI*f%M-;?QG!Rz5gA;?WSrl*hfml2O=~0B1_FaCYFR8sk z-&W(@KY=Fi`@GNdd;ZVw|M>{$&4eK$ArVQ5NKQl&A`&~F35bX#q5&eZ5>X!!^$^i3 zBC->a!{4Pbu|EQkW1T=p6A{1zAcXsMotIk&zW@v1*npXcdVK}pE9g-~q#_~?sITj} zkLNb<%y}BT=Hm+*nhYVL@L@E`Yq1dq0Y^I#b@HJNAJEY1I42eS<{^(=K{22Vz>i27 zZ=k_j&;iEwt^`I3x`6Kx9lKpxS_)5q2>B)gMPi-~ZW33}0Yo(22S3be zG#YtDMaBNHW5-4@41+K}C@jkkI2?|i2M->6HDkt%JR*`gU)h}62lae81&qBg2!0UWatAJAGnO8@FuKQs|_wLEI-IXQU;4<2kGB82%tZdX=TE{>0n&lZV9!OhLhe=`^i*L6DGSKQ=gv-$4n z)2H)NQ&aEqTo+XQ8hH!1ON3|enUAo|&CR;0Q>Ui)_4PFe1_u7xYPABWyT@SwQCnN$VcPgwFv{ET~Gs=n^%d6 zi5Xp0RaFoe7&y1MxcE04Hf;De5s8NRu#Mo$V=9&S@R>kUVn1bs8PWJfnbUkJ8-8UKwc4Wsfq<#2tILjwiNS)dbAW10cX#*Ez`(#?bai$8Ywp~+pFeu^2(==_ zk&==UQdCrQPAC-0<#PEfi^YO(_;?T-2EE5~uZ(qX6_wo)L+|=15LX4n1_}(0;jG9?39_ z6hWe=r{}&{ELO5C+dD8Y&?}eA2bD1}Fwki<8jEvsaw!w?5`;VY*dMMXukQc_a>E))u-7K^3n{Q2_-*REZAmE$T$HHAVkrlzLm zw`#R|twFVmb8Xg|L#cH)$proLnAlco!cmJePsS-sZ(b(43*5V~gmK3zKvORk&IurZr$>-va&8e{Q8i)Y-(!SICJLA z&l(#W^P-}nKr_xi_ct^&{4Odg>Wjw4#{8(Ls6r2*UlP#^PW{NGk%M@uTr4chKI-Y| zXN+9YLy5+xkj9wj$fLR4yMx96w8XeRg}*d-o8N&J zXpIe3R-XLe52=@j6NW*K*vsQI^h4>IdTjTOR4IJl{b{&2kM7l5c?00M2^g-g@iw{3 z&Gkk%0o)|uI66?+0IxQKpF4pQKtn)T=YPx$Gf6~2R47x0(7j6oK@bJ-nb}=?!Nx`uKMITF_LeIw>=Z>oZ1hjC6-zrUB3Q)F zQbDY&Z3HbWtxUoh6G&+x*onvyFgvqyLPSOJmBah-V9;7Sj)=?5e3Yi?Bm5Io;Z$20N_w-J?p){ z27t9{wR-2ATLgezrPQGJeh(2hDwWF1C(N;PZa9RnqqSaO=Bp6GEdVSTV@5lj&SsWn zj!?lL0o6VaTAyb)0kGncX~+wP)YVSX$Yi(^Wu10tGX=Cb#`RIk^czdr08 XLdt}e{UV|;00000NkvXXu0mjf^p~J3 literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-mdpi/ic_expend_up.png b/common/src/main/res/mipmap-mdpi/ic_expend_up.png new file mode 100644 index 0000000000000000000000000000000000000000..983c252517081cdb84b709488ee1f19f0aae9ac4 GIT binary patch literal 366 zcmV-!0g?WRP)Px$C`m*?R47wzkUvYqP!z@QdBkWP(jj*1kf9%-ea#2xSacOf7Y7GXP(jp1TvP-t zCt4li z{P71@V5`-d^*rwYz!4GU%)IjpUJ{WH;J7G?)8TOVW%UZwTAu^hC8Bo`Su@5w*nrl0 z1;8B<&5Ou|F=npOKYwB0PMqWBDz7h+qEOqn0Yx((-$I=X`rpu>2&%^sYhGq2fKD^wpkych5!Hn M07*qoM6N<$f@e0O`Tzg` literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xhdpi/icon_live_close_4.png b/common/src/main/res/mipmap-xhdpi/icon_live_close_4.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a646c2c4587090bc28695ea906381c42e31713 GIT binary patch literal 1777 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 literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xxhdpi/ic_expend_up.png b/common/src/main/res/mipmap-xxhdpi/ic_expend_up.png new file mode 100644 index 0000000000000000000000000000000000000000..d75a1b232125e5b2294d2ffa6fb896ecbd772c09 GIT binary patch literal 950 zcmV;n14;aeP)X1^@s6M=iWq00001b5ch_0Itp) z=>Px&a7jc#R9HvVmrsZkM-;~2d(}MyCP9J+2?_>Wg~+heU0r)n4=#$V=*5G2QoI;J z0uez-@GfX_i5>*egZSqV6~u!I8cjU7vopQhT?>*xR79enpac_9VY~aq3bQi1cJ|9;U|tf@`Y;S{ z&IWc?pq}S>LWti0VD1bM&xvR-3`5;5Y}cSt%CCs%_vv!mKuj7qjmh-fGb!{HA1LC2s?3o>%g>-4bZ`e%qZI669dyOaGLfl4X+5b;jY z0nEI{aU4j~^m@TME|p44Yqi?lc46BF^?hFnA#O19XO`d-S(fdH)Hggl{GjM&3qeiA zAtGbcHlIw=G~K1OK3;T)l=5ptJOTiYW!-Zj#HykSW(BQQt4m$iz0S-FZE~k+x-E*L z)9vJ#QfeC_o-9a%hs~VLZDevmtJUfP$8qifK-uyTOipgpT3>7ja&k=&1RD|YLO~k5 zc3roxR;xXl9`_y4=EJ#Vx*!XLk$bn++DO^)P)dEn%s&;R!QZayuAE-Mrhrx|mBr<9 z`4<5A(kA!B#KcamwXvP9hf-=MA|5SBgZs?9c5H0SsQUkS3tFjE=9kN5W5Ayl$h}2t zeXeW5mW@)%EkcN&3t;~hLM*A*>rdW-HY?6ZL0L?hd2bX&MzWp_rPLl~{t*Cd*7uZ| zmq$@_7lR=90sxE!EwRa+B+2eLjt}>Yuq99s1m634U z$yTlPnfC!X8FOG@U@HKe%7bnG)?7uU6kF`V$h|L$q95KTWQ%ou_ogq{Z%Kn!=0^Vl zfGMWltli(oaeVMYK(@jX(Se+seTY)ZbwqTf^;WYi+dkO^eMnGqmg%|>@x&xgQ~II* Y0NQ+07yERHH~;_u07*qoM6N<$fb%7 literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_expend_down.png b/common/src/main/res/mipmap-xxxhdpi/ic_expend_down.png new file mode 100644 index 0000000000000000000000000000000000000000..3432b8e1b1848634e21a172b7da5d9ce80add403 GIT binary patch literal 455 zcmV;&0XY7NP)Px$fk{L`R9Hvl*xhY|Fc1LX3tk{2bOcL?_ofqcl}ywT+6_7Y5A_JyAbCgFsUsQ% zu<_p=Tou3YfF*Ho}lfXzz8Fxl=4Lg@c{r50QSGnufFe(N~zO-_!++V@5rIU z&wzV0U8<@&v~8<6L#32b2=VQT|BkHd`V#=&JrLH=1>lYIh%|wbVhIfar^vHosHbjL z&=}wpY3K86#JXbvjRlU73mcEiy(u&WXpFgxQb^M@Qfuwnq1ZrEfm-XstQg=7%>gQ< zl(XXD2+akK*5q_Pa)Oos7m@ZQ2WTlUh};^A0gOU!1;qkJBiDvv0+WzyL9v0!NNOkr zFbhcqr2=Lnv7wZ}A|w`+8d!`hg{}caLFPict^?1V%Px$Ye_^wR9Hvd*vnDFFc1ddl{LOo0wsvp1ppOL3k^|1sDKpU11fwH75*h~HZmEQg40@0T}$8h4~Y0tBFQ9R z4sMRA6fzn}fh&oO0#f2iA%lS&xDv=9ASaF+=>?X+aUxfNC2?HHtH3RA9LPoBmN;tU zA7BkQO5_EwCL9&=2UsJH0yzO|#^oZ#=~DJHq_cPPoEv%OslYeTQ9qAu(2X%W(RJM( z0A73_vo$U;$%6ypf59anM+Y3&wr4HL{SF~;yP^ZS>x0Lo6l=vrB>8^zkf|N#Ln7j6 bt=$~~rg`j6OjPy300000NkvXXu0mjf7=5o5 literal 0 HcmV?d00001 diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java index 29b6c00d2..c5a5857fd 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java @@ -4,6 +4,7 @@ import static android.text.TextUtils.isEmpty; import android.content.Context; import android.graphics.drawable.Drawable; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -74,7 +75,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter { @NonNull @Override public Vh onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new Vh(mInflater.inflate(R.layout.item_live_user, parent, false)); + return new Vh(mInflater.inflate(R.layout.item_live_user1, parent, false)); } @Override @@ -115,6 +116,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter { if (payload == null) { ImgLoader.display2(mContext, userBean.getAvatar(), mAvatar,100,100); + Log.i("LiveUserAdapter", "setData:设置头像"+ userBean.getAvatar()); // ImageLoadUtils.loadUrl(userBean.getAvatar(),32,32,mAvatar); } gift_svga.setImageDrawable(null); @@ -149,6 +151,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter { if (mList != null && list != null && list.size() > 0) { mList.clear(); mList.addAll(list); + Log.i("LiveUserAdapter", "refreshList:"+list.size()); notifyDataSetChanged(); } } 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 adb719a8b..bebcf0281 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -381,7 +381,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private List wishlist = new ArrayList<>(); private TextView mHourRank, mHotText; private LinearLayout msg; //默认悬浮窗布局 - private LinearLayout mAnchorLayout, liveRankPk2; + private View mAnchorLayout; + private LinearLayout liveRankPk2; private ImageView mGoodNumberIcon; private View msg2; //悬浮窗来私信的布局 private ConstraintLayout msgLayout; //悬浮窗 @@ -1799,7 +1800,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis room_hot = (TextView) findViewById(R.id.room_hot); fans = (TextView) findViewById(R.id.fans); fans_btn = (LinearLayout) findViewById(R.id.fans_btn); - mAnchorLayout = (LinearLayout) findViewById(R.id.group_1); + mAnchorLayout = findViewById(R.id.group_1); liveRankPk2 = (LinearLayout) findViewById(R.id.live_rank_pk2); mGoodNumberIcon = (ImageView) findViewById(R.id.good_nub_ico); pkRankLayout = (FrameLayout) findViewById(R.id.live_rank_pk); @@ -4040,10 +4041,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); +// 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); } @@ -4055,10 +4056,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void setGuardIcon(GuardUserModel model) { if (model != null && !TextUtils.isEmpty(model.getGuardUserAvatar())) { guardUserModel = model; - ViewGroup.LayoutParams params = userGuard.getLayoutParams(); - params.height = DpUtil.dp2px(30); - params.width = DpUtil.dp2px(30); - userGuard.setLayoutParams(params); +// ViewGroup.LayoutParams params = userGuard.getLayoutParams(); +// params.height = DpUtil.dp2px(30); +// params.width = DpUtil.dp2px(30); +// userGuard.setLayoutParams(params); ImgLoader.displayAvatar(mContext, model.getGuardUserAvatar(), userGuard); gift_svga.setVisibility(View.VISIBLE); } diff --git a/live/src/main/res/drawable/bg_live_add.xml b/live/src/main/res/drawable/bg_live_add.xml new file mode 100644 index 000000000..d0c0e5d52 --- /dev/null +++ b/live/src/main/res/drawable/bg_live_add.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_live_item_an.xml b/live/src/main/res/drawable/bg_live_item_an.xml index f94242069..7053a2004 100644 --- a/live/src/main/res/drawable/bg_live_item_an.xml +++ b/live/src/main/res/drawable/bg_live_item_an.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/live/src/main/res/layout/item_live_user.xml b/live/src/main/res/layout/item_live_user.xml index 23eaf33f4..992d4dc4e 100644 --- a/live/src/main/res/layout/item_live_user.xml +++ b/live/src/main/res/layout/item_live_user.xml @@ -2,6 +2,7 @@ @@ -47,7 +48,8 @@ android:layout_height="16dp" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" - android:visibility="gone" /> + android:visibility="gone" + tools:visibility="visible"/> + android:visibility="gone" + tools:visibility="visible"/> \ No newline at end of file diff --git a/live/src/main/res/layout/item_live_user1.xml b/live/src/main/res/layout/item_live_user1.xml new file mode 100644 index 000000000..1e2900005 --- /dev/null +++ b/live/src/main/res/layout/item_live_user1.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 26d9f60b9..9e4c365eb 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -8,174 +8,181 @@ android:layout_marginBottom="45dp" android:paddingTop="15dp"> - + android:layout_height="40dp" + android:layout_marginTop="25dp"> - + android:layout_width="0dp" + android:layout_height="38dp" + android:layout_marginStart="12dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="3.852" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintWidth_percent="0.33" + tools:background="@drawable/bg_live_item_an" /> - + - + - - - + - + - + - + - - + - - - - - - - - + + android:layout_marginEnd="12dp" + android:src="@mipmap/icon_live_close_4" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file