Merge remote-tracking branch 'origin/master'

live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java

@@ -21,6 +21,7 @@ import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.SpeechRecognizer;
 import com.yunbao.common.dialog.AbsDialogFragment;
+import com.yunbao.common.utils.WordsTypeUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveAudienceActivity;
 
@@ -284,7 +285,8 @@ public class VoiceDialog extends AbsDialogFragment {
                 endOfSpeech();
             }
             builder.append(text);
-            voiceChat.setText(builder);
+
+            voiceChat.setText(WordsTypeUtil.changeTraditional(builder.toString()));
         } catch (JSONException e) {
             e.printStackTrace();
         }

main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java

@@ -152,6 +152,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
         mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height);
         mAdapter.setOnItemClickListener(MainHomeLiveViewHolder.this);
         mAdapter.setHasStableIds(true);//
+        mRefreshView.setLoadMoreEnable(true);
         mRefreshView.setRecyclerViewAdapter(mAdapter);
         mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<LiveBean>() {
             @Override

main/src/main/res/layout/view_main_home.xml

@@ -1,42 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:orientation="vertical"
-    >
+    android:background="@color/white">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="70dp"
+        android:layout_marginTop="10dp"
         android:background="@color/transparent"
         android:fadingEdge="none"
         app:elevation="0dp"
-        android:layout_marginTop="10dp"
+        app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior">
-        app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior"
-        >
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
+            app:layout_scrollFlags="scroll|enterAlways">
-            >
 
 
             <ImageView
                 android:id="@+id/btn_search"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="2dp"
-                android:layout_marginRight="45dp"
-                android:onClick="mainClick"
                 android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginRight="45dp"
+                android:layout_marginBottom="2dp"
+                android:contentDescription="TODO"
+                android:onClick="mainClick"
                 android:padding="9dp"
-                android:src="@mipmap/icon_main_search"
+                android:src="@mipmap/icon_main_search" />
-                android:contentDescription="TODO" />
 
             <ImageView
                 android:id="@+id/img_trophy"
@@ -54,25 +51,21 @@
                 android:layout_width="match_parent"
                 android:layout_height="37dp"
                 android:layout_alignParentBottom="true"
-                android:layout_marginBottom="5dp"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:layout_toLeftOf="@id/btn_search"
+                android:layout_marginBottom="5dp"
-                >
+                android:layout_toLeftOf="@id/btn_search">
-
 
 
                 <net.lucode.hackware.magicindicator.MagicIndicator
                     android:id="@+id/indicator"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="match_parent" />
-                    />
 
 
             </FrameLayout>
 
 
-
         </RelativeLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -82,6 +75,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:overScrollMode="never"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-        />
+</LinearLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

main/src/main/res/layout/view_main_home_live.xml

@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="4dp"
-        android:layout_marginRight="10dp"/>
+        android:layout_marginRight="10dp" />
 
     <FrameLayout
         android:id="@+id/btn_dismiss"