1.修复16进制低位在前高位在后转换成10进制时的bug 2.完成充值相关功能 3.优化导出记录相关信息

zuoxiao

2024-05-08 b6779014ad6b2627d0a7e4d170d918d001fc03db

 henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java

@@ -12,6 +12,7 @@

import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.utils.AidlUtil;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.MornyUtil;
@@ -253,11 +254,11 @@
        ) {
            binding.textView.setText("该卡已经写入用户信息，请更换卡片");
            binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
        } else if (cardType.equals("-1")) {
        } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR1)) {
            TipUtil.show(NFCWreatActivity.this, "请勿移动卡片，读卡失败请重试！！");
        } else if (cardType.equals("-2")) {
            TipUtil.show(NFCWreatActivity.this, "读卡失败,请检查卡是否是用户卡");
        } else {
        } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
            TipUtil.show(NFCWreatActivity.this, "，卡片未能识别，请检查卡片是否是本公司卡片");
        }  else {
            Log.i("NFCWreatActivity", "olduserCard!=null  saveData");
            saveData();
        }
@@ -640,7 +641,7 @@
                                    //默认是1元
                                    userCard.setElectricityPrice(1.000f);
                                }
                                userCard.setSwipeNumber((short) 0);
                                userCard.setSwipeNumber( 0);
                                userCard.setState("00");
                                userCard.setBalance(0);
                                userCard.setAddressCode(adminData.getAddressCode());