修改未关泵补卡逻辑

zuoxiao

2024-08-13 3673328730251736f9614793d9a75630c17b28f6

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

@@ -8,7 +8,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

@@ -18,10 +17,10 @@
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.databinding.ActivityMyQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.AdminDataBean;
import com.dayu.qiheonlinelibrary.dbBean.ElectricPriceBean;
import com.dayu.qiheonlinelibrary.utils.DeviceNumberUtils;
import com.dayu.qiheonlinelibrary.utils.ExcelUtil;

import java.io.File;
@@ -92,6 +91,7 @@
                startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
            }
        });
        //开卡记录
        myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
@@ -99,6 +99,7 @@
                beginDatePicker.show(System.currentTimeMillis());
            }
        });
        //充值记录
        myBinding.myRechargeOut.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
@@ -166,10 +167,10 @@
                            return;
                        }
                        if (isRechargeList) {
                            title = new String[]{"设备序列号", "用户名", "卡号", "充值日期", "充值金额（元）", "剩余金额（元）"};
                            title = new String[]{"设备序列号", "用户名", "卡号", "充值日期", "充值金额（元）", "剩余金额（元）","充值电量（度）","剩余电量（度）","用户编号"};
                            fileName = file.toString() + "/" + ExcelUtil.outRechargePathName;
                        } else {
                            title = new String[]{"设备序列号", "用户名", "身份证号", "卡号", "注册日期", "电话"};
                            title = new String[]{"设备序列号", "用户名", "身份证号", "卡号", "注册日期", "电话","用户编号"};
                            fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
                        }
                        ExcelUtil.initExcel(fileName, title);
@@ -206,31 +207,10 @@
    private void setData() {
        AdminDataBean adminData;
        try {
            adminData = baseDao.adminDao().findFirst();
            if (adminData != null) {
                myBinding.myAdminName.setText(adminData.getAddressCode());
                myBinding.myVillageNum.setText(adminData.getSerial());
//                myBinding.myWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
            } else {
                myBinding.myAdminName.setText("请点击区域号进行设置");
                myBinding.myVillageNum.setText("请点击区域号进行设置");
//                myBinding.myWaterPrice.setText("请点击区域号进行设置");
            }
            StringBuilder msgData = new StringBuilder();
            myBinding.myAdName.setText(QHOnLineApplication.getInstance().addressName);
            myBinding.myAdminName.setText(QHOnLineApplication.getInstance().arerNumber);
            myBinding.myWaterPrice.setText(QHOnLineApplication.getInstance().electriclePriceStr);

            String initCode = DeviceNumberUtils.getDeviceNumber();
            if (TextUtils.isEmpty(initCode)) {
                msgData.append("设备未注册");
            } else {
                msgData.append("设备注册号：" + initCode);
            }
            myBinding.myTestConnect.setText(msgData);
            ElectricPriceBean priceBean = baseDao.electricPriceDao().findFirst();
            if (priceBean != null) {
                myBinding.myWaterPrice.setText(priceBean.getPrice() + "元");
            } else {
                myBinding.myWaterPrice.setText("1.000元");
            }
        } catch (Exception e) {
            e.printStackTrace();
        }