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

Merge remote-tracking branch 'origin/master' into 6.6.4_推送管理

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/utils/RouteUtil.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	config.gradle
This commit is contained in:
hch
2024-01-12 13:52:03 +08:00
parent 661c2fd334 7795317c14
commit ac6eb21e06
198 changed files with 6905 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/main/res/drawable/background_order_dialog.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap
android:gravity="fill_vertical|fill_horizontal"
android:src="@drawable/background_order_dialog_out_layout" />
</item>
<item
android:bottom="3dp"
android:left="3dp"
android:right="4dp"
android:top="4dp">
<shape>
<solid android:color="#F5F5FF" />
<corners android:radius="10dp" />
<stroke
android:width="3dp"
android:color="#657FE4" />
</shape>
</item>
</layer-list>

BIN
common/src/main/res/drawable/background_order_dialog_out_layout.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 873 KiB

21
common/src/main/res/drawable/order_level_progress_bg.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--设置ProgressBar背景色-->
<item android:id="@android:id/background">
<shape>
<!--设置ProgressBar进度条圆角半径-->
<corners android:radius="3dp" />
<solid android:color="#B7AFCD" />
</shape>
</item>
<!--设置ProgressBar进度条颜色-->
<item android:id="@android:id/progress">
<clip android:clipOrientation="horizontal">
<shape>
<corners android:radius="3dp" />
<solid android:color="#CE2BFF" />
</shape>
</clip>
</item>
</layer-list>

176
common/src/main/res/layout/activate_elite_battle_order_popup.xml Normal file
View File

@@ -0,0 +1,176 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp">
<ImageView
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/background_order_dialog"
android:layout_width="0dp"
android:layout_height="0dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginBottom="15dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/war_order_close"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_sud_rule_close" />
<ImageView
android:id="@+id/elites_image"
android:layout_width="211dp"
android:layout_height="27dp"
android:layout_gravity="center"
android:layout_marginTop="3dp"
android:src="@mipmap/icon_activate_the_elite_battle_order"
android:visibility="gone" />
<ImageView
android:id="@+id/enjoy_image"
android:layout_width="211dp"
android:layout_height="27dp"
android:layout_gravity="center"
android:layout_marginTop="3dp"
android:src="@mipmap/icon_enjoy_image"
android:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@mipmap/icon_war_order_diamond" />
<TextView
android:id="@+id/gift_overvalue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/gift_overvalue"
android:textColor="#CE2BFF"
android:textSize="14sp"
android:visibility="gone" />
<TextView
android:id="@+id/gift_overvalue3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/gift_overvalue3"
android:textColor="#CE2BFF"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@mipmap/icon_order_score" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/more_integral"
android:textColor="#CE2BFF"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@mipmap/icon_war_order_gift" />
<TextView
android:id="@+id/gift3_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/unlock_more_gifts"
android:textColor="#CE2BFF"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="10dp"
android:text="@string/has_reached_level_after_opening"
android:textColor="#0D21B2"
android:textSize="13sp" />
<LinearLayout
android:id="@+id/button_war_order"
android:layout_width="150dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:background="@mipmap/button_war_order"
android:gravity="center">
<TextView
android:id="@+id/button_war_order_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold"
tools:text="123" />
<ImageView
android:layout_width="20dp"
android:layout_height="wrap_content"
android:src="@mipmap/diamond" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

40
common/src/main/res/layout/activity_end_popup.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="218dp"
android:layout_marginStart="22dp"
android:layout_marginEnd="22dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginStart="30dp"
android:layout_marginTop="75dp"
android:layout_marginEnd="30dp"
android:gravity="center"
android:text="@string/this_activity_is_over"
android:textColor="#0D21B2"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/confirm"
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginTop="10dp"
android:layout_marginBottom="33dp"
android:background="@mipmap/button_buying_experience"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/edit_one_4"
android:textColor="#E03600"
android:textSize="14sp" />
</LinearLayout>
</FrameLayout>

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

@@ -13,7 +13,7 @@
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="12dp"
android:scaleType="fitEnd"
android:scaleType="fitCenter"
app:layout_constraintBottom_toTopOf="@+id/close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

68
common/src/main/res/layout/liberal_battle_pass_popup.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="218dp"
android:layout_marginStart="22dp"
android:layout_marginEnd="22dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
<TextView
android:id="@+id/liberal_battle_pass"
android:layout_width="match_parent"
android:gravity="center"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="73dp"
android:text="liberal_battle_pass2"
android:textColor="#0D21B2"
android:textSize="16sp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="57dp">
<LinearLayout
android:id="@+id/cancel"
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_marginStart="19dp"
android:background="@mipmap/button_liberal_battle_cancel"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/cancel"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/liberal_battle_sure"
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_gravity="end"
android:layout_marginEnd="19dp"
android:background="@mipmap/button_liberal_battle_sure"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/confirm"
android:textColor="#E03600"
android:textSize="14sp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>

182
common/src/main/res/layout/order_level_popup.xml Normal file
View File

@@ -0,0 +1,182 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="218dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
<ImageView
android:id="@+id/war_order_close"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_sud_rule_close" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="2dp"
android:text="@string/order_level"
android:textColor="#0D21B2"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center_vertical">
<TextView
android:id="@+id/current"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="46dp"
android:text="Lv7"
android:textColor="#CE2BFF"
android:textSize="14sp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="221dp"
android:layout_height="wrap_content"
android:layout_marginStart="7dp">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="221dp"
android:layout_height="6dp"
android:max="100"
android:progress="10"
android:progressDrawable="@drawable/order_level_progress_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/exp_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="#000"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="500/1000" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/buying_experience_point"
android:textColor="#0D21B2"
android:textSize="14sp" />
<LinearLayout
android:layout_width="90dp"
android:layout_height="25dp"
android:background="@mipmap/backgroud_tickets_plus_minus">
<View
android:id="@+id/sub"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:id="@+id/tickets_plus_minus"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:background="@null"
android:gravity="center"
android:imeOptions="actionSend"
android:inputType="number"
android:singleLine="true"
android:text="0"
android:textColor="#000000"
android:textSize="12dp" />
<View
android:id="@+id/add"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
<TextView
android:id="@+id/order_level_diamond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="100"
android:textColor="#0D21B2"
android:textSize="11sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="5dp"
android:src="@mipmap/icon_diamond2" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/balance_diamond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="100"
android:textColor="#0D21B2"
android:textSize="11sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="5dp"
android:src="@mipmap/icon_diamond2" />
</LinearLayout>
<LinearLayout
android:id="@+id/buying_experience"
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:background="@mipmap/button_buying_experience"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/buying_experience"
android:textColor="#E03600"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>

82
common/src/main/res/layout/promotion_elite_popup.xml Normal file
View File

@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginEnd="22dp"
android:background="@drawable/background_order_dialog"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/close"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_sud_rule_close" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/upgrade_elite"
android:textColor="#0D21B2"
android:textSize="23sp"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="15dp"
android:gravity="center"
android:text="@string/upgrade_elite2"
android:textColor="#0D21B2"
android:textSize="16sp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp">
<Button
android:id="@+id/button_quintessence"
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_marginStart="34dp"
android:background="@mipmap/bg_dialog_battlepass_btn"
android:text="@string/upgrade_elite_type1"
android:textAllCaps="false"
android:textColor="#F36100"
android:textSize="14sp" />
<Button
android:id="@+id/button_enjoy"
android:layout_width="116dp"
android:layout_height="38dp"
android:layout_gravity="end"
android:layout_marginEnd="34dp"
android:background="@mipmap/bg_dialog_battlepass_btn"
android:text="@string/upgrade_elite_type2"
android:textAllCaps="false"
android:textColor="#F36100"
android:textSize="14sp" />
</FrameLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

56
common/src/main/res/layout/rule_of_war_popup.xml Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="380dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
<ImageView
android:layout_width="111dp"
android:layout_height="62.5dp"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:src="@mipmap/icon_order_rule" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_marginBottom="15dp"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/rule"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp"
android:textColor="#0D21B2"
tools:text="1.戰令開啟時，完成戰令任務，提升戰令等級，可獲得大量等級獎勵。\n2.所有用戶免費解鎖普通版，戰令開啟時隨時可進階為精英版和尊享版，獲得豐厚額外專屬獎勵。\n3.三種戰令都會獎勵積分，可在兌換商城中兌換心儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數量限制。\n4.每日任務0點刷新，未完成任務進度不再累計，每季任務將會在新一季戰令開啟時刷新。\n5.任務達成時需主動領取經驗，未领取經驗將會在任務刷新時過期。\n6.活動最終解釋權歸PDLIVE所有。"
android:textSize="14sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
<ImageView
android:id="@+id/close"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:src="@mipmap/icon_order_rule_close" />
</LinearLayout>

125
common/src/main/res/layout/war_order_exchange_details_popup.xml Normal file
View File

@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="282dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
<ImageView
android:id="@+id/war_order_close"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:layout_marginTop="10dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_sud_rule_close" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/exchange_particulars"
android:textColor="#0D21B2"
android:textSize="16sp" />
<LinearLayout
android:background="@mipmap/bg_dialog_battlepass_exchange"
android:layout_width="99dp"
android:layout_height="99dp"
android:layout_gravity="center"
android:layout_marginTop="19dp">
<ImageView
android:id="@+id/exchange_particulars"
android:layout_width="99dp"
android:layout_height="99dp"
android:layout_gravity="center"
android:scaleType="centerCrop"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/point_exchange_number"
android:textColor="#0D21B2"
android:textSize="14sp" />
<LinearLayout
android:layout_width="90dp"
android:layout_height="25dp"
android:background="@mipmap/backgroud_tickets_plus_minus">
<View
android:id="@+id/sub"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:id="@+id/tickets_plus_minus"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:background="@null"
android:gravity="center"
android:imeOptions="actionSend"
android:inputType="number"
android:singleLine="true"
android:text="0"
android:textColor="#000000"
android:textSize="12dp" />
<View
android:id="@+id/add"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/point_exchange_linear"
android:layout_width="140dp"
android:layout_height="38dp"
android:layout_gravity="center"
android:layout_marginTop="17dp"
android:background="@mipmap/button_buying_experience"
android:gravity="center_horizontal">
<TextView
android:id="@+id/point_exchange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:textColor="#E03600"
android:textSize="14sp"
tools:text="123" />
<ImageView
android:layout_width="19dp"
android:layout_height="21dp"
android:layout_marginTop="6dp"
android:src="@mipmap/ic_integral" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:textColor="#E03600"
android:textSize="14sp"
android:text="@string/point_exchange2" />
</LinearLayout>
</LinearLayout>

BIN
common/src/main/res/mipmap-b+en+us/icon_activate_the_elite_battle_order.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
common/src/main/res/mipmap-b+en+us/icon_enjoy_image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
common/src/main/res/mipmap-b+en+us/icon_order_rule.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
common/src/main/res/mipmap-xxhdpi/bg_dialog_battlepass_btn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
common/src/main/res/mipmap-xxhdpi/bg_dialog_battlepass_exchange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 71 KiB

BIN
common/src/main/res/mipmap-xxhdpi/button_buying_experience.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
common/src/main/res/mipmap-xxhdpi/button_enjoy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
common/src/main/res/mipmap-xxhdpi/button_liberal_battle_cancel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
common/src/main/res/mipmap-xxhdpi/button_liberal_battle_sure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
common/src/main/res/mipmap-xxhdpi/button_quintessence.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
common/src/main/res/mipmap-xxhdpi/button_war_order.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
common/src/main/res/mipmap-xxhdpi/ic_integral.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_enjoy_image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_order_rule.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_order_rule_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_order_score.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_war_order_diamond.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_war_order_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

31
common/src/main/res/values-en-rUS/string.xml
View File

@@ -411,7 +411,7 @@
<string name="live_link_mic_cannot_link_2">Connecting wheat is currently in progress~</string>
<string name="live_link_mic_cannot_pk">You are already in PK</string>
<string name="live_link_mic_pk_1">We</string>
<string name="live_link_mic_pk_2">Other party</string>
<string name="live_link_mic_pk_2">Opponent</string>
<string name="live_coin_not_enough">The balance is insufficient. Do you want to recharge it?</string>
<string name="live_online_anchor">Current online anchor</string>
<string name="link_mic_play_game">The other anchor is in the game</string>
@@ -1393,11 +1393,40 @@ Limited ride And limited avatar frame</string>
<string name="conversion_quantity_need_of_use1">1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
<string name="conversion_quantity_need_of_use2">2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
<string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
<string name="rule_of_war_hint1">1. When the BattlePass is activated, completing the BattlePass task and increasing the BattlePass level can earn a large amount of level rewards.\n</string>
<string name="rule_of_war_hint2">2. All users can unlock the regular version for free, and when the BattlePass is activated, they can upgrade to the elite version and the luxury version at any time, and receive rich additional exclusive rewards.\n</string>
<string name="pay_cancel">Payment cancellation</string>
<string name="pay_suc">Payment successful</string>
<string name="pay_fail">Payment failed</string>
<string name="upgrade_elite">Upgrade Elite/Luxury BattlePass</string>
<string name="upgrade_elite_type1">Upgrade Elite BattlePass</string>
<string name="upgrade_elite_type2">Upgrade Luxury BattlePass</string>
<string name="upgrade_elite2">You can receive a massive amount of points and exchange more rewards</string>
<string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
<string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
<string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
<string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
<string name="more_integral">More points</string>
<string name="gift_overvalue">Gifts worth over 200%</string>
<string name="gift_overvalue3">Gifts worth over 300%</string>
<string name="unlock_more_gifts">More Rare outfits</string>
<string name="unlock_more_gifts2">More Collectible outfits</string>
<string name="has_reached_level_after_opening">After opened，the rewards that have reached will be automatically unlocked!</string>
<string name="order_level">My level</string>
<string name="buying_experience_point">Purchase EXP value：</string>
<string name="buying_experience">Buy</string>
<string name="this_activity_is_over">This activity has ended. Please collect the unclaimed rewards as soon as possible.Points can be reserved for future use</string>
<string name="exchange_particulars">Exchange Details</string>
<string name="point_exchange">%s(points) exchange</string>
<string name="point_exchange2">exchange</string>
<string name="point_exchange_number">Quantity：</string>
<string name="battlepass_exchange_buy_integral">Insufficient points</string>
<string name="battlepass_exchange_buy_max">The quantity of goods exchanged has reached the upper limit</string>
<string name="battlepass_zl_get">Successfully opened</string>
<string name="battlepass_buy_max">You have purchased the BattlePass</string>
<string name="msg_del_sys01">The items inside have not been claimed yet.Are you sure to delete the message？</string>
<string name="msg_del_sys02">Are you sure to delete the message？</string>

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

@@ -1387,9 +1387,6 @@
<string name="conversion_quantity">兌換數量：</string>
<string name="conversion_quantity_need">余额 %s</string>
<string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
<string name="conversion_quantity_need_of_use1">一、1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">二、1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">三、觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
<string name="msg_del_sys01">內含物品還未領取，是否確定刪除消息？</string>
@@ -1398,6 +1395,38 @@
<string name="pay_cancel">支付取消</string>
<string name="pay_suc">支付成功</string>
<string name="pay_fail">支付失敗</string>
<string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
<string name="rule_of_war_hint1">1.戰令開啟時，完成戰令任務，提升戰令等級，可 獲得大量等級獎勵。</string>
<string name="rule_of_war_hint2">2.所有用戶免費解鎖普通版，戰令開啟時隨時可進 階為精英版和尊享版，獲得豐厚額外專屬獎勵。</string>
<string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
<string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
<string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
<string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
<string name="upgrade_elite">升級精英/尊享戰令</string>
<string name="upgrade_elite_type1">升級精英戰令</string>
<string name="upgrade_elite_type2">升級尊享戰令</string>
<string name="upgrade_elite2">可領取海量積分，兌換更多獎勵</string>
<string name="more_integral">更多積分</string>
<string name="gift_overvalue">禮物價值超 200%</string>
<string name="gift_overvalue3">禮物價值超 300%</string>
<string name="unlock_more_gifts">解鎖更多禮物 和全套珍稀裝扮</string>
<string name="unlock_more_gifts2">解鎖更多禮物 和全套典藏裝扮</string>
<string name="has_reached_level_after_opening">開通后已達到等級的獎勵將會自動解鎖！</string>
<string name="order_level">我的等級</string>
<string name="buying_experience_point">購買經驗值：</string>
<string name="buying_experience">購買</string>
<string name="this_activity_is_over">本期活動已結束，請儘快領取未領取的獎勵積分可保留下次使用</string>
<string name="exchange_particulars">兌換詳情</string>
<string name="point_exchange">%s(積分) 兌換</string>
<string name="point_exchange2">兌換</string>
<string name="point_exchange_number">數量：</string>
<string name="battlepass_exchange_buy_integral">積分不足</string>
<string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
<string name="battlepass_zl_get">開通成功</string>
<string name="battlepass_buy_max">您已購買該戰令</string>
<string name="receive_success">領取成功</string>
<string name="receive1">領取</string>

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

@@ -1386,9 +1386,6 @@
<string name="conversion_quantity">兌換數量：</string>
<string name="conversion_quantity_need">余额 %s</string>
<string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
<string name="conversion_quantity_need_of_use1">一、1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">二、1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">三、觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
<string name="msg_del_sys01">內含物品還未領取，是否確定刪除消息？</string>
@@ -1397,6 +1394,38 @@
<string name="pay_cancel">支付取消</string>
<string name="pay_suc">支付成功</string>
<string name="pay_fail">支付失敗</string>
<string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
<string name="rule_of_war_hint1">1.戰令開啟時，完成戰令任務，提升戰令等級，可 獲得大量等級獎勵。</string>
<string name="rule_of_war_hint2">2.所有用戶免費解鎖普通版，戰令開啟時隨時可進 階為精英版和尊享版，獲得豐厚額外專屬獎勵。</string>
<string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
<string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
<string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
<string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
<string name="upgrade_elite">升級精英/尊享戰令</string>
<string name="upgrade_elite_type1">升級精英戰令</string>
<string name="upgrade_elite_type2">升級尊享戰令</string>
<string name="upgrade_elite2">可領取海量積分，兌換更多獎勵</string>
<string name="more_integral">更多積分</string>
<string name="gift_overvalue">禮物價值超 200%</string>
<string name="gift_overvalue3">禮物價值超 300%</string>
<string name="unlock_more_gifts">解鎖更多禮物 和全套珍稀裝扮</string>
<string name="unlock_more_gifts2">解鎖更多禮物 和全套典藏裝扮</string>
<string name="has_reached_level_after_opening">開通后已達到等級的獎勵將會自動解鎖！</string>
<string name="order_level">我的等級</string>
<string name="buying_experience_point">購買經驗值：</string>
<string name="buying_experience">購買</string>
<string name="this_activity_is_over">本期活動已結束，請儘快領取未領取的獎勵積分可保留下次使用</string>
<string name="exchange_particulars">兌換詳情</string>
<string name="point_exchange">%s(積分) 兌換</string>
<string name="point_exchange2">兌換</string>
<string name="point_exchange_number">數量：</string>
<string name="battlepass_exchange_buy_integral">積分不足</string>
<string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
<string name="battlepass_zl_get">開通成功</string>
<string name="battlepass_buy_max">您已購買該戰令</string>
<string name="receive_success">領取成功</string>
<string name="receive1">領取</string>

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

@@ -1385,14 +1385,42 @@
<string name="conversion_quantity">兌換數量：</string>
<string name="conversion_quantity_need">余额 %s</string>
<string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
<string name="conversion_quantity_need_of_use1">一、1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">二、1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">三、觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
<string name="rule_of_war_hint1">1.戰令開啟時，完成戰令任務，提升戰令等級，可 獲得大量等級獎勵。</string>
<string name="rule_of_war_hint2">2.所有用戶免費解鎖普通版，戰令開啟時隨時可進 階為精英版和尊享版，獲得豐厚額外專屬獎勵。</string>
<string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
<string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
<string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
<string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
<string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
<string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
<string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
<string name="pay_cancel">支付取消</string>
<string name="pay_suc">支付成功</string>
<string name="pay_fail">支付失敗</string>
<string name="upgrade_elite">升級精英/尊享戰令</string>
<string name="upgrade_elite_type1">升級精英戰令</string>
<string name="upgrade_elite_type2">升級尊享戰令</string>
<string name="upgrade_elite2">可領取海量積分，兌換更多獎勵</string>
<string name="more_integral">更多積分</string>
<string name="gift_overvalue">禮物價值超 200%</string>
<string name="gift_overvalue3">禮物價值超 300%</string>
<string name="unlock_more_gifts">解鎖更多禮物 和全套珍稀裝扮</string>
<string name="unlock_more_gifts2">解鎖更多禮物 和全套典藏裝扮</string>
<string name="has_reached_level_after_opening">開通后已達到等級的獎勵將會自動解鎖！</string>
<string name="order_level">我的等級</string>
<string name="buying_experience_point">購買經驗值：</string>
<string name="buying_experience">購買</string>
<string name="this_activity_is_over">本期活動已結束，請儘快領取未領取的獎勵積分可保留下次使用</string>
<string name="exchange_particulars">兌換詳情</string>
<string name="point_exchange">%s(積分) 兌換</string>
<string name="point_exchange2">兌換</string>
<string name="point_exchange_number">數量：</string>
<string name="battlepass_exchange_buy_integral">積分不足</string>
<string name="battlepass_exchange_buy_max">商品兌換數量已達到上限</string>
<string name="battlepass_zl_get">開通成功</string>
<string name="battlepass_buy_max">您已購買該戰令</string>
<string name="msg_del_sys01">內含物品還未領取，是否確定刪除消息？</string>
<string name="msg_del_sys02">是否確定刪除消息？</string>

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

@@ -411,7 +411,7 @@
<string name="live_link_mic_cannot_link_2">Connecting wheat is currently in progress~</string>
<string name="live_link_mic_cannot_pk">You are already in PK</string>
<string name="live_link_mic_pk_1">We</string>
<string name="live_link_mic_pk_2">Other party</string>
<string name="live_link_mic_pk_2">Opponent</string>
<string name="live_coin_not_enough">The balance is insufficient. Do you want to recharge it?</string>
<string name="live_online_anchor">Current online anchor</string>
<string name="link_mic_play_game">The other anchor is in the game</string>
@@ -1404,6 +1404,34 @@ Limited ride And limited avatar frame</string>
<string name="pay_cancel">Payment cancellation</string>
<string name="pay_suc">Payment successful</string>
<string name="pay_fail">Payment failed</string>
<string name="upgrade_elite">Upgrade Elite/Luxury BattlePass</string>
<string name="upgrade_elite_type1">Upgrade Elite BattlePass</string>
<string name="upgrade_elite_type2">Upgrade Luxury BattlePass</string>
<string name="upgrade_elite2">You can receive a massive amount of points and exchange more rewards</string>
<string name="rule_of_war_hint1">1. When the BattlePass is activated, completing the BattlePass task and increasing the BattlePass level can earn a large amount of level rewards.\n</string>
<string name="rule_of_war_hint2">2. All users can unlock the regular version for free, and when the BattlePass is activated, they can upgrade to the elite version and the luxury version at any time, and receive rich additional exclusive rewards.\n</string>
<string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
<string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
<string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
<string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
<string name="more_integral">More points</string>
<string name="gift_overvalue">Gifts worth over 200%</string>
<string name="gift_overvalue3">Gifts worth over 300%</string>
<string name="unlock_more_gifts">More Rare outfits</string>
<string name="unlock_more_gifts2">More Collectible outfits</string>
<string name="has_reached_level_after_opening">After opened，the rewards that have reached will be automatically unlocked!</string>
<string name="order_level">My level</string>
<string name="buying_experience_point">Purchase EXP value：</string>
<string name="buying_experience">Buy</string>
<string name="this_activity_is_over">This activity has ended. Please collect the unclaimed rewards as soon as possible.Points can be reserved for future use</string>
<string name="exchange_particulars">Exchange Details</string>
<string name="point_exchange">%s(points) exchange</string>
<string name="point_exchange2">exchange</string>
<string name="point_exchange_number">Quantity：</string>
<string name="battlepass_exchange_buy_integral">Insufficient points</string>
<string name="battlepass_exchange_buy_max">The quantity of goods exchanged has reached the upper limit</string>
<string name="battlepass_zl_get">Successfully opened</string>
<string name="battlepass_buy_max">You have purchased the BattlePass</string>
<string name="receive_success">Successfully claimed</string>
<string name="receive1">Receive</string>