From 192b0cb417d0066e44ba8c524eb72a5090d3ac8e Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 25 Oct 2023 10:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E9=81=8A=E6=88=B2=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/background_live_sud_hint.png | Bin 0 -> 6630 bytes .../yunbao/live/views/LiveRoomViewHolder.java | 14 +++--- live/src/main/res/layout/view_live_room.xml | 40 +++++++++++------- 3 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 common/src/main/res/drawable/background_live_sud_hint.png diff --git a/common/src/main/res/drawable/background_live_sud_hint.png b/common/src/main/res/drawable/background_live_sud_hint.png new file mode 100644 index 0000000000000000000000000000000000000000..e98cf1c4801b5d766f6dc89ebfd55a2d58dcf52f GIT binary patch literal 6630 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 literal 0 HcmV?d00001 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 569ca21f7..3fe10691e 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -636,26 +636,28 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } private TextView sud_text_name; + private LinearLayout sud_layout_name; private Handler sudNameHandler = new Handler(); private Runnable sudNameRunnable = new Runnable() { @Override public void run() { - if (sud_text_name != null) { - sud_text_name.setVisibility(View.GONE); + if (sud_layout_name != null) { + sud_layout_name.setVisibility(View.GONE); } } }; public void setSudName(String sudName) { - sud_text_name = (TextView) findViewById(com.yunbao.common.R.id.sud_text_name); + sud_text_name = (TextView) findViewById(R.id.sud_text_name); + sud_layout_name = (LinearLayout) findViewById(R.id.sud_layout_name); sud_text_name.setText(WordUtil.isNewZh() ? String.format("主播创建了【%s】房间，快来与主播同玩~", sudName) : String.format("The anchor has created a 【%s】 room. Come and play with the anchor~", sudName)); - sud_text_name.setVisibility(View.VISIBLE); - ViewClicksAntiShake.clicksAntiShake(sud_text_name, new ViewClicksAntiShake.ViewClicksCallBack() { + sud_layout_name.setVisibility(View.VISIBLE); + ViewClicksAntiShake.clicksAntiShake(sud_layout_name, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { - sud_text_name.setVisibility(View.GONE); + sud_layout_name.setVisibility(View.GONE); } }); sudNameHandler.removeCallbacks(sudNameRunnable); diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 2995e1eb0..b7080669b 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -2478,21 +2478,31 @@ android:layout_marginTop="80dp" app:autoPlay="true" /> - + android:layout_marginEnd="42dp" + android:paddingStart="21dp" + android:visibility="gone" + android:paddingEnd="15dp"> + + + +