1.添加水量单价 2.修复发现的bug

zuoxiao

2024-05-11 844597b5813ff8589de503cd7d7b1bbd0586d287

 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

            }

        });

    }

}