zlzw 1fc417ec25 Merge branch 'dev_userCard' ... # Conflicts: # main/src/main/java/com/yunbao/main/activity/MainActivity.java		2022-11-09 11:01:45 +08:00
app	调整融云推流参数	2022-11-09 09:44:18 +08:00
baidu	androidx版本首次提交	2022-07-18 15:31:45 +08:00
beauty	1	2022-07-20 14:40:44 +08:00
common	Merge branch 'dev_userCard'	2022-11-09 11:01:45 +08:00
FaceUnity	调整融云推流参数	2022-11-09 09:44:18 +08:00
gradle/wrapper	替换优化后SVGA库	2022-09-13 17:15:33 +08:00
lib_country_code	update	2022-09-22 13:57:15 +08:00
libs	更新SVGA库：新增获取动画持续时间方法	2022-10-10 16:10:15 +08:00
live	Merge branch 'dev_userCard'	2022-11-09 11:01:45 +08:00
main	Merge branch 'dev_userCard'	2022-11-09 11:01:45 +08:00
video	11111	2022-07-29 16:04:12 +08:00
.gitignore	androidx版本首次提交	2022-07-18 15:31:45 +08:00
build.gradle	新增firebase-crashlytics	2022-10-24 17:55:43 +08:00
config.gradle	侧边栏	2022-11-09 09:47:04 +08:00
dependencies.gradle	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +08:00
gradle.properties	androidx版本首次提交	2022-07-18 15:31:45 +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	Merge branch 'master' into dev_20221020	2022-10-20 11:17:52 +08:00