Merge branch 'yinyou_v3.6.4' into yinyou_develop

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
#	app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt
#	app/src/main/res/layout/layout_room_pk_board_view.xml
#	core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
#	core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java

core/build.gradle

@@ -105,6 +105,8 @@ dependencies {
     api project(':nim_uikit')
     api project(':library')
     api project(':agora-ktv-kit-release')
+    api 'com.tencent.liteav:LiteAVSDK_TRTC:latest.release'
+
 }
 repositories {
     mavenCentral()