From ddafb0f0951e68b4e56bfceef43cf78559f5161f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 六月 2024 14:52:27 +0800
Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
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 a257a7d..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;
@@ -39,15 +43,17 @@
private void initView() {
adminBinding.setupOk.setOnClickListener(v -> {
- String strSerial = adminBinding.adminSerial.getText().toString();
+ 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
@@ -60,12 +66,15 @@
}
} else {
- TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勮澶囩紪鍙蜂笉鑳借秴杩�65535");
+ 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,11 +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
+ }
+ });
+
+ }
}
--
Gitblit v1.8.0