From 09f763dc2eaf53fab527467f2c10f0f410ffb86d Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Tue, 5 Nov 2024 15:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=20pandas=20=E6=94=B9=E6=88=90YOLA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- live/src/main/java/com/yunbao/live/socket/SocketRyClient.java | 2 +- live/src/main/java/com/yunbao/live/socket/SocketSwClient.java | 2 +- main/src/main/res/layout/view_main_me2.xml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 18f33db74..ca48b8faa 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -838,7 +838,7 @@ public class SocketRyClient { stringBuffer.append(sendQuickGiftModel.getUserNicename()) .append(WordUtil.isNewZh() ? " 送出了 " : " sent ") .append(sendQuickGiftModel.getQuickGiftNumber()) - .append(WordUtil.isNewZh() ? " 個小Yola " : " small pandas "); + .append(WordUtil.isNewZh() ? " 個小Yola " : " small Yola "); systemChatMessage2(stringBuffer.toString()); Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum())); break; diff --git a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java index 51198810e..515bf2d66 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java @@ -764,7 +764,7 @@ public class SocketSwClient { case "sendQuickGift": SendQuickGiftModel sendQuickGiftModel = GsonUtils.fromJson(map.toString(), SendQuickGiftModel.class); StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小Yola " : " small pandas "); + stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小Yola " : " small Yola "); systemChatMessage2(stringBuffer.toString()); Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum())); break; diff --git a/main/src/main/res/layout/view_main_me2.xml b/main/src/main/res/layout/view_main_me2.xml index 9d98a0851..c24c816e1 100644 --- a/main/src/main/res/layout/view_main_me2.xml +++ b/main/src/main/res/layout/view_main_me2.xml @@ -537,10 +537,9 @@ android:layout_marginStart="16dp" android:layout_marginTop="12dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="8dp" + android:layout_marginBottom="20dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" - app:layout_goneMarginTop="10dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/otherFunctionsView"