From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java | 38 +++++++++-----------------------------
1 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
index 2574be7..b71122b 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
+++ b/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) {
@@ -148,7 +149,7 @@
List listData = new ArrayList();
try {
if (isRechargeList) {
- listData = asynchBaseDao.rechargeDao().ansyFindByTime(beginTime, endTime);
+ listData = asynchBaseDao.rechargeDao().ansyFindByTime(QHOnLineApplication.getInstance().adminId, beginTime, endTime);
} else {
listData = asynchBaseDao.userCardDao().findByTime(beginTime, endTime);
}
@@ -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();
}
--
Gitblit v1.8.0