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/SysActivity.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/SysActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/SysActivity.java
index 87f98e8..5e03ddf 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/SysActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/SysActivity.java
@@ -2,9 +2,11 @@
import android.content.Intent;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.card.CleanCard;
import com.dayu.qiheonlinelibrary.card.ElectricPriceCard;
import com.dayu.qiheonlinelibrary.card.PassWordCard;
@@ -41,7 +43,7 @@
//鍒朵綔绠＄悊鍗�
adminBinding.adminAdmin.setOnClickListener(v -> {
- AdminCardDialog dialog=new AdminCardDialog(this);
+ AdminCardDialog dialog = new AdminCardDialog(this);
dialog.show();
});
@@ -71,23 +73,21 @@
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
RegionCard regionCard = new RegionCard();
- AdminDataBean adminDataBean = baseDao.adminDao().findFirst();
- regionCard.setRegion(Integer.valueOf(adminDataBean.getAddressCode()));
- regionCard.setControllerCodel(Integer.valueOf(adminDataBean.getAddressCode()));
+ regionCard.setArerNumber(Integer.valueOf(QHOnLineApplication.getInstance().arerNumber));
intent.putExtra("regionCard", regionCard);
startActivity(intent);
});
//鍒朵綔璁剧疆鐢ㄦ埛鐢甸噺鍗曚环鍗�
adminBinding.adminElectricCard.setOnClickListener(v -> {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
- if (electricPriceBean != null) {
+
+ if (!TextUtils.isEmpty(QHOnLineApplication.getInstance().electriclePriceStr)) {
ElectricPriceCard electricPriceCard = new ElectricPriceCard();
- electricPriceCard.setElectricPrice(electricPriceBean.getPrice());
+ electricPriceCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
intent.putExtra("electricPriceCard", electricPriceCard);
startActivity(intent);
} else {
- TipUtil.show(this, "璇峰厛鍦ㄥ弬鏁拌缃唴璁剧疆鐢甸噺鍗曚环");
+ TipUtil.show(this, "鏈幏鍙栧埌鐢典环");
}
});
--
Gitblit v1.8.0