yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

切换封面固定为切换封面

Browse Source
This commit is contained in:
ningwenqiang 2024-10-11 17:30:11 +08:00
parent 1d45fa8d3d
commit 88cf7ca74b
6 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/tmp/full-r8-config.txt
View File

@ -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 { <init>(); }
-keep class androidx.core.content.FileProvider { <init>(); }
-keep class androidx.core.content.FileProvider4Utils { <init>(); }
@ -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*

8
live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
View File

@ -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;
}
}

2
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -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 {

17
live/src/main/res/drawable/bg_chang_live_cover.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="360"
android:endColor="#cc333333"
android:startColor="#cc333333"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="3dp"
android:bottomRightRadius="3dp"
android:topLeftRadius="3dp"
android:topRightRadius="3dp" />
</shape>

13
live/src/main/res/layout/view_live_room.xml
View File

@ -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" />
<com.makeramen.roundedimageview.RoundedImageView
@ -66,12 +65,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/group_1"
app:layout_constraintDimensionRatio="1"
app:layout_constraintBottom_toBottomOf="@id/group_1"
app:layout_constraintEnd_toEndOf="@id/group_1"
app:layout_constraintHorizontal_bias="0.92"
app:layout_constraintStart_toStartOf="@+id/group_1"
@ -80,16 +77,16 @@
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:ellipsize="end"
android:includeFontPadding="false"
android:maxWidth="90dp"
android:maxEms="4"
android:singleLine="true"
android:paddingEnd="2dp"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintEnd_toStartOf="@+id/btn_follow"
app:layout_constraintBottom_toBottomOf="@+id/group_1"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintTop_toTopOf="@id/group_1"

13
live/src/main/res/layout/view_new_live_ready.xml
View File

@ -90,16 +90,23 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"
app:srcCompat="@mipmap/icon_live_ready_add" />
<TextView
android:id="@+id/cover_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:text="@string/live_cover"
android:layout_marginBottom="4dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="7dp"
android:text="@string/live_cover_2"
android:paddingStart="1dp"
android:paddingEnd="1dp"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:singleLine="true"
android:background="@drawable/bg_chang_live_cover"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />