Merge branch 'dev_FaceUnity'

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

common/build.gradle

@@ -152,12 +152,14 @@ dependencies {
     //腾讯im
     api 'com.tencent.imsdk:imsdk-plus:5.4.666'
     api 'com.google.code.gson:gson:2.8.8'
-    api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库
+    //api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库
+    api 'cn.rongcloud.sdk:call_lib:5.2.5' // 音视频呼叫能力库（内含 rtc_lib)
+    api 'cn.rongcloud.sdk:call_kit:5.2.5' // 音视频通话能力 UI 组件
     //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_lib:5.1.3.10' // 即时通讯基础能力库
-    api 'cn.rongcloud.sdk:im_kit:5.1.3.10' // 即时通讯 UI 基础组件
+    api 'cn.rongcloud.sdk:im_lib:5.2.5' // 即时通讯基础能力库
+    api 'cn.rongcloud.sdk:im_kit:5.2.5' // 即时通讯 UI 基础组件
     //融云小视频模块
-    api 'cn.rongcloud.sdk:sight:5.1.2'
+    api 'cn.rongcloud.sdk:sight:5.2.5'
     api 'com.facebook.android:facebook-login:8.2.0'
     implementation 'com.facebook.android:facebook-android-sdk:[8,9)'
 

common/src/main/java/com/yunbao/common/dialog/AbsDialogFragment.java

@@ -29,7 +29,11 @@ public abstract class AbsDialogFragment extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         mContext = new WeakReference<>(getActivity()).get();
-        mRootView = LayoutInflater.from(mContext).inflate(getLayoutId(), null);
+        if (getLayoutId() == 0) {
+            mRootView = getLayoutView();
+        } else {
+            mRootView = LayoutInflater.from(mContext).inflate(getLayoutId(), null);
+        }
         final Dialog dialog = new Dialog(mContext, getDialogStyle());
         dialog.setContentView(mRootView);
         dialog.setCancelable(canCancel());
@@ -47,6 +51,10 @@ public abstract class AbsDialogFragment extends DialogFragment {
         super.onDismiss(dialog);
     }
 
+    protected View getLayoutView() {
+        return null;
+    }
+
     protected abstract int getLayoutId();
 
     protected abstract int getDialogStyle();

common/src/main/java/com/yunbao/common/manager/imrongcloud/PDMessageInterceptor.java

@@ -22,6 +22,7 @@ import io.rong.imkit.userinfo.RongUserInfoManager;
 import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
+import io.rong.imlib.model.MessageContent;
 import io.rong.imlib.model.UserInfo;
 import io.rong.message.TextMessage;
 
@@ -97,4 +98,14 @@ public class PDMessageInterceptor implements MessageInterceptor {
     public boolean interceptOnSentMessage(Message message) {
         return false;
     }
+
+    @Override
+    public boolean interceptOnInsertOutgoingMessage(Conversation.ConversationType type, String targetId, Message.SentStatus sentStatus, MessageContent content, long sentTime) {
+        return false;
+    }
+
+    @Override
+    public boolean interceptOnInsertIncomingMessage(Conversation.ConversationType type, String targetId, String senderId, Message.ReceivedStatus receivedStatus, MessageContent content, long sentTime) {
+        return false;
+    }
 }

common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java

@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.event.RongIMConnectionStatusEvent;
 import com.yunbao.common.manager.IMLoginManager;
@@ -37,9 +38,16 @@ public class RongcloudIMManager {
     //融云开发者平台注册app唯一识别符
 //    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
     //测试环境
-    public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
+    public static  String RONG_IM_KEY = "pvxdm17jpd3hr";
 
     private static final String CLASSNAME = "RongcloudIMManager";
+    static {//自动切换key
+        if(CommonAppConfig.HOST.contains("ceshi")){
+            RONG_IM_KEY = "pvxdm17jpd3hr"; //测试服key
+        }else{
+            RONG_IM_KEY = "uwd1c0sxu1p71"; //正式服key
+        }
+    }
 
     /**
      * 融云初始化

common/src/main/res/drawable/bg_live_tota2.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topLeftRadius="12dp" android:topRightRadius="12dp" />
+    <solid android:color="#B3000000" />
+</shape>