Merge branch 'dev_FaceUnity'

# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/res/layout/view_live_room.xml

main/build.gradle

@@ -70,6 +70,7 @@ dependencies {
     //短视频
     api project(':video')
     api project(':common')
+    api project(':FaceUnity')
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'
     annotationProcessor rootProject.ext.dependencies["arouter-compiler"]

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -1,5 +1,7 @@
 package com.yunbao.main.activity;
 
+import static com.yunbao.common.CommonAppContext.isReady;
+
 import android.Manifest;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -136,8 +138,6 @@ import io.rong.push.PushManager;
 import io.rong.push.PushType;
 import kotlin.Unit;
 
-import static com.yunbao.common.CommonAppContext.isReady;
-
 @Route(path = RouteUtil.PATH_MAIN)
 public class MainActivity extends AbsActivity implements MainAppBarLayoutListener {
 
@@ -301,6 +301,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         RongIMClient.init(this, RongcloudIMManager.RONG_IM_KEY, true);
         // RTCLib 初始化
         RCRTCConfig.Builder config = RCRTCConfig.Builder.create();
+        config.enableEncoderTexture(false);
         RCRTCEngine.getInstance().init(MainActivity.this, config.build());
         //推送跳直播间
         if (getIntent().getStringExtra("liveid") != null) {