zlzw ff7bfc040d Merge branch 'dev_Memory' into dev_test ... # Conflicts: # app/src/main/java/com/shayu/phonelive/AppContext.java # common/src/main/java/com/yunbao/common/glide/ImgLoader.java # dependencies.gradle # live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java # live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java # main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java # main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java		2022-09-22 14:43:57 +08:00
app	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +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_Memory' into dev_test	2022-09-22 14:43:57 +08:00
FaceUnity	解决冲突	2022-09-22 13:50:46 +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	androidx版本首次提交	2022-07-18 15:31:45 +08:00
live	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +08:00
main	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +08:00
video	11111	2022-07-29 16:04:12 +08:00
.gitignore	androidx版本首次提交	2022-07-18 15:31:45 +08:00
build.gradle	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +08:00
config.gradle	Merge branch 'dev_FaceUnity'	2022-09-22 13:41:13 +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	新接入FaceUnity美颜SDK	2022-09-17 16:54:58 +08:00