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/config.gradle
+++ b/config.gradle
@@ -1,9 +1,9 @@
 ext {
    android = [
-            compileSdkVersion: 30,
+            compileSdkVersion: 31,
            buildToolsVersion: "28.0.3",
            minSdkVersion    : 21,
-            targetSdkVersion : 30,
+            targetSdkVersion : 31,
            versionCode      : 212,
            versionName      : "6.4.0"
    ]