Go to file
zlzw 0b0967f84d Merge branch 'dev_FaceUnity'
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/res/layout/view_live_room.xml
2022-09-22 13:41:13 +08:00
app Merge branch 'dev_FaceUnity' 2022-09-22 13:41:13 +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_FaceUnity' 2022-09-22 13:41:13 +08:00
FaceUnity 补充注释及移除部分未用到代码 2022-09-22 13:35:45 +08:00
gradle/wrapper androidx版本首次提交 2022-07-18 15:31:45 +08:00
lib_country_code androidx版本首次提交 2022-07-18 15:31:45 +08:00
libs androidx版本首次提交 2022-07-18 15:31:45 +08:00
live Merge branch 'dev_FaceUnity' 2022-09-22 13:41:13 +08:00
main Merge branch 'dev_FaceUnity' 2022-09-22 13:41:13 +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_FaceUnity' 2022-09-22 13:41:13 +08:00
config.gradle Merge branch 'dev_FaceUnity' 2022-09-22 13:41:13 +08:00
dependencies.gradle 新接入FaceUnity美颜SDK 2022-09-17 16:54:58 +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