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

Merge branch 'master_umeng'

Browse Source 
# Conflicts:
#	app/proguard-rules.pro
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
This commit is contained in:
18401019693
2023-09-05 14:18:42 +08:00
parent a5b0ee757c 82fd35305a
commit 0721ff4f37
55 changed files with 756 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/res/layout/view_full_service_notification.xml
View File

@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="19dp"
android:layout_marginStart="75dp"
android:layout_marginTop="42dp"
android:layout_marginEnd="20dp"
android:layout_toStartOf="@+id/goto_room_view"