1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀

zuoxiao

2024-05-07 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27

 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java

@@ -17,9 +17,9 @@
public class UserCard implements Serializable {
    public String cardType = CardCommon.USER_CARD_TYPE_1;//写卡标志 A1刷卡开泵前 A8刷卡开泵后  A2叠加充值

    public short arerNumber;//区域号(底位在前高位在后)
    public int arerNumber;//区域号(底位在前高位在后)

    public short deviceNumberl;//设备编号(底位在前高位在后)
    public int deviceNumberl;//设备编号(底位在前高位在后)
    public byte rechargeTimes;//充值次数

    public int totalWater;//用户总用水量  底位在前，高位在后2位小数点  含两个小数点的整数
@@ -48,11 +48,11 @@

            byte[] arerNumberByte = new byte[2];
            System.arraycopy(zero, 1, arerNumberByte, 0, arerNumberByte.length);
            userCard.arerNumber = (short) HexUtil.get16to10LowHigh(HexUtil.bytesToHex(arerNumberByte));
            userCard.arerNumber = HexUtil.get16to10LowHigh(HexUtil.bytesToHex(arerNumberByte));

            byte[] deviceNumberlByte = new byte[2];
            System.arraycopy(zero, 3, deviceNumberlByte, 0, deviceNumberlByte.length);
            userCard.deviceNumberl = (short) HexUtil.get16to10LowHigh(HexUtil.bytesToHex(deviceNumberlByte));
            userCard.deviceNumberl =  HexUtil.get16to10LowHigh(HexUtil.bytesToHex(deviceNumberlByte));

            userCard.rechargeTimes = HexUtil.hexToByte(HexUtil.byteToHex(zero[5]));

@@ -242,19 +242,19 @@
        this.cardType = cardType;
    }

    public short getArerNumber() {
    public int getArerNumber() {
        return arerNumber;
    }

    public void setArerNumber(short arerNumber) {
    public void setArerNumber(int arerNumber) {
        this.arerNumber = arerNumber;
    }

    public short getDeviceNumberl() {
    public int getDeviceNumberl() {
        return deviceNumberl;
    }

    public void setDeviceNumberl(short deviceNumberl) {
    public void setDeviceNumberl(int deviceNumberl) {
        this.deviceNumberl = deviceNumberl;
    }