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

修复测试反馈问题

Browse Source
This commit is contained in:
zlzw 2023-12-23 11:01:28 +08:00
parent 34986d6897
commit 05aea2448f
12 changed files with 110 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/main/java/com/yunbao/common/dialog/PromotionElitePopupWindow.java
View File

@ -6,10 +6,14 @@ import android.content.Context;
import androidx.annotation.NonNull;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.core.BasePopupView;
import com.lxj.xpopup.core.CenterPopupView;
import com.yunbao.common.R;
import com.yunbao.common.bean.BattlePassUserInfoBean;
import com.yunbao.common.utils.DeviceUtils;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
/**
@ -19,6 +23,7 @@ public class PromotionElitePopupWindow extends CenterPopupView {
private String enjoySpendMoney, quintessenceSpendMoney;//花费钱
private LiberalBattlePassPopupWindow.LiberalBattlePassCallback mPassCallback;
private String elitesTypeId,enjoyTypeId;
private BattlePassUserInfoBean data;
public PromotionElitePopupWindow(@NonNull Context context, String mEnjoySpendMoney,
String mQuintessenceSpendMoney, LiberalBattlePassPopupWindow.LiberalBattlePassCallback passCallback,
@ -30,6 +35,10 @@ public class PromotionElitePopupWindow extends CenterPopupView {
this.elitesTypeId = elitesTypeId;
this.enjoyTypeId = enjoyTypeId;
}
public PromotionElitePopupWindow setUserData(BattlePassUserInfoBean data) {
this.data=data;
return this;
}
@Override
protected int getImplLayoutId() {
@ -49,6 +58,10 @@ public class PromotionElitePopupWindow extends CenterPopupView {
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.button_quintessence), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
if(data!=null && data.getBattlePassUserRecords2()==2){
ToastUtil.show(WordUtil.getNewString(R.string.battlepass_buy_max));
return;
}
dialog.dismiss();
new XPopup.Builder(getContext())
.enableDrag(false)
@ -60,6 +73,10 @@ public class PromotionElitePopupWindow extends CenterPopupView {
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.button_enjoy), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
if(data!=null && data.getBattlePassUserRecords3()==2){
ToastUtil.show(WordUtil.getNewString(R.string.battlepass_buy_max));
return;
}
dialog.dismiss();
new XPopup.Builder(getContext())
.enableDrag(false)
@ -69,4 +86,6 @@ public class PromotionElitePopupWindow extends CenterPopupView {
}
});
}
}

5
common/src/main/res/layout/liberal_battle_pass_popup.xml
View File

@ -10,7 +10,10 @@
<TextView
android:id="@+id/liberal_battle_pass"
android:layout_width="wrap_content"
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"

46
common/src/main/res/layout/promotion_elite_popup.xml
View File

@ -1,11 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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="219dp"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginEnd="22dp"
android:background="@drawable/background_order_dialog"
android:orientation="vertical">
>
<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"
@ -19,7 +31,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/upgrade_elite"
android:textColor="#0D21B2"
@ -29,7 +41,9 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:layout_marginStart="15dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="15dp"
android:gravity="center"
android:text="@string/upgrade_elite2"
android:textColor="#0D21B2"
@ -38,27 +52,31 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp">
android:layout_marginTop="20dp">
<Button
android:id="@+id/button_quintessence"
android:layout_width="116dp"
android:layout_height="38dp"
android:text="@string/upgrade_elite_type1"
android:textColor="#F36100"
android:textSize="14sp"
android:layout_marginStart="34dp"
android:background="@mipmap/bg_dialog_battlepass_btn" />
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:text="@string/upgrade_elite_type2"
android:textColor="#F36100"
android:textSize="14sp"
android:layout_gravity="end"
android:layout_marginEnd="34dp"
android:background="@mipmap/bg_dialog_battlepass_btn" />
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>

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

@ -1421,4 +1421,6 @@ Limited ride And limited avatar frame</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>
</resources>

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

@ -1417,4 +1417,6 @@
<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>
</resources>

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

@ -1416,4 +1416,6 @@
<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>
</resources>

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

@ -1416,4 +1416,6 @@
<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>
</resources>

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

@ -1422,5 +1422,6 @@ Limited ride And limited avatar frame</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>
</resources>

7
main/src/main/java/com/yunbao/main/activity/BattlePassActivity.java
View File

@ -123,10 +123,6 @@ public class BattlePassActivity extends AbsActivity {
moreIntegralButton = findViewById(R.id.more_integral);
ViewClicksAntiShake.clicksAntiShake(moreIntegralButton, () -> {
if (data.getBattlePassUserRecords3() == 2) {
ToastUtil.show(WordUtil.getNewString(R.string.battlepass_buy_max));
return;
}
new XPopup.Builder(mContext)
.enableDrag(false)
.maxWidth(DeviceUtils.getScreenHeight(mContext) - DpUtil.dp2px(34))
@ -142,7 +138,8 @@ public class BattlePassActivity extends AbsActivity {
},
String.valueOf(data.getLive_battle_pass_type().get(1).getId()),
String.valueOf(data.getLive_battle_pass_type().get(2).getId())
))
).setUserData(data)
)
.show();
});
ViewClicksAntiShake.clicksAntiShake(rule, new ViewClicksAntiShake.ViewClicksCallBack() {

1
main/src/main/java/com/yunbao/main/fragment/BattlePassMissionFragment.java
View File

@ -67,6 +67,7 @@ public class BattlePassMissionFragment extends BaseFragment {
adapter.setOnItemClickListener(new OnItemClickListener<BattlePassTask.Task>() {
@Override
public void onItemClick(BattlePassTask.Task bean, int position) {
Bus.get().post(new BattlePassTypeEvent(0));
if (position == -2) {
if (userInfoBean.getNextLevelExp() == 0) {
ToastUtil.show(WordUtil.getNewString(R.string.battlepass_user_level_max));

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="battlepass_user_session">Session 1</string>
<string name="battlepass_user_time">活動時間：%s</string>
<string name="battlepass_user_time">活動時間：</string>
<string name="battlepass_user_level">我的等級：</string>
<string name="battlepass_user_level_max">等級已滿</string>
<string name="battlepass_user_my_integral">我的積分：%s</string>
@ -18,7 +18,5 @@
<string name="battlepass_exchange_submit_lock">未解鎖</string>
<string name="battlepass_reward_item_lock">暫未達到等級</string>
<string name="battlepass_reward_item_get">領取成功</string>
<string name="battlepass_zl_get">開通成功</string>
<string name="battlepass_buy_max">您已購買該戰令</string>
</resources>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="battlepass_user_session">Session 1</string>
<string name="battlepass_user_time">Activity time:%s</string>
<string name="battlepass_user_time">Activity time:</string>
<string name="battlepass_user_level">My level:</string>
<string name="battlepass_user_level_max">Experience full</string>
<string name="battlepass_user_my_integral">My points：%s</string>
@ -18,6 +18,5 @@
<string name="battlepass_exchange_submit_lock">Unlocked</string>
<string name="battlepass_reward_item_lock">Not yet reached level</string>
<string name="battlepass_reward_item_get">Successfully claimed</string>
<string name="battlepass_zl_get">Successfully opened</string>
<string name="battlepass_buy_max">You have purchased the BattlePass</string>
</resources>