Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me

Browse Source

# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java

...

This commit is contained in:

zlzw

2023-03-28 11:01:58 +08:00

parent 2b56eff39a 6ef8c3778b

commit 3a980d22fd

21 changed files with 460 additions and 142 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-mdpi/ic_live_anchor_say_hide.png Normal file

Binary file not shown.

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

BIN

live/src/main/res/mipmap-mdpi/ic_live_anchor_say_show.png Normal file

Binary file not shown.

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