Merge branch 'master' into dev_20221020

# Conflicts:
#	settings.gradle

common/build.gradle

@@ -189,4 +189,7 @@ dependencies {
     implementation 'com.github.tajchert:WaitingDots:0.6.1'
     //悬浮窗
     api 'com.github.princekin-f:EasyFloat:2.0.4'
+
+
+//    api project(path: ':recognizer')
 }

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) {

common/src/main/res/layout/view_live_total.xml

@@ -266,6 +266,27 @@
                     android:textColor="#FF9A9A9A"
                     android:textSize="12sp" />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/float_settings_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="23dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:src="@mipmap/live_more_icon_fenestrule" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/small_window"
+                    android:textColor="#FF9A9A9A"
+                    android:textSize="12sp" />
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/system_notice"

common/src/main/res/values/strings.xml

@@ -926,4 +926,10 @@
     <string name="star_change">%s星挑战</string>
     <string name="star_success">恭喜 %s，完成了%s %s星 挑戰，快去一睹主播芳容吧！</string>
     <string name="star">星</string>
+    <string name="small_window_settings">小窗播放設置</string>
+    <string name="small_window">小窗播放</string>
+    <string name="app_window">APP內小窗播放</string>
+    <string name="app_window_hint">讓直播間內容在本APP主頁面中小窗播放</string>
+    <string name="system_window">APP全應用小窗播放</string>
+    <string name="system_window_hint">讓直播間內容在所有APP及頁面中小窗播放</string>
 </resources>