From d1573513f0eada6a915c2163ce6c84451c8c1070 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 13 六月 2024 15:06:05 +0800
Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 60 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index 61f6f6c..5f11fca 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -12,13 +12,13 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.baselibrary.utils.DateUtil;
-import com.dayu.baselibrary.view.TitleBar;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.HeNanApplication;
+import com.dayu.baselibrary.view.ConfirmDialog;
+import com.dayu.baselibrary.view.TitleBar;
import com.dayu.henanlibrary.card.CleanCard;
import com.dayu.henanlibrary.card.CleanUserCard;
import com.dayu.henanlibrary.card.ConfigurationPowerCard;
@@ -28,7 +28,7 @@
import com.dayu.henanlibrary.card.RegisteredCard;
import com.dayu.henanlibrary.card.TestCard;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.databinding.ActivityWriteTextBinding;
+import com.dayu.henanlibrary.databinding.ActivityWriteTextHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
import com.dayu.henanlibrary.dbBean.RechargeBean;
@@ -41,9 +41,9 @@
import com.dayu.henanlibrary.tools.NFCWriteHelper;
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
-import com.dayu.henanlibrary.utils.MyCommon;
+import com.dayu.henanlibrary.utils.CardCommon;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
-import com.dayu.henanlibrary.view.ConfirmDialog;
import com.dayu.henanlibrary.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;
@@ -110,17 +110,18 @@
boolean isRecharge = false;
//鍏呭�奸�氫俊鏄惁瀹屾垚
boolean rechargeIsOk = false;
- ActivityWriteTextBinding binding;
+ ActivityWriteTextHnBinding binding;
ConfirmDialog confirmDialog;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityWriteTextBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityWriteTextHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
nfcWreatActivity = this;
setData();
+ titleBack();
getData();
} catch (Exception e) {
e.printStackTrace();
@@ -203,9 +204,13 @@
cleanUserCard = (CleanUserCard) this.getIntent().getSerializableExtra("cleanUserCard");
binding.cardData.setText("鍒朵綔鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�");
}
- if (this.getIntent().hasExtra("domainCard")) {
- domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard");
- binding.cardData.setText("鍒朵綔璁剧疆鍩熷悕鍗�");
+ if (this.getIntent().hasExtra("domainCard_xinxiang")) {
+ domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard_xinxiang");
+ binding.cardData.setText("鍒朵綔璁剧疆鏂颁埂鍩熷悕鍗�");
+ }
+ if (this.getIntent().hasExtra("domainCard_luyi")) {
+ domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard_luyi");
+ binding.cardData.setText("鍒朵綔璁剧疆鏂颁埂鍩熷悕鍗�");
}
if (this.getIntent().hasExtra("testCard")) {
testCard = (TestCard) this.getIntent().getSerializableExtra("testCard");
@@ -248,16 +253,16 @@
String cardType = NfcReadHelper.getInstence(intent, this).getCradType();
Log.i("NFCWreatActivity", "cardType=" + cardType);
- if (cardType.equals(MyCommon.USER_CARD_TYPE_1) ||
- cardType.equals(MyCommon.USER_CARD_TYPE_2) ||
- cardType.equals(MyCommon.USER_CARD_TYPE_3)
+ if (cardType.equals(CardCommon.USER_CARD_TYPE_1) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_2) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_3)
) {
binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
- } else if (cardType.equals("-1")) {
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR1)) {
TipUtil.show(NFCWreatActivity.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
- } else if (cardType.equals("-2")) {
- TipUtil.show(NFCWreatActivity.this, "璇诲崱澶辫触,璇锋鏌ュ崱鏄惁鏄敤鎴峰崱");
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
+ TipUtil.show(NFCWreatActivity.this, "锛屽崱鐗囨湭鑳借瘑鍒紝璇锋鏌ュ崱鐗囨槸鍚︽槸鏈叕鍙稿崱鐗�");
} else {
Log.i("NFCWreatActivity", "olduserCard!=null saveData");
saveData();
@@ -557,19 +562,19 @@
* 璁剧疆鍩熷悕鍗�
*
* @param intent
- * @param domainCard
+ * @param domainXinXiangCard
*/
- private void setDomainCard(Intent intent, DomainCard domainCard) {
+ private void setDomainCard(Intent intent, DomainCard domainXinXiangCard) {
try {
- domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getZeroByte(), 1, 0);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getZeroByte(), 1, 0);
if (!domainCrdFlag) {
return;
}
- domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getOneByte(), 1, 1);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getOneByte(), 1, 1);
if (!domainCrdFlag) {
return;
}
- domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getTwoByte(), 1, 2);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getTwoByte(), 1, 2);
} catch (Exception e) {
domainCrdFlag = false;
throw new RuntimeException(e);
@@ -641,7 +646,7 @@
//榛樿鏄�1鍏�
userCard.setElectricityPrice(1.000f);
}
- userCard.setSwipeNumber((short) 0);
+ userCard.setSwipeNumber(0);
userCard.setState("00");
userCard.setBalance(0);
userCard.setAddressCode(adminData.getAddressCode());
@@ -716,4 +721,13 @@
ProgressDialog.dismiss();
nfcWreatActivity = null;
}
+
+ private void titleBack() {
+ titleBar.setOnItemclickListner(TitleBar.ClickType_LEFT_IMAGE, new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ back();
+ }
+ });
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0