From 97ad5c2d924c735dd6b96137a0bc0cadda99cc61 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Sat, 1 Apr 2023 11:14:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E5=A5=B3=E7=A5=9E?=
 =?UTF-8?q?=E8=AF=B4=E5=B8=83=E5=B1=80=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/LiveAnchorSayItemsAdapter.java    |  2 +-
 .../live/dialog/LiveAnchorSayPopDialog.java   | 30 ++++++++++---------
 .../src/main/res/layout/dialog_anchor_say.xml |  2 +-
 live/src/main/res/layout/item_anchor_say.xml  |  6 ++--
 .../res/layout/sim_live_room_anchor_say.xml   | 11 +++----
 live/src/main/res/layout/view_live_room.xml   |  2 +-
 6 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java
index a0a6d8998..c27a9e024 100644
--- a/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java
@@ -76,7 +76,7 @@ public class LiveAnchorSayItemsAdapter extends RecyclerView.Adapter<LiveAnchorSa
         }
 
         public void setData(String text, int position) {
-            textView.setText("已输入的\n内容已输\n入的内容\n入的内容");
+            textView.setText("已输入的内容\n已输入的内容\n已输入的");
             ImgLoader.display(mContext, text, icon);
             if (position == click) {
                 itemView.setBackgroundResource(R.drawable.bg_anchor_say_select);
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java
index 67006691c..04aad5c86 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java
@@ -121,20 +121,7 @@ public class LiveAnchorSayPopDialog extends AbsDialogPopupWindow {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 sayModel.getLivePreview().setContent(s.toString());
-                StringBuilder sb = new StringBuilder();
-                int len=6;
-                int n = (s.length() + 3) / len;
-                for (int i = 0; i < n; i++) {
-                    if (i < (n - 1)) {
-                        sb.append(s.toString().substring(i * len, (i + 1) * len)).append("\n");
-                    } else {
-                        sb.append(s.toString().substring(i * len));
-                    }
-                }
-                if (sb.length() == 0) {
-                    sb.append("默认字符\n默认字符\n默认字符");
-                }
-                sayText.setText(sb.toString());
+                sayText.setText(getText(s.toString()));
             }
 
             @Override
@@ -142,6 +129,21 @@ public class LiveAnchorSayPopDialog extends AbsDialogPopupWindow {
 
             }
 
+            public String getText(String content) {
+                int t = 6;
+                float len = (float) content.length() / t;
+                StringBuilder sb = new StringBuilder();
+                sb.append("\n");
+                for (int i = 0; i < len; i++) {
+                    if (len - i < 1) {
+                        sb.append(content.substring(i * t));
+                    } else {
+                        sb.append(content.substring(i * t, i * t + t)).append("\n");
+                    }
+                }
+                return sb.toString();
+            }
+
         });
         close.setOnClickListener(v -> {
             dismiss();
diff --git a/live/src/main/res/layout/dialog_anchor_say.xml b/live/src/main/res/layout/dialog_anchor_say.xml
index 520668864..a46b7f8d8 100644
--- a/live/src/main/res/layout/dialog_anchor_say.xml
+++ b/live/src/main/res/layout/dialog_anchor_say.xml
@@ -9,7 +9,7 @@
         android:id="@+id/anchor_say"
         layout="@layout/sim_live_room_anchor_say"
         android:layout_width="77dp"
-        android:layout_height="88dp"
+        android:layout_height="110dp"
         android:layout_marginStart="16dp"
         android:visibility="invisible"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/live/src/main/res/layout/item_anchor_say.xml b/live/src/main/res/layout/item_anchor_say.xml
index a769bc248..ccad7ede4 100644
--- a/live/src/main/res/layout/item_anchor_say.xml
+++ b/live/src/main/res/layout/item_anchor_say.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="106dp"
     android:layout_height="128dp"
-    android:layout_marginStart="5dp"
+    android:layout_marginStart="2dp"
     android:layout_marginEnd="5dp"
     android:background="@drawable/bg_anchor_say"
     android:layout_marginTop="10dp">
@@ -11,8 +11,8 @@
 
     <include
         layout="@layout/sim_live_room_anchor_say"
-        android:layout_width="67dp"
-        android:layout_height="88dp"
+        android:layout_width="83dp"
+        android:layout_height="110dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/live/src/main/res/layout/sim_live_room_anchor_say.xml b/live/src/main/res/layout/sim_live_room_anchor_say.xml
index c5bc03e34..f1801da26 100644
--- a/live/src/main/res/layout/sim_live_room_anchor_say.xml
+++ b/live/src/main/res/layout/sim_live_room_anchor_say.xml
@@ -2,20 +2,21 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="67dp"
-    android:layout_height="88dp">
+    android:layout_width="77dp"
+    android:layout_height="110dp">
 
     <ImageView
         android:id="@+id/anchor_say_icon"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="8dp"
+        android:scaleType="fitXY"
         android:src="@color/main_color_79CDF9"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@color/main_color_79CDF9" />
+        tools:srcCompat="@mipmap/tmp" />
 
     <TextView
         android:id="@+id/anchor_say_text"
@@ -28,14 +29,14 @@
         android:gravity="center"
         android:inputType="textMultiLine"
         android:maxEms="6"
-        android:text="中文测试\n中文测试\n中文测试\n中文测试"
+        android:text="已输入的内容\n已输入的内容\n已输入的"
         android:textColor="#333333"
         android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/anchor_say_icon"
-        tools:text="中文测试\n中文测试\n中文测试\n中文测试" />
+        tools:text="已输入的内容\n已输入的内容\n已输入的" />
 
     <ImageView
         android:id="@+id/anchor_say_hide"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 9ce0ab8df..468f7baf9 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -1295,7 +1295,7 @@
         android:id="@+id/anchor_say_layout"
         layout="@layout/sim_live_room_anchor_say"
         android:layout_width="77dp"
-        android:layout_height="88dp"
+        android:layout_height="110dp"
         android:layout_alignBottom="@+id/live_video"
         android:layout_marginStart="14dp"
         android:visibility="invisible"