Merge remote-tracking branch 'origin/master'

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

@@ -61,7 +61,7 @@ public class RongcloudIMManager {
         Log.e(CLASSNAME, "initRongIM:");
         initPhotoGlide();
         //初始化科大讯飞语音转文字
-        Recognizer.setAppId("af2efca9");
+        Recognizer.setAppId("671d2ae3");
     }
 
     private static RongIMClient.OnReceiveMessageWrapperListener mListener;

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

@@ -11,6 +11,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="24dp"
         android:text="@string/fun_games"
+        android:visibility="gone"
         android:textColor="@color/white"
         android:textSize="14sp" />
 
@@ -18,6 +19,7 @@
         android:id="@+id/fun_games_list"
         android:layout_width="match_parent"
         android:layout_height="62dp"
+        android:visibility="gone"
         android:layout_marginStart="16dp"
         android:layout_marginTop="10dp" />
 

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

@@ -943,4 +943,5 @@
     <string name="alerts">消息通知</string>
     <string name="studio_gift_effects">屏蔽直播間禮物特效</string>
     <string name="studio_ride_effects">屏蔽直播間座駕特效</string>
+    <string name="in_batch">換一批</string>
 </resources>