From ddafb0f0951e68b4e56bfceef43cf78559f5161f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 六月 2024 14:52:27 +0800
Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
similarity index 84%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
index 312b576..bcba78a 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -14,6 +14,7 @@
import androidx.annotation.NonNull;
+import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
@@ -34,7 +35,7 @@
* Date: 2023-11-10 19:52
* Description: 涓汉涓績
*/
-public class MyActivityQHAlone extends BaseActivityQHAlone {
+public class MyActivity extends BaseActivity {
private CustomDatePicker beginDatePicker;
@@ -57,36 +58,38 @@
}
private void initView() {
- myBinding.cardReplacement.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, ReplacementActivityQHAlone.class));
- }
- });
+
myBinding.myAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- PassWordDialog passWordDialog = new PassWordDialog(MyActivityQHAlone.this, new Intent(MyActivityQHAlone.this, AdminSetupActivityQHAlone.class));
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
passWordDialog.show();
// startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
+ }
+ });
+ myBinding.myWaterPriceLL.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
+ passWordDialog.show();
}
});
myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, PassWordActivityQHAlone.class));
+ startActivity(new Intent(MyActivity.this, PassWordActivity.class));
}
});
myBinding.myRechargeListLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, RechargeListActivityQHAlone.class));
+ startActivity(new Intent(MyActivity.this, RechargeListActivity.class));
}
});
myBinding.myNewCardListLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, NewCardListActivityQHAlone.class));
+ startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
}
});
myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
@@ -113,13 +116,13 @@
public boolean handleMessage(@NonNull Message msg) {
switch (msg.what) {
case 1:
- TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭鎴愬姛!");
+ TipUtil.show(MyActivity.this, "瀵煎嚭鎴愬姛!");
break;
case 3:
- TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖!");
+ TipUtil.show(MyActivity.this, "璁板綍涓虹┖!");
break;
default:
- TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭澶辫触!");
+ TipUtil.show(MyActivity.this, "瀵煎嚭澶辫触!");
break;
}
stopAnim();
@@ -159,18 +162,18 @@
String[] title;
String fileName;
if (listData == null || listData.size() == 0) {
- TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖");
+ TipUtil.show(MyActivity.this, "璁板綍涓虹┖");
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);
- ExcelUtil.writeObjListToExcel(listData, fileName, MyActivityQHAlone.this);
+ ExcelUtil.writeObjListToExcel(listData, fileName, MyActivity.this);
handler.sendEmptyMessage(1);
} catch (Exception e) {
handler.sendEmptyMessage(2);
@@ -205,11 +208,13 @@
try {
adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
+ 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.myAdminName.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+ myBinding.myVillageNum.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+ myBinding.myWaterPrice.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
}
StringBuilder msgData = new StringBuilder();
@@ -259,7 +264,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(MyActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
try {
endTime = endTime + (1000 * 60 * 60 * 24) - 1;
--
Gitblit v1.8.0