1.添加水量单价 2.修复发现的bug

zuoxiao

2024-05-11 844597b5813ff8589de503cd7d7b1bbd0586d287

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

@@ -17,7 +17,10 @@
import com.dayu.qihealonelibrary.card.ConfigurationPowerCard;
import com.dayu.qihealonelibrary.card.ConfigureDeviceRegistrationCrad;
import com.dayu.qihealonelibrary.card.DomainCard;
import com.dayu.qihealonelibrary.card.ElectricPriceCard;
import com.dayu.qihealonelibrary.card.ManageCard;
import com.dayu.qihealonelibrary.card.PassWordCard;
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
import com.dayu.qihealonelibrary.card.UserCard;
@@ -41,8 +44,26 @@
 */
public class NFCWreatActivity extends BaseNfcActivity {

    RegisteredCard registeredCard;
    CleanUserCard cleanUserCard;
    ManageCard manageCard;
    DomainCard domainCard;

    CleanCard cleanCard;
    ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad;
    TestCard testCard;
    //区域表号卡
    RegionCard regionCard;
    ConfigurationPowerCard configurationPowerCard;
    //密码卡
    PassWordCard passWordCard;
    //用户电量单价卡
    ElectricPriceCard electricPriceCard;
    UserCardBean userCardBeanByManager;
    boolean electricPriceFlag = false;
    boolean passwordFlag = false;
    boolean cleanFlag = false;
    boolean regionFlag = false;
    boolean userFlag = false;
    boolean manageCardFlag = false;
    boolean registeredFlag = false;
@@ -61,22 +82,13 @@
    UserCard olduserCard;

    String morny;
    String rechageWater;//充值的水量
    String userName;
    AdminDataBean adminData;
    RechargeBean rechargeBean;
    Intent intent;


    RegisteredCard registeredCard;
    CleanUserCard cleanUserCard;
    ManageCard manageCard;
    DomainCard domainCard;

    CleanCard cleanCard;
    ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad;
    TestCard testCard;

    ConfigurationPowerCard configurationPowerCard;
    //打印
    QHAloneApplication baseApp;

@@ -115,13 +127,25 @@
            if (this.getIntent().hasExtra("userCard")) {
                userCard = (UserCard) this.getIntent().getSerializableExtra("userCard");
            }
            if (this.getIntent().hasExtra("electricPriceCard")) {
                electricPriceCard = (ElectricPriceCard) this.getIntent().getSerializableExtra("electricPriceCard");

                binding.cardData.setText("制作用户电量单价卡\n当前单价：" + electricPriceCard.getElectricPrice().toString() + " 元");
            }
            if (this.getIntent().hasExtra("passWordCard")) {
                passWordCard = (PassWordCard) this.getIntent().getSerializableExtra("passWordCard");
                binding.cardData.setText("制作密码卡");
            }
            if (this.getIntent().hasExtra("cleanCard")) {
                cleanCard = (CleanCard) this.getIntent().getSerializableExtra("cleanCard");
                binding.cardData.setText("制作清零卡");
            }
            if (this.getIntent().hasExtra("manageCard")) {
                manageCard = (ManageCard) this.getIntent().getSerializableExtra("manageCard");
                binding.cardData.setText("制作管理卡");
                if (this.getIntent().hasExtra("userCardBean_manager")) {
                    userCardBeanByManager = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean_manager");
                }
                binding.cardData.setText("制作管理卡(请将管理卡贴在设备上)\n用户卡号：" + manageCard.getUserCard());
            }
            if (this.getIntent().hasExtra("registeredCard")) {
                registeredCard = (RegisteredCard) this.getIntent().getSerializableExtra("registeredCard");
@@ -151,6 +175,10 @@
                configurationPowerCard = (ConfigurationPowerCard) this.getIntent().getSerializableExtra("configurationPowerCard");
                binding.cardData.setText("制作配置水泵功率卡");
            }
            if (this.getIntent().hasExtra("regionCard")) {
                regionCard = (RegionCard) this.getIntent().getSerializableExtra("regionCard");
                binding.cardData.setText("制作区域表号卡");
            }
            if (this.getIntent().hasExtra("morny")) {
                // 充值逻辑
                isRecharge = true;
@@ -158,7 +186,8 @@
                userName = this.getIntent().getStringExtra("userName");
                cardNumber = this.getIntent().getStringExtra("cardNumber");
                userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean");
                binding.cardData.setText("充值金额：" + morny + "元");
                rechageWater = this.getIntent().getStringExtra("rechageWater");
                binding.cardData.setText("充值金额：" + morny + " 元\n充值水量：" + rechageWater + " 立方米（吨）");
            }

            try {
@@ -218,15 +247,29 @@
                    || registeredCard != null || cleanUserCard != null
                    || domainCard != null || testCard != null
                    || configureDeviceRegistrationCrad != null
                    || configurationPowerCard != null) {
                    || configurationPowerCard != null || regionCard != null || passWordCard != null || electricPriceCard != null) {
                if (userCard != null && TextUtils.isEmpty(morny)) {
                    userFlag = WriteCardUtils.setUser(intent, userCard, this);
                }
                if (electricPriceCard != null) {
                    setElectricPriceCard(intent, electricPriceCard);
                }
                if (passWordCard != null) {
                    setPassWordCard(intent, passWordCard);
                }
                if (regionCard != null) {
                    setRegionCard(intent, regionCard);
                }
                if (cleanCard != null) {
                    setClean(intent, cleanCard);
                }
                if (manageCard != null) {
                    setmanageCard(intent, manageCard);
                    if (manageCardFlag && userCardBeanByManager != null) {
                        //修改用户表信息
                        userCardBeanByManager.setCardNumber(manageCard.getUserCard());
                        baseDao.userCardDao().update(userCardBeanByManager);
                    }
                }
                if (registeredCard != null) {
                    setRegisteredCard(intent, registeredCard);
@@ -246,7 +289,7 @@
                if (configurationPowerCard != null) {
                    setConfigurationPower(intent, configurationPowerCard);
                }
                if ((configPowerFlag || configDeviceRegiestFlag || testCardFlag || domainCrdFlag || userFlag || cleanFlag || manageCardFlag || registeredFlag || administrativeCardFlag || cleanUserCardFlag)) {
                if (electricPriceFlag || passwordFlag || regionFlag || configPowerFlag || configDeviceRegiestFlag || testCardFlag || domainCrdFlag || userFlag || cleanFlag || manageCardFlag || registeredFlag || administrativeCardFlag || cleanUserCardFlag) {
                    try {
                        if (userFlag && userCardBean != null) {
                            //用户卡
@@ -283,7 +326,7 @@
        super.onNewIntent(intent);
        try {
            this.intent = intent;
            startAnim();
//            startAnim();
            Log.i("NFCWreatActivity", "isUser:" + isUser);
            if (isUser) {
                //新卡注册逻辑
@@ -352,8 +395,13 @@
        String cardNumberThis = NfcReadHelper.getInstence(intent, this).getCardNumber();
        //判断是否充值的是一个卡
        if (cardNumberThis.equalsIgnoreCase(cardNumber)) {
            //余额
            int balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
            userCard.setBalance(balance);
            //剩余水量
            int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
            userCard.setSurplusWater(surplusWater);

            int rechageTims = userCard.getRechargeTimes() + 1;
            if (rechageTims == 256) {
                rechageTims = 0;
@@ -370,6 +418,8 @@
                rechargeBean.setMorny(morny);
                rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
                rechargeBean.setCardNumber(cardNumber);
                rechargeBean.setSurplusWater(MornyUtil.changeF2Y(surplusWater));
                rechargeBean.setRechargeWater(rechageWater);
                try {
                    baseDao.rechargeDao().insert(rechargeBean);
                } catch (Exception e) {
@@ -387,7 +437,7 @@
    }

    private void setmanageCard(Intent intent, final ManageCard manageCard) {
        manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
        manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toByte(baseDao), 1, 0);
    }

    /**
@@ -396,10 +446,39 @@
     * @param intent
     * @param clearOrInitCard
     */
    private void setClean(Intent intent, final CleanCard clearOrInitCard) {
    private void setClean(Intent intent, CleanCard clearOrInitCard) {
        cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
    }

    /**
     * 保存区域表号卡
     *
     * @param intent
     * @param regionCard
     */
    private void setRegionCard(Intent intent, RegionCard regionCard) {
        regionFlag = NFCWriteHelper.getInstence(intent, this).writeData(regionCard.toByte(), 1, 0);
    }

    /**
     * 密码卡
     *
     * @param intent
     * @param passWordCard
     */
    private void setPassWordCard(Intent intent, PassWordCard passWordCard) {
        passwordFlag = NFCWriteHelper.getInstence(intent, this).writeData(passWordCard.toByte(baseDao), 1, 0);
    }

    /**
     * 用户电量单价
     *
     * @param intent
     * @param electricPriceCard
     */
    private void setElectricPriceCard(Intent intent, ElectricPriceCard electricPriceCard) {
        electricPriceFlag = NFCWriteHelper.getInstence(intent, this).writeData(electricPriceCard.toByte(baseDao), 1, 0);
    }

    /**
     * 重新注册设备卡
@@ -470,10 +549,12 @@
        detail.putExtra("userCard", userCard);
        if (!TextUtils.isEmpty(morny)) {
            detail.putExtra("morny", morny);
            detail.putExtra("rechageWater", rechageWater);
        }
        if (!TextUtils.isEmpty(cardNumber)) {
            detail.putExtra("cardNumber", cardNumber);
        }

        startActivity(detail);
        if (NewCardActivity.newCardActivity != null) {
            NewCardActivity.newCardActivity.finish();