From 88cf7ca74b18bec8a2a1e7cb3011bc04f78ca259 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Fri, 11 Oct 2024 17:30:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=B0=81=E9=9D=A2=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E4=B8=BA=E5=88=87=E6=8D=A2=E5=B0=81=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/tmp/full-r8-config.txt | 12 ++++++------ .../live/views/LiveNewReadySwViewHolder.java | 8 ++++---- .../yunbao/live/views/LiveRoomViewHolder.java | 2 -- .../main/res/drawable/bg_chang_live_cover.xml | 17 +++++++++++++++++ live/src/main/res/layout/view_live_room.xml | 13 +++++-------- .../src/main/res/layout/view_new_live_ready.xml | 13 ++++++++++--- 6 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 live/src/main/res/drawable/bg_chang_live_cover.xml diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index a9c636796..b0731b31e 100644 --- a/app/tmp/full-r8-config.txt +++ b/app/tmp/full-r8-config.txt @@ -421,7 +421,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # End of content from D:\AndroidProject\pandorapan\app\proguard-rules.pro -# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt -keep class androidx.core.app.CoreComponentFactory { (); } -keep class androidx.core.content.FileProvider { (); } -keep class androidx.core.content.FileProvider4Utils { (); } @@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keepclassmembers class * { *** videoEditClick(android.view.View); } -# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\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 { @@ -1157,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\pandorapan\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\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\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/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java index 17378f3c4..6d58671c4 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java @@ -193,10 +193,10 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl } }); - if (mAvatarFile == null) { - mCoverText.setText(mContext.getString(R.string.live_cover_2)); - mCoverText.setBackground(ContextCompat.getDrawable(mContext, R.drawable.bg_live_cover)); - } +// if (mAvatarFile == null) { +// mCoverText.setText(mContext.getString(R.string.live_cover_2)); +// mCoverText.setBackground(ContextCompat.getDrawable(mContext, R.drawable.bg_live_cover)); +// } mAvatarFile = file; } } 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 c895d2f18..dfc28a828 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -6249,8 +6249,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) newMessage.getLayoutParams(); RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) atMessage.getLayoutParams(); if (atMessage.getVisibility() == View.VISIBLE) { - - if (fastMsgRecyclerView.getVisibility() == View.VISIBLE) { params2.bottomMargin = DpUtil.dp2px(68); } else { diff --git a/live/src/main/res/drawable/bg_chang_live_cover.xml b/live/src/main/res/drawable/bg_chang_live_cover.xml new file mode 100644 index 000000000..4f396039d --- /dev/null +++ b/live/src/main/res/drawable/bg_chang_live_cover.xml @@ -0,0 +1,17 @@ + + + + + + + \ 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 a63dc084b..62ad0dd64 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -20,10 +20,9 @@ android:layout_height="match_parent" android:layout_marginStart="12dp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintDimensionRatio="3.852" + app:layout_constraintDimensionRatio="3.95" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_percent="0.33" android:background="@drawable/bg_live_item_an" />