yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复英文模式下，购买是守护文案超长问题

Browse Source
This commit is contained in:
zlzw 2023-07-21 13:34:31 +08:00
parent e32d450ca1
commit dfeb3a78c1
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
live/src/main/res/layout/dialog_new_guard_buy.xml
View File

@ -145,14 +145,20 @@
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:visibility="gone"> tools:visibility="visible">
<TextView <com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/guard_coin_name" android:id="@+id/guard_coin_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:textColor="#9E7CFD" android:textColor="#9E7CFD"
android:textSize="14sp" /> android:textSize="14sp" />
@ -173,13 +179,13 @@
android:id="@+id/guard_btn_buy" android:id="@+id/guard_btn_buy"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="30dp" android:layout_height="30dp"
android:maxLines="1"
android:ellipsize="end"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:background="@drawable/bg_guard_btn_buy" android:background="@drawable/bg_guard_btn_buy"
android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLines="1"
android:text="@string/guard_buy" android:text="@string/guard_buy"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
@ -194,7 +200,7 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible"> tools:visibility="invisible">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

18
live/src/main/res/layout/dialog_new_guard_list.xml
View File

@ -115,21 +115,27 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="280dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:orientation="vertical"> android:orientation="vertical">
<TextView <com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/guard_tip1" android:id="@+id/guard_tip1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:text="" android:text=""
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#A281FD" android:textColor="#A281FD"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/guard_tip2" android:id="@+id/guard_tip2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -138,6 +144,12 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:drawablePadding="4dp" android:drawablePadding="4dp"
android:text="456" android:text="456"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#A281FD" android:textColor="#A281FD"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" /> android:visibility="gone" />

3
live/src/main/res/layout/view_live_room.xml
View File

@ -515,7 +515,8 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:visibility="invisible"> android:visibility="invisible"
tools:visibility="visible">
<ImageView <ImageView
android:layout_width="8dp" android:layout_width="8dp"