Martin 0252963b2e Merge remote-tracking branch 'origin/声网升级' into 声网升级 ... # Conflicts: # live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java		2024-05-28 17:13:59 +08:00
app	fix[声望升级-修复BUG]	2024-05-28 17:12:52 +08:00
baidu	androidx版本首次提交	2022-07-18 15:31:45 +08:00
beauty	多语言切换	2023-04-18 10:30:55 +08:00
common	Merge remote-tracking branch 'origin/声网升级' into 声网升级	2024-05-28 17:13:59 +08:00
FaceUnity	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
gradle/wrapper	替换优化后SVGA库	2022-09-13 17:15:33 +08:00
IAP6Helper	三星内购	2023-12-07 17:46:22 +08:00
lib_country_code	lib_google	2023-11-28 18:28:47 +08:00
lib_faceunity	fix[声望升级-修复BUG]	2024-05-28 17:12:52 +08:00
lib_google	移除友盟SDK	2024-05-08 11:34:56 +08:00
lib_huawei	修复支付问题	2023-11-30 16:15:23 +08:00
libs	替换友盟为本地aar	2024-05-08 09:52:35 +08:00
live	Merge remote-tracking branch 'origin/声网升级' into 声网升级	2024-05-28 17:13:59 +08:00
main	fix[声望升级-修复BUG]	2024-05-28 17:12:52 +08:00
pluginsForAnchor	add[声望升级-接入美颜]	2024-04-18 09:47:38 +08:00
Share	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
video	移除友盟SDK	2024-05-08 11:34:56 +08:00
.gitignore	androidx版本首次提交	2022-07-18 15:31:45 +08:00
build.gradle	add[声望升级-接入美颜]	2024-04-18 09:47:38 +08:00
config.gradle	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
dependencies.gradle	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +08:00
gradle.properties	fix[声望升级-修复BUG]	2024-05-28 13:44:44 +08:00
gradlew	androidx版本首次提交	2022-07-18 15:31:45 +08:00
gradlew.bat	androidx版本首次提交	2022-07-18 15:31:45 +08:00
hdl.jks	androidx版本首次提交	2022-07-18 15:31:45 +08:00
settings.gradle	add[声望升级-接入美颜]	2024-04-18 09:47:38 +08:00