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): 更新登录逻辑和用户信息展示
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 225 +++++++++++++++++++++++++++++++------------------------
1 files changed, 127 insertions(+), 98 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..13418a8 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -11,24 +11,25 @@
import android.widget.Toast;
import com.dayu.baselibrary.tools.BcdUtil;
-import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.tools.print.PrintAdater;
+import com.dayu.baselibrary.tools.print.ShangMiAidlUtil;
+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.henanlibrary.card.CleanCard;
-import com.dayu.henanlibrary.card.CleanUserCard;
-import com.dayu.henanlibrary.card.ConfigurationPowerCard;
+import com.dayu.baselibrary.view.ConfirmDialog;
+import com.dayu.baselibrary.view.TitleBar;
+import com.dayu.henanlibrary.card.CleanCardHN;
+import com.dayu.henanlibrary.card.CleanUserCardHN;
+import com.dayu.henanlibrary.card.ConfigurationPowerCardHN;
import com.dayu.henanlibrary.card.ConfigureDeviceRegistrationCrad;
import com.dayu.henanlibrary.card.DomainCard;
-import com.dayu.henanlibrary.card.ManageCard;
-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.card.ManageCardHN;
+import com.dayu.henanlibrary.card.RegisteredCardHN;
+import com.dayu.henanlibrary.card.TestCardHN;
+import com.dayu.henanlibrary.card.UserCardHN;
+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,14 +42,16 @@
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;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
+import java.util.List;
/**
* Copyright (C), 2023,
@@ -56,7 +59,7 @@
* Date: 2023-11-08 21:19
* Description: nfc鍐欏崱鐣岄潰
*/
-public class NFCWreatActivity extends BaseNfcActivity {
+public class NFCWreatActivity extends HNBaseNfcActivity {
public static String TAG = "NFCWreatActivity";
boolean cleanFlag = false;
@@ -88,16 +91,16 @@
Intent intent;
- RegisteredCard registeredCard;
- CleanUserCard cleanUserCard;
- ManageCard manageCard;
+ RegisteredCardHN registeredCard;
+ CleanUserCardHN cleanUserCard;
+ ManageCardHN manageCard;
DomainCard domainCard;
- CleanCard cleanCard;
+ CleanCardHN cleanCard;
ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad;
- TestCard testCard;
+ TestCardHN testCard;
- ConfigurationPowerCard configurationPowerCard;
+ ConfigurationPowerCardHN configurationPowerCard;
//鎵撳嵃
public static NFCWreatActivity nfcWreatActivity;
@@ -110,17 +113,42 @@
boolean isRecharge = false;
//鍏呭�奸�氫俊鏄惁瀹屾垚
boolean rechargeIsOk = false;
- ActivityWriteTextBinding binding;
+ ActivityWriteTextHnBinding binding;
ConfirmDialog confirmDialog;
+
+ @Override
+ public void onNfcBack(Intent intent) {
+ try {
+ this.intent = intent;
+ startAnim();
+ Log.i("NFCWreatActivity", "isUser:" + isUser);
+ if (isUser) {
+ checkHasUser();
+ } else if (isRecharge) {
+ if (rechargeIsOk) {
+ rechargeWrratCard();
+ } else {
+ Toast.makeText(this, "姝ｅ湪閫氫俊璇风◢鍚�", Toast.LENGTH_SHORT).show();
+ }
+
+ } else {
+ saveData();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+ }
@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();
@@ -181,18 +209,18 @@
private void getData() {
try {
if (this.getIntent().hasExtra("userCard")) {
- userCard = (UserCard) this.getIntent().getSerializableExtra("userCard");
+ userCard = (UserCardHN) this.getIntent().getSerializableExtra("userCard");
}
if (this.getIntent().hasExtra("cleanCard")) {
- cleanCard = (CleanCard) this.getIntent().getSerializableExtra("cleanCard");
+ cleanCard = (CleanCardHN) this.getIntent().getSerializableExtra("cleanCard");
binding.cardData.setText("鍒朵綔娓呴浂鍗�");
}
if (this.getIntent().hasExtra("manageCard")) {
- manageCard = (ManageCard) this.getIntent().getSerializableExtra("manageCard");
+ manageCard = (ManageCardHN) this.getIntent().getSerializableExtra("manageCard");
binding.cardData.setText("鍒朵綔绠＄悊鍗�");
}
if (this.getIntent().hasExtra("registeredCard")) {
- registeredCard = (RegisteredCard) this.getIntent().getSerializableExtra("registeredCard");
+ registeredCard = (RegisteredCardHN) this.getIntent().getSerializableExtra("registeredCard");
binding.cardData.setText("鍒朵綔閲嶆柊娉ㄥ唽璁惧鍗�");
}
if (this.getIntent().hasExtra("dbUserCard")) {
@@ -200,15 +228,19 @@
isUser = true;
}
if (this.getIntent().hasExtra("cleanUserCard")) {
- cleanUserCard = (CleanUserCard) this.getIntent().getSerializableExtra("cleanUserCard");
+ cleanUserCard = (CleanUserCardHN) 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");
+ testCard = (TestCardHN) this.getIntent().getSerializableExtra("testCard");
binding.cardData.setText("鍒朵綔娴嬭瘯鍗�");
}
if (this.getIntent().hasExtra("configureDeviceRegistrationCrad")) {
@@ -216,7 +248,7 @@
binding.cardData.setText("鍒朵綔閰嶇疆璁惧娉ㄥ唽淇℃伅鍗�");
}
if (this.getIntent().hasExtra("configurationPowerCard")) {
- configurationPowerCard = (ConfigurationPowerCard) this.getIntent().getSerializableExtra("configurationPowerCard");
+ configurationPowerCard = (ConfigurationPowerCardHN) this.getIntent().getSerializableExtra("configurationPowerCard");
binding.cardData.setText("鍒朵綔閰嶇疆姘存车鍔熺巼鍗�");
}
if (this.getIntent().hasExtra("morny")) {
@@ -248,16 +280,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();
@@ -334,31 +366,6 @@
}
}
- @Override
- public void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- try {
- this.intent = intent;
- startAnim();
- Log.i("NFCWreatActivity", "isUser:" + isUser);
- if (isUser) {
- checkHasUser();
- } else if (isRecharge) {
- if (rechargeIsOk) {
- rechargeWrratCard();
- } else {
- Toast.makeText(this, "姝ｅ湪閫氫俊璇风◢鍚�", Toast.LENGTH_SHORT).show();
- }
-
- } else {
- saveData();
- }
- } catch (Exception e) {
- e.printStackTrace();
- CrashReport.postCatchedException(e);
- }
- }
-
/**
* 鎵撳嵃鏈虹浉鍏充俊鎭�
@@ -367,24 +374,21 @@
*/
private void setPrinterData(RechargeBean rechargeBean) {
try {
- StringBuffer data = new StringBuffer();
+ List<String> data = new ArrayList<>();
if (rechargeBean != null) {
- data.append("*****************************" + "\n");
- data.append(getResources().getString(com.dayu.baselibrary.R.string.login_title)).append("\n");
- data.append("璁惧搴忓垪鍙凤細").append(rechargeBean.getSerial()).append("\n");
- data.append("鐢ㄦ埛鍚嶏細").append(rechargeBean.getUserName()).append("\n");
- // data.append("鎴� 鍙凤細" + rechargeBean.getUserNum() + "\n");
- data.append("鍏呭�奸噾棰濓細").append(rechargeBean.getMorny()).append("鍏�").append("\n");
- data.append("鍗″唴浣欓锛�").append(rechargeBean.getBalance()).append("鍏�").append("\n");
- data.append("鏃� 鏈燂細").append(DateUtil.dateToStamp(rechargeBean.getDate(), DateUtil.type2)).append("\n\n");
- data.append("*****************************");
+
+ data.add("*****************************");
+ data.add("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial());
+ data.add("鐢ㄦ埛鍚嶏細" + rechargeBean.getUserName());
+ data.add("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + "鍏�");
+ data.add("鍗″唴浣欓锛�" + rechargeBean.getBalance() + "鍏�");
+ data.add("鏃� 鏈燂細" + DateUtil.dateToStamp(rechargeBean.getDate(), DateUtil.type2));
+ data.add("*****************************");
}
-
float size = 26;
-
try {
- AidlUtil.getInstance().printText(data.toString(), size, true, false);
- AidlUtil.getInstance().print3Line();
+ PrintAdater.getInstance().printText(data, size, true, false);
+ ShangMiAidlUtil.getInstance().print3Line();
} catch (Exception e) {
e.printStackTrace();
}
@@ -497,7 +501,7 @@
//寰�鍗″唴鍐欏厖鍊煎悗鐨勬暟鎹�
private void rechargeWrratCard() {
- UserCard userCardold = NfcReadHelper.getInstence(intent, this).getUserCardData();
+ UserCardHN userCardold = NfcReadHelper.getInstence(intent, this).getUserCardData();
if (userCardold != null) {
//鍒ゆ柇鏄惁鍏呭�肩殑鏄竴涓崱
if (userCard.getInitPeasantCode().equals(userCardold.getInitPeasantCode()) || isAgainWrite) {
@@ -518,8 +522,12 @@
stopAnim();
}
- private void setmanageCard(Intent intent, final ManageCard manageCard) {
- manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
+ private void setmanageCard(Intent intent, final ManageCardHN manageCard) {
+ try {
+ manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -528,8 +536,12 @@
* @param intent
* @param clearOrInitCard
*/
- private void setClean(Intent intent, final CleanCard clearOrInitCard) {
- cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
+ private void setClean(Intent intent, final CleanCardHN clearOrInitCard) {
+ try {
+ cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@@ -539,8 +551,12 @@
* @param intent
* @param registeredCard
*/
- private void setRegisteredCard(Intent intent, RegisteredCard registeredCard) {
- registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
+ private void setRegisteredCard(Intent intent, RegisteredCardHN registeredCard) {
+ try {
+ registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -549,34 +565,38 @@
* @param intent
* @param cleanUserCard
*/
- private void setCleanUserCard(Intent intent, CleanUserCard cleanUserCard) {
- cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
+ private void setCleanUserCard(Intent intent, CleanUserCardHN cleanUserCard) {
+ try {
+ cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
* 璁剧疆鍩熷悕鍗�
*
* @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);
+ e.printStackTrace();
}
}
- private void setTestCard(Intent intent, TestCard testCard) {
+ private void setTestCard(Intent intent, TestCardHN testCard) {
testCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(testCard.toByte(baseDao), 1, 0);
}
@@ -585,12 +605,12 @@
configDeviceRegiestFlag = NFCWriteHelper.getInstence(intent, this).writeData(configureDeviceRegistrationCrad.toByte(baseDao), 1, 0);
}
- private void setConfigurationPower(Intent intent, ConfigurationPowerCard configurationPowerCard) {
+ private void setConfigurationPower(Intent intent, ConfigurationPowerCardHN configurationPowerCard) {
try {
configPowerFlag = NFCWriteHelper.getInstence(intent, this).writeData(configurationPowerCard.toByte(baseDao), 1, 0);
} catch (Exception e) {
configPowerFlag = false;
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
@@ -632,7 +652,7 @@
stateText = new StringBuffer();
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]); //BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠s
if (userCard == null) {
- userCard = new UserCard();
+ userCard = new UserCardHN();
userCard.setRechargeTimes(0);
ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
if (electricPriceBean != null) {
@@ -641,7 +661,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 +736,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