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

zuoxiao

2024-05-11 844597b5813ff8589de503cd7d7b1bbd0586d287

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

@@ -42,6 +42,8 @@
    String userName;
    String cardNumber = null;
    UserCardBean userCardBean;
    int waterPrice;
    String rechageWater;//充值的水量

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -51,6 +53,7 @@
            setContentView(binding.getRoot());
            setPricePoint(binding.rechargeWater);
            rechargeActivity = this;
            waterPrice = baseDao.adminDao().findFirst().getWaterPrice();
            initView();
        } catch (Exception e) {
            e.printStackTrace();
@@ -98,12 +101,16 @@
        String state = "";
        if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
            state = "终端写卡";
            binding.rechargeTextLL.setVisibility(View.VISIBLE);
            binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
        } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
            state = "刷卡开泵后,当前状态不能充值";
            binding.rechargeLL.setVisibility(View.GONE);
            binding.rechargeRegistBtn.setVisibility(View.GONE);
        } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
            state = "叠加充值";
            binding.rechargeLL.setVisibility(View.GONE);
            binding.rechargeRegistBtn.setVisibility(View.GONE);
        } else {
            TipUtil.show(this, "非用户卡，不能充值");
            return;
@@ -111,40 +118,48 @@
        userCard = UserCard.getBean(data);
        List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
        AdminDataBean adminDataBean = baseDao.adminDao().findFirst();
        if (!userCardBeans.isEmpty()){
            userCardBean = userCardBeans.get(0);
            if (adminDataBean.addressCode.equalsIgnoreCase(String.valueOf(userCard.getArerNumber()))) {


        if (Integer.valueOf(adminDataBean.getAddressCode()) == userCard.getArerNumber()) {
            if (!userCardBeans.isEmpty()) {
                userCardBean = userCardBeans.get(0);
                this.userName = userCardBean.getUserName();
                binding.rechargeReadLL.setVisibility(View.GONE);
                binding.rechargeTextLL.setVisibility(View.VISIBLE);
                binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
                binding.userName.setText(userName);
                binding.redStatu.setText(state);
                if (userCard != null) {
                    Calendar calendar = userCard.getRechargeDate();
                    if (calendar != null) {
                        int year = calendar.get(Calendar.YEAR);
                        int month = calendar.get(Calendar.MONTH); // 月份从0开始，所以需要加1
                        int day = calendar.get(Calendar.DAY_OF_MONTH);
                        binding.redRechargeDate.setText("本卡最后购水日期：" + year + "年" + month + "月" + day + "日");
                    } else {
                        binding.redRechargeDate.setText("本卡最后购水日期：无");
                    }
                    binding.redInitCode.setText(cardNumber);
                    binding.redRechargeNumber.setText("本卡充值次数：" + userCard.getRechargeTimes() + "");
                    binding.redTotalWater.setText("总用水量：" + userCard.getTotalWater());
                    binding.redTotalPower.setText("总用电量：" + userCard.getTotalElectric());
                    binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + "元");
                    binding.redRemainderWater.setText("剩余水量：" + userCard.getSurplusWater());
                }

            } else {
                TipUtil.show(this, "不是本区域卡");
                userCardBean = new UserCardBean();
                userCardBean.setCardNumber(cardNumber);
                userCardBean.setUserName("未知用户");
                userCardBean.setPhone("未知");
                userCardBean.setUserID("未知");
                userCardBean.setAddressCode(String.valueOf(userCard.getArerNumber()));
                userCardBean.setSerial(String.valueOf(userCard.getArerNumber()));
                this.userName = "未知用户";
            }
        }else {
            TipUtil.show(this, "未查询到该卡用户信息");
        }

            binding.rechargeReadLL.setVisibility(View.GONE);
            binding.userName.setText(userName);
            binding.redStatu.setText(state);
            if (userCard != null) {
                Calendar calendar = userCard.getRechargeDate();
                if (calendar != null) {
                    int year = calendar.get(Calendar.YEAR);
                    int month = calendar.get(Calendar.MONTH); // 月份从0开始，所以需要加1
                    int day = calendar.get(Calendar.DAY_OF_MONTH);
                    binding.redRechargeDate.setText("本卡最后购水日期：" + year + "年" + month + "月" + day + "日");
                } else {
                    binding.redRechargeDate.setText("本卡最后购水日期：无");
                }
                binding.redInitCode.setText(cardNumber);
                binding.redRechargeNumber.setText("本卡充值次数：" + userCard.getRechargeTimes() + " 次");
                binding.redTotalWater.setText("总用水量：" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 吨");
                binding.redTotalPower.setText("总用电量：" + MornyUtil.changeF2Y(userCard.getTotalElectric()) + " 度");
                binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 元");
                binding.redRemainderWater.setText("剩余水量：" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 吨");
                binding.redWaterPrice.setText("每立方米水价格：" + MornyUtil.changeF2Y(adminData.getWaterPrice()) + " 元");
            }

        } else {
            TipUtil.show(this, "不是本区域卡");
        }


    }
@@ -167,6 +182,7 @@
                intent.putExtra("cardNumber", cardNumber);
                intent.putExtra("userCard", userCard);
                intent.putExtra("userCardBean", userCardBean);
                intent.putExtra("rechageWater", rechageWater);
                startActivity(intent);
            } else {
                TipUtil.show(RechargeActivity.this, "请输入充值金额（元）");
@@ -176,7 +192,7 @@


    //校验金额
    public static void setPricePoint(final EditText editText) {
    public void setPricePoint(final EditText editText) {
        editText.addTextChangedListener(new TextWatcher() {
            @Override
            public void onTextChanged(CharSequence s, int start, int before,
@@ -202,6 +218,13 @@
                        editText.setSelection(1);
                    }
                }
                String morny = editText.getText().toString();
                if (!TextUtils.isEmpty(morny)) {
                    rechageWater = MornyUtil.intDiv(MornyUtil.changeY2F(editText.getText().toString()), waterPrice);
                    binding.redRechargeWater.setText("充值水量：" + rechageWater + " 立方米(吨)");
                }


            }

            @Override