Merge branch 'master' into dev_20221020

# Conflicts:
#	settings.gradle

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

@@ -1,5 +1,7 @@
 package com.yunbao.common.manager.imrongcloud;
 
+import static com.yunbao.common.CommonAppContext.isReady;
+
 import android.app.Application;
 import android.content.Context;
 import android.util.Log;
@@ -17,8 +19,6 @@ import com.yunbao.common.manager.IMLoginManager;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.util.ArrayList;
-
 import io.rong.imkit.GlideKitImageEngine;
 import io.rong.imkit.IMCenter;
 import io.rong.imkit.RongIM;
@@ -26,9 +26,7 @@ import io.rong.imkit.config.RongConfigCenter;
 import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
-import io.rong.imlib.model.MessageContent;
-
-import static com.yunbao.common.CommonAppContext.isReady;
+import io.rong.recognizer.Recognizer;
 
 /**
  * 会话列表
@@ -38,13 +36,14 @@ public class RongcloudIMManager {
     //融云开发者平台注册app唯一识别符
 //    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
     //测试环境
-    public static  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")){
+        if (CommonAppConfig.HOST.contains("ceshi")) {
             RONG_IM_KEY = "pvxdm17jpd3hr"; //测试服key
-        }else{
+        } else {
             RONG_IM_KEY = "uwd1c0sxu1p71"; //正式服key
         }
     }
@@ -61,13 +60,13 @@ public class RongcloudIMManager {
 
         Log.e(CLASSNAME, "initRongIM:");
         initPhotoGlide();
-
+        //初始化科大讯飞语音转文字
+        Recognizer.setAppId("af2efca9");
     }
 
     private static RongIMClient.OnReceiveMessageWrapperListener mListener;
 
     /**
-     *
      * 设置消息接受监听器
      */
     public static void addRongcloudIMOnReceiveMessageListener(RongIMClient.OnReceiveMessageWrapperListener listener) {