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

修复测试反馈内容

Browse Source
This commit is contained in:
zlzw
2024-07-25 15:00:05 +08:00
parent 96a6b05d03
commit c20a9804e9
43 changed files with 555 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/res/layout/dialog_gift_wall_gift_info.xml
View File

@@ -198,6 +198,7 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="17dp"
android:layout_marginBottom="58dp"
android:paddingBottom="32dp"
android:background="@mipmap/gift_wall_gift_info_list"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

22
common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
View File

@@ -61,7 +61,6 @@
android:textColor="#FFD3A4"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@+id/gift"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="@+id/gift"
app:layout_constraintTop_toBottomOf="@+id/gift" />
@@ -81,11 +80,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="TextView"
tools:text="TextView"
android:textColor="#FFD3A4"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@+id/user_avatar_container"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="@+id/user_avatar_container"
app:layout_constraintTop_toBottomOf="@+id/user_avatar_container" />
@@ -208,7 +206,7 @@
android:id="@+id/user_avatar_2"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/icon_avatar_placeholder"
tools:src="@mipmap/icon_avatar_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -233,7 +231,7 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="TextView"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/user_value_2"
@@ -245,7 +243,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
android:text="TextView"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@+id/imageView17"
@@ -295,7 +293,7 @@
android:id="@+id/user_avatar_1"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/icon_avatar_placeholder"
tools:src="@mipmap/icon_avatar_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -325,7 +323,7 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="TextView"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/user_value_1"
@@ -337,7 +335,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
android:text="TextView"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@+id/imageView9"
@@ -386,7 +384,7 @@
android:id="@+id/user_avatar_3"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/icon_avatar_placeholder"
tools:src="@mipmap/icon_avatar_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -411,7 +409,7 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="TextView"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/user_value_3"
@@ -423,7 +421,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
android:text="TextView"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"

10
common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
View File

@@ -67,17 +67,17 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/star_layout"
android:layout_width="match_parent"
android:layout_height="275dp"
android:layout_marginBottom="20dp">
android:layout_height="match_parent"
>
<ImageView
android:id="@+id/bg1"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:translationY="1dp"
android:background="@mipmap/gift_wall_main_list_bg"
android:scaleType="fitXY"
android:translationY="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -157,7 +157,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/classic_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<ImageView

231
common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
View File

@@ -17,130 +17,129 @@
app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
app:toolbarId="@+id/toolbar">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
tools:visibility="gone">
<com.angcyo.tablayout.DslTabLayout
android:id="@+id/tab_layout"
<com.angcyo.tablayout.DslTabLayout
android:id="@+id/tab_layout"
android:layout_width="wrap_content"
android:layout_height="30dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tab_enable_text_bold="true"
app:tab_indicator_drawable="@drawable/gift_wall_man_tab2_dsl"
app:tab_indicator_height="2dp"
app:tab_indicator_width="16dp"
app:tab_indicator_y_offset="8dp"
app:tab_text_max_size="14sp"
app:tab_text_min_size="12sp">
<TextView
android:id="@+id/dsl_tab1"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:letterSpacing="0.1"
android:text="@string/dialog_gift_wall_tab2_dsl_tab1"
android:textSize="12dp"
app:gradient_angle="45" />
<TextView
android:id="@+id/dsl_tab2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:letterSpacing="0.1"
android:text="@string/dialog_gift_wall_tab2_dsl_tab2"
android:textColor="#FFEED8"
android:textSize="12dp"
app:gradient_angle="45" />
</com.angcyo.tablayout.DslTabLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/show_time_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tab_layout">
<TextView
android:id="@+id/show_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#E5D2C0"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tab_enable_text_bold="true"
app:tab_indicator_drawable="@drawable/gift_wall_man_tab2_dsl"
app:tab_indicator_height="2dp"
app:tab_indicator_width="16dp"
app:tab_indicator_y_offset="8dp"
app:tab_text_max_size="14sp"
app:tab_text_min_size="12sp">
tools:text="本期展館時間 :000000" />
<TextView
android:id="@+id/dsl_tab1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:letterSpacing="0.1"
android:text="@string/dialog_gift_wall_tab2_dsl_tab1"
android:textSize="12dp"
app:gradient_angle="45" />
<TextView
android:id="@+id/dsl_tab2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:letterSpacing="0.1"
android:text="@string/dialog_gift_wall_tab2_dsl_tab2"
android:textColor="#FFEED8"
android:textSize="12dp"
app:gradient_angle="45" />
</com.angcyo.tablayout.DslTabLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/show_time_layout"
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
app:layout_constraintBottom_toBottomOf="@+id/show_time"
app:layout_constraintStart_toEndOf="@+id/show_time"
app:layout_constraintTop_toTopOf="@+id/show_time"
app:srcCompat="@mipmap/ic_gift_wall_time2" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:rotation="180"
app:layout_constraintBottom_toBottomOf="@+id/show_time"
app:layout_constraintEnd_toStartOf="@+id/show_time"
app:layout_constraintTop_toTopOf="@+id/show_time"
app:srcCompat="@mipmap/ic_gift_wall_time2" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/star_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center">
<TextView
android:id="@+id/star_gifts_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:layout_marginTop="20dp"
android:text="@string/dialog_gift_wall_list1_title"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_marginTop="50dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tab_layout">
<TextView
android:id="@+id/show_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#E5D2C0"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="本期展館時間 :000000" />
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
app:layout_constraintBottom_toBottomOf="@+id/show_time"
app:layout_constraintStart_toEndOf="@+id/show_time"
app:layout_constraintTop_toTopOf="@+id/show_time"
app:srcCompat="@mipmap/ic_gift_wall_time2" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:rotation="180"
app:layout_constraintBottom_toBottomOf="@+id/show_time"
app:layout_constraintEnd_toStartOf="@+id/show_time"
app:layout_constraintTop_toTopOf="@+id/show_time"
app:srcCompat="@mipmap/ic_gift_wall_time2" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/star_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/star_gifts_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:layout_marginTop="20dp"
android:text="@string/dialog_gift_wall_list1_title"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:spanCount="3"
tools:itemCount="6"
tools:listitem="@layout/item_gift_wall_man_tab2_list_1" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="10dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.49"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0"
app:spanCount="3"
tools:itemCount="6"
tools:listitem="@layout/item_gift_wall_man_tab2_list_1" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
@@ -149,24 +148,22 @@
android:id="@+id/classic_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:visibility="visible">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="10dp"
android:layout_marginStart="20dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="10dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.492"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:spanCount="3"
tools:itemCount="10"
tools:layoutManager="GridLayoutManager"

21
common/src/main/res/layout/item_dialog_gift_wall_gift_info.xml
View File

@@ -12,35 +12,38 @@
android:gravity="start"
android:text="@string/dialog_gift_wall_list_info_list_header_rank"
android:textColor="#FFFFFF"
tools:text="10"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar2"
android:layout_width="37dp"
android:layout_height="37dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
android:layout_marginStart="32dp"
android:layout_marginStart="55dp"
android:src="@mipmap/icon_avatar_placeholder"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
app:layout_constraintStart_toEndOf="@+id/tv_rank"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_rank"
app:riv_oval="true"
tools:visibility="visible" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="37dp"
android:layout_height="37dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentBottom="true"
android:layout_marginEnd="18dp"
android:scaleType="centerCrop"
android:layout_marginStart="10dp"
android:src="@mipmap/icon_avatar_placeholder"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
app:layout_constraintStart_toEndOf="@+id/tv_rank"
app:layout_constraintEnd_toEndOf="@+id/avatar2"
app:layout_constraintTop_toTopOf="@+id/tv_rank"
app:riv_oval="true"
tools:visibility="visible" />

2
common/src/main/res/layout/item_gift_wall_man_tab2_list_1.xml
View File

@@ -118,7 +118,7 @@
android:layout_marginStart="20dp"
android:gravity="center"
android:layout_marginEnd="20dp"
android:text="@string/dialog_gift_wall_tab2_list_wait"
android:text="@string/dialog_gift_wall_classic_wait"
android:textColor="#A2A2A2"
android:textSize="14sp"
android:visibility="gone"

4
common/src/main/res/layout/view_gift_wall_achieve_item.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="10dp">
@@ -21,7 +21,7 @@
<TextView
android:id="@+id/achieveName"
android:layout_width="wrap_content"
android:layout_height="26dp"
android:layout_height="wrap_content"
android:layout_below="@+id/achieve_img"
android:layout_centerHorizontal="true"
android:clickable="true"