zlzw b7ba717cb9 Merge branch 'dev_6.5.5' ... # Conflicts: # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java		2023-09-06 10:42:05 +08:00
app	Merge branch 'master_umeng'	2023-09-05 14:18:42 +08:00
baidu	androidx版本首次提交	2022-07-18 15:31:45 +08:00
beauty	多语言切换	2023-04-18 10:30:55 +08:00
common	Merge branch 'dev_6.5.5'	2023-09-06 10:42:05 +08:00
FaceUnity	更新美颜中英文繁体	2023-08-24 13:34:08 +08:00
gradle/wrapper	替换优化后SVGA库	2022-09-13 17:15:33 +08:00
lib_country_code	修复部分机型开播异常问题	2023-07-04 13:03:19 +08:00
libs	更新SVGA库：新增获取动画持续时间方法	2022-10-10 16:10:15 +08:00
live	Merge branch 'dev_6.5.5'	2023-09-06 10:42:05 +08:00
main	Merge branch 'master_umeng'	2023-09-05 14:18:42 +08:00
pluginsForAnchor	新增插件模块管理	2023-06-14 13:41:12 +08:00
Share	调整直播间分享链接	2023-06-16 15:30:21 +08:00
video	Merge branch 'master_umeng'	2023-09-05 14:18:42 +08:00
.gitignore	androidx版本首次提交	2022-07-18 15:31:45 +08:00
build.gradle	6.5.4礼物冠名	2023-08-22 14:03:04 +08:00
config.gradle	Merge branch 'master_umeng'	2023-09-05 14:18:42 +08:00
dependencies.gradle	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +08:00
gradle.properties	update 6.5.5	2023-08-24 14:26:38 +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	移除百度语言残留内容	2023-07-17 13:35:59 +08:00