From 7976d36701162b971a67ef6bc0d89afd4c402aed Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Tue, 24 Sep 2024 10:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E6=96=B0=E7=9A=84=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=E5=92=8C=E6=9C=BA=E5=99=A8=E4=BA=BA=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/values-en-rUS/strings.xml | 2 +- common/src/main/res/values-zh/strings.xml | 2 +- common/src/main/res/values/strings.xml | 2 +- .../yunbao/live/views/LiveRoomViewHolder.java | 3 ++- .../main/res/layout/view_live_pk_details.xml | 18 ++++++++++++------ live/src/main/res/layout/view_live_room.xml | 4 ++-- .../main/res/layout/view_ry_live_anchor.xml | 11 +++++++---- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml index 1ba7f1561..dcb2c6bd8 100644 --- a/common/src/main/res/values-en-rUS/strings.xml +++ b/common/src/main/res/values-en-rUS/strings.xml @@ -1030,7 +1030,7 @@ Limited ride And limited avatar frame Anchor Task I have read and agreed to the Please read and agree to the PandoraLive Host Agreement - PDLIVE Host Agreement + PandoraLive Host Agreement The statute of limitations for new anchors expires Get diamonds Get gold beans diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index e98360877..917be52d5 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1052,7 +1052,7 @@ 主播任務 我已閱讀並同意 請閱讀並同意《PandoraLive主播協議》 - 《PDLIVE主播協議》 + 《PandoraLive主播協議》 新秀主播時效截止至 收穫鑽石 收穫金豆 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7d8800ebf..6fc84668a 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -863,7 +863,7 @@ Limited ride And limited avatar frame Anchor Task I have read and agreed to the Please read and agree to the PandoraLive Host Agreement - PDLIVE Host Agreement + PandoraLive Host Agreement The statute of limitations for new anchors expires Get diamonds Get gold beans 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 e1f449021..0284c1036 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -6564,12 +6564,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mRoot.post(new Runnable() { @Override public void run() { + //TODO 设置布局参数 int mScreenWdith = ScreenDimenUtil.getInstance().getScreenWdith(); int vHeight = mScreenWdith * 720 / 960; RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) detailsView.getLayoutParams(); params.height = vHeight; params.width = mScreenWdith; - params.topMargin = DpUtil.dp2px(105); + params.topMargin = DpUtil.dp2px(128); params.addRule(RelativeLayout.ALIGN_TOP); detailsView.setLayoutParams(params); } diff --git a/live/src/main/res/layout/view_live_pk_details.xml b/live/src/main/res/layout/view_live_pk_details.xml index 981fa2f64..d3b016f00 100644 --- a/live/src/main/res/layout/view_live_pk_details.xml +++ b/live/src/main/res/layout/view_live_pk_details.xml @@ -1,14 +1,16 @@ + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> + android:visibility="gone" + tools:visibility="visible"> + android:visibility="gone" + tools:visibility="visible"> + android:visibility="gone" + tools:visibility="visible"> + android:visibility="gone" + tools:visibility="visible"> + android:visibility="gone" + tools:visibility="visible"> @@ -3150,7 +3150,7 @@ android:ellipsize="marquee" android:scrollHorizontally="true" android:singleLine="true" - tools:text="主播發起了整蠱娛樂，點擊查看" + android:text="主播發起了整蠱娛樂，點擊查看" android:textColor="@color/black1" android:textSize="12dp" /> diff --git a/live/src/main/res/layout/view_ry_live_anchor.xml b/live/src/main/res/layout/view_ry_live_anchor.xml index 16b5ef126..60c1fee28 100644 --- a/live/src/main/res/layout/view_ry_live_anchor.xml +++ b/live/src/main/res/layout/view_ry_live_anchor.xml @@ -10,9 +10,10 @@ android:id="@+id/live_time" android:layout_width="wrap_content" android:layout_height="23dp" - android:layout_marginTop="82dp" - android:layout_gravity="end" + android:layout_centerVertical="true" + android:layout_gravity="end" + android:layout_marginTop="82dp" android:layout_marginEnd="10dp" android:background="@drawable/bg_live_push_time" android:drawablePadding="5dp" @@ -25,7 +26,8 @@ android:visibility="visible" app:dt_left_drawable="@drawable/bg_push_time_point" app:dt_left_height="4dp" - app:dt_left_width="4dp" /> + app:dt_left_width="4dp" + tools:visibility="visible" /> + android:visibility="gone" + tools:visibility="visible" />