Merge branch 'dev_6.5.0_anchor_call_me'

Browse Source

# Conflicts:
#	common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

...

This commit is contained in:

zlzw

2023-03-30 11:31:32 +08:00

parent 9472ccf6c8 ce2048b9a5

commit 6d83c6f8ae

95 changed files with 3684 additions and 99 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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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