Merge branch 'refs/heads/for_master_0829_体积优化' into 6.8.2

# Conflicts:
#	common/build.gradle
#	lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java
#	main/src/main/res/mipmap-xxxhdpi/login_twitter.png

common/build.gradle

@@ -173,10 +173,13 @@ dependencies {
 
     api 'com.squareup.picasso:picasso:2.5.2'
     api "com.immomo.cosmos.mediax:beautyutils:2.2.1_01071700"
+    // 腾讯播放器 liteavsdk.jar、libtxffmpeg.so、libliteavsdk.so、libtxsoundtouch.so https://cloud.tencent.com/document/product/881/81205
     api files('libs/liteavsdk.jar')
-    api 'com.xw.repo:bubbleseekbar:3.20-lite'
-    //腾讯im
+    //腾讯im libImSDK.so https://cloud.tencent.com/document/product/269/75283
     api 'com.tencent.imsdk:imsdk-plus:5.4.666'
+
+    api 'com.xw.repo:bubbleseekbar:3.20-lite'
+
     api 'com.google.code.gson:gson:2.8.8'
 
     //此处以集成 5.1.2 版本为例
@@ -186,6 +189,7 @@ dependencies {
     api 'cn.rongcloud.sdk:im_kit:5.7.0' // 即时通讯 UI 基础组件
     //融云小视频模块
     api 'cn.rongcloud.sdk:sight:5.7.0'
+
     api 'com.facebook.android:facebook-android-sdk:15.2.0'
     implementation 'com.facebook.android:facebook-android-sdk:15.2.0'
 

common/src/main/java/com/yunbao/common/Constants.java

@@ -315,4 +315,11 @@ public class Constants {
     public static boolean isShowLiveDialog = false;//是否在直播间打开单聊
     public static int firstInto = 0;//
 
+    // 声网so
+    public static final String DOWNLOAD_Agora_SO = "agora_lib";
+    public static final String Agora_SO_Name = "agora_lib.zip";
+    // 美颜SO
+    public static final String DOWNLOAD_FaceUnity_SO = "faceunity_lib";
+    public static final String FaceUnity_SO_Name = "faceunity_lib.zip";
+
 }