zlzw 3a980d22fd Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me ... # Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java		2023-03-28 11:01:58 +08:00
app	新增设置联系方式相关UI	2023-03-24 10:52:44 +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_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me	2023-03-28 11:01:58 +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	update	2022-09-22 13:57:15 +08:00
libs	更新SVGA库：新增获取动画持续时间方法	2022-10-10 16:10:15 +08:00
live	Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me	2023-03-28 11:01:58 +08:00
main	Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me	2023-03-28 11:01:58 +08:00
video	Js调用原生整改	2022-11-11 18:32:35 +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-03-17 14:52:55 +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