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/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
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 9820463..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;
@@ -42,6 +45,8 @@
String userName;
String cardNumber = null;
UserCardBean userCardBean;
+ int waterPrice;
+ String rechageWater;//鍏呭�肩殑姘撮噺
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -51,6 +56,7 @@
setContentView(binding.getRoot());
setPricePoint(binding.rechargeWater);
rechargeActivity = this;
+ waterPrice = baseDao.adminDao().findFirst().getWaterPrice();
initView();
} catch (Exception e) {
e.printStackTrace();
@@ -76,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();
@@ -92,28 +100,36 @@
}
+ @SuppressLint("ResourceAsColor")
private void setUserData(String cardType, String cardNumber, List<byte[]> data) {
String state = "";
if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
state = "缁堢鍐欏崱";
+ 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);
+ binding.rechargeRegistBtn.setVisibility(View.GONE);
} else {
TipUtil.show(this, "闈炵敤鎴峰崱锛屼笉鑳藉厖鍊�");
return;
}
+
+
userCard = UserCard.getBean(data);
List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
AdminDataBean adminDataBean = baseDao.adminDao().findFirst();
- if (adminDataBean.addressCode.equalsIgnoreCase(String.valueOf(userCard.getArerNumber()))) {
+ if (Integer.valueOf(adminDataBean.getAddressCode()) == userCard.getArerNumber()) {
if (!userCardBeans.isEmpty()) {
userCardBean = userCardBeans.get(0);
this.userName = userCardBean.getUserName();
@@ -127,10 +143,8 @@
userCardBean.setSerial(String.valueOf(userCard.getArerNumber()));
this.userName = "鏈煡鐢ㄦ埛";
}
-
binding.rechargeReadLL.setVisibility(View.GONE);
binding.rechargeTextLL.setVisibility(View.VISIBLE);
- binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
binding.userName.setText(userName);
binding.redStatu.setText(state);
if (userCard != null) {
@@ -144,11 +158,12 @@
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
binding.redInitCode.setText(cardNumber);
- binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
- binding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + userCard.getTotalWater());
- binding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + userCard.getTotalElectric());
- binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + "鍏�");
- binding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + userCard.getSurplusWater());
+// 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()) + " 鍏�");
}
} else {
@@ -176,6 +191,7 @@
intent.putExtra("cardNumber", cardNumber);
intent.putExtra("userCard", userCard);
intent.putExtra("userCardBean", userCardBean);
+ intent.putExtra("rechageWater", rechageWater);
startActivity(intent);
} else {
TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
@@ -185,7 +201,7 @@
//鏍￠獙閲戦
- public static void setPricePoint(final EditText editText) {
+ public void setPricePoint(final EditText editText) {
editText.addTextChangedListener(new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before,
@@ -211,6 +227,13 @@
editText.setSelection(1);
}
}
+ String morny = editText.getText().toString();
+ if (!TextUtils.isEmpty(morny)) {
+ rechageWater = MornyUtil.intDiv(MornyUtil.changeY2F(editText.getText().toString()), waterPrice);
+ binding.redRechargeWater.setText("鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫�(鍚�)");
+ }
+
+
}
@Override
--
Gitblit v1.8.0