调整女神说6字改回4字

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;
     }
 }

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>
 

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);

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");

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");

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_width="67dp"
-        android:layout_height="110dp"
+        android:layout_height="88dp"
         android:layout_marginStart="16dp"
         android:visibility="invisible"
         app:layout_constraintStart_toStartOf="parent"

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_width="67dp"
-        android:layout_height="110dp"
+        android:layout_height="88dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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_width="67dp"
-    android:layout_height="110dp">
+    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"

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_width="67dp"
-        android:layout_height="110dp"
+        android:layout_height="88dp"
         android:layout_alignBottom="@+id/live_video"
         android:layout_marginStart="14dp"
         android:visibility="invisible"