Merge branch 'master' into dev_6.5.4_tmp

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/java/com/yunbao/common/utils/JavascriptInterfaceUtils.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
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

...

This commit is contained in:

zlzw

2023-08-04 15:41:11 +08:00

parent fe921e25bb 45c256cbbb

commit bf8d88608d

203 changed files with 9611 additions and 285 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

live/src/main/res/mipmap-xxxhdpi/background_gift_wall_title.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

live/src/main/res/mipmap-xxxhdpi/background_giftwall_tab.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 27 KiB

BIN

live/src/main/res/mipmap-xxxhdpi/background_regular_title.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 28 KiB

BIN

live/src/main/res/mipmap-xxxhdpi/bg_blind_bottom.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

live/src/main/res/mipmap-xxxhdpi/icon_following_anchor.png Normal file

Binary file not shown.

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

BIN

live/src/main/res/mipmap-xxxhdpi/icon_regular_bubble.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

live/src/main/res/mipmap-xxxhdpi/icon_what.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.2 KiB

BIN

live/src/main/res/mipmap-xxxhdpi/live_icon_leftt_sliding.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 331 B After Width:  |  Height:  |  Size: 357 B