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
parent ab2991a999 1e98de9931
commit 0b0967f84d
1002 changed files with 77384 additions and 61 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ buildscript {
        maven { url 'https://maven.aliyun.com/repository/public' }
        maven { url 'https://maven.aliyun.com/repository/google' }
        maven { url 'https://maven.fabric.io/public' }
+        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
        google()
        mavenCentral()
    }
@@ -36,6 +37,7 @@ allprojects {
        maven { url 'https://maven.aliyun.com/repository/google' }
        maven { url 'http://developer.huawei.com/repo'}//华为库
        maven { url 'https://maven.fabric.io/public' }
+        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
        maven { url "https://jitpack.io" }
        google()  // Google's Maven repository
    }