diff --git a/common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java b/common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java
new file mode 100644
index 000000000..8fef68d2d
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java
@@ -0,0 +1,24 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.core.CenterPopupView;
+import com.yunbao.common.R;
+
+public class ActivateEliteBattleOrderPopupWindow extends CenterPopupView {
+ public ActivateEliteBattleOrderPopupWindow(@NonNull Context context) {
+ super(context);
+ }
+ @Override
+ protected int getImplLayoutId() {
+ return R.layout.activate_elite_battle_order_popup;
+ }
+
+ // 执行初始化操作,比如:findView,设置点击,或者任何你弹窗内的业务逻辑
+ @Override
+ protected void onCreate() {
+ super.onCreate();
+ }
+}
diff --git a/common/src/main/res/layout/activate_elite_battle_order_popup.xml b/common/src/main/res/layout/activate_elite_battle_order_popup.xml
new file mode 100644
index 000000000..30dc369d5
--- /dev/null
+++ b/common/src/main/res/layout/activate_elite_battle_order_popup.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/src/main/res/mipmap-b+en+us/icon_activate_the_elite_battle_order.png b/common/src/main/res/mipmap-b+en+us/icon_activate_the_elite_battle_order.png
new file mode 100644
index 000000000..78ab118fb
Binary files /dev/null and b/common/src/main/res/mipmap-b+en+us/icon_activate_the_elite_battle_order.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/button_war_order.png b/common/src/main/res/mipmap-xxhdpi/button_war_order.png
new file mode 100644
index 000000000..715188f3f
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/button_war_order.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png b/common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png
new file mode 100644
index 000000000..2e5c126a5
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_activate_the_elite_battle_order.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_order_score.png b/common/src/main/res/mipmap-xxhdpi/icon_order_score.png
new file mode 100644
index 000000000..db6191afd
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_order_score.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_war_order_diamond.png b/common/src/main/res/mipmap-xxhdpi/icon_war_order_diamond.png
new file mode 100644
index 000000000..9f91226fc
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_war_order_diamond.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_war_order_gift.png b/common/src/main/res/mipmap-xxhdpi/icon_war_order_gift.png
new file mode 100644
index 000000000..6bb92e9e3
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_war_order_gift.png differ
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 2bab89497..b40b5891f 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1393,5 +1393,7 @@ Limited ride And limited avatar frame
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;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;3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.
+ 1. When the BattlePass is activated, completing the BattlePass task and increasing the BattlePass level can earn a large amount of level rewards.\n
+ 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
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index 20f17754b..35d409de1 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1390,4 +1390,10 @@
1.1星幣兌換1張觀影券,您可以根據需求自定義兌換數量,觀影券一經兌換不可撤銷,請提前確認;2.1張觀影券可觀看一集短劇,兌換成功後即可返回觀影頁面,使用觀影券繼續觀看影片;3.觀影券禁止線下交易、收購等不正當行為,PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。
+ 1.戰令開啟時,完成戰令任務,提升戰令等級,可 獲得大量等級獎勵。
+ 2.所有用戶免費解鎖普通版,戰令開啟時隨時可進 階為精英版和尊享版,獲得豐厚額外專屬獎勵。
+ 3.三種戰令都會獎勵積分,可在兌換商城中兌換心 儀的寶貝,部分寶貝兌換有戰令等級要求或兌換數 量限制。
+ 4.每日任務0點刷新,未完成任務進度不再累計, 每季任務將會在新一季戰令開啟時刷新。
+ 5.任務達成時需主動領取經驗,未领取經驗將會在 任務刷新時自动领取。
+ 6.活動最終解釋權歸PDLIVE所有。
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index f14c42b6d..946aad302 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1389,4 +1389,10 @@
1.1星幣兌換1張觀影券,您可以根據需求自定義兌換數量,觀影券一經兌換不可撤銷,請提前確認;2.1張觀影券可觀看一集短劇,兌換成功後即可返回觀影頁面,使用觀影券繼續觀看影片;3.觀影券禁止線下交易、收購等不正當行為,PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。
+ 1.戰令開啟時,完成戰令任務,提升戰令等級,可 獲得大量等級獎勵。
+ 2.所有用戶免費解鎖普通版,戰令開啟時隨時可進 階為精英版和尊享版,獲得豐厚額外專屬獎勵。
+ 3.三種戰令都會獎勵積分,可在兌換商城中兌換心 儀的寶貝,部分寶貝兌換有戰令等級要求或兌換數 量限制。
+ 4.每日任務0點刷新,未完成任務進度不再累計, 每季任務將會在新一季戰令開啟時刷新。
+ 5.任務達成時需主動領取經驗,未领取經驗將會在 任務刷新時自动领取。
+ 6.活動最終解釋權歸PDLIVE所有。
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 68ced0bf7..3fb8e6d84 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1389,5 +1389,11 @@
1.1星幣兌換1張觀影券,您可以根據需求自定義兌換數量,觀影券一經兌換不可撤銷,請提前確認;2.1張觀影券可觀看一集短劇,兌換成功後即可返回觀影頁面,使用觀影券繼續觀看影片;3.觀影券禁止線下交易、收購等不正當行為,PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。
+ 1.戰令開啟時,完成戰令任務,提升戰令等級,可 獲得大量等級獎勵。
+ 2.所有用戶免費解鎖普通版,戰令開啟時隨時可進 階為精英版和尊享版,獲得豐厚額外專屬獎勵。
+ 3.三種戰令都會獎勵積分,可在兌換商城中兌換心 儀的寶貝,部分寶貝兌換有戰令等級要求或兌換數 量限制。
+ 4.每日任務0點刷新,未完成任務進度不再累計, 每季任務將會在新一季戰令開啟時刷新。
+ 5.任務達成時需主動領取經驗,未领取經驗將會在 任務刷新時自动领取。
+ 6.活動最終解釋權歸PDLIVE所有。
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 8e007b7fd..721c83061 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1398,10 +1398,14 @@ Limited ride And limited avatar frame
3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.升級精英/尊享戰令可領取海量積分,兌換更多獎勵
- 1.戰令開啟時,完成戰令任務,提升戰令等級,可 獲得大量等級獎勵。
- 2.所有用戶免費解鎖普通版,戰令開啟時隨時可進 階為精英版和尊享版,獲得豐厚額外專屬獎勵。
+ 1. When the BattlePass is activated, completing the BattlePass task and increasing the BattlePass level can earn a large amount of level rewards.\n
+ 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.\n3.三種戰令都會獎勵積分,可在兌換商城中兌換心 儀的寶貝,部分寶貝兌換有戰令等級要求或兌換數 量限制。4.每日任務0點刷新,未完成任務進度不再累計, 每季任務將會在新一季戰令開啟時刷新。5.任務達成時需主動領取經驗,未领取經驗將會在 任務刷新時自动领取。6.活動最終解釋權歸PDLIVE所有。
+ 更多積分
+ 禮物價值超 200%
+ 解鎖更多禮物 和全套珍稀裝扮
+ 開通后已達到等級的獎勵將會自動解鎖!
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
index 0f187bb61..fa8202edf 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
@@ -34,6 +34,7 @@ import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.HtmlConfig;
import com.yunbao.common.bean.LiveBean;
+import com.yunbao.common.dialog.ActivateEliteBattleOrderPopupWindow;
import com.yunbao.common.dialog.PromotionElitePopupWindow;
import com.yunbao.common.dialog.RuleOfWarPopupWindow;
import com.yunbao.common.event.JavascriptInterfaceEvent;
@@ -390,8 +391,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
new XPopup.Builder(mContext)
.enableDrag(false)
.maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34))
- .asCustom(new RuleOfWarPopupWindow(mContext))
- .show();
+ .asCustom(new ActivateEliteBattleOrderPopupWindow(mContext)) .show();
// LiveNetManager.get(mContext).
// getCoolConfig(new com.yunbao.common.http.base.HttpCallback() {