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

修复测试反馈内容

Browse Source 
新增临时需求：banner点进礼物墙
新增临时需求：主播下播后显示违规内容(未接入接口）
合并潘多拉修复问题
This commit is contained in:
zlzw
2024-07-30 10:29:34 +08:00
parent 516a068c25
commit 9ae6fedd8d
40 changed files with 592 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,7 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/diamond_icon"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_weight="1"
@@ -373,6 +374,8 @@
android:minWidth="32dp"
android:text="需10个"
android:textSize="8dp"
android:visibility="gone"
tools:visibility="visible"
android:translationZ="2dp"
app:layout_constraintBottom_toTopOf="@+id/btn_one"
app:layout_constraintEnd_toEndOf="@+id/btn_one" />

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

@@ -21,7 +21,6 @@
app:layout_constraintVertical_bias="0.0" />
<androidx.core.widget.NestedScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
@@ -80,12 +79,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
tools:text="TextView"
android:textColor="#FFD3A4"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@+id/user_avatar_container"
app:layout_constraintStart_toStartOf="@+id/user_avatar_container"
app:layout_constraintTop_toBottomOf="@+id/user_avatar_container" />
app:layout_constraintTop_toBottomOf="@+id/user_avatar_container"
tools:text="TextView" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/user_avatar_container"
@@ -206,12 +205,12 @@
android:id="@+id/user_avatar_2"
android:layout_width="0dp"
android:layout_height="0dp"
tools:src="@mipmap/icon_avatar_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
app:riv_oval="true"
tools:src="@mipmap/icon_avatar_placeholder" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
@@ -231,24 +230,25 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/user_value_2"
app:layout_constraintEnd_toEndOf="@+id/imageView17"
app:layout_constraintStart_toStartOf="@+id/imageView17"/>
app:layout_constraintStart_toStartOf="@+id/imageView17"
tools:text="TextView" />
<TextView
android:id="@+id/user_value_2"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
tools:text="TextView"
android:gravity="center"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@+id/imageView17"
app:layout_constraintEnd_toEndOf="@+id/user_name_2"
app:layout_constraintStart_toStartOf="@+id/user_name_2" />
app:layout_constraintStart_toStartOf="@+id/user_name_2"
tools:text="TextView" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -293,12 +293,12 @@
android:id="@+id/user_avatar_1"
android:layout_width="0dp"
android:layout_height="0dp"
tools:src="@mipmap/icon_avatar_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
app:riv_oval="true"
tools:src="@mipmap/icon_avatar_placeholder" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -323,24 +323,26 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/user_value_1"
app:layout_constraintEnd_toEndOf="@+id/imageView9"
app:layout_constraintStart_toStartOf="@+id/imageView9" />
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/imageView9"
tools:text="TextView" />
<TextView
android:id="@+id/user_value_1"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
tools:text="TextView"
android:layout_marginBottom="10dp"
android:gravity="center"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@+id/imageView9"
app:layout_constraintEnd_toEndOf="@+id/user_name_1"
app:layout_constraintStart_toStartOf="@+id/user_name_1" />
app:layout_constraintStart_toStartOf="@+id/user_name_1"
tools:text="Mystery Man" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -384,12 +386,12 @@
android:id="@+id/user_avatar_3"
android:layout_width="0dp"
android:layout_height="0dp"
tools:src="@mipmap/icon_avatar_placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
app:riv_oval="true"
tools:src="@mipmap/icon_avatar_placeholder" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
@@ -409,24 +411,25 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
tools:text="TextView"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/user_value_3"
app:layout_constraintEnd_toEndOf="@+id/imageView16"
app:layout_constraintStart_toStartOf="@+id/imageView16" />
app:layout_constraintStart_toStartOf="@+id/imageView16"
tools:text="TextView" />
<TextView
android:id="@+id/user_value_3"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
tools:text="TextView"
android:gravity="center"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/user_name_3"
app:layout_constraintStart_toStartOf="@+id/user_name_3" />
app:layout_constraintStart_toStartOf="@+id/user_name_3"
tools:text="TextView" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
@@ -472,6 +475,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<ImageView
android:id="@+id/iv_back"
android:layout_width="wrap_content"

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

@@ -17,7 +17,7 @@
<ImageView
android:id="@+id/gift_soles"
android:layout_width="wrap_content"
android:layout_width="58dp"
android:layout_height="20dp"
app:layout_constraintBottom_toBottomOf="@+id/gift_bg"

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

@@ -9,15 +9,15 @@
android:id="@+id/gift_bg"
android:layout_width="74dp"
android:layout_height="74dp"
android:src="@mipmap/gift_wall_main_item_bg1"
app:autoPlay="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@mipmap/gift_wall_main_item_bg1" />
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/gift_soles"
android:layout_width="wrap_content"
android:layout_width="58dp"
android:layout_height="20dp"
app:layout_constraintBottom_toBottomOf="@+id/gift_bg"
@@ -28,13 +28,16 @@
<TextView
android:id="@+id/gift_status"
android:layout_width="wrap_content"
android:textSize="10sp"
android:textColor="#01071A"
android:layout_height="wrap_content"
tools:text="未點亮"
android:gravity="center"
android:maxLines="1"
android:textColor="#01071A"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="@+id/gift_bg"
app:layout_constraintEnd_toEndOf="@+id/gift_soles"
app:layout_constraintStart_toStartOf="@+id/gift_soles" />
app:layout_constraintStart_toStartOf="@+id/gift_soles"
tools:text="未點亮 00/000" />
<ImageView
android:id="@+id/gift"
@@ -63,8 +66,10 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textColor="#FFFFFF"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="#FFFFFF"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

5
common/src/main/res/values-zh/strings.xml
View File

@@ -1541,4 +1541,9 @@
<string name="dialog_gift_wall_assistance_star">助力值</string>
<string name="dialog_gift_wall_time_now">本期展館時間:</string>
<string name="dialog_gift_wall_time_old">上期展館時間:</string>
<string name="live_end_view_ban_title">您由於【%s】 違規被中斷直播</string>
<string name="live_end_view_ban_reason">違規原因:</string>
<string name="live_end_view_ban_content">處罰內容:</string>
<string name="live_end_view_ban_timer">處罰時間:</string>
</resources>

5
common/src/main/res/values/strings.xml
View File

@@ -1549,4 +1549,9 @@
<string name="dialog_gift_wall_time_old">Last hall time:</string>
<string name="sub_admission_fee">*10% of the threshold will be charged as ticket</string>
<string name="live_end_view_ban_title">You were interrupted from the live broadcast due to violation of [%s]. </string>
<string name="live_end_view_ban_reason">Violation reasons:</string>
<string name="live_end_view_ban_content">Penalty content:</string>
<string name="live_end_view_ban_timer">Penalty time:</string>
</resources>