zlzw c1c8921f59 Merge branch 'dev_6.5.2' ... # Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/res/values-en-rUS/string.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-05-17 16:20:10 +08:00
app	fix修复line支付无法唤起app的问题	2023-05-08 14:04:43 +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.2'	2023-05-17 16:20:10 +08:00
FaceUnity	update 机器人	2022-12-22 09:58:43 +08:00
gradle/wrapper	替换优化后SVGA库	2022-09-13 17:15:33 +08:00
lib_country_code	新增通过后端获取国家地区信息接口在注册时自动填写号码编号	2023-04-03 15:15:50 +08:00
libs	更新SVGA库：新增获取动画持续时间方法	2022-10-10 16:10:15 +08:00
live	Merge branch 'dev_6.5.2'	2023-05-17 16:20:10 +08:00
main	Merge branch 'dev_6.5.2'	2023-05-17 16:20:10 +08:00
Share	多语言切换	2023-04-19 14:02:45 +08:00
video	修改，中英文问题（聊天框的中英文修改）	2023-04-25 15:24:57 +08:00
.gitignore	androidx版本首次提交	2022-07-18 15:31:45 +08:00
build.gradle	调整个人名片	2022-11-10 11:17:04 +08:00
config.gradle	新增【非贵族，守护，粉丝牌送礼交互优化】功能	2023-05-10 14:31:15 +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	update	2023-03-21 18:20:11 +08:00