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-07 15:16:48 +08:00
parent 121f07fa45
commit 4c4d53196a
5 changed files with 33 additions and 32 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 # 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.app.CoreComponentFactory { <init>(); }
-keep class androidx.core.content.FileProvider { <init>(); } -keep class androidx.core.content.FileProvider { <init>(); }
-keep class androidx.core.content.FileProvider4Utils { <init>(); } -keep class androidx.core.content.FileProvider4Utils { <init>(); }
@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-keepclassmembers class * { *** videoEditClick(android.view.View); } -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 # 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\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.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 # 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. # Generated keep rule for Lifecycle observer adapter.
-if class com.lxj.xpopup.core.BasePopupView { -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 # 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 # 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* -keepattributes *Annotation*

1
live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
View File

@ -386,6 +386,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
+"Lv."+level+" | "+(WordUtil.isNewZh()?"差 "+levelExp+" 經驗升級":levelExp+" experience points to level up"); +"Lv."+level+" | "+(WordUtil.isNewZh()?"差 "+levelExp+" 經驗升級":levelExp+" experience points to level up");
} }
anchor_level.setText(tips +"2132141242353454356465465464564564575GHFHFGHFGHFGHFGHFGHFG4"); anchor_level.setText(tips +"2132141242353454356465465464564564575GHFHFGHFGHFGHFGHFGHFG4");
anchor_level.invalidate();
} }
if(!StringUtil.isEmpty(hot_strategy)){ if(!StringUtil.isEmpty(hot_strategy)){
List<HotStrategyBean> hotStrategyBeanList = JSON.parseArray(hot_strategy, HotStrategyBean.class); List<HotStrategyBean> hotStrategyBeanList = JSON.parseArray(hot_strategy, HotStrategyBean.class);

4
live/src/main/res/layout/dialog_user_more_list.xml
View File

@ -154,7 +154,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:text="@string/enjoy_a_lot" android:text="@string/enjoy_a_lot"
android:textColor="#ffc2dff0" android:textColor="#ffc2dff0"
android:textSize="12sp" /> android:textSize="12sp" />
@ -163,7 +163,7 @@
android:id="@+id/btn" android:id="@+id/btn"
android:layout_width="93dp" android:layout_width="93dp"
android:layout_height="33dp" android:layout_height="33dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"

2
live/src/main/res/layout/item_live_chat.xml
View File

@ -270,7 +270,7 @@
android:layout_marginEnd="11dp" android:layout_marginEnd="11dp"
android:layout_weight="0" android:layout_weight="0"
android:clickable="false" android:clickable="false"
android:src="@mipmap/btn_attention" /> android:src="@mipmap/live_icon_focus" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

46
live/src/main/res/layout/view_live_end.xml
View File

@ -36,9 +36,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="180dp" android:layout_height="180dp"
android:layout_below="@id/text_1" android:layout_below="@id/text_1"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="100dp" android:layout_marginTop="100dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:background="@drawable/bg_live_end" android:background="@drawable/bg_live_end"
android:orientation="vertical"> android:orientation="vertical">
@ -156,9 +156,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_below="@id/group" android:layout_below="@id/group"
android:layout_marginLeft="50dp" android:layout_marginStart="50dp"
android:layout_marginTop="50dp" android:layout_marginTop="50dp"
android:layout_marginRight="50dp" android:layout_marginEnd="50dp"
android:background="@drawable/login_btn" android:background="@drawable/login_btn"
android:gravity="center" android:gravity="center"
android:text="@string/live_back" android:text="@string/live_back"
@ -431,7 +431,7 @@
android:id="@+id/anchor_name" android:id="@+id/anchor_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="14dp" android:layout_marginStart="14dp"
android:layout_toEndOf="@+id/image_anchorLayout" android:layout_toEndOf="@+id/image_anchorLayout"
tools:text="用户名称" tools:text="用户名称"
android:textColor="@color/white" android:textColor="@color/white"
@ -450,18 +450,18 @@
android:id="@+id/anchor_level" android:id="@+id/anchor_level"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="14dp" android:layout_marginStart="14dp"
android:layout_weight="1" android:layout_weight="1"
tools:text="主播等级Lv.1 | 差600經驗升級" tools:text="主播等级Lv.1 | 差600經驗升級"
android:textColor="#898989" android:textColor="#898989"
android:textSize="9sp" /> android:textSize="10sp" />
<TextView <TextView
android:id="@+id/my_level" android:id="@+id/my_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/live_duration_anchor" android:layout_below="@+id/live_duration_anchor"
android:layout_marginLeft="14dp" android:layout_marginStart="14dp"
android:layout_toEndOf="@+id/image_anchorLayout" android:layout_toEndOf="@+id/image_anchorLayout"
android:text="@string/live_end_level" android:text="@string/live_end_level"
android:textColor="@color/white" android:textColor="@color/white"
@ -495,9 +495,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/level_progress" android:layout_below="@id/level_progress"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -530,7 +530,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/live_end_view_ban_reason" android:text="@string/live_end_view_ban_reason"
android:textColor="#E5E5E5" android:textColor="#E5E5E5"
@ -541,7 +541,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="17dp" android:layout_marginEnd="17dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1.5" android:layout_weight="1.5"
android:gravity="end" android:gravity="end"
@ -562,7 +562,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/live_end_view_ban_content" android:text="@string/live_end_view_ban_content"
android:textColor="#E5E5E5" android:textColor="#E5E5E5"
@ -572,7 +572,7 @@
android:id="@+id/ban_content" android:id="@+id/ban_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="17dp" android:layout_marginEnd="17dp"
android:gravity="end" android:gravity="end"
android:text="123\n45678" android:text="123\n45678"
android:textColor="#E5E5E5" android:textColor="#E5E5E5"
@ -590,7 +590,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/live_end_view_ban_timer" android:text="@string/live_end_view_ban_timer"
android:textColor="#E5E5E5" android:textColor="#E5E5E5"
@ -600,7 +600,7 @@
android:id="@+id/ban_timer" android:id="@+id/ban_timer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="17dp" android:layout_marginEnd="17dp"
android:gravity="end" android:gravity="end"
android:text="123\n45678" android:text="123\n45678"
android:textColor="#E5E5E5" android:textColor="#E5E5E5"
@ -661,7 +661,7 @@
android:id="@+id/count3" android:id="@+id/count3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
tools:text="0" tools:text="0"
android:textColor="@color/white" android:textColor="@color/white"
@ -693,7 +693,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/live_data_accept" android:text="@string/live_data_accept"
android:textColor="#92949A" android:textColor="#92949A"
@ -728,7 +728,7 @@
android:id="@+id/count6" android:id="@+id/count6"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
tools:text="0" tools:text="0"
android:textColor="@color/white" android:textColor="@color/white"
@ -760,7 +760,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/live_data_attention_rate" android:text="@string/live_data_attention_rate"
android:textColor="#92949A" android:textColor="#92949A"
@ -794,7 +794,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
tools:text="0" tools:text="0"
android:textColor="@color/white" android:textColor="@color/white"
@ -827,7 +827,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_weight="1"
android:text="打賞人數" android:text="打賞人數"
android:textColor="#92949A" android:textColor="#92949A"
@ -922,7 +922,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="37dp" android:layout_marginStart="37dp"
android:background="@drawable/backgroud_live_end_1" android:background="@drawable/backgroud_live_end_1"
android:gravity="center" android:gravity="center"
android:minWidth="115dp" android:minWidth="115dp"