Merge branch 'master' into master_sud

Browse Source

# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	config.gradle

...

This commit is contained in:

18401019693

2023-10-07 14:46:22 +08:00

parent 916a1447f0 20ccb37ccf

commit c3d4cb8d62

58 changed files with 1184 additions and 157 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

common/src/main/res/mipmap-mdpi/ic_open_ad_close.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 807 B

BIN

common/src/main/res/mipmap-mdpi/icon_rank_top_box.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.0 KiB After Width:  |  Height:  |  Size: 22 KiB