From 8521954fa97bdfc54123afb4a72755ece311db06 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 21 三月 2025 14:45:45 +0800
Subject: [PATCH] feat(general): 更新登录逻辑和用户信息展示
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
index 312b576..a8e618b 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
@@ -20,6 +20,7 @@
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
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;
@@ -34,7 +35,7 @@
* Date: 2023-11-10 19:52
* Description: 涓汉涓績
*/
-public class MyActivityQHAlone extends BaseActivityQHAlone {
+public class MyActivityQHAlone extends QHAloneBaseActivity {
private CustomDatePicker beginDatePicker;
@@ -57,18 +58,20 @@
}
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.show();
// startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
+ }
+ });
+ myBinding.myWaterPriceLL.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivityQHAlone.this, new Intent(MyActivityQHAlone.this, AdminSetupActivityQHAlone.class));
+ passWordDialog.show();
}
});
myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
@@ -163,10 +166,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);
@@ -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();
@@ -220,6 +225,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