From 844597b5813ff8589de503cd7d7b1bbd0586d287 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 13 五月 2024 19:38:03 +0800
Subject: [PATCH] 1.添加水量单价 2.修复发现的bug
---
qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml | 16 +
qihealonelibrary/build.gradle | 2
baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java | 15 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java | 2
qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml | 22 ++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java | 10 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/RechargeBean.java | 17 ++
henanlibrary/build.gradle | 3
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java | 8
qihealonelibrary/src/main/res/layout/activity_my_qha.xml | 22 ++
qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml | 28 +++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java | 14 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 10
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java | 66 +++++++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java | 32 ++-
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ElectricPriceCard.java | 8
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java | 10
qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml | 1
qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml | 59 +++++--
qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java | 6
henanlibrary/src/main/res/layout/item_replacement_hn.xml | 2
local.properties | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 16 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java | 31 +++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java | 9
27 files changed, 357 insertions(+), 66 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java b/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
index f19ab18..fdf558e 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
@@ -1,6 +1,7 @@
package com.dayu.baselibrary.utils;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
/**
* Copyright (C), 2022,
@@ -28,4 +29,18 @@
return BigDecimal.valueOf(Long.valueOf(price)).divide(new BigDecimal(100)).toString();
}
+
+ /**
+ * 绮剧‘闄ゆ硶锛屼繚鐣欎袱浣嶅皬鏁�
+ * @param dividend
+ * @param divisor
+ * @return
+ */
+ public static String intDiv(int dividend, int divisor) {
+ double result = (double) dividend / divisor;
+ // 浣跨敤 DecimalFormat 鏍煎紡鍖栫粨鏋滐紝淇濈暀涓や綅灏忔暟
+ DecimalFormat df = new DecimalFormat("#.##");
+ return df.format(result);
+ }
+
}
diff --git a/henanlibrary/build.gradle b/henanlibrary/build.gradle
index 016d3a0..02deea0 100644
--- a/henanlibrary/build.gradle
+++ b/henanlibrary/build.gradle
@@ -2,6 +2,7 @@
android {
namespace 'com.dayu.henanlibrary'
compileSdk 33
+ ndkPath 'D:\\android\\sdk\\ndk\\android-ndk-r21'
defaultConfig {
minSdk 23
targetSdk 26
@@ -36,7 +37,7 @@
dependencies {
- implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+ implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
compileOnly 'com.android.support:appcompat-v7:28.0.0'
compileOnly 'com.android.support.constraint:constraint-layout:1.1.3'
diff --git a/henanlibrary/src/main/res/layout/item_replacement_hn.xml b/henanlibrary/src/main/res/layout/item_replacement_hn.xml
index 288dc56..47e8578 100644
--- a/henanlibrary/src/main/res/layout/item_replacement_hn.xml
+++ b/henanlibrary/src/main/res/layout/item_replacement_hn.xml
@@ -24,7 +24,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:layout_marginRight="15dp"
- android:onClick="@{ activity.itemClick}"
+ android:onClick="@{ activity::itemClick}"
android:orientation="vertical">
<TextView
diff --git a/local.properties b/local.properties
index 285b71e..36d8ed3 100644
--- a/local.properties
+++ b/local.properties
@@ -4,6 +4,6 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Fri Mar 15 09:00:13 CST 2024
-ndk.dir=D\:\\android\\sdk\\ndk\\android-ndk-r21
-sdk.dir=D\:\\android\\sdk
+#Mon May 13 11:15:58 CST 2024
+#ndk.dir=D\:\\android\\sdk\\ndk\\android-ndk-r21
+sdk.dir=D\:\\AndroidStudio\\sdk
diff --git a/qihealonelibrary/build.gradle b/qihealonelibrary/build.gradle
index 5079714..08d91f6 100644
--- a/qihealonelibrary/build.gradle
+++ b/qihealonelibrary/build.gradle
@@ -2,7 +2,7 @@
android {
namespace 'com.dayu.qihealonelibrary'
compileSdk 33
-
+ ndkPath 'D:\\android\\sdk\\ndk\\android-ndk-r21'
defaultConfig {
minSdk 23
targetSdk 33
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
index 978c57f..dbd62fb 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
@@ -1,9 +1,13 @@
package com.dayu.qihealonelibrary.activity;
import android.os.Bundle;
+import android.text.Editable;
import android.text.TextUtils;
+import android.text.TextWatcher;
import android.view.LayoutInflater;
+import android.widget.EditText;
+import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qihealonelibrary.databinding.ActivityAdminSetupQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
@@ -41,13 +45,15 @@
adminBinding.setupOk.setOnClickListener(v -> {
String strSerial = adminBinding.adminAddressCode.getText().toString();
String strAddressCode = adminBinding.adminAddressCode.getText().toString();
+ String strWaterPrice = adminBinding.adminWaterPrice.getText().toString();
if (!TextUtils.isEmpty(strAddressCode)
- && !TextUtils.isEmpty(strSerial)) {
-
-// if (Integer.valueOf(strSerial) <= 65535) {
+ && !TextUtils.isEmpty(strSerial) && !TextUtils.isEmpty(strWaterPrice)) {
+ int wtaterPrice = MornyUtil.changeY2F(strWaterPrice);
+ if (Integer.valueOf(wtaterPrice) > 0) {
if (Integer.valueOf(strAddressCode) <= 65535) {
adminData.setAddressCode(strAddressCode);
adminData.setSerial(strSerial);
+ adminData.setWaterPrice(wtaterPrice);
baseDao.adminDao().insert(adminData);
TipUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
@Override
@@ -59,13 +65,16 @@
TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勫尯鍩熷彿涓嶈兘瓒呰繃65535");
}
-// } else {
-// TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勮澶囩紪鍙蜂笉鑳借秴杩�65535");
-// }
+ } else {
+ TipUtil.show(AdminSetupActivity.this, "鍗曚环涓嶈兘涓�0");
+ }
} else {
TipUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
});
+
+ setPricePoint(adminBinding.adminWaterPrice);
+
}
@@ -76,6 +85,7 @@
this.adminData = adminData;
adminBinding.adminSerial.setText(adminData.getSerial());
adminBinding.adminAddressCode.setText(adminData.getAddressCode());
+ adminBinding.adminWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
}
} catch (Exception e) {
@@ -84,5 +94,49 @@
}
}
+ //姘村崟浠锋牎楠�
+ public static void setPricePoint(final EditText editText) {
+ editText.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before,
+ int count) {
+ if (s.toString().contains(".")) {
+ if (s.length() - 1 - s.toString().indexOf(".") > 2) {
+ s = s.toString().subSequence(0,
+ s.toString().indexOf(".") + 3);
+ editText.setText(s);
+ editText.setSelection(s.length());
+ }
+ }
+ if (s.toString().trim().substring(0).equals(".")) {
+ s = "0" + s;
+ editText.setText(s);
+ editText.setSelection(2);
+ }
+
+ if (s.toString().startsWith("0")
+ && s.toString().trim().length() > 1) {
+ if (!s.toString().substring(1, 2).equals(".")) {
+ editText.setText(s.subSequence(0, 1));
+ editText.setSelection(1);
+ }
+ }
+ }
+
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count,
+ int after) {
+
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ // TODO Auto-generated method stub
+
+ }
+
+ });
+
+ }
}
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 f94b5cf..3ba10ef 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
@@ -52,7 +52,11 @@
public void onClick(View v) {
AdminDataBean adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
+ if (adminData.getWaterPrice()!=0){
+ startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
+ }else {
+ TipUtil.show(HomeActivity.this,"璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆姘翠环");
+ }
} else {
TipUtil.show("璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�");
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
index 5137d47..bcba78a 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -14,6 +14,7 @@
import androidx.annotation.NonNull;
+import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
@@ -64,6 +65,13 @@
PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
passWordDialog.show();
// startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
+ }
+ });
+ myBinding.myWaterPriceLL.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
+ passWordDialog.show();
}
});
myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
@@ -202,9 +210,11 @@
if (adminData != null) {
myBinding.myAdminName.setText(adminData.getAddressCode());
myBinding.myVillageNum.setText(adminData.getSerial());
+ myBinding.myWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
} else {
- myBinding.myAdminName.setText("璇风偣鍑昏缃尯鍩熷彿");
- myBinding.myVillageNum.setText("璇风偣鍑昏缃尯鍩熷彿");
+ myBinding.myAdminName.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+ myBinding.myVillageNum.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+ myBinding.myWaterPrice.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
}
StringBuilder msgData = new StringBuilder();
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 a03e0fb..554d672 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -82,6 +82,7 @@
UserCard olduserCard;
String morny;
+ String rechageWater;//鍏呭�肩殑姘撮噺
String userName;
AdminDataBean adminData;
RechargeBean rechargeBean;
@@ -128,7 +129,8 @@
}
if (this.getIntent().hasExtra("electricPriceCard")) {
electricPriceCard = (ElectricPriceCard) this.getIntent().getSerializableExtra("electricPriceCard");
- binding.cardData.setText("鍒朵綔鐢ㄦ埛鐢甸噺鍗曚环鍗n褰撳墠鍗曚环锛�" + electricPriceCard.getElectricPrice().toString() + "鍏�");
+
+ binding.cardData.setText("鍒朵綔鐢ㄦ埛鐢甸噺鍗曚环鍗n褰撳墠鍗曚环锛�" + electricPriceCard.getElectricPrice().toString() + " 鍏�");
}
if (this.getIntent().hasExtra("passWordCard")) {
passWordCard = (PassWordCard) this.getIntent().getSerializableExtra("passWordCard");
@@ -184,7 +186,8 @@
userName = this.getIntent().getStringExtra("userName");
cardNumber = this.getIntent().getStringExtra("cardNumber");
userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean");
- binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + "鍏�");
+ rechageWater = this.getIntent().getStringExtra("rechageWater");
+ binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏僜n鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫筹紙鍚級");
}
try {
@@ -392,8 +395,13 @@
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);
+
int rechageTims = userCard.getRechargeTimes() + 1;
if (rechageTims == 256) {
rechageTims = 0;
@@ -410,6 +418,8 @@
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) {
@@ -539,10 +549,12 @@
detail.putExtra("userCard", userCard);
if (!TextUtils.isEmpty(morny)) {
detail.putExtra("morny", morny);
+ detail.putExtra("rechageWater", rechageWater);
}
if (!TextUtils.isEmpty(cardNumber)) {
detail.putExtra("cardNumber", cardNumber);
}
+
startActivity(detail);
if (NewCardActivity.newCardActivity != null) {
NewCardActivity.newCardActivity.finish();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
index 2157346..5abced2 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
@@ -1,7 +1,11 @@
package com.dayu.qihealonelibrary.activity;
import android.os.Bundle;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.Spanned;
import android.text.TextUtils;
+import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
@@ -62,7 +66,30 @@
}
}
});
+ // 璁剧疆杈撳叆杩囨护鍣�
+ binding.villageNewNum.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ if (!isValidInput(s.toString())) {
+ // 濡傛灉杈撳叆鐨勫瓧绗︿笉绗﹀悎瑕佹眰锛屽垯灏� EditText 鐨勫唴瀹硅缃负鏈�鍚庝竴娆″悎娉曠殑杈撳叆
+ binding.villageNewNum.setText(s.subSequence(0, s.length() - 1).toString().toUpperCase());
+ binding.villageNewNum.setSelection(binding.villageNewNum.getText().length()); // 灏嗗厜鏍囩Щ鍔ㄥ埌鏈熬
+ }
+ }
+ });
}
-
-}
+ // 妫�鏌ヨ緭鍏ョ殑瀛楃鏄惁绗﹀悎瑕佹眰
+ private boolean isValidInput(String input) {
+ return input.matches("[0-9a-fA-F]*"); // 鍖呭惈 0-9 鍜� a-f 鐨勫瓧绗�
+ }
+}
\ 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 38cb3dd..b5c1a5f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -62,11 +62,11 @@
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
redCardBinding.redInitCode.setText(cardNumber);
- redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
- redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + userCard.getTotalWater());
- redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + userCard.getTotalElectric());
- redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + "鍏�");
- redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + 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())+" 鍚�");
}
}
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..6a0e5c3 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
@@ -42,6 +42,8 @@
String userName;
String cardNumber = null;
UserCardBean userCardBean;
+ int waterPrice;
+ String rechageWater;//鍏呭�肩殑姘撮噺
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -51,6 +53,7 @@
setContentView(binding.getRoot());
setPricePoint(binding.rechargeWater);
rechargeActivity = this;
+ waterPrice = baseDao.adminDao().findFirst().getWaterPrice();
initView();
} catch (Exception e) {
e.printStackTrace();
@@ -98,12 +101,16 @@
String state = "";
if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
state = "缁堢鍐欏崱";
+ binding.rechargeTextLL.setVisibility(View.VISIBLE);
+ binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
state = "鍒峰崱寮�娉靛悗,褰撳墠鐘舵�佷笉鑳藉厖鍊�";
binding.rechargeLL.setVisibility(View.GONE);
+ binding.rechargeRegistBtn.setVisibility(View.GONE);
} 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;
@@ -113,7 +120,7 @@
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();
@@ -129,8 +136,6 @@
}
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 +149,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 +182,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 +192,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 +218,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
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 3c6c752..ab09a3c 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
@@ -25,6 +25,7 @@
String statu;
String userName;
String morny;
+ String rechageWater;
String cardNumber;
@Override
@@ -40,6 +41,7 @@
userName = getIntent().getStringExtra("userName");
if (getIntent().hasExtra("morny")) {
morny = getIntent().getStringExtra("morny");
+ rechageWater = getIntent().getStringExtra("rechageWater");
}
if (getIntent().hasExtra("cardNumber")) {
cardNumber = getIntent().getStringExtra("cardNumber");
@@ -55,15 +57,18 @@
int balance = userCard.getBalance();
if (!TextUtils.isEmpty(morny)) {
binding.tip.setText("鍏呭�兼垚鍔燂紒");
- balance = userCard.getBalance() ;
+ balance = userCard.getBalance();
binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
+ binding.redRechargeWater.setText("鍏呭�兼按閲忥細" + rechageWater + " 鍚�");
} else {
binding.tip.setText("寮�鍗℃垚鍔燂紒");
balance = userCard.getBalance();
binding.redRemainderMorny.setVisibility(View.GONE);
+ binding.redRechargeWater.setVisibility(View.GONE);
}
binding.redName.setText("鐢ㄦ埛濮撳悕锛�" + userName);
binding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
+ binding.redSurplusWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
if (userCard != null) {
binding.redInitCode.setText("褰撳墠鍗″彿锛�" + cardNumber);
@@ -73,7 +78,7 @@
int month = calendar.get(Calendar.MONTH); // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ラ渶瑕佸姞1
int day = calendar.get(Calendar.DAY_OF_MONTH);
- binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + month + day );
+ binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + month + day);
} else {
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
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 2aac4c1..405a001 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/RechargeAdapter.java
@@ -12,6 +12,7 @@
import com.dayu.baselibrary.utils.DateUtil;
+import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.qihealonelibrary.R;
import com.dayu.qihealonelibrary.databinding.QiheItemRechargeBinding;
import com.dayu.qihealonelibrary.dbBean.RechargeBean;
@@ -53,7 +54,10 @@
if (rechargeList.size() > 0) {
((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().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().date.setText("鏃ユ湡:" + DateUtil.dateToStamp(rechargeList.get(position).getDate(), DateUtil.type1));
}
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ElectricPriceCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ElectricPriceCard.java
index 9adf95a..f6aa469 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ElectricPriceCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ElectricPriceCard.java
@@ -59,12 +59,16 @@
byte[] data = new byte[16];
data[0] = HexUtil.hexToByte(cardType);
- byte[] regionBytes = HexUtil.hexToByteArray(cardData);
+ byte[] regionBytes = new byte[4];
+ byte[] regionDatas = HexUtil.hexToByteArray(cardData);
+ System.arraycopy(regionDatas, 0, regionBytes, 0, regionDatas.length);
if (regionBytes != null) {
System.arraycopy(regionBytes, 0, data, 1, regionBytes.length);
}
- byte[] controllerCodelBytes = HexUtil.hexToByteArray(HexUtil.floatToHexLowHigh(electricPrice));
+ byte[] controllerCodelBytes = new byte[4];
+ byte[] controllerCodelDatas = HexUtil.hexToByteArray(HexUtil.floatToHexLowHigh(electricPrice));
+ System.arraycopy(controllerCodelDatas, 0, controllerCodelBytes, 0, controllerCodelDatas.length);
if (controllerCodelBytes != null) {
System.arraycopy(controllerCodelBytes, 0, data, 5, controllerCodelBytes.length);
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java
index fb4443a..2db7a51 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java
@@ -69,13 +69,15 @@
public byte[] toByte() {
byte[] data = new byte[16];
data[0] = HexUtil.hexToByte(cardType);
-
- byte[] regionBytes = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(region));
+ byte[] regionBytes = new byte[2];
+ byte[] regionDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(region));
+ System.arraycopy(regionDatas, 0, regionBytes, 0, regionDatas.length);
if (regionBytes != null) {
System.arraycopy(regionBytes, 0, data, 1, regionBytes.length);
}
-
- byte[] controllerCodelBytes = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(controllerCodel));
+ byte[] controllerCodelBytes = new byte[2];
+ byte[] controllerCodelDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(controllerCodel));
+ System.arraycopy(controllerCodelDatas, 0, controllerCodelBytes, 0, controllerCodelDatas.length);
if (controllerCodelBytes != null) {
System.arraycopy(controllerCodelBytes, 0, data, 3, controllerCodelBytes.length);
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
index 7ae89d7..a38497e 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
@@ -28,7 +28,7 @@
public int balance;//鍓╀綑閲戦 搴曚綅鍦ㄥ墠 2浣嶅皬鏁扮偣锛屽崟浣嶅垎
- public int surplusWater;//鍓╀綑姘撮噺 搴曚綅鍦ㄥ墠 2浣嶅皬鏁扮偣銆�鍗曚綅绔嬫柟绫�
+ public int surplusWater;//鍓╀綑姘撮噺 搴曚綅鍦ㄥ墠 2浣嶅皬鏁扮偣銆�鍗曚綅绔嬫柟绫� (璺熶环鏍间竴鏍峰厛涔樹互100)
public Calendar rechargeDate;// 璐按鏃堕棿 BCD
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java
index 8caf6c3..37cf79e 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java
@@ -34,6 +34,16 @@
public String addressCode;//鍖哄煙鍙�
+ public int waterPrice;//姘翠环(淇濆瓨鐨勬椂鍊欎箻浠�100鏄剧ず鐨勬椂鍊欓櫎浠�100璺熶綑棰濅竴鏍峰鐞�)
+
+ public int getWaterPrice() {
+ return waterPrice;
+ }
+
+ public void setWaterPrice(int waterPrice) {
+ this.waterPrice = waterPrice;
+ }
+
public int getState() {
return state;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/RechargeBean.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/RechargeBean.java
index 156b8d4..05301b3 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/RechargeBean.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/RechargeBean.java
@@ -19,13 +19,30 @@
public String userId;//鐢ㄦ埛韬唤璇佸彿
public long date;
public String morny;//鍏呭�奸噾棰� 鍗曚綅鍏�
+ public String rechargeWater;//鍏呭�兼按閲�
public String balance;//浣欓 鍗曚綅鍏�
public String total_morn;//鎬诲厖鍊奸噾棰�
//鐘舵�� 0鏈笂浼� 1鎴愬姛涓婁紶
public int state = 0;
public String cardNumber;//鍗″彿
+ public String surplusWater;//鍓╀綑姘撮噺 搴曚綅鍦ㄥ墠 2浣嶅皬鏁扮偣銆�鍗曚綅鍏�/绔嬫柟绫� ()
+ public String getRechargeWater() {
+ return rechargeWater;
+ }
+
+ public void setRechargeWater(String rechargeWater) {
+ this.rechargeWater = rechargeWater;
+ }
+
+ public String getSurplusWater() {
+ return surplusWater;
+ }
+
+ public void setSurplusWater(String surplusWater) {
+ this.surplusWater = surplusWater;
+ }
public String getCardNumber() {
return cardNumber;
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 dff0d49..295e31c 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,10 @@
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);
Log.i("NFCWreatActivity", "hex===" + hex);
- return hex;
+ return hex.toUpperCase();
}
}
@@ -176,6 +178,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);
strData.append(hex);
strData.append(",");
Log.i("NFCWreatActivity", "hex===" + hex);
@@ -193,7 +197,7 @@
String hex = HexUtil.byteToHex(data[0]);
strData.append(hex);
Log.i("NFCWreatActivity", "hex===" + hex);
- return strData.toString();
+ return strData.toString().toUpperCase();
}
} else {
Log.i("NFCWreatActivity", "isOpen===" + isOpen);
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
index d7a3b10..4fe1ee4 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
@@ -47,7 +47,6 @@
android:inputType="number"
android:lines="1"
android:maxLength="5"
-
android:paddingLeft="10dp"
android:textSize="@dimen/new_card_size" />
@@ -82,6 +81,33 @@
</LinearLayout>
<LinearLayout
+ style="@style/newCardLL"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="visible">
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1.5"
+ android:text="姘村崟浠�(鍏�/鍚�)"
+ android:textSize="@dimen/new_card_size" />
+
+ <EditText
+ android:id="@+id/admin_waterPrice"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/edt_height"
+ android:layout_weight="2"
+ android:background="@drawable/editbg"
+ android:inputType="numberDecimal"
+ android:lines="1"
+ android:paddingLeft="10dp"
+ android:textSize="@dimen/new_card_size" />
+
+
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/chose_address"
style="@style/newCardLL"
android:layout_width="match_parent"
diff --git a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
index f6baa22..55af50c 100644
--- a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
@@ -70,6 +70,28 @@
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/my_waterPriceLL"
+ 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:textColor="@color/text_selecter"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/my_waterPrice"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/text_selecter"
+ android:textSize="@dimen/text_size" />
+
+ </LinearLayout>
<RelativeLayout
diff --git a/qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml b/qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml
index 689e90e..ae03793 100644
--- a/qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml
@@ -47,7 +47,6 @@
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:hint="璇疯緭鍏ユ柊璁剧疆鐨�12浣�16杩涘埗鍗″瘑鐮�"
- android:inputType="number|numberDecimal"
android:lines="1"
android:maxLength="12" />
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 8cfaf8e..1b66dd3 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
@@ -43,7 +43,13 @@
android:layout_marginTop="15dp"
android:text="鍏呭�奸噾棰濓細"
android:textSize="@dimen/text_size" />
-
+ <TextView
+ android:id="@+id/red_recharge_water"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鍏呭�兼按閲忥細"
+ android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/red_remainder_blance"
android:layout_width="match_parent"
@@ -51,7 +57,13 @@
android:layout_marginTop="15dp"
android:text="鍓╀綑閲戦锛�"
android:textSize="@dimen/text_size" />
-
+ <TextView
+ android:id="@+id/red_surplusWater"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鍓╀綑姘撮噺锛�"
+ android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/red_rechargeDate"
android:layout_width="match_parent"
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
index 106296c..315e1c2 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
@@ -109,6 +109,7 @@
android:textSize="@dimen/new_card_size" />
</LinearLayout>
+
<TextView
android:id="@+id/red_remainder_water"
android:layout_width="match_parent"
@@ -173,29 +174,55 @@
android:textSize="@dimen/new_card_size" />
</LinearLayout>
-
+ <TextView
+ android:id="@+id/red_waterPrice"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="姣忕珛鏂圭背姘翠环鏍硷細"
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
<LinearLayout
android:id="@+id/recharge_LL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:orientation="horizontal">
+ android:orientation="vertical">
<TextView
- android:id="@+id/recharge_tx"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="閲戦锛堝厓锛夛細"
- android:textColor="@color/red"
- android:textSize="@dimen/new_card_size" />
-
- <EditText
- android:id="@+id/recharge_water"
+ android:id="@+id/red_recharge_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ュ厖鍊肩殑閲戦"
- android:inputType="numberDecimal"
- android:textSize="@dimen/new_card_size" />
+ android:layout_marginTop="15dp"
+ android:text="鍏呭�兼按閲忥細"
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+
+
+ <TextView
+ android:id="@+id/recharge_tx"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="閲戦锛堝厓锛夛細"
+ android:textColor="@color/red"
+ android:textSize="@dimen/new_card_size" />
+
+ <EditText
+ android:id="@+id/recharge_water"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="璇疯緭鍏ュ厖鍊肩殑閲戦"
+ android:inputType="numberDecimal"
+ android:textSize="@dimen/new_card_size" />
+
+ </LinearLayout>
+
+
</LinearLayout>
</LinearLayout>
@@ -204,11 +231,11 @@
android:id="@+id/recharge_registBtn"
android:layout_width="match_parent"
android:layout_height="50dp"
- android:visibility="gone"
android:layout_alignParentBottom="true"
android:background="@color/title_bg"
android:gravity="center"
android:text="鍏呭��"
android:textColor="#000000"
- android:textSize="@dimen/new_card_size" />
+ android:textSize="@dimen/new_card_size"
+ android:visibility="gone" />
</RelativeLayout>
\ No newline at end of file
diff --git a/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml b/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
index 5760b9a..1252d90 100644
--- a/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
+++ b/qihealonelibrary/src/main/res/layout/qihe_item_recharge.xml
@@ -38,6 +38,28 @@
android:layout_weight="1"
android:text="閲戦锛�"
android:textSize="14sp" />
+ <TextView
+ android:id="@+id/rachagerWater"
+ 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"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鍓╀綑姘撮噺锛�"
+ android:textSize="14sp" />
<TextView
android:id="@+id/date"
diff --git a/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml b/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml
index 2604abe..20e42a0 100644
--- a/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml
+++ b/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml
@@ -23,7 +23,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:layout_marginRight="15dp"
- android:onClick="@{ activity.itemClick}"
+ android:onClick="@{ activity::itemClick}"
android:orientation="vertical">
<TextView
--
Gitblit v1.8.0