From 9b3a0114990a217d05f0cbfbfe2e44bb709d0173 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 10 Aug 2023 17:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B1=E6=96=87say=20hi?=
 =?UTF-8?q?=E4=B8=8B=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98#131?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/common/utils/LogUtil.java |  3 +--
 .../yunbao/live/adapter/LiveChatAdapter.java  |  5 ++--
 live/src/main/res/layout/item_live_chat.xml   | 27 +++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/utils/LogUtil.java b/common/src/main/java/com/yunbao/common/utils/LogUtil.java
index 889027b41..b5deb1c93 100644
--- a/common/src/main/java/com/yunbao/common/utils/LogUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/LogUtil.java
@@ -266,8 +266,7 @@ public class LogUtil {
                 .connectTimeout(3, TimeUnit.SECONDS)
                 .build();
         Request request = new Request.Builder()
-                //.url("https://newht.yaoulive.com/index.php/api/error_log/report") //无法接受文件
-                .url("https://tools.yutou233.cn/public/file/request.do")//临时上报地址，可接受文件
+                .url("https://newht.yaoulive.com/index.php/api/error_log/report") //无法接受文件
                 .post(requestBody)
                 .build();
         client.newCall(request)
diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
index 8d62f2e11..98a0245a9 100644
--- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
@@ -33,6 +33,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -206,7 +207,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
         View v_chat_active_close;
         RecyclerView rv_chat_active;
         ImageView img_zg_img, btnAttention, textLeave;
-        FrameLayout attentionLayout;
+        LinearLayoutCompat attentionLayout;
         ClipPathCircleImage clipImage2;
 
         public Vh(View itemView) {
@@ -214,7 +215,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
             mBg = (LinearLayout) itemView.findViewById(R.id.bg);
             mTextView = (TextView) itemView.findViewById(R.id.text_txt);
             textTxt2 = (TextView) itemView.findViewById(R.id.text_txt2);
-            attentionLayout = (FrameLayout) itemView.findViewById(R.id.attention_layout);
+            attentionLayout = (LinearLayoutCompat) itemView.findViewById(R.id.attention_layout);
             clipImage2 = (ClipPathCircleImage) itemView.findViewById(R.id.clip_image2);
             itemView.setOnClickListener(mOnClickListener);
 
diff --git a/live/src/main/res/layout/item_live_chat.xml b/live/src/main/res/layout/item_live_chat.xml
index 8f08140de..32f59f738 100644
--- a/live/src/main/res/layout/item_live_chat.xml
+++ b/live/src/main/res/layout/item_live_chat.xml
@@ -28,7 +28,8 @@
         android:gravity="center|left"
         android:orientation="horizontal"
         android:visibility="gone"
-        tools:ignore="RtlHardcoded">
+        tools:ignore="RtlHardcoded"
+        tools:visibility="visible">
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/avatar"
@@ -58,7 +59,8 @@
         android:layout_height="wrap_content"
         android:background="@drawable/bg_live_chat_item"
         android:orientation="vertical"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -162,7 +164,8 @@
         android:paddingRight="6dp"
         android:paddingBottom="3dp"
         android:visibility="gone"
-        tools:ignore="RtlHardcoded">
+        tools:ignore="RtlHardcoded"
+        tools:visibility="visible">
 
         <TextView
             android:id="@+id/tv_zg_anchorname"
@@ -181,7 +184,7 @@
             android:layout_height="45dp" />
     </LinearLayout>
 
-    <FrameLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/attention_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -190,32 +193,34 @@
         android:background="@drawable/chat_message_bg"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <com.yunbao.common.views.weight.ClipPathCircleImage
             android:id="@+id/clip_image2"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_margin="9dp"
+            android:layout_weight="0"
             android:scaleType="centerCrop" />
 
         <TextView
             android:id="@+id/automatic_chat"
+            android:layout_weight="0.5"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="42dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginTop="3dp"
-            android:layout_marginEnd="74dp"
             android:layout_marginBottom="3dp"
             android:clickable="false"
             android:enabled="false"
-            android:gravity="center_vertical"
+            android:gravity="start"
             android:text="@string/automatic_chat"
             android:textColor="#FFFFFF"
             android:textSize="12sp" />
 
         <ImageView
+            android:layout_weight="0"
             android:id="@+id/btn_attention"
             android:layout_width="54dp"
             android:layout_height="26dp"
@@ -225,7 +230,7 @@
             android:clickable="false"
             android:src="@mipmap/btn_attention" />
 
-    </FrameLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
     <LinearLayout
         android:id="@+id/xyd_complete"