From 36410ddcaa7de156a9fcc06f90793ea0a14034d7 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 6 Apr 2023 14:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A5=B3=E7=A5=9E=E8=AF=B46?=
 =?UTF-8?q?=E5=AD=97=E6=94=B9=E5=9B=9E4=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/share/ui/InvitePopDialog.java |   6 ++++--
 Share/src/main/res/layout/dialog_share.xml        |   2 +-
 Share/src/main/res/mipmap/icon_invite_close.png   | Bin 0 -> 548 bytes
 Share/src/main/res/mipmap/icon_share_close.png    | Bin 0 -> 484 bytes
 .../live/adapter/LiveAnchorSayItemsAdapter.java   |   2 +-
 .../live/dialog/LiveAnchorSayPopDialog.java       |   2 +-
 .../com/yunbao/live/views/LiveRoomViewHolder.java |   2 +-
 live/src/main/res/layout/dialog_anchor_say.xml    |   4 ++--
 live/src/main/res/layout/item_anchor_say.xml      |   4 ++--
 .../main/res/layout/sim_live_room_anchor_say.xml  |   6 +++---
 live/src/main/res/layout/view_live_room.xml       |   4 ++--
 11 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 Share/src/main/res/mipmap/icon_invite_close.png
 create mode 100644 Share/src/main/res/mipmap/icon_share_close.png

diff --git a/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java b/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
index 0bc78d407..9d3767442 100644
--- a/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
+++ b/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
@@ -10,6 +10,7 @@ import android.graphics.Color;
 import android.graphics.LinearGradient;
 import android.graphics.Shader;
 import android.view.ViewTreeObserver;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -84,6 +85,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow {
     protected void onCreate() {
         super.onCreate();
         findViewById(R.id.close).setOnClickListener(v -> dismiss());
+        ((ImageView) findViewById(R.id.close)).setImageResource(R.mipmap.icon_invite_close);
         findViewById(R.id.share_copy).setOnClickListener(v -> copyLink());
         // findViewById(R.id.share_preview).setVisibility(GONE);
         findViewById(R.id.share_dialog).setBackgroundResource(R.mipmap.bg_dialog_inviet);
@@ -148,7 +150,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow {
         ClipData clipData = ClipData.newPlainText("text", url);
         cm.setPrimaryClip(clipData);
         ToastUtil.show(WordUtil.getString(com.yunbao.common.R.string.copy_success));
-        DialogUitl.showSimpleDialog(getContext(),url, new DialogUitl.SimpleCallback() {
+        DialogUitl.showSimpleDialog(getContext(), url, new DialogUitl.SimpleCallback() {
             @Override
             public void onConfirmClick(Dialog dialog, String content) {
                 dialog.dismiss();
@@ -157,7 +159,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow {
     }
 
     public InvitePopDialog setUrl(String data) {
-        this.url = data+"&isGoogle="+  (CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0");
+        this.url = data + "&isGoogle=" + (CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0");
         return this;
     }
 }
diff --git a/Share/src/main/res/layout/dialog_share.xml b/Share/src/main/res/layout/dialog_share.xml
index 65b31da1c..b9f50abe4 100644
--- a/Share/src/main/res/layout/dialog_share.xml
+++ b/Share/src/main/res/layout/dialog_share.xml
@@ -33,7 +33,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginEnd="16dp"
-            app:srcCompat="@mipmap/icon_dialog_charge_close" />
+            app:srcCompat="@mipmap/icon_share_close" />
 
     </LinearLayout>
 
diff --git a/Share/src/main/res/mipmap/icon_invite_close.png b/Share/src/main/res/mipmap/icon_invite_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..e72e9a18acdef6efda57cfef7551ed118187f88a
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$-bqA3RA@u(m`zT@Fc5{G6%-DD1RGdVfjAGBVU-n^;S#L40it4uU_+%Ipb=5f
zv_v#%6Oa8SK^5-0eSY8k*&T-i|F{G9j|A}78B7^S86YE&N{9>~{quj8f!jL64Ng$P
zA;%Jh`=UcA0)(zU14VrV;0hIv*QPV90KB4bB?VE`Ie=M9_ZcsEaFs?^4{%qXA;Wn~
zl!fS;Z^Sdaqi_pbfTBJ{g^L~0ScpFJazKR-+`CU(0IAbUTqFA_p>6e0h+*?9<d|#w
zOJ71_SPm{Rqagg|gZe5AfQ2wNFLuHKVj)H_9}f@;F_L)>Knt;H_TM?b-TW1#VS{SE
zJDK82Xj{eK*fJJ3m!GkDJ_C)RA&7m$+#vFeET4f;2t)IB8PGx)n;!?DuVLl1&>LIv
zmar|MA@hwHV+b37p*g=ViiQw8fbWvpl+NxLHG<#(eCFknk`Ma;9O#930FC+P-<toj
zi@uHH07A@bMl4ZI;Q%q_M}!CiV9bvMp$F)0C76equO}wkN(e;k^I#ZaqOC-%d0#nA
zvXx-X_d$s66Xtl-ZT<8;AO}hxl<U=EjW;Z{+cWQ*jL;1O@H(0P3khKQn72<%8Aur*
mBaljn3?TjUlmR+~q`)_?TroiK#wQ8@0000<MNUMnLSTZxe&?J3

literal 0
HcmV?d00001

diff --git a/Share/src/main/res/mipmap/icon_share_close.png b/Share/src/main/res/mipmap/icon_share_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cb43acbd4792b251d9bf074ac08aad545891f67
GIT binary patch
literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$o=HSORA@u(SiNe5KoCCBLX+meA_td3NM~UqzW)>0h}Z=zav@g;2PUYXc<g~7
zV)k}+MsiEW(w&+8es;%ot)1bIWjOvF6ZmTf*#UL{sQ@n_q=4vjb^t9QvcUgyAP552
z_x)qjG(SaAd?5wArH5g7@I3Fis;X02mMx?v*nv2X-^Ov=i%I&vKWAC?0hw?a8%5Ep
z<2Wzky=7UKG)><j^}qy#TCVFJr%5m*=HNxWwrx*PSHT3tM9YbFNKn+cxdyRo9*Y5h
z$z9^rCZOvCC3utrlM)a>kXY4~fpP#sVhivj4ycgW3Op%+-}Z!fKlOR4Z^wLjkt`uu
zcbbpswA*`oft<ja6I&=h5n}?fv(0ks;g`@_w=rfD%Ub2bw^0><Dlzvu&e}M76GMPO
zVpYkY2<QOP$&r!KCV&Bg$t5{XQvjf-p>-BYlH@Q9gSo$y#{bk$*D77tedl?8R_zwD
zIB`*6+xAmk*PokTt55)@tfAe7C_!LqF#(Kv6uImGg^HLO>;OhRid=SpLPbmsb^xOu
aMeY@)XInsc{<3}m0000<MNUMnLSTXj_tL-s

literal 0
HcmV?d00001

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 c27a9e024..9b628d1ab 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已输入的");
+            textView.setText("已输入的\n内容已输\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 5e3cf6cb2..09f2915ca 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java
@@ -130,7 +130,7 @@ public class LiveAnchorSayPopDialog extends AbsDialogPopupWindow {
             }
 
             public String getText(String content) {
-                int t = 6;
+                int t = 4;
                 float len = (float) content.length() / t;
                 StringBuilder sb = new StringBuilder();
                 sb.append("\n");
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index dfd1ef0a6..505594da6 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -4443,7 +4443,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                     }
 
                     public String getText(String content) {
-                        int t = 6;
+                        int t = 4;
                         float len = (float) content.length() / t;
                         StringBuilder sb = new StringBuilder();
                         sb.append("\n");
diff --git a/live/src/main/res/layout/dialog_anchor_say.xml b/live/src/main/res/layout/dialog_anchor_say.xml
index a46b7f8d8..94ebe87a1 100644
--- a/live/src/main/res/layout/dialog_anchor_say.xml
+++ b/live/src/main/res/layout/dialog_anchor_say.xml
@@ -8,8 +8,8 @@
     <include
         android:id="@+id/anchor_say"
         layout="@layout/sim_live_room_anchor_say"
-        android:layout_width="77dp"
-        android:layout_height="110dp"
+        android:layout_width="67dp"
+        android:layout_height="88dp"
         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 ccad7ede4..d2be1404a 100644
--- a/live/src/main/res/layout/item_anchor_say.xml
+++ b/live/src/main/res/layout/item_anchor_say.xml
@@ -11,8 +11,8 @@
 
     <include
         layout="@layout/sim_live_room_anchor_say"
-        android:layout_width="83dp"
-        android:layout_height="110dp"
+        android:layout_width="67dp"
+        android:layout_height="88dp"
         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 3eabc1146..7896b10e8 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,8 +2,8 @@
 <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="77dp"
-    android:layout_height="110dp">
+    android:layout_width="67dp"
+    android:layout_height="88dp">
 
     <ImageView
         android:id="@+id/anchor_say_icon"
@@ -36,7 +36,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/anchor_say_icon"
-        tools:text="已输入的内容\n已输入的内容\n已输入的" />
+        tools:text="已输入的\n内容已输\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 a1e332025..6e24f8f2b 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -1295,8 +1295,8 @@
     <include
         android:id="@+id/anchor_say_layout"
         layout="@layout/sim_live_room_anchor_say"
-        android:layout_width="77dp"
-        android:layout_height="110dp"
+        android:layout_width="67dp"
+        android:layout_height="88dp"
         android:layout_alignBottom="@+id/live_video"
         android:layout_marginStart="14dp"
         android:visibility="invisible"