修复列表显示异常的bug 修复充值后用户卡结构翻译异常的bug

zuoxiao

2024-03-15 0fe9cc9142484ea3818340ca709886c126faf986

修复列表显示异常的bug
修复充值后用户卡结构翻译异常的bug

 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{

 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;

 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);

 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("开卡成功！");

 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;

 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();
    }
}

 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

 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