From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 八月 2024 09:10:27 +0800
Subject: [PATCH] 修改未关泵补卡逻辑
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
index dd324a9..a05548b 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
@@ -74,7 +74,7 @@
}
private void initView() {
- newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
+// newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
//韬唤璇佽瘑鍒�
newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
@@ -94,7 +94,7 @@
if (!TextUtils.isEmpty(userName)
&& !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
) {
- if (userName.length() <= 1 || !validateName(userName)) {
+ if (userName.length() <= 1) {
TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
} else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
@@ -320,9 +320,9 @@
addUser(peasantIdNumber, peasantPhone, peasantName, QHOnLineApplication.getInstance().planId, morny);
}
} else {
- startNFCWreatActivity(peasantIdNumber, peasantPhone, peasantName, t.getData().getRecords().get(0).getPeasantId(), morny);
+ startNFCWreatActivity(peasantIdNumber, t.getData().getRecords().get(0).getPeasantPhone(), t.getData().getRecords().get(0).getPeasantName(), t.getData().getRecords().get(0).getPeasantId(), morny);
}
- }else {
+ } else {
ToastUtil.show(t.getMsg());
}
}
@@ -339,7 +339,7 @@
userCard.setSurplusElecticity(0);
userCard.setTotalMorny(0);
userCard.setRechargeDate(Calendar.getInstance());
-
+ userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
UserCardBean userCardBean = new UserCardBean();
userCardBean.setUserName(peasantName);
@@ -383,8 +383,8 @@
@Override
public void onNext(BaseResponse<AddUserResult> t) {
if (t.isSuccess()) {
- startNFCWreatActivity(peasantIdNumber, peasantPhone, peasantName, t.getData().getPeasantId(), morny);
- }else {
+ startNFCWreatActivity(peasantIdNumber, t.getData().getPeasantPhone(), t.getData().getPeasantName(), t.getData().getPeasantId(), morny);
+ } else {
ToastUtil.show(t.getMsg());
}
}
--
Gitblit v1.8.0