From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 八月 2024 09:10:27 +0800
Subject: [PATCH] 修改未关泵补卡逻辑
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
index 7049960..4520884 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -14,17 +14,16 @@
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;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
-import com.dayu.qihealonelibrary.databinding.ActivityMyBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityMyQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
-
+import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
-
import com.dayu.qihealonelibrary.utils.ExcelUtil;
-
import java.io.File;
import java.util.ArrayList;
@@ -37,7 +36,7 @@
* Date: 2023-11-10 19:52
* Description: 涓汉涓績
*/
-public class MyActivity extends QHAloneBaseActivity {
+public class MyActivity extends BaseActivity {
private CustomDatePicker beginDatePicker;
@@ -46,12 +45,12 @@
long endTime;
boolean isRechargeList = false;
- ActivityMyBinding myBinding;
+ ActivityMyQhaBinding myBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- myBinding = ActivityMyBinding.inflate(LayoutInflater.from(this));
+ myBinding = ActivityMyQhaBinding.inflate(LayoutInflater.from(this));
setContentView(myBinding.getRoot());
getVersion(this);
setData();
@@ -60,18 +59,20 @@
}
private void initView() {
- myBinding.cardReplacement.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, ReplacementActivity.class));
- }
- });
+
myBinding.myAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
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() {
@@ -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);
@@ -208,11 +209,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();
@@ -223,6 +226,12 @@
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