From db8dc2a78178dda3799b5fd81d268ceabb24eb7e Mon Sep 17 00:00:00 2001
From: 18142669586 <1669783059@qq.com>
Date: Thu, 13 Apr 2023 15:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9E=E9=BA=A6=E6=A0=B7?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/utils/ToastUtils.java   |   4 +-
 live/src/main/res/layout/view_live_room.xml   | 132 +++++++++---------
 .../yunbao/main/activity/MainActivity.java    |   1 -
 3 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/utils/ToastUtils.java b/common/src/main/java/com/yunbao/common/utils/ToastUtils.java
index 12d7412df..541f07392 100644
--- a/common/src/main/java/com/yunbao/common/utils/ToastUtils.java
+++ b/common/src/main/java/com/yunbao/common/utils/ToastUtils.java
@@ -1,6 +1,7 @@
 package com.yunbao.common.utils;
 
 import android.content.Context;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
@@ -21,10 +22,11 @@ public class ToastUtils {
             toast = new Toast(context);
             View view = LayoutInflater.from(context).inflate(R.layout.toast_utils, null, false);
             toast.setView(view);
+            toast.setGravity(Gravity.CENTER, 0, 0);
         }
     }
     public void setGravity(int gravity){
-        toast.setGravity(gravity, 0, 0);
+        toast.setGravity(Gravity.CENTER, 0, 0);
     }
     public void setText(String tips){
         tipsText.setText(tips);
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index dd202c7ad..6d7ef612e 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -2067,72 +2067,7 @@
         android:layout_marginRight="19dp"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/mic_view"
-            android:layout_width="40dp"
-            android:layout_height="50dp"
-            android:visibility="gone">
 
-            <View
-                android:layout_width="41dp"
-                android:layout_height="41dp"
-                android:layout_marginBottom="10dp"
-                android:background="@drawable/bg_live_mic_av" />
-
-            <com.makeramen.roundedimageview.RoundedImageView
-                android:id="@+id/mic_ico"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginStart="1dp"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_marginBottom="11dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/m_chu_xia"
-                app:riv_oval="true" />
-
-            <ImageView
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:src="@mipmap/voice" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/mic_view1"
-            android:layout_width="40dp"
-            android:layout_height="50dp"
-            android:layout_marginTop="19dp"
-            android:visibility="gone">
-
-            <View
-                android:layout_width="41dp"
-                android:layout_height="41dp"
-                android:layout_marginBottom="10dp"
-                android:background="@drawable/bg_live_mic_av" />
-
-            <com.makeramen.roundedimageview.RoundedImageView
-                android:id="@+id/mic_ico1"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginStart="1dp"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_marginBottom="11dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/m_chu_xia"
-                app:riv_oval="true" />
-
-            <ImageView
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:src="@mipmap/voice" />
-
-        </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/mic_view2"
@@ -2167,6 +2102,73 @@
                 android:src="@mipmap/voice" />
 
         </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/mic_view1"
+            android:layout_width="40dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="19dp"
+            android:visibility="gone">
+
+            <View
+                android:layout_width="41dp"
+                android:layout_height="41dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/bg_live_mic_av" />
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/mic_ico1"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="1dp"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="1dp"
+                android:layout_marginBottom="11dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/m_chu_xia"
+                app:riv_oval="true" />
+
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:src="@mipmap/voice" />
+
+        </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/mic_view"
+            android:layout_width="40dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="19dp"
+            android:visibility="gone">
+
+            <View
+                android:layout_width="41dp"
+                android:layout_height="41dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/bg_live_mic_av" />
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/mic_ico"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="1dp"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="1dp"
+                android:layout_marginBottom="11dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/m_chu_xia"
+                app:riv_oval="true" />
+
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:src="@mipmap/voice" />
+
+        </RelativeLayout>
+
     </LinearLayout>
 
     <com.yunbao.common.views.weight.FullServiceNotificationView
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index f4a8498fb..aa188c6ac 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -197,7 +197,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     @Override
     protected void main() {
         ConversationIMListManager.get(this);
-
         //在请求一下这个接口给我后台版本号
         CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
             @Override