添加混淆，修复因权限问题的bug

zuoxiao

2024-09-10 f0de01d017c0ce0a4954dd1215449ceea05af29b

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

@@ -1,7 +1,5 @@
package com.dayu.qiheonlinelibrary.activity;

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
@@ -11,37 +9,25 @@
import android.view.View;
import android.widget.EditText;

import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.DeviceUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;


import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.baselibrary.view.TipDialog;
import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.R;
import com.dayu.qiheonlinelibrary.bean.CardInfoResult;
import com.dayu.qiheonlinelibrary.bean.RechargeResult;
import com.dayu.qiheonlinelibrary.card.UserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityRechargeQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.AdminDataBean;
import com.dayu.qiheonlinelibrary.dbBean.ElectricPriceBean;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
import com.dayu.qiheonlinelibrary.net.BaseResponse;
import com.dayu.qiheonlinelibrary.net.RSAUtile;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
import com.dayu.qiheonlinelibrary.tools.NfcReadHelper;
import com.dayu.qiheonlinelibrary.utils.CardCommon;
import com.tencent.bugly.crashreport.CrashReport;

import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


@@ -67,6 +53,8 @@
    String cardType;//卡状态

    CardInfoResult cardInfoResult;



    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -103,46 +91,64 @@
            cardNumber = cardType.split(",")[0];
            cardType = cardType.split(",")[1];
        }
        getUserInfoAndCardInfo(cardNumber);
        //获取卡内信息
        userCard = NfcReadHelper.getInstence(intent, this).getUserCardData();
        if (userCard != null) {
            try {
                getUserInfoAndCardInfo(cardNumber, userCard.getMyUserCode());
            } catch (Exception e) {
                e.printStackTrace();
                CrashReport.postCatchedException(e);
                TipUtil.show(this, "读卡失败，请刷卡后不要立即移开");
            }
        } else {
            TipUtil.show(this, "读卡失败，请刷卡后不要立即移开");
        }


    }


    private void setUserData(String cardNumber, String userName, String lastRechargeTime, float iccardBalanceMoney, List<byte[]> data) {
        String state = "";
    private void setUserData(String cardNumber, String userName, String lastRechargeTime) {
        if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
            state = "终端写卡";
            setCardState("终端写卡");
            binding.rechargeLL.setVisibility(View.VISIBLE);
            binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
            binding.redStatu.setTextColor(this.getResources().getColor(R.color.black));
        } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
            setCardState("未刷卡关泵,当前不可充值");
            TipUtil.show(RechargeActivity.this, "未刷卡关泵,当前不可充值");
        } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
            setCardState("叠加充值");
        } else {
            TipUtil.show(this, "非用户卡，不能充值");
            return;
        }
        if (userCard != null) {
            try {
                if (Integer.valueOf(QHOnLineApplication.getInstance().arerNumber) == userCard.getArerNumber()) {
                    binding.rechargeReadLL.setVisibility(View.GONE);
                    binding.rechargeTextLL.setVisibility(View.VISIBLE);
                    binding.userName.setText(userName);
                    binding.redInitCode.setText(cardNumber);
                    binding.redRechargeDate.setText("本卡最后购水日期：\n\n" + lastRechargeTime);
                    binding.redUserCode.setText(cardInfoResult.getIccardCode());
                    if (userCard != null) {
                        binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 元");
                        binding.redBalanceElectric.setText("充值后剩余电量：" + MornyUtil.changeF2Y(userCard.getSurplusElecticity()) + " 度");
                    }
                    binding.redRechargeElectric.setText("电量单价：" + QHOnLineApplication.getInstance().electriclePriceStr + "元/度");

        userCard = UserCard.getBean(data);

        if (Integer.valueOf(QHOnLineApplication.getInstance().arerNumber) == userCard.getArerNumber()) {

            binding.rechargeReadLL.setVisibility(View.GONE);
            binding.rechargeTextLL.setVisibility(View.VISIBLE);
            binding.userName.setText(userName);
            binding.redStatu.setText(state);
            binding.redInitCode.setText(cardNumber);
            binding.redRechargeDate.setText("本卡最后购水日期：\n\n" + lastRechargeTime);
            if (userCard != null) {

                binding.redRemainderBlance.setText(String.valueOf(iccardBalanceMoney) + " 元");
                } else {
                    TipUtil.show(this, "非本区域卡\n不能充值！！！");
                }
            } catch (Exception e) {
                e.printStackTrace();
                CrashReport.postCatchedException(e);
                TipUtil.show(this, "读卡失败，请刷卡后不要立即移开");
            }

            binding.redRechargeElectric.setText("电量单价：" + QHOnLineApplication.getInstance().electriclePriceStr + "元/度");

        } else {
            TipUtil.show(this, "非本区域卡\n不能充值！！！");
            TipUtil.show(this, "读卡失败，请刷卡后不要立即移开");
        }


@@ -220,12 +226,20 @@


    private void startNfcActivity(String morny, String balance, float rechargeElectric, float iccardBalanceElectric, float totalMorny, String iccardRechargeRecordId) {
        //先处理补扣
        //充值补扣金额=充值金额+充值前读取的卡内余额-充值回调返回卡内余额
        int deductionMorny = MornyUtil.changeY2F(morny) + userCard.getBalance() - MornyUtil.changeY2F(balance);

        if (MornyUtil.changeY2F(morny) < deductionMorny) {
            TipUtil.show(RechargeActivity.this, "当前充值金额小于补扣金额，补扣金额为" + MornyUtil.changeF2Y(deductionMorny) + "元，充值金额应大于补扣金额！");
            return;
        }

        //添加充值信息
        rechargeBean = new RechargeBean();
        rechargeBean.setCardNumber(cardNumber);
        rechargeBean.setUserCode(userCard.getUserCode());
        rechargeBean.setUserName("");
        rechargeBean.setUserCode(userCard.getUserCode() + userCard.getUserCodeNumber());
        rechargeBean.setUserName(cardInfoResult.getPeasantName());
        rechargeBean.setPersonId(cardInfoResult.getPeasantId());
        rechargeBean.setSerial(DeviceUtils.getSN());
        rechargeBean.setArerNumber(QHOnLineApplication.getInstance().arerNumber);
@@ -240,6 +254,9 @@
        rechargeBean.setTotalMorny(String.valueOf(totalMorny));
        rechargeBean.setState(1);
        rechargeBean.setOrderId(iccardRechargeRecordId);
        rechargeBean.setDeductionMorny(MornyUtil.changeF2Y(deductionMorny));
        rechargeBean.setAdminId(QHOnLineApplication.getInstance().adminId);


        userCard.setCardWriteState(0);
        userCard.setCardState(1);
@@ -247,16 +264,28 @@
        calendar.setTimeInMillis(time);
        userCard.setBalance(MornyUtil.changeY2F(String.valueOf(balance)));
        userCard.setSurplusElecticity(MornyUtil.changeY2F(String.valueOf(iccardBalanceElectric)));
        String sumMorny = MornyUtil.sumPrice(Float.valueOf(MornyUtil.changeF2Y(userCard.getTotalMorny())), Float.valueOf(morny));
        userCard.setTotalMorny(MornyUtil.changeY2F(sumMorny));
        userCard.setTotalMorny(MornyUtil.changeY2F(String.valueOf(totalMorny)));
        userCard.setRechargeDate(calendar);
        userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
        if (deductionMorny == 0) {
            Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
            intent.putExtra("morny", morny);
            intent.putExtra("userCard", userCard);
            intent.putExtra("rechargeBean", rechargeBean);
            startActivity(intent);
        } else {
            TipUtil.show(RechargeActivity.this, "挂失卡后有补交金额！补交金额为：" + MornyUtil.changeF2Y(deductionMorny) + "元，详情可在平台查询。", new TipUtil.TipListener() {
                @Override
                public void onCancle() {
                    Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
                    intent.putExtra("morny", morny);
                    intent.putExtra("userCard", userCard);
                    intent.putExtra("rechargeBean", rechargeBean);
                    startActivity(intent);
                }
            });
        }


        Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
        intent.putExtra("morny", morny);
        intent.putExtra("userCard", userCard);
        intent.putExtra("rechargeBean", rechargeBean);
        startActivity(intent);
    }


@@ -279,12 +308,18 @@
        data.put("iccardBalanceAmonunt", "0");
        //卡内剩余电量
        data.put("iccardBalanceElectric", MornyUtil.changeF2Y(userCard.getSurplusElecticity()));
        ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/rechargeCard", RechargeResult.class, data, new SubscriberListener<BaseResponse<RechargeResult>>() {
        ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/rechargeCard", RechargeResult.class, data, new SubscriberListener<BaseResponse<RechargeResult>>() {
            @Override
            public void onNext(BaseResponse<RechargeResult> t) {
                if (t.isSuccess()) {
                    RechargeResult rechargeResult = t.getData();
                    startNfcActivity(morny, rechargeResult.getIccardBalanceMoney(), rechargeResult.getRechargeElectricAmount(), rechargeResult.getIccardBalanceElectric(), rechargeResult.getTotalRechargeMoney(), rechargeResult.getIccardRechargeRecordId());
                    if (t.getData() != null) {
                        RechargeResult rechargeResult = t.getData();
                        startNfcActivity(morny, rechargeResult.getIccardBalanceMoney(), rechargeResult.getRechargeElectricAmount(), rechargeResult.getIccardBalanceElectric(), rechargeResult.getTotalRechargeMoney(), rechargeResult.getIccardRechargeRecordId());
                    } else {
                        TipUtil.show(RechargeActivity.this, "充值失败请重试！");
                    }
                } else {
                    TipUtil.show(RechargeActivity.this, t.getMsg());
                }
            }
        });
@@ -296,35 +331,41 @@
     *
     * @param iccardCode
     */
    public void getUserInfoAndCardInfo(String iccardCode) {
    public void getUserInfoAndCardInfo(String iccardNum, String iccardCode) {
        Map<String, Object> data = new HashMap<>();
        //ic卡信息id
        data.put("iccardNum", iccardCode);
        ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
        data.put("iccardNum", iccardNum);
        data.put("iccardCode", iccardCode);
        ApiManager.getInstance().requestPostLoading(this, "iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
            @Override
            public void onNext(BaseResponse<CardInfoResult> t) {
                String state = "";
                if (t.isSuccess()) {
                    //ic卡状态 0 正常 1 已注销 2 已挂失
                    if (t.getData().getIccardStatus() == 0) {
                        List<byte[]> data = NfcReadHelper.getInstence(intent, RechargeActivity.this).getOnesectorData();
                        if (!data.isEmpty()) {
                            if (!TextUtils.isEmpty(cardNumber)) {
                                cardInfoResult = t.getData();
                                setUserData(cardNumber, cardInfoResult.getPeasantName(), cardInfoResult.getLastRechargeTime(), cardInfoResult.getIccardBalanceMoney(), data);
                    if (t.getData() != null) {
                        //ic卡状态 0 正常 1 已注销 2 已挂失
                        if (t.getData().getIccardStatus() == 0) {
//                            List<byte[]> data = NfcReadHelper.getInstence(intent, RechargeActivity.this).getOnesectorData();
                            if (!data.isEmpty()) {
                                if (!TextUtils.isEmpty(cardNumber)) {
                                    cardInfoResult = t.getData();
                                    setUserData(cardNumber, cardInfoResult.getPeasantName(), cardInfoResult.getLastRechargeTime());
                                } else {
                                    TipUtil.show(RechargeActivity.this, "读取卡片失败，请重新贴卡");
                                }
                            } else {
                                TipUtil.show(RechargeActivity.this, "读取卡片失败，请重新贴卡");
                                TipUtil.show(RechargeActivity.this, "卡片识别错误,请重试！");
                            }
                        } else if (t.getData().getIccardStatus() == 1) {
                            TipUtil.show(RechargeActivity.this, "当前卡已注销");
                        } else {
                            TipUtil.show(RechargeActivity.this, "卡片识别错误,请重试！");
                            TipUtil.show(RechargeActivity.this, "当前卡已挂失");
                        }
                    } else if (t.getData().getIccardStatus() == 1) {
                        TipUtil.show(RechargeActivity.this, "当前卡已注销");
                    } else {
                        TipUtil.show(RechargeActivity.this, "当前卡已挂失");
                        TipUtil.show(RechargeActivity.this, "当前卡片错误，未能查到该卡信息！");
                    }


                } else {
                    TipUtil.show(RechargeActivity.this, t.getMsg());
                }
            }
        });