zlzw 3a980d22fd Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me ... # 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		2023-03-28 11:01:58 +08:00
..
assets	修复：上下滑动直播间，Pk头像展示在不PK得房间的情况	2022-12-13 16:56:06 +08:00
java/com/yunbao/live	Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me	2023-03-28 11:01:58 +08:00
res	Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me	2023-03-28 11:01:58 +08:00
AndroidManifest.xml	删除埋点（adjust-android）	2022-11-23 17:16:45 +08:00