Martin cbf517bed6 Merge branch 'master' into 声网升级 ...

# Conflicts:
#	common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
#	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/DialogUitl.java
#	common/src/main/java/com/yunbao/common/utils/RouteUtil.java
#	live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
#	main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java

2024-05-22 13:37:33 +08:00

..

src

Merge branch 'master' into 声网升级

2024-05-22 13:37:33 +08:00

.gitignore

新接入FaceUnity美颜SDK

2022-09-17 16:54:58 +08:00

build.gradle

add[声望升级-接入美颜]

2024-04-18 09:47:38 +08:00

consumer-rules.pro

新接入FaceUnity美颜SDK

2022-09-17 16:54:58 +08:00

proguard-rules.pro

新接入FaceUnity美颜SDK

2022-09-17 16:54:58 +08:00