From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 7e6732a..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,12 +14,14 @@
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.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;
@@ -57,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() {
@@ -207,9 +211,11 @@
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.myAdminName.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+ myBinding.myVillageNum.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+// myBinding.myWaterPrice.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
}
StringBuilder msgData = new StringBuilder();
@@ -220,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