From 3be3591b1570787cca38e13f87be64496476789e Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 21 Mar 2023 14:21:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AD=94=E6=B3=95=E5=B8=BDUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/avroom/widget/RoomEffectView.kt | 8 +++---- .../nnbc123/app/common/EmptyViewHelper.java | 4 ++-- .../res/layout/layout_room_box_notify.xml | 6 ++--- .../activity/TreasureBoxActivity.java | 22 +++++++++++++------ 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/nnbc123/app/avroom/widget/RoomEffectView.kt index becc1a068..76854d90d 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/widget/RoomEffectView.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/widget/RoomEffectView.kt @@ -437,9 +437,9 @@ class RoomEffectView @JvmOverloads constructor( val textView = LayoutInflater.from(mContext).inflate(R.layout.layout_room_box_notify, null) as TextView val text = SpannableBuilder() - .append("厉害了! ", ForegroundColorSpan(Color.WHITE)) + .append("厉害了!", ForegroundColorSpan(Color.WHITE)) .append( - attachment.nick.sub(6) + " ", + attachment.nick.sub(6), ForegroundColorSpan(resources.getColor(R.color.notice_nick)) ) .append("在魔法帽中获得", ForegroundColorSpan(Color.WHITE)) @@ -485,9 +485,9 @@ class RoomEffectView @JvmOverloads constructor( private fun showBoxNotifyBySVGA(chatRoomMessage: ChatRoomMessage) { val attachment = chatRoomMessage.attachment as RoomBoxPrizeAttachment val text = SpannableBuilder() - .append("厉害了! ", ForegroundColorSpan(Color.WHITE)) + .append("厉害了!", ForegroundColorSpan(Color.WHITE)) .append( - attachment.nick + " ", + attachment.nick.sub(6), ForegroundColorSpan(resources.getColor(R.color.notice_nick)) ) .append("在魔法帽中获得", ForegroundColorSpan(Color.WHITE)) diff --git a/app/src/main/java/com/nnbc123/app/common/EmptyViewHelper.java b/app/src/main/java/com/nnbc123/app/common/EmptyViewHelper.java index 2fd1112f3..ddcdb0f6d 100644 --- a/app/src/main/java/com/nnbc123/app/common/EmptyViewHelper.java +++ b/app/src/main/java/com/nnbc123/app/common/EmptyViewHelper.java @@ -26,8 +26,8 @@ public class EmptyViewHelper { public static TextView createEmptyTextView(Context context,CharSequence text) { TextView textView = new TextView(context); textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.WHITE); - textView.setTextSize(12); + textView.setTextColor(Color.parseColor("#dcc3ff")); + textView.setTextSize(11); textView.setSingleLine(true); textView.setText(text); return textView; diff --git a/app/src/main/res/layout/layout_room_box_notify.xml b/app/src/main/res/layout/layout_room_box_notify.xml index e5f8886d4..a1da65f90 100644 --- a/app/src/main/res/layout/layout_room_box_notify.xml +++ b/app/src/main/res/layout/layout_room_box_notify.xml @@ -11,9 +11,9 @@ android:maxLines="2" android:lineSpacingExtra="0dp" android:lineSpacingMultiplier="0.9" - android:paddingStart="80dp" - android:paddingEnd="80dp" + android:paddingStart="45dp" + android:paddingEnd="45dp" android:textSize="13sp" android:paddingTop="7dp" tools:layout_height="wrap_content" - tools:text="哈哈哈哈哈哈啊哈哈啊哈哈哈哈哈哈哈哈哈哈哈" /> \ No newline at end of file + tools:text="厉害了！用户名六个字 在魔法帽中获得礼物名字11" /> \ No newline at end of file diff --git a/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java index 215930ffc..212f2fd32 100644 --- a/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/nnbc123/app/treasure_box/activity/TreasureBoxActivity.java @@ -59,9 +59,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers; @ActLayoutRes(R.layout.activity_treasure_box) public class TreasureBoxActivity extends BaseBindingActivity implements View.OnClickListener { private final Runnable removeRunnable = () -> mBinding.llPrizeHint.removeAllViews(); - private volatile int keyNum; private final ArrayList hintPrizeCacheList = new ArrayList<>(); private final int boxType = IBoxModel.BOX_TYPE_NORMAL; + private volatile int keyNum; private int height; private int sendMessageSwitchLevel; @@ -107,7 +107,7 @@ public class TreasureBoxActivity extends BaseBindingActivity { - // mBinding.ivOpen.setEnabled(true); + // mBinding.ivOpen.setEnabled(true); SingleToastUtil.showToast(throwable.getMessage()); }) .toObservable() //.delay(startTime - System.currentTimeMillis() + 300, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread()) - .doOnNext(openBoxResult ->{ + .doOnNext(openBoxResult -> { //mBinding.ivOpen.setEnabled(true); changeKeyNum(openBoxResult.getRemainKeyNum()); mBinding.svgaGiftBg.startAnimation();