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

礼物包裹的逻辑进行修改

Browse Source
This commit is contained in:
ningwenqiang
2024-10-06 17:20:50 +08:00
parent c65a19dc4c
commit 2236a90b31
20 changed files with 166 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/res/layout/dialog_live_gift_popup2.xml
View File

@@ -215,11 +215,11 @@
app:layout_constraintEnd_toEndOf="parent" />
<View
android:layout_width="1dp"
android:layout_width="1.5dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical"
android:layout_marginTop="1dp"
android:background="@color/white"
android:background="#17FFFFFF"
app:layout_constraintBottom_toBottomOf="@+id/giftWrapTv"
app:layout_constraintEnd_toStartOf="@+id/giftWrapTv"
app:layout_constraintTop_toTopOf="@+id/giftWrapTv" />
@@ -257,8 +257,11 @@
<TextView
android:id="@+id/lvTitleTv"
android:layout_width="40dp"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:minWidth="40dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:layout_gravity="center"
android:layout_marginStart="18dp"
android:layout_marginBottom="11dp"
@@ -306,13 +309,14 @@
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="0dp"
android:layout_height="3dp"
android:layout_marginStart="1dp"
android:layout_marginEnd="18dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="10dp"
android:progressDrawable="@drawable/bg_gift_progressbar2"
app:layout_constraintEnd_toStartOf="@+id/openVipBg"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/lvTipsTv"
app:layout_constraintTop_toBottomOf="@+id/lvTipsTv"
app:layout_constraintWidth_percent="0.54"
tools:progress="10" />

10
common/src/main/res/values-en-rUS/strings.xml
View File

@@ -293,8 +293,8 @@
<string name="live_dr">Multi PK</string>
<string name="live_mic">Voice connection</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</string>
<string name="live_zslk1">ResumeLive</string>
<string name="live_zslk">BRB</string>
<string name="live_zslk1">Continue</string>
<string name="live_flash">Flash lamp</string>
<string name="live_music">accompaniment</string>
<string name="live_share">share</string>
@@ -306,7 +306,7 @@
<string name="live_open_flash">Only the rear camera can turn on the flash</string>
<string name="live_open_flash_error">Flash on failed</string>
<string name="live_you_are_shut">You\'ve been banned</string>
<string name="live_end">Live broadcast ended</string>
<string name="live_end">Live broadcast has ended</string>
<string name="live_back">Back to home page</string>
<string name="live_duration">Duration of live broadcast</string>
<string name="live_votes">Harvest</string>
@@ -998,7 +998,7 @@ Limited ride And limited avatar frame</string>
<string name="robot_minimum_interval">At least once every 5 minutes</string>
<string name="robot_add_content_hint3">When a user enters the studio, the robot will @the user and automatically</string>
<string name="robot_add_content_hint4">The following sentence is random. Set a minimum of 1 to a maximum of 20.</string>
<string name="robot_setup">Robot setup</string>
<string name="robot_setup">Bot setup</string>
<string name="high_definition">High definition</string>
<string name="standard_clear">fluency</string>
<string name="ultra_hd">Ultra hd</string>
@@ -1025,7 +1025,7 @@ Limited ride And limited avatar frame</string>
<string name="live_user_ban_hd">There is no choice, the anchor is not turned on HD live.</string>
<string name="function_is_suspended">Sorry, this feature is on hold.</string>
<string name="phone_number">Phone Number</string>
<string name="broadcast_data">Broadcast</string>
<string name="broadcast_data">Live data</string>
<string name="click_to_view">Click To View</string>
<string name="anchor_task">Anchor Task</string>
<string name="anchor_agreement">I have read and agreed to the </string>

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

@@ -236,13 +236,13 @@
<string name="live_dr">Multi PK</string>
<string name="live_mic">Voice connection</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</string>
<string name="live_zslk1">ResumeLive</string>
<string name="live_zslk">BRB</string>
<string name="live_zslk1">Continue</string>
<string name="live_share">share</string>
<string name="live_link_pk">SinglePK</string>
<string name="live_wishlist">WishList</string>
<string name="live_open_flash">Only the rear camera can turn on the flash</string>
<string name="live_end">Live broadcast ended</string>
<string name="live_end">Live broadcast has ended</string>
<string name="live_back">Back to Home</string>
<string name="live_duration">Duration of live broadcast</string>
<string name="live_votes">Harvest</string>
@@ -831,7 +831,7 @@ Limited ride And limited avatar frame</string>
<string name="robot_minimum_interval">At least once every 5 minutes</string>
<string name="robot_add_content_hint3">When a user enters the studio, the robot will @the user and automatically</string>
<string name="robot_add_content_hint4">The following sentence is random. Set a minimum of 1 to a maximum of 20.</string>
<string name="robot_setup">Robot setup</string>
<string name="robot_setup">Bot setup</string>
<string name="high_definition">High definition</string>
<string name="standard_clear">fluency</string>
<string name="ultra_hd">Ultra hd</string>
@@ -858,7 +858,7 @@ Limited ride And limited avatar frame</string>
<string name="live_user_ban_hd">There is no choice, the anchor is not turned on HD live.</string>
<string name="function_is_suspended">Sorry, this feature is on hold.</string>
<string name="phone_number">Phone Number</string>
<string name="broadcast_data">Broadcast</string>
<string name="broadcast_data">Live data</string>
<string name="click_to_view">Click To View</string>
<string name="anchor_task">Anchor Task</string>
<string name="anchor_agreement">I have read and agreed to the </string>