From d5adf9f2e2b02baaebf1c5c673ca4a4899f1db5f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 14 五月 2024 14:01:14 +0800
Subject: [PATCH] 1.隐藏一些不需要的信息 2.将卡号倒序显示，但是制作管理卡时正序写入。
---
qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml | 1
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java | 7 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 20 ++-
qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml | 14 +-
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java | 8
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java | 21 ++-
qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml | 7
baselibrary/src/main/res/values/strings.xml | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java | 2
qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml | 49 ++++---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java | 17 ++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java | 2
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 14 ++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java | 1
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 146 +++++++++++++++++-------
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java | 4
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java | 6
qihealonelibrary/src/main/res/layout/activity_my_qha.xml | 2
qihealonelibrary/src/main/res/layout/activity_admin_qha.xml | 1
19 files changed, 218 insertions(+), 106 deletions(-)
diff --git a/baselibrary/src/main/res/values/strings.xml b/baselibrary/src/main/res/values/strings.xml
index e7d8054..b6c1494 100644
--- a/baselibrary/src/main/res/values/strings.xml
+++ b/baselibrary/src/main/res/values/strings.xml
@@ -27,7 +27,7 @@
<string name="select_time">閫夋嫨鏃堕棿</string>
<string name="current_time">褰撳墠鏃堕棿</string>
- <string name="login_title">澶х鑺傛按\n鏅鸿兘鍏呭�肩鐞嗙郴缁�</string>
+ <string name="login_title"> 澶х鑺傛按\n 鏅鸿兘鍏呭�肩鐞嗙郴缁�</string>
<string name="company_name">澶х鑺傛按绉戞妧鐮旂┒鏈夐檺鍏徃</string>
<string name="eq_no">鍖哄煙鍙凤細</string>
<string name="address_code">鍖哄煙鍙凤細</string>
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 bfae435..f098f97 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -121,6 +121,7 @@
setContentView(binding.getRoot());
nfcWreatActivity = this;
setData();
+ titleBack();
getData();
} catch (Exception e) {
e.printStackTrace();
@@ -258,7 +259,7 @@
TipUtil.show(NFCWreatActivity.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
} else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
TipUtil.show(NFCWreatActivity.this, "锛屽崱鐗囨湭鑳借瘑鍒紝璇锋鏌ュ崱鐗囨槸鍚︽槸鏈叕鍙稿崱鐗�");
- } else {
+ } else {
Log.i("NFCWreatActivity", "olduserCard!=null saveData");
saveData();
}
@@ -641,7 +642,7 @@
//榛樿鏄�1鍏�
userCard.setElectricityPrice(1.000f);
}
- userCard.setSwipeNumber( 0);
+ userCard.setSwipeNumber(0);
userCard.setState("00");
userCard.setBalance(0);
userCard.setAddressCode(adminData.getAddressCode());
@@ -716,4 +717,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
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java
index 576c2c1..1b42ce5 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java
@@ -49,7 +49,6 @@
if (view != null && view instanceof TitleBar) {
titleBar = (TitleBar) view;
titleBar.setOnItemclickListner(TitleBar.ClickType_LEFT_IMAGE, new View.OnClickListener() {
-
@Override
public void onClick(View v) {
finish();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
index 3ba10ef..61b61ff 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
@@ -42,7 +42,7 @@
if (adminData != null) {
startActivity(new Intent(HomeActivity.this, NewCardActivity.class));
} else {
- TipUtil.show("璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�");
+ TipUtil.show(HomeActivity.this, "璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�");
}
}
@@ -52,10 +52,10 @@
public void onClick(View v) {
AdminDataBean adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- if (adminData.getWaterPrice()!=0){
+ if (adminData.getWaterPrice() != 0) {
startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
- }else {
- TipUtil.show(HomeActivity.this,"璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆姘翠环");
+ } else {
+ TipUtil.show(HomeActivity.this, "璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆姘翠环");
}
} else {
TipUtil.show("璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�");
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java
index 9f98c26..3624781 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java
@@ -9,6 +9,7 @@
import androidx.recyclerview.widget.LinearLayoutManager;
+import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.EdtDialog;
import com.dayu.qihealonelibrary.adapter.ManagerCardAdapter;
@@ -60,9 +61,13 @@
public void itemClick(View view) {
UserCardBean userCardBean = userCardBeanList.get((int) view.getTag());
ManageCard manageCard = new ManageCard();
- manageCard.setUserCard(cardNumber);
+ String hex = userCardBean.getCardNumber();
+ hex = HexUtil.spaceHex(hex);
+ hex = HexUtil.HighLowHex(hex);
+ manageCard.setUserCard(hex);
Intent intent = new Intent(ManagerListActivity.this, NFCWreatActivity.class);
intent.putExtra("manageCard", manageCard);
+ intent.putExtra("cardNumber", cardNumber);
intent.putExtra("userCardBean_manager", userCardBean);
startActivity(intent);
this.finish();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
index 554d672..f1ebcf4 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -4,13 +4,18 @@
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
+import android.view.KeyEvent;
import android.view.LayoutInflater;
+import android.view.View;
+import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.AidlUtil;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.baselibrary.view.ConfirmDialog;
+import com.dayu.baselibrary.view.TitleBar;
import com.dayu.qihealonelibrary.QHAloneApplication;
import com.dayu.qihealonelibrary.card.CleanCard;
import com.dayu.qihealonelibrary.card.CleanUserCard;
@@ -105,6 +110,7 @@
//褰撳墠鍗＄殑鐗╃悊鍗″彿
String cardNumber;
+ ConfirmDialog confirmDialog;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -114,6 +120,7 @@
setContentView(binding.getRoot());
nfcWreatActivity = this;
getData();
+ titleBack();
baseApp = QHAloneApplication.getInstance();
} catch (Exception e) {
e.printStackTrace();
@@ -141,11 +148,15 @@
binding.cardData.setText("鍒朵綔娓呴浂鍗�");
}
if (this.getIntent().hasExtra("manageCard")) {
+ cardNumber = this.getIntent().getStringExtra("cardNumber");
manageCard = (ManageCard) this.getIntent().getSerializableExtra("manageCard");
if (this.getIntent().hasExtra("userCardBean_manager")) {
userCardBeanByManager = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean_manager");
}
- binding.cardData.setText("鍒朵綔绠＄悊鍗�(璇峰皢绠＄悊鍗¤创鍦ㄨ澶囦笂)\n鐢ㄦ埛鍗″彿锛�" + manageCard.getUserCard());
+ //鏄剧ず鐨勬椂鍊欒鍙嶈繃鏉�
+ String hex = HexUtil.spaceHex(manageCard.getUserCard());
+ hex = HexUtil.HighLowHex(hex);
+ binding.cardData.setText("鍒朵綔绠＄悊鍗�(璇峰皢绠＄悊鍗¤创鍦ㄨ澶囦笂)\n鐢ㄦ埛鍗″彿锛�" + hex);
}
if (this.getIntent().hasExtra("registeredCard")) {
registeredCard = (RegisteredCard) this.getIntent().getSerializableExtra("registeredCard");
@@ -213,6 +224,8 @@
String[] cardTypes = cardType.split(",");
if (cardTypes != null && cardTypes.length == 2) {
cardNumber = cardType.split(",")[0];
+ cardNumber = HexUtil.spaceHex(cardNumber);
+ cardNumber = HexUtil.HighLowHex(cardNumber);
cardType = cardType.split(",")[1];
}
Log.i("NFCWreatActivity", "cardType=" + cardType);
@@ -266,8 +279,8 @@
if (manageCard != null) {
setmanageCard(intent, manageCard);
if (manageCardFlag && userCardBeanByManager != null) {
- //淇敼鐢ㄦ埛琛ㄤ俊鎭�
- userCardBeanByManager.setCardNumber(manageCard.getUserCard());
+ //淇敼鐢ㄦ埛琛ㄤ俊鎭慨鏀规垚鏂板崱鍗″彿
+ userCardBeanByManager.setCardNumber(cardNumber);
baseDao.userCardDao().update(userCardBeanByManager);
}
}
@@ -355,12 +368,14 @@
StringBuffer data = new StringBuffer();
if (rechargeBean != null) {
data.append("*****************************" + "\n");
- data.append(getResources().getString(com.dayu.baselibrary.R.string.login_title) + "\n");
+ data.append(" 澶х鑺傛按\n 鏅鸿兘鍏呭�肩鐞嗙郴缁�" + "\n");
data.append("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial() + "\n");
data.append("鐢ㄦ埛鍚嶏細" + rechargeBean.getUserName() + "\n");
data.append("鍗� 鍙凤細" + rechargeBean.getCardNumber() + "\n");
- data.append("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + "鍏�" + "\n");
- data.append("鍗″唴浣欓锛�" + rechargeBean.getBalance() + "鍏�" + "\n");
+ data.append("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�" + "\n");
+// data.append("鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
+ data.append("鍏呭�兼按閲忥細" + rechargeBean.getRechargeWater() + " 鍚�" + "\n");
+ data.append("鍓╀綑姘撮噺锛�" + rechargeBean.getSurplusWater() + " 鍚�" + "\n");
data.append("鏃� 鏈燂細" + DateUtil.dateToStamp(rechargeBean.getDate(), DateUtil.type2) + "\n\n");
data.append("*****************************");
}
@@ -392,47 +407,53 @@
//寰�鍗″唴鍐欏厖鍊煎悗鐨勬暟鎹�
private void rechargeWreatCard() {
- String cardNumberThis = NfcReadHelper.getInstence(intent, this).getCardNumber();
- //鍒ゆ柇鏄惁鍏呭�肩殑鏄竴涓崱
- if (cardNumberThis.equalsIgnoreCase(cardNumber)) {
- //浣欓
- int balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
- userCard.setBalance(balance);
- //鍓╀綑姘撮噺
- int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
- userCard.setSurplusWater(surplusWater);
+ try {
+ String cardNumberThis = NfcReadHelper.getInstence(intent, this).getCardNumber();
+ cardNumberThis = HexUtil.spaceHex(cardNumberThis);
+ cardNumberThis = HexUtil.HighLowHex(cardNumberThis);
+ //鍒ゆ柇鏄惁鍏呭�肩殑鏄竴涓崱
+ if (cardNumberThis.equalsIgnoreCase(cardNumber)) {
+ //浣欓
+ int balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
+ userCard.setBalance(balance);
+ //鍓╀綑姘撮噺
+ int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
+ userCard.setSurplusWater(surplusWater);
- int rechageTims = userCard.getRechargeTimes() + 1;
- if (rechageTims == 256) {
- rechageTims = 0;
- }
- userCard.setRechargeTimes((short) rechageTims);
- userCard.setRechargeDate(Calendar.getInstance());
- userFlag = WriteCardUtils.setUser(intent, userCard, this);
- if (userFlag) {
- rechargeBean = new RechargeBean();
- rechargeBean.setUserName(userName);
- rechargeBean.setSerial(userCardBean.getSerial());
- rechargeBean.setUserId(userCardBean.getUserID());
- rechargeBean.setDate(System.currentTimeMillis());
- rechargeBean.setMorny(morny);
- rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
- rechargeBean.setCardNumber(cardNumber);
- rechargeBean.setSurplusWater(MornyUtil.changeF2Y(surplusWater));
- rechargeBean.setRechargeWater(rechageWater);
- try {
- baseDao.rechargeDao().insert(rechargeBean);
- } catch (Exception e) {
- e.printStackTrace();
+ int rechageTims = userCard.getRechargeTimes() + 1;
+ if (rechageTims == 256) {
+ rechageTims = 0;
}
- // 鎵撳嵃鐩稿叧
- setPrinterData(rechargeBean);
- startDetailActivity(userName, "缁堢鍐欏崱");
+ userCard.setRechargeTimes((short) rechageTims);
+ userCard.setRechargeDate(Calendar.getInstance());
+ userFlag = WriteCardUtils.setUser(intent, userCard, this);
+ if (userFlag) {
+ rechargeBean = new RechargeBean();
+ rechargeBean.setUserName(userName);
+ rechargeBean.setSerial(userCardBean.getSerial());
+ rechargeBean.setUserId(userCardBean.getUserID());
+ rechargeBean.setDate(System.currentTimeMillis());
+ rechargeBean.setMorny(morny);
+ rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
+ rechargeBean.setCardNumber(cardNumber);
+ rechargeBean.setSurplusWater(MornyUtil.changeF2Y(surplusWater));
+ rechargeBean.setRechargeWater(rechageWater);
+ try {
+ baseDao.rechargeDao().insert(rechargeBean);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ // 鎵撳嵃鐩稿叧
+ setPrinterData(rechargeBean);
+ startDetailActivity(userName, "缁堢鍐欏崱");
+ } else {
+ TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触锛岃閲嶆柊鍐嶈瘯");
+ }
} else {
- TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触锛岃閲嶆柊鍐嶈瘯");
+ TipUtil.show(NFCWreatActivity.this, "璇诲彇鐨勫崱鍜屽厖鍊肩殑鍗′笉涓�鑷�");
}
- } else {
- TipUtil.show(NFCWreatActivity.this, "璇诲彇鐨勫崱鍜屽厖鍊肩殑鍗′笉涓�鑷�");
+ } catch (Exception e) {
+ TipUtil.show(NFCWreatActivity.this, "璇诲彇閿欒锛岃閲嶈瘯");
}
}
@@ -570,4 +591,43 @@
super.onDestroy();
nfcWreatActivity = null;
}
+
+ /**
+ * 鐐瑰嚮杩斿洖鏃舵彁绀虹敤鎴疯繕鏈啓鍗�
+ *
+ * @param keyCode
+ * @param event
+ * @return
+ */
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ back();
+ return true;
+ }
+ return super.onKeyDown(keyCode, event);
+ }
+
+ private void back() {
+ confirmDialog = new ConfirmDialog(NFCWreatActivity.this, v -> {
+ confirmDialog.dismiss();
+ if (NewCardActivity.newCardActivity != null) {
+ NewCardActivity.newCardActivity.finish();
+ }
+ if (RechargeActivity.rechargeActivity != null) {
+ RechargeActivity.rechargeActivity.finish();
+ }
+ NFCWreatActivity.nfcWreatActivity.finish();
+ });
+ confirmDialog.show();
+ }
+
+ 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
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
index b5c1a5f..0529821 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -14,6 +14,7 @@
import com.dayu.qihealonelibrary.card.ConfigurationPowerCard;
import com.dayu.qihealonelibrary.card.DomainCard;
import com.dayu.qihealonelibrary.card.ElectricPriceCard;
+import com.dayu.qihealonelibrary.card.ManageCard;
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
@@ -62,11 +63,11 @@
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
redCardBinding.redInitCode.setText(cardNumber);
- redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
- redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
- redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric())+" 搴�");
- redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
- redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater())+" 鍚�");
+// redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
+// redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
+// redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric()) + " 搴�");
+// redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
+ redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
}
}
@@ -93,6 +94,8 @@
String[] cardTypes = cardType.split(",");
if (cardTypes != null && cardTypes.length == 2) {
cardNumber = cardType.split(",")[0];
+ cardNumber = HexUtil.spaceHex(cardNumber);
+ cardNumber = HexUtil.HighLowHex(cardNumber);
cardType = cardType.split(",")[1];
}
List<byte[]> data = NfcReadHelper.getInstence(intent, this).getOnesectorData();
@@ -128,8 +131,13 @@
break;
case CardCommon.MANAGE_CRAD:
+ ManageCard manageCard = ManageCard.getBean(data);
viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
+ String hex = manageCard.getUserCard().toUpperCase();
+ hex = HexUtil.spaceHex(hex);
+ hex = HexUtil.HighLowHex(hex);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
+ + "鍘熷鍗″彿锛�" + hex);
break;
case CardCommon.CLEAN_CARD_TYPE:
viweGone(false);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
index 6a0e5c3..2d35414 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
@@ -1,5 +1,6 @@
package com.dayu.qihealonelibrary.activity;
+import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
@@ -9,8 +10,10 @@
import android.view.View;
import android.widget.EditText;
+import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.qihealonelibrary.R;
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRechargeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
@@ -79,6 +82,8 @@
String[] cardTypes = cardType.split(",");
if (cardTypes != null && cardTypes.length == 2) {
cardNumber = cardType.split(",")[0];
+ cardNumber = HexUtil.spaceHex(cardNumber);
+ cardNumber = HexUtil.HighLowHex(cardNumber);
cardType = cardType.split(",")[1];
}
List<byte[]> data = NfcReadHelper.getInstence(intent, this).getOnesectorData();
@@ -95,18 +100,20 @@
}
+ @SuppressLint("ResourceAsColor")
private void setUserData(String cardType, String cardNumber, List<byte[]> data) {
String state = "";
if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
state = "缁堢鍐欏崱";
- binding.rechargeTextLL.setVisibility(View.VISIBLE);
binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
+ binding.redStatu.setTextColor(R.color.black);
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
state = "鍒峰崱寮�娉靛悗,褰撳墠鐘舵�佷笉鑳藉厖鍊�";
binding.rechargeLL.setVisibility(View.GONE);
binding.rechargeRegistBtn.setVisibility(View.GONE);
+ binding.redStatu.setTextColor(com.dayu.baselibrary.R.color.red);
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
state = "鍙犲姞鍏呭��";
binding.rechargeLL.setVisibility(View.GONE);
@@ -115,6 +122,8 @@
TipUtil.show(this, "闈炵敤鎴峰崱锛屼笉鑳藉厖鍊�");
return;
}
+
+
userCard = UserCard.getBean(data);
List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
AdminDataBean adminDataBean = baseDao.adminDao().findFirst();
@@ -134,8 +143,8 @@
userCardBean.setSerial(String.valueOf(userCard.getArerNumber()));
this.userName = "鏈煡鐢ㄦ埛";
}
-
binding.rechargeReadLL.setVisibility(View.GONE);
+ binding.rechargeTextLL.setVisibility(View.VISIBLE);
binding.userName.setText(userName);
binding.redStatu.setText(state);
if (userCard != null) {
@@ -149,10 +158,10 @@
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
binding.redInitCode.setText(cardNumber);
- binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
- binding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
- binding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric()) + " 搴�");
- binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
+// binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
+// binding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
+// binding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric()) + " 搴�");
+// binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
binding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
binding.redWaterPrice.setText("姣忕珛鏂圭背姘翠环鏍硷細" + MornyUtil.changeF2Y(adminData.getWaterPrice()) + " 鍏�");
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
index ab09a3c..d28d704 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
@@ -67,7 +67,7 @@
binding.redRechargeWater.setVisibility(View.GONE);
}
binding.redName.setText("鐢ㄦ埛濮撳悕锛�" + userName);
- binding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
+// binding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
binding.redSurplusWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
if (userCard != null) {
@@ -83,7 +83,7 @@
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
- binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
+// binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
}
}
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java
index 405a001..a06815a 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java
@@ -56,7 +56,7 @@
((ViewHolder) holder).getBinding().userNo.setText("鍗″彿:" + rechargeList.get(position).getCardNumber());
((ViewHolder) holder).getBinding().morny.setText("鍏呭�奸噾棰�:" + rechargeList.get(position).getMorny() + " 鍏�");
((ViewHolder) holder).getBinding().rachagerWater.setText("鍏呭�兼按閲�:" + rechargeList.get(position).getRechargeWater() + " 鍚�");
- ((ViewHolder) holder).getBinding().balance.setText("浣欓:" + rechargeList.get(position).getBalance() + " 鍏�");
+// ((ViewHolder) holder).getBinding().balance.setText("浣欓:" + rechargeList.get(position).getBalance() + " 鍏�");
((ViewHolder) holder).getBinding().surplusWater.setText("鍓╀綑姘撮噺:" + rechargeList.get(position).getSurplusWater() + " 鍚�");
((ViewHolder) holder).getBinding().date.setText("鏃ユ湡:" + DateUtil.dateToStamp(rechargeList.get(position).getDate(), DateUtil.type1));
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
index a0ad0da..c435dcb 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
@@ -5,6 +5,7 @@
import com.dayu.qihealonelibrary.utils.CardCommon;
import java.io.Serializable;
+import java.util.List;
/**
* Copyright (C), 2023,
@@ -33,6 +34,22 @@
this.userCard = userCard;
}
+
+ public static ManageCard getBean(List<byte[]> data) {
+
+ if (data != null) {
+ ManageCard passWordCard = new ManageCard();
+
+ byte[] zero = data.get(0);
+ byte[] passWordByte = new byte[4];
+ System.arraycopy(zero, 5, passWordByte, 0, passWordByte.length);
+ passWordCard.setUserCard(HexUtil.bytesToHex(passWordByte));
+ return passWordCard;
+ }
+ return null;
+ }
+
+
public byte[] toByte(QHAloneAppDatabase QHAloneAppDatabase) {
setCardData(QHAloneAppDatabase, cardType);
Zero zero = new Zero();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java
index 295e31c..aecd0a4 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java
@@ -135,8 +135,8 @@
byte[] data = mfc.readBlock(bIndex + 0);
if (data != null && data.length > 0) {
String hex = HexUtil.bytesToHex(Arrays.copyOfRange(data, 0, 4));
- hex = HexUtil.spaceHex(hex);
- hex = HexUtil.HighLowHex(hex);
+// hex = HexUtil.spaceHex(hex);
+// hex = HexUtil.HighLowHex(hex);
Log.i("NFCWreatActivity", "hex===" + hex);
return hex.toUpperCase();
}
@@ -178,8 +178,6 @@
byte[] data = mfc.readBlock(bIndex + 0);
if (data != null && data.length > 0) {
String hex = HexUtil.bytesToHex(Arrays.copyOfRange(data, 0, 4));
- hex = HexUtil.spaceHex(hex);
- hex = HexUtil.HighLowHex(hex);
strData.append(hex);
strData.append(",");
Log.i("NFCWreatActivity", "hex===" + hex);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java
index a0cf36f..350863e 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java
@@ -69,7 +69,7 @@
mContext.startActivity(intent);
AdminCardDialog.this.dismiss();
} else {
- edtDialog = new EdtDialog(mContext, "璇疯緭鍏�16杩涘埗鐨勭敤鎴峰崱鍙�", new EdtDialog.DialogBack() {
+ edtDialog = new EdtDialog(mContext, "璇疯緭鍏�8涓瓧绗︾殑16杩涘埗鐨勭敤鎴峰崱鍙�", new EdtDialog.DialogBack() {
@Override
public void onOk(String data) {
if (!TextUtils.isEmpty(data) && data.length() == 8) {
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml b/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
index 85f99e2..6751972 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
@@ -51,6 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
+ android:visibility="gone"
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔瀵嗙爜鍗�"
diff --git a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
index 55af50c..2ba9c9e 100644
--- a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
@@ -80,7 +80,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="姘村崟浠凤紙鍏�/鍚級锛�"
+ android:text="姘村崟浠�(鍏�/鍚�)锛�"
android:textColor="@color/text_selecter"
android:textSize="@dimen/text_size" />
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
index 1b66dd3..67f68e7 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
@@ -56,6 +56,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍓╀綑閲戦锛�"
+ android:visibility="gone"
android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/red_surplusWater"
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
index 315e1c2..ed56be9 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
@@ -48,6 +48,26 @@
android:padding="20dp"
android:visibility="gone">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍗＄姸鎬侊細"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/red_statu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/red"
+ android:textSize="@dimen/new_card_size" />
+
+ </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -93,7 +113,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:visibility="gone">
<TextView
@@ -134,7 +155,7 @@
android:layout_marginTop="15dp"
android:text="鍏呭�兼鏁帮細"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<TextView
android:id="@+id/red_total_water"
@@ -143,7 +164,7 @@
android:layout_marginTop="15dp"
android:text="鎬荤敤姘撮噺锛�"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<TextView
android:id="@+id/red_total_power"
@@ -152,28 +173,9 @@
android:layout_marginTop="15dp"
android:text="鎬荤敤鐢甸噺锛�"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍗＄姸鎬侊細"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/red_statu"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="@dimen/new_card_size" />
-
- </LinearLayout>
<TextView
android:id="@+id/red_waterPrice"
android:layout_width="match_parent"
@@ -182,6 +184,7 @@
android:text="姣忕珛鏂圭背姘翠环鏍硷細"
android:textSize="@dimen/text_size"
android:visibility="visible" />
+
<LinearLayout
android:id="@+id/recharge_LL"
android:layout_width="match_parent"
diff --git a/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
index f0b5b90..ccd3296 100644
--- a/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
@@ -60,6 +60,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
+ android:visibility="gone"
android:text="鍓╀綑閲戦锛�"
android:textSize="@dimen/text_size" />
<TextView
@@ -86,7 +87,7 @@
android:layout_marginTop="15dp"
android:text="鍏呭�兼鏁帮細"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<TextView
android:id="@+id/red_total_water"
@@ -95,7 +96,7 @@
android:layout_marginTop="15dp"
android:text="鎬荤敤姘撮噺锛�"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<TextView
android:id="@+id/red_total_power"
@@ -104,7 +105,7 @@
android:layout_marginTop="15dp"
android:text="鎬荤敤鐢甸噺锛�"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<TextView
android:id="@+id/red_statu"
diff --git a/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml b/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
index 1252d90..68325b5 100644
--- a/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
+++ b/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
@@ -46,13 +46,13 @@
android:text="鍏呭�兼按閲忥細"
android:textSize="14sp" />
- <TextView
- android:id="@+id/balance"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="浣欓锛�"
- android:textSize="14sp" />
+<!-- <TextView-->
+<!-- android:id="@+id/balance"-->
+<!-- android:layout_width="match_parent"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:layout_weight="1"-->
+<!-- android:text="浣欓锛�"-->
+<!-- android:textSize="14sp" />-->
<TextView
android:id="@+id/surplusWater"
android:layout_width="match_parent"
--
Gitblit v1.8.0