From 0fe9cc9142484ea3818340ca709886c126faf986 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 15 三月 2024 18:53:28 +0800
Subject: [PATCH] 修复列表显示异常的bug 修复充值后用户卡结构翻译异常的bug
---
app/src/main/res/layout/item_new_card.xml | 2 +-
app/src/main/java/com/dayu/recharge/utils/ToastUtil.java | 3 +++
app/src/main/java/com/dayu/recharge/card/UserCard.java | 3 +--
app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java | 2 +-
app/src/main/res/layout/item_replacement.xml | 2 +-
app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java | 1 +
app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java | 2 +-
app/build.gradle | 4 ++--
8 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 494202c..ecd5b26 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@
applicationId "com.dayu.recharge"
minSdk 23
targetSdk 26
- versionCode 16
- versionName "1.6"
+ versionCode 20
+ versionName "2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// ndk{
diff --git a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
index 2c0ae7b..fb08ec3 100644
--- a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
@@ -124,7 +124,7 @@
}
if (mNfcAdapter != null && !mNfcAdapter.isEnabled()) {
startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
- ToastUtil.show( "璇峰湪绯荤粺璁剧疆涓厛鍚敤NFC鍔熻兘锛�");
+ ToastUtil.showLong( "璇峰湪绯荤粺璁剧疆涓厛鍚敤NFC鍔熻兘锛�");
return false;
}
return true;
diff --git a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
index 9ffd1aa..548f272 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
@@ -383,6 +383,7 @@
rechargeBean.setSerial(adminData.getSerial());
userCard.setRechargeDate(Calendar.getInstance());
+ userCard.setBalance(balance);
rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
rechargeBean.setInitPeasantCode(initPeasantCode);
rechargeBean.setOrderID(orderId);
diff --git a/app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java b/app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java
index 118d523..5075444 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java
@@ -52,7 +52,7 @@
int balance = userCard.getBalance();
if (!TextUtils.isEmpty(morny)) {
binding.tip.setText("鍏呭�兼垚鍔燂紒");
- balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
+ balance = userCard.getBalance() ;
binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
} else {
binding.tip.setText("寮�鍗℃垚鍔燂紒");
diff --git a/app/src/main/java/com/dayu/recharge/card/UserCard.java b/app/src/main/java/com/dayu/recharge/card/UserCard.java
index 6643b8c..22ea997 100644
--- a/app/src/main/java/com/dayu/recharge/card/UserCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/UserCard.java
@@ -76,10 +76,9 @@
System.arraycopy(zero,9,balanceBytes,0,balanceBytes.length);
userCard.balance = HexUtil.get16to10LowHigh(HexUtil.bytesToHex(balanceBytes));
-
byte[] addressCodeBytes = new byte[6];
System.arraycopy(zero,13,addressCodeBytes,0,2);
- System.arraycopy(two,11,addressCodeBytes,0,4);
+ System.arraycopy(two,11,addressCodeBytes,2,4);
userCard.addressCode = BcdUtil.bcdToStr(addressCodeBytes);
int year = 0;
diff --git a/app/src/main/java/com/dayu/recharge/utils/ToastUtil.java b/app/src/main/java/com/dayu/recharge/utils/ToastUtil.java
index 6a9965a..eba096b 100644
--- a/app/src/main/java/com/dayu/recharge/utils/ToastUtil.java
+++ b/app/src/main/java/com/dayu/recharge/utils/ToastUtil.java
@@ -15,4 +15,7 @@
public static void show(String data) {
Toast.makeText(MyApplication.myApplication, data, Toast.LENGTH_SHORT).show();
}
+ public static void showLong(String data) {
+ Toast.makeText(MyApplication.myApplication, data, Toast.LENGTH_LONG).show();
+ }
}
diff --git a/app/src/main/res/layout/item_new_card.xml b/app/src/main/res/layout/item_new_card.xml
index 323228f..bf13cf0 100644
--- a/app/src/main/res/layout/item_new_card.xml
+++ b/app/src/main/res/layout/item_new_card.xml
@@ -6,7 +6,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
diff --git a/app/src/main/res/layout/item_replacement.xml b/app/src/main/res/layout/item_replacement.xml
index cea90d1..fe83c90 100644
--- a/app/src/main/res/layout/item_replacement.xml
+++ b/app/src/main/res/layout/item_replacement.xml
@@ -14,7 +14,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
--
Gitblit v1.8.0