From d08a5a6d062f1568aaeb14d2d72357826291ef97 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期六, 13 七月 2024 18:14:28 +0800
Subject: [PATCH] 添加齐河管理卡相关逻辑 修复bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java | 26 +++++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 53 +++++++++++-
local.properties | 4
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 16 ++--
qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml | 7 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManagerToUserCard.java | 104 ++++++++++++++++++++++++++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java | 3
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java | 3
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java | 4
qihealonelibrary/src/main/res/layout/activity_admin_qha.xml | 1
12 files changed, 199 insertions(+), 30 deletions(-)
diff --git a/local.properties b/local.properties
index efd65e3..9cd06d1 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Fri May 17 09:12:28 CST 2024
-sdk.dir=D\:\\android\\sdk
+#Sat Jul 13 14:35:23 CST 2024
+sdk.dir=D\:\\AndroidStudio\\sdk
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 3624781..1540b70 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManagerListActivity.java
@@ -67,7 +67,7 @@
manageCard.setUserCard(hex);
Intent intent = new Intent(ManagerListActivity.this, NFCWreatActivity.class);
intent.putExtra("manageCard", manageCard);
- intent.putExtra("cardNumber", cardNumber);
+// 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 ea81f0d..b72f7a6 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -278,11 +278,11 @@
}
if (manageCard != null) {
setmanageCard(intent, manageCard);
- if (manageCardFlag && userCardBeanByManager != null) {
- //淇敼鐢ㄦ埛琛ㄤ俊鎭慨鏀规垚鏂板崱鍗″彿
- userCardBeanByManager.setCardNumber(cardNumber);
- baseDao.userCardDao().update(userCardBeanByManager);
- }
+// if (manageCardFlag && userCardBeanByManager != null) {
+// //淇敼鐢ㄦ埛琛ㄤ俊鎭慨鏀规垚鏂板崱鍗″彿
+// userCardBeanByManager.setCardNumber(cardNumber);
+// baseDao.userCardDao().update(userCardBeanByManager);
+// }
}
if (registeredCard != null) {
setRegisteredCard(intent, registeredCard);
@@ -372,9 +372,9 @@
data.append("鐢ㄦ埛鍚嶏細" + rechargeBean.getUserName() + "\n");
data.append("鍗� 鍙凤細" + rechargeBean.getCardNumber() + "\n");
data.append("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�" + "\n");
-// data.append("鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
- data.append("鍏呭�兼按閲忥細" + rechargeBean.getRechargeWater() + " 鍚�" + "\n");
- data.append("鍓╀綑姘撮噺锛�" + rechargeBean.getSurplusWater() + " 鍚�" + "\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("*****************************");
}
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 d3ec6cb..1132551 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -10,15 +10,19 @@
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.baselibrary.view.ConfirmDialog;
import com.dayu.qihealonelibrary.card.BlackCard;
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.ManagerToUserCard;
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
+import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
+import com.dayu.qihealonelibrary.tools.NFCWriteHelper;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.CardCommon;
import com.dayu.qihealonelibrary.view.ProgressDialog;
@@ -39,7 +43,10 @@
Intent intent;
-
+ ConfirmDialog confirmDialog;
+ AdminDataBean adminData;
+ String cardNumber;
+ String userCardStr;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -90,7 +97,7 @@
String cardType = NfcReadHelper.getInstence(intent, this).getCradTypeAndCardNumber();
- String cardNumber = null;
+
String[] cardTypes = cardType.split(",");
if (cardTypes != null && cardTypes.length == 2) {
cardNumber = cardType.split(",")[0];
@@ -130,14 +137,46 @@
}
break;
- case CardCommon.MANAGE_CRAD:
+ case CardCommon.MANAGE_CRAD://绠＄悊鍗�
ManageCard manageCard = ManageCard.getBean(data);
viweGone(false);
- String hex = manageCard.getUserCard().toUpperCase();
- hex = HexUtil.spaceHex(hex);
- hex = HexUtil.HighLowHex(hex);
+ userCardStr = manageCard.getUserCard().toUpperCase();
+ userCardStr = HexUtil.spaceHex(userCardStr);
+ userCardStr = HexUtil.HighLowHex(userCardStr);
redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
- + "鍘熷鍗″彿锛�" + hex);
+ + "鍘熷鍗″彿锛�" + userCard);
+ if (manageCard.getType()==(byte) 1){
+ //褰�01鏃跺皢1鎵囧尯0鍧楀師绠＄悊鍗′俊鎭敼鎴愮敤鎴峰崱鍐呭
+ confirmDialog=new ConfirmDialog(this, "鏄惁纭琛ュ崱锛岃鍗″皢鎴愪负鏂扮敤鎴峰崱锛熷苟涓斾笉瑕佺Щ鍔ㄥ崱鐗�", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ ProgressDialog.show(ReadCardAcitivy.this);
+ try {
+ confirmDialog.dismiss();
+
+ List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(userCardStr);
+ if (userCardBeans != null && !userCardBeans.isEmpty()) {
+ UserCardBean userName = userCardBeans.get(0);
+ userName.setCardNumber(cardNumber);
+ baseDao.userCardDao().update(userName);
+ }
+
+ NFCWriteHelper nfcWriteHelper= NFCWriteHelper.getInstence(intent,ReadCardAcitivy.this);
+ adminData = baseDao.adminDao().findFirst();
+ ManagerToUserCard managerToUserCard=new ManagerToUserCard();
+ managerToUserCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
+ managerToUserCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
+ managerToUserCard.setTotalElectric(manageCard.getTotalElectric());
+ nfcWriteHelper.writeData(managerToUserCard.getZeroBytes(),1,0);
+ TipUtil.show(ReadCardAcitivy.this, "琛ュ崱鎴愬姛", () -> ReadCardAcitivy.this.finish());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ stopAnim();
+ }
+ });
+ confirmDialog.show();
+ }
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 bb1befb..bfce39b 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
@@ -112,10 +112,11 @@
String state = "";
if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
state = "缁堢鍐欏崱";
+ binding.rechargeLL.setVisibility(View.VISIBLE);
binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
binding.redStatu.setTextColor(R.color.black);
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
- state = "鍒峰崱寮�娉靛悗,褰撳墠鐘舵�佷笉鑳藉厖鍊�";
+ state = "鏈埛鍗″叧娉�,褰撳墠涓嶅彲鍏呭��";
binding.rechargeLL.setVisibility(View.GONE);
binding.rechargeRegistBtn.setVisibility(View.GONE);
binding.redStatu.setTextColor(com.dayu.baselibrary.R.color.red);
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 a06815a..8e248c3 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java
@@ -55,9 +55,9 @@
((ViewHolder) holder).getBinding().userName.setText("濮撳悕:" + rechargeList.get(position).getUserName());
((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().surplusWater.setText("鍓╀綑姘撮噺:" + rechargeList.get(position).getSurplusWater() + " 鍚�");
+// ((ViewHolder) holder).getBinding().rachagerWater.setText("鍏呭�兼按閲�:" + rechargeList.get(position).getRechargeWater() + " 鍚�");
+ ((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 c435dcb..397a2f2 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
@@ -26,6 +26,22 @@
*/
public String userCard; //鐢ㄦ埛鍗″彿
+ public byte type;//褰撳墠鐘舵�� 00锛氬厖鍊肩鐞嗘満鍐� 01:鎺у埗鍣ㄥ弽鍐欑殑 褰�01鏃跺皢1鎵囧尯0鍧楀師绠＄悊鍗′俊鎭敼鎴愮敤鎴峰崱鍐呭
+
+ public int totalElectric;//鎬荤敤鐢甸噺浣� 搴曚綅鍦ㄥ墠锛岄珮浣嶅湪鍚� 1浣嶅皬鏁扮偣 鍚�1浣嶅皬鏁扮偣鐨勬暣鏁�
+
+ public int getTotalElectric() {
+ return totalElectric;
+ }
+
+ public byte getType() {
+ return type;
+ }
+
+ public void setType(byte type) {
+ this.type = type;
+ }
+
public String getUserCard() {
return userCard;
}
@@ -38,13 +54,17 @@
public static ManageCard getBean(List<byte[]> data) {
if (data != null) {
- ManageCard passWordCard = new ManageCard();
+ ManageCard manageCard = 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;
+ manageCard.setUserCard(HexUtil.bytesToHex(passWordByte));
+ manageCard.setType(zero[9]);
+ byte[] totalElectricByte = new byte[4];
+ System.arraycopy(zero, 10, totalElectricByte, 0, totalElectricByte.length);
+ manageCard.totalElectric = HexUtil.get16To10LowHightByBytes(totalElectricByte);
+ return manageCard;
}
return null;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManagerToUserCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManagerToUserCard.java
new file mode 100644
index 0000000..2f1eb8a
--- /dev/null
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManagerToUserCard.java
@@ -0,0 +1,104 @@
+package com.dayu.qihealonelibrary.card;
+
+import com.dayu.baselibrary.tools.HexUtil;
+import com.dayu.qihealonelibrary.utils.CardCommon;
+
+import java.io.Serializable;
+
+/**
+ * Created by Android Studio.
+ * author: zuo
+ * Date: 2024-07-13
+ * Time: 15:47
+ * 澶囨敞锛�
+ */
+public class ManagerToUserCard extends BaseCard implements Serializable {
+
+ public String cardType = CardCommon.USER_CARD_TYPE_1;//鍐欏崱鏍囧織 A1鍒峰崱寮�娉靛墠 A8鍒峰崱寮�娉靛悗 A2鍙犲姞鍏呭��
+
+ public int arerNumber;//鍖哄煙鍙�(搴曚綅鍦ㄥ墠楂樹綅鍦ㄥ悗)
+
+ public int deviceNumberl;//璁惧缂栧彿(搴曚綅鍦ㄥ墠楂樹綅鍦ㄥ悗)
+ public short rechargeTimes;//鍏呭�兼鏁�
+
+ public int totalWater;//鐢ㄦ埛鎬荤敤姘撮噺 搴曚綅鍦ㄥ墠锛岄珮浣嶅湪鍚�2浣嶅皬鏁扮偣 鍚袱涓皬鏁扮偣鐨勬暣鏁�
+
+ public int totalElectric;//鎬荤敤鐢甸噺浣� 搴曚綅鍦ㄥ墠锛岄珮浣嶅湪鍚� 1浣嶅皬鏁扮偣 鍚�1浣嶅皬鏁扮偣鐨勬暣鏁�
+
+
+
+ /**
+ * 鐢ㄦ埛鍗�0鍧�
+ */
+ public class Zero extends BaseCard {
+ public byte[] toByte() {
+ try {
+ byte[] data = new byte[16];
+ data[0] = HexUtil.hexToByte(cardType);
+ //鍖哄煙鍙�
+ byte[] arerNumberBytes = new byte[2];
+ byte[] arerNumberDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(arerNumber));
+ System.arraycopy(arerNumberDatas, 0, arerNumberBytes, 0, arerNumberDatas.length);
+ if (arerNumberBytes != null) {
+ System.arraycopy(arerNumberBytes, 0, data, 1, arerNumberBytes.length);
+ }
+ //璁惧缂栧彿
+ byte[] deviceNumberlBytes = new byte[2];
+ byte[] deviceNumberlDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(deviceNumberl));
+ System.arraycopy(deviceNumberlDatas, 0, deviceNumberlBytes, 0, deviceNumberlDatas.length);
+ if (deviceNumberlBytes != null) {
+ System.arraycopy(deviceNumberlBytes, 0, data, 3, deviceNumberlBytes.length);
+ }
+ //鍏呭�兼鏁�
+ byte rechargeTimesByte = HexUtil.hexToByte(HexUtil.get10to16(rechargeTimes));
+ data[5] = rechargeTimesByte;
+
+ //鐢ㄦ埛鎬荤敤姘撮噺
+ byte[] totalWaterBytes = new byte[4];
+ byte[] totalWaterDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(totalWater));
+ System.arraycopy(totalWaterDatas, 0, totalWaterBytes, 0, totalWaterDatas.length);
+ if (totalWaterBytes != null) {
+ System.arraycopy(totalWaterBytes, 0, data, 6, totalWaterBytes.length);
+ }
+ //鎬荤敤鐢甸噺浣�
+ byte[] totalElectricBytes = new byte[4];
+ byte[] totalElectricDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(totalElectric));
+ System.arraycopy(totalElectricDatas, 0, totalElectricBytes, 0, totalElectricDatas.length);
+ if (totalElectricBytes != null) {
+ System.arraycopy(totalElectricBytes, 0, data, 10, totalElectricBytes.length);
+ }
+ data[15] = getByteSum(data);
+ return data;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ }
+
+ public void setArerNumber(int arerNumber) {
+ this.arerNumber = arerNumber;
+ }
+
+ public void setDeviceNumberl(int deviceNumberl) {
+ this.deviceNumberl = deviceNumberl;
+ }
+
+ public void setRechargeTimes(short rechargeTimes) {
+ this.rechargeTimes = rechargeTimes;
+ }
+
+ public void setTotalWater(int totalWater) {
+ this.totalWater = totalWater;
+ }
+
+ public void setTotalElectric(int totalElectric) {
+ this.totalElectric = totalElectric;
+ }
+ public byte[] getZeroBytes() {
+ ManagerToUserCard.Zero zero = new ManagerToUserCard.Zero();
+ return zero.toByte();
+ }
+}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java
index 9f6f979..4ae0936 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java
@@ -58,7 +58,8 @@
defauleKey = HexUtil.hexToByteArray(decryptedText);
//鍒濆瀵嗙爜
// byte[] encryptedBytes2 = Base64.decode("aYC9feYEOFOQHuzflLIXSw==", Base64.DEFAULT);
- byte[] encryptedBytes2 = Base64.decode("qeg4DUWf0ni9JfRWtD2krA==", Base64.DEFAULT);
+ //010203:qeg4DUWf0ni9JfRWtD2krA==
+ byte[] encryptedBytes2 = Base64.decode("Zro4j8QP6yjYEA6HtSSNOw==", Base64.DEFAULT);
byte[] decryptedBytes2 = cipher.doFinal(encryptedBytes2);
//decryptedBytes2 瀵瑰簲010203040506
companyKeyA = new String(decryptedBytes2, StandardCharsets.UTF_8);
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 350863e..b599f45 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/AdminCardDialog.java
@@ -21,6 +21,7 @@
import com.dayu.baselibrary.view.LibraryDialog;
import com.dayu.qihealonelibrary.R;
import com.dayu.qihealonelibrary.activity.BaseActivity;
+import com.dayu.qihealonelibrary.activity.ManagerListActivity;
import com.dayu.qihealonelibrary.activity.ManagerReadActivity;
import com.dayu.qihealonelibrary.activity.NFCWreatActivity;
import com.dayu.qihealonelibrary.card.ManageCard;
@@ -65,7 +66,8 @@
okBtn.setOnClickListener(v -> {
if (ischose) {
if (type == 0) {
- Intent intent = new Intent(mContext, ManagerReadActivity.class);
+ Intent intent = new Intent(mContext, ManagerListActivity.class);
+// intent.putExtra("cardNumber", cardNumber);
mContext.startActivity(intent);
AdminCardDialog.this.dismiss();
} else {
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml b/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
index 6751972..3327791 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
@@ -42,6 +42,7 @@
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔娓呴浂鍗�"
+ android:visibility="gone"
android:textColor="@color/text_selecter"
android:textSize="@dimen/text_size" />
diff --git a/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml b/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
index 68325b5..198d4c8 100644
--- a/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
+++ b/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
@@ -36,14 +36,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="閲戦锛�"
+ android:text="鍏呭�奸噾棰濓細"
android:textSize="14sp" />
<TextView
- android:id="@+id/rachagerWater"
+ android:id="@+id/balance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="鍏呭�兼按閲忥細"
+ android:text="鍓╀綑閲戦锛�"
android:textSize="14sp" />
<!-- <TextView-->
@@ -59,6 +59,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="鍓╀綑姘撮噺锛�"
+ android:visibility="gone"
android:textSize="14sp" />
<TextView
--
Gitblit v1.8.0