From 420562c180324d5cc22bb8bec0fe040c304eca03 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 12 七月 2024 15:29:13 +0800
Subject: [PATCH] 齐河单机版充值逻辑调整由水费计价改为电费计价
---
baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java | 17 ++++
qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml | 27 ++++++
qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml | 1
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java | 11 ++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 6
baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java | 12 +++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java | 48 ++++++++++-
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java | 16 ++-
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java | 16 ++-
qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml | 8 +
qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml | 17 +++-
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 11 +-
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java | 2
qihealonelibrary/src/main/res/layout/activity_my_qha.xml | 2
15 files changed, 156 insertions(+), 40 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 fdf558e..102e8b8 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/utils/MornyUtil.java
@@ -20,6 +20,18 @@
return bigDecimal.multiply(new BigDecimal(100)).intValue();
}
+
+ /**
+ * 鍏冭浆鍘橈紝纭繚price淇濈暀涓や綅鏈夋晥鏁板瓧
+ *
+ * @return
+ */
+ public static int changeY2L(String amount) {
+ BigDecimal bigDecimal = new BigDecimal(amount).setScale(3);
+ return bigDecimal.multiply(new BigDecimal(1000)).intValue();
+ }
+
+
/**
* 鍒嗚浆鍏冿紝杞崲涓篵igDecimal鍦╰oString
*
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java b/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
index b58dd71..2495a6c 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
@@ -5,6 +5,8 @@
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -67,4 +69,19 @@
ok.setOnClickListener(mListner);
}
}
+
+ @Override
+ public void show() {
+
+ super.show();
+ /**
+ * 璁剧疆瀹藉害鍏ㄥ睆锛岃璁剧疆鍦╯how鐨勫悗闈�
+ */
+ WindowManager.LayoutParams layoutParams = getWindow().getAttributes();
+ layoutParams.gravity = Gravity.CENTER;
+ layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;
+ layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
+ getWindow().getDecorView().setPadding(0, 0, 0, 0);
+ getWindow().setAttributes(layoutParams);
+ }
}
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 8fb1d67..c6315bf 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -375,7 +375,7 @@
StringBuffer data = new StringBuffer();
if (rechargeBean != null) {
data.append("*****************************" + "\n");
- data.append(getResources().getString(com.dayu.baselibrary.R.string.login_title)).append("\n");
+
data.append("璁惧搴忓垪鍙凤細").append(rechargeBean.getSerial()).append("\n");
data.append("鐢ㄦ埛鍚嶏細").append(rechargeBean.getUserName()).append("\n");
// data.append("鎴� 鍙凤細" + rechargeBean.getUserNum() + "\n");
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 dbd62fb..0df2ad2 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
@@ -11,6 +11,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qihealonelibrary.databinding.ActivityAdminSetupQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
+import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
import com.tencent.bugly.crashreport.CrashReport;
/**
@@ -25,6 +26,7 @@
public static AdminSetupActivity adminSetupActivity;
AdminDataBean adminData = new AdminDataBean();
+ ElectricPriceBean electricPriceBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -45,16 +47,18 @@
adminBinding.setupOk.setOnClickListener(v -> {
String strSerial = adminBinding.adminAddressCode.getText().toString();
String strAddressCode = adminBinding.adminAddressCode.getText().toString();
- String strWaterPrice = adminBinding.adminWaterPrice.getText().toString();
+ String strElectricPrice = adminBinding.electricNewNum.getText().toString();
if (!TextUtils.isEmpty(strAddressCode)
- && !TextUtils.isEmpty(strSerial) && !TextUtils.isEmpty(strWaterPrice)) {
- int wtaterPrice = MornyUtil.changeY2F(strWaterPrice);
- if (Integer.valueOf(wtaterPrice) > 0) {
+ && !TextUtils.isEmpty(strSerial) && !TextUtils.isEmpty(strElectricPrice)) {
+ int electricPrice = MornyUtil.changeY2L(strElectricPrice);
+ if (Integer.valueOf(electricPrice) > 0) {
if (Integer.valueOf(strAddressCode) <= 65535) {
adminData.setAddressCode(strAddressCode);
adminData.setSerial(strSerial);
- adminData.setWaterPrice(wtaterPrice);
+// adminData.setWaterPrice(wtaterPrice);
baseDao.adminDao().insert(adminData);
+ electricPriceBean.setPrice(Float.parseFloat(strElectricPrice));
+ baseDao.electricPriceDao().insert(electricPriceBean);
TipUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
@Override
public void onCancle() {
@@ -73,8 +77,32 @@
}
});
- setPricePoint(adminBinding.adminWaterPrice);
+// setPricePoint(adminBinding.adminWaterPrice);
+ //淇濈暀涓変綅灏忔暟
+ adminBinding.electricNewNum.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) {
+ // 鍒犻櫎棰濆鐨勫皬鏁颁綅
+ String text = s.toString();
+ if (text.contains(".")) {
+ int decimalIndex = text.indexOf(".");
+ int decimalCount = text.length() - decimalIndex - 1;
+ if (decimalCount > 3) {
+ s.delete(decimalIndex + 4, s.length());
+ }
+ }
+ }
+ });
}
@@ -87,6 +115,14 @@
adminBinding.adminAddressCode.setText(adminData.getAddressCode());
adminBinding.adminWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
}
+ ElectricPriceBean priceBean = baseDao.electricPriceDao().findFirst();
+ if (priceBean != null) {
+ electricPriceBean = priceBean;
+ adminBinding.electricNewNum.setText(priceBean.getPrice()+"" );
+ } else {
+ electricPriceBean = new ElectricPriceBean();
+ adminBinding.electricNewNum.setText("1.000");
+ }
} catch (Exception e) {
CrashReport.postCatchedException(e);
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 61b61ff..bafb396 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
@@ -8,6 +8,7 @@
import android.widget.Toast;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.qihealonelibrary.databinding.ActivityHomeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
@@ -52,11 +53,11 @@
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("璇峰厛鍦ㄤ釜浜轰腑蹇冨唴璁剧疆鍖哄煙鍙�");
}
@@ -73,15 +74,16 @@
homeBinding.homeAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, SysActivity.class));
+ PassWordDialog passWordDialog = new PassWordDialog(HomeActivity.this, new Intent(HomeActivity.this, SysActivity.class));
+ passWordDialog.show();
}
});
//鍙傛暟璁剧疆
homeBinding.homeParameter.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, ParameterActivity.class));
-
+ PassWordDialog passWordDialog = new PassWordDialog(HomeActivity.this, new Intent(HomeActivity.this, ParameterActivity.class));
+ passWordDialog.show();
}
});
homeBinding.homeMy.setOnClickListener(new View.OnClickListener() {
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 bcba78a..4520884 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -21,6 +21,7 @@
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.qihealonelibrary.databinding.ActivityMyQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
+import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
import com.dayu.qihealonelibrary.utils.ExcelUtil;
@@ -210,11 +211,11 @@
if (adminData != null) {
myBinding.myAdminName.setText(adminData.getAddressCode());
myBinding.myVillageNum.setText(adminData.getSerial());
- myBinding.myWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
+// myBinding.myWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
} else {
myBinding.myAdminName.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
myBinding.myVillageNum.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
- myBinding.myWaterPrice.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+// myBinding.myWaterPrice.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
}
StringBuilder msgData = new StringBuilder();
@@ -225,6 +226,12 @@
msgData.append("璁惧娉ㄥ唽鍙凤細" + initCode);
}
myBinding.myTestConnect.setText(msgData);
+ ElectricPriceBean priceBean = baseDao.electricPriceDao().findFirst();
+ if (priceBean != null) {
+ myBinding.myWaterPrice.setText(priceBean.getPrice() + "鍏�");
+ } else {
+ myBinding.myWaterPrice.setText("1.000鍏�");
+ }
} catch (Exception e) {
e.printStackTrace();
}
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 f1ebcf4..ea81f0d 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -197,8 +197,8 @@
userName = this.getIntent().getStringExtra("userName");
cardNumber = this.getIntent().getStringExtra("cardNumber");
userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean");
- rechageWater = this.getIntent().getStringExtra("rechageWater");
- binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏僜n鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫筹紙鍚級");
+// rechageWater = this.getIntent().getStringExtra("rechageWater");
+ binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
}
try {
@@ -368,7 +368,6 @@
StringBuffer data = new StringBuffer();
if (rechargeBean != null) {
data.append("*****************************" + "\n");
- data.append(" 澶х鑺傛按\n 鏅鸿兘鍏呭�肩鐞嗙郴缁�" + "\n");
data.append("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial() + "\n");
data.append("鐢ㄦ埛鍚嶏細" + rechargeBean.getUserName() + "\n");
data.append("鍗� 鍙凤細" + rechargeBean.getCardNumber() + "\n");
@@ -417,8 +416,8 @@
int balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
userCard.setBalance(balance);
//鍓╀綑姘撮噺
- int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
- userCard.setSurplusWater(surplusWater);
+// int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
+// userCard.setSurplusWater(surplusWater);
int rechageTims = userCard.getRechargeTimes() + 1;
if (rechageTims == 256) {
@@ -436,7 +435,7 @@
rechargeBean.setMorny(morny);
rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
rechargeBean.setCardNumber(cardNumber);
- rechargeBean.setSurplusWater(MornyUtil.changeF2Y(surplusWater));
+ rechargeBean.setSurplusWater(MornyUtil.changeF2Y(0));
rechargeBean.setRechargeWater(rechageWater);
try {
baseDao.rechargeDao().insert(rechargeBean);
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 0529821..d3ec6cb 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -63,11 +63,11 @@
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
redCardBinding.redInitCode.setText(cardNumber);
-// redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
+ 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.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 2d35414..bb1befb 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
@@ -17,6 +17,7 @@
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRechargeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
+import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.CardCommon;
@@ -47,6 +48,7 @@
UserCardBean userCardBean;
int waterPrice;
String rechageWater;//鍏呭�肩殑姘撮噺
+ ElectricPriceBean priceBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -91,6 +93,9 @@
if (!data.isEmpty()) {
if (!TextUtils.isEmpty(cardNumber)) {
setUserData(cardType, cardNumber, data);
+ if(priceBean!=null){
+ binding.redRechargeElectric.setText("鐢甸噺鍗曚环锛�"+priceBean.getPrice()+"鍏�/搴�");
+ }
} else {
TipUtil.show(this, "璇诲彇鍗＄墖澶辫触锛岃閲嶆柊璐村崱");
}
@@ -161,13 +166,13 @@
// 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.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
binding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
- binding.redWaterPrice.setText("姣忕珛鏂圭背姘翠环鏍硷細" + MornyUtil.changeF2Y(adminData.getWaterPrice()) + " 鍏�");
+// binding.redWaterPrice.setText("姣忕珛鏂圭背姘翠环鏍硷細" + MornyUtil.changeF2Y(adminData.getWaterPrice()) + " 鍏�");
}
} else {
- TipUtil.show(this, "涓嶆槸鏈尯鍩熷崱");
+ TipUtil.show(this, "闈炴湰鍖哄煙鍗n涓嶈兘鍏呭�硷紒锛侊紒");
}
@@ -177,6 +182,7 @@
private void initView() {
try {
adminData = baseDao.adminDao().findFirst();
+ priceBean = baseDao.electricPriceDao().findFirst();
} catch (Exception e) {
e.printStackTrace();
CrashReport.postCatchedException(e);
@@ -191,7 +197,7 @@
intent.putExtra("cardNumber", cardNumber);
intent.putExtra("userCard", userCard);
intent.putExtra("userCardBean", userCardBean);
- intent.putExtra("rechageWater", rechageWater);
+// intent.putExtra("rechageWater", rechageWater);
startActivity(intent);
} else {
TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
@@ -230,7 +236,7 @@
String morny = editText.getText().toString();
if (!TextUtils.isEmpty(morny)) {
rechageWater = MornyUtil.intDiv(MornyUtil.changeY2F(editText.getText().toString()), waterPrice);
- binding.redRechargeWater.setText("鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫�(鍚�)");
+// binding.redRechargeWater.setText("鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫�(鍚�)");
}
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 d28d704..0f207ef 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
@@ -59,7 +59,7 @@
binding.tip.setText("鍏呭�兼垚鍔燂紒");
balance = userCard.getBalance();
binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
- binding.redRechargeWater.setText("鍏呭�兼按閲忥細" + rechageWater + " 鍚�");
+ binding.redRechargeWater.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
} else {
binding.tip.setText("寮�鍗℃垚鍔燂紒");
balance = userCard.getBalance();
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 4fe1ee4..bc37b1d 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
@@ -84,7 +84,7 @@
style="@style/newCardLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="visible">
+ android:visibility="gone">
<TextView
android:layout_width="0dp"
@@ -106,7 +106,32 @@
</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/electric_newNum"
+ 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"
diff --git a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
index 2ba9c9e..1bee96d 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 67f68e7..4799161 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
@@ -64,6 +64,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_rechargeDate"
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
index ed56be9..825e865 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
@@ -72,6 +72,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
android:orientation="horizontal">
<TextView
@@ -114,7 +115,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal"
- android:visibility="gone">
+ android:visibility="visible">
<TextView
@@ -137,6 +138,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍓╀綑姘撮噺锛�"
+ android:visibility="gone"
android:textSize="@dimen/text_size" />
<TextView
@@ -147,7 +149,14 @@
android:text="鏈�鍚庤喘姘存棩鏈燂細"
android:textSize="@dimen/text_size"
android:visibility="visible" />
-
+ <TextView
+ android:id="@+id/red_rechargeElectric"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鐢甸噺鍗曚环锛�"
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
<TextView
android:id="@+id/red_rechargeNumber"
android:layout_width="match_parent"
@@ -183,7 +192,7 @@
android:layout_marginTop="15dp"
android:text="姣忕珛鏂圭背姘翠环鏍硷細"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<LinearLayout
android:id="@+id/recharge_LL"
@@ -199,7 +208,7 @@
android:layout_marginTop="15dp"
android:text="鍏呭�兼按閲忥細"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<LinearLayout
android:layout_width="wrap_content"
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 ccd3296..b6094af 100644
--- a/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
@@ -60,16 +60,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:visibility="gone"
android:text="鍓╀綑閲戦锛�"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
+
<TextView
android:id="@+id/red_remainder_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍓╀綑姘撮噺锛�"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="gone"/>
<TextView
android:id="@+id/red_rechargeDate"
--
Gitblit v1.8.0