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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
zlzw
2022-08-29 16:51:14 +08:00
parent 24d694ff5e 623e17ae4e
commit 313309ba5d
7 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,8 +7,8 @@
<ImageView
android:id="@+id/wish_pic"
android:layout_width="20dp"
android:layout_height="20dp" />
android:layout_width="17dp"
android:layout_height="17dp" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/wish_index"