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 09:59:30 +08:00
parent 924afce81e
commit 34986d6897
24 changed files with 170 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/yunbao/common/dialog/ActivateEliteBattleOrderPopupWindow.java
View File

@@ -49,14 +49,14 @@ public class ActivateEliteBattleOrderPopupWindow extends CenterPopupView {
findViewById(R.id.enjoy_image).setVisibility(GONE);
findViewById(R.id.elites_image).setVisibility(VISIBLE);
findViewById(R.id.gift_overvalue).setVisibility(VISIBLE);
((TextView)findViewById(R.id.gift3_text)).setText(WordUtil.getNewString(R.string.gift_overvalue));
((TextView)findViewById(R.id.gift3_text)).setText(WordUtil.getNewString(R.string.unlock_more_gifts));
} else {
findViewById(R.id.gift_overvalue).setVisibility(GONE);
findViewById(R.id.gift_overvalue3).setVisibility(VISIBLE);
findViewById(R.id.enjoy_image).setVisibility(VISIBLE);
findViewById(R.id.elites_image).setVisibility(GONE);
findViewById(R.id.gift_overvalue).setVisibility(GONE);
((TextView)findViewById(R.id.gift3_text)).setText(WordUtil.getNewString(R.string.gift_overvalue3));
((TextView)findViewById(R.id.gift3_text)).setText(WordUtil.getNewString(R.string.unlock_more_gifts2));
}
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.war_order_close), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override

9
common/src/main/java/com/yunbao/common/dialog/RuleOfWarPopupWindow.java
View File

@@ -1,6 +1,7 @@
package com.yunbao.common.dialog;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -25,6 +26,12 @@ public class RuleOfWarPopupWindow extends CenterPopupView {
protected void onCreate() {
super.onCreate();
rule=findViewById(R.id.rule);
findViewById(R.id.close).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
dismiss();
}
});
initData();
}
private void initData(){
@@ -32,7 +39,7 @@ public class RuleOfWarPopupWindow extends CenterPopupView {
.getBattlePassRule(new HttpCallback<String>() {
@Override
public void onSuccess(String data) {
rule.setText(data);
rule.setText(data.replace("\n","\n\n"));
}
@Override

5
common/src/main/java/com/yunbao/common/dialog/WarOrderExchangeDetailsPopupWindow.java
View File

@@ -13,6 +13,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.ResponseModel;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -89,6 +90,10 @@ public class WarOrderExchangeDetailsPopupWindow extends CenterPopupView {
orderLevel.setText(buyExp);
BigDecimal needExpBigDecimal = buyExpBigDecimal.multiply(new BigDecimal(mScale));
pointExchange.setText(String.format("%s",needExpBigDecimal));
}else if(exp >= mLimitQuantity){
ToastUtil.show(WordUtil.getNewString(R.string.battlepass_exchange_buy_max));
}else {
ToastUtil.show(WordUtil.getNewString(R.string.battlepass_exchange_buy_integral));
}
}
});

10
common/src/main/res/layout/order_level_popup.xml
View File

@@ -54,8 +54,10 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:gravity="center">
@@ -83,10 +85,10 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:gravity="center"
android:inputType="number"
android:imeOptions="actionSend"
android:background="@null"
android:gravity="center"
android:imeOptions="actionSend"
android:inputType="number"
android:singleLine="true"
android:text="0"
android:textColor="#000000"

6
common/src/main/res/layout/rule_of_war_popup.xml
View File

@@ -14,8 +14,8 @@
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="111dp"
android:layout_height="62.5dp"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
@@ -23,6 +23,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_marginBottom="15dp"
android:layout_height="match_parent">
<LinearLayout
@@ -45,6 +46,7 @@
</LinearLayout>
<ImageView
android:id="@+id/close"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="center"

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

@@ -1412,11 +1412,13 @@ Limited ride And limited avatar frame</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 experience value：</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>
</resources>

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

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

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

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

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

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

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

@@ -1413,12 +1413,14 @@ Limited ride And limited avatar frame</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 experience value：</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>
</resources>