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

修复测试反馈BUG

Browse Source
This commit is contained in:
zlzw
2024-01-23 17:33:55 +08:00
parent 0a70cc027f
commit 0e596e9be9
4 changed files with 131 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
main/src/main/java/com/yunbao/main/adapter/BattlePassExchangeAdapter.java
View File

@@ -8,6 +8,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -76,6 +77,10 @@ public class BattlePassExchangeAdapter extends RecyclerView.Adapter<BattlePassEx
private View mark;
private TextView markText;
LinearLayout topMoneySubscript;
TextView topMoney;
ImageView topMoneyIcon;
public VH(@NonNull View itemView) {
super(itemView);
@@ -87,6 +92,10 @@ public class BattlePassExchangeAdapter extends RecyclerView.Adapter<BattlePassEx
mark = itemView.findViewById(R.id.mark_layout);
markText = itemView.findViewById(R.id.mark_text);
indicator.setVisibility(View.GONE);
topMoney = itemView.findViewById(R.id.top_money_text);
topMoneyIcon = itemView.findViewById(R.id.top_money_icon);
topMoneySubscript = itemView.findViewById(R.id.top_money_layout);
}
public void setData(BattlePassPoints battlePassPoints) {
@@ -100,6 +109,25 @@ public class BattlePassExchangeAdapter extends RecyclerView.Adapter<BattlePassEx
markText.setText(battlePassPoints.getExchangeMark());
}
submit.setOnClickListener(null);
topMoneyIcon.setVisibility(View.VISIBLE);
switch (battlePassPoints.getSendGiftType()) {
case 0:
topMoneyIcon.setImageResource(R.mipmap.diamond);
break;
case 1:
topMoneyIcon.setImageResource(R.mipmap.gold_coin);
break;
default:
topMoneyIcon.setVisibility(View.GONE);
}
topMoney.setText(String.valueOf(battlePassPoints.getSendGiftNeedcoin()));
if (battlePassPoints.getSendGiftType() == 999) {
topMoney.setText(String.format("%s%s", battlePassPoints.getRestrictTime(), WordUtil.isNewZh() ? "天" : "Day"));
if (battlePassPoints.getRestrictTime() == 0) {
topMoney.setText(WordUtil.isNewZh() ? "永久" : "Forever");
}
}
if (battlePassPoints.getExchangeStatus() == 1) {
submit.setText(WordUtil.getNewString(R.string.battlepass_exchange_submit_lock));
submit.setBackgroundResource(R.mipmap.bg_zl_battlepass_exchange_btn_lock);
@@ -127,7 +155,7 @@ public class BattlePassExchangeAdapter extends RecyclerView.Adapter<BattlePassEx
.enableDrag(false)
.maxWidth(DeviceUtils.getScreenHeight((Activity) mContext) - DpUtil.dp2px(34))
.asCustom(new WarOrderExchangeDetailsPopupWindow(mContext,
battlePassPoints.getExchangeQuantity()-battlePassPoints.getUserQuintyCount(),
battlePassPoints.getExchangeQuantity() - battlePassPoints.getUserQuintyCount(),
point,
Integer.parseInt(battlePassPoints.getPointsThreshold()),
battlePassPoints.getImageUrl(),

29
main/src/main/res/layout/item_battlepass_exchange.xml
View File

@@ -60,6 +60,35 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/top_money_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/ic_zl_battlpas_exchange_top_subscript"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/top_money_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginBottom="1dp"
android:layout_marginEnd="1dp"
android:textColor="#fff"
android:textSize="11sp"
tools:text="10000" />
<ImageView
android:id="@+id/top_money_icon"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="1dp"
android:src="@mipmap/gold_coin" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>