From 732e4481b8437719468cddfb4971ee54a4b36625 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 02 四月 2024 09:48:38 +0800
Subject: [PATCH] 修复设备序列号没有设置地址时一直变化的bug
---
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java | 113 ++++++++++++++++++++++----------------------------------
1 files changed, 45 insertions(+), 68 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
index 2a419ff..aa20f02 100644
--- a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
@@ -4,17 +4,14 @@
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
-import android.view.View;
import android.view.inputmethod.InputMethodManager;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityAdminSetupBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.IpBean;
-import com.dayu.recharge.utils.ToastUtil;
+import com.dayu.recharge.utils.TipUtil;
import com.example.pickerviewlibrary.picker.TeaPickerView;
-import com.example.pickerviewlibrary.picker.entity.PickerData;
-import com.example.pickerviewlibrary.picker.listener.OnPickerClickListener;
import com.tencent.bugly.crashreport.CrashReport;
/**
@@ -47,66 +44,48 @@
}
private void initView() {
- adminBinding.setupOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (!TextUtils.isEmpty(adminBinding.adminName.getText().toString())
- && !TextUtils.isEmpty(adminBinding.adminPhone.getText().toString())
- && !TextUtils.isEmpty(adminData.getCun())
- && !TextUtils.isEmpty(adminBinding.adminSerial.getText().toString())
- ) {
- if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 16777215) {
- adminData.setName(adminBinding.adminName.getText().toString());
- adminData.setPhone(adminBinding.adminPhone.getText().toString());
- adminData.setSerial(adminBinding.adminSerial.getText().toString());
- baseDao.adminDao().insert(adminData);
- MyApplication.myApplication.initEasySocket(false, null);
-
- ToastUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛");
- setData();
- IpBean ipBean = baseDao.ipDao().findFirst();
- if (ipBean != null) {
- MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
- }
-
- } else {
- ToastUtil.show(AdminSetupActivity.this, "杈撳叆鐨勬暟瀛椾笉鑳借秴杩�16777215");
+ adminBinding.setupOk.setOnClickListener(v -> {
+ if (!TextUtils.isEmpty(adminData.getCun())
+ && !TextUtils.isEmpty(adminBinding.adminSerial.getText().toString())
+ ) {
+ if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 16777215) {
+ adminBinding.adminAddressCode.setText(adminData.getAddressCode());
+ adminData.setSerial(adminBinding.adminSerial.getText().toString());
+ baseDao.adminDao().insert(adminData);
+ setData();
+ IpBean ipBean = MyApplication.myApplication.ipBean;
+ if (ipBean != null) {
+ MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
}
+ TipUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛", () -> AdminSetupActivity.this.finish());
} else {
- ToastUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勬暟瀛椾笉鑳借秴杩�16777215");
}
+ } else {
+ TipUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
});
- adminBinding.choseAddress.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.hideSoftInputFromWindow(adminBinding.adminSerial.getWindowToken(), 0);
- intiPickerView();
- }
+ adminBinding.choseAddress.setOnClickListener(v -> {
+ InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(adminBinding.adminSerial.getWindowToken(), 0);
+ intiPickerView();
});
pickerView = new TeaPickerView(this);
- new Thread(new Runnable() {
- @Override
- public void run() {
- pickerView.initAddressData();
- }
- }).start();
+ new Thread(() -> pickerView.initAddressData()).start();
}
private void setData() {
try {
- AdminDataBean adminData = baseDao.adminDao().findFirst();
-
- if (adminData != null) {
- this.adminData = adminData;
+ adminData = baseDao.adminDao().findFirst();
+ if (adminData.isHasAddressCode()) {
adminBinding.adminSerial.setText(adminData.getSerial());
- adminBinding.adminPhone.setText(adminData.getPhone());
- adminBinding.adminName.setText(adminData.getName());
+ adminBinding.adminAddressCode.setText(adminData.getAddressCode());
adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
+ } else {
+ adminBinding.adminSerial.setText(adminData.getSerial());
}
} catch (Exception e) {
@@ -126,27 +105,25 @@
.setRadius(25)
.build();
pickerView.show(adminBinding.choseAddress);
- pickerView.setOnPickerClickListener(new OnPickerClickListener() {
- @Override
- public void OnPickerClick(PickerData pickerData) {
- adminData.setSheng("娌冲崡");
- adminData.setShi(pickerData.getFirstText().getName());
- adminData.setXian(pickerData.getSecondText().getName());
- if (pickerData.getThirdText() != null) {
- adminData.setZhen(pickerData.getThirdText().getName());
- } else {
- adminData.setZhen("");
- }
- if (pickerData.getFourthText() != null) {
- adminData.setCun(pickerData.getFourthText().getName());
- adminData.setAddressCode(pickerData.getFourthText().getCode());
- } else {
- adminData.setCun("");
- adminData.setAddressCode(pickerData.getSecondText().getCode());
- }
- adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- pickerView.dismiss();
+ pickerView.setOnPickerClickListener(pickerData -> {
+ adminData.setSheng("娌冲崡");
+ adminData.setShi(pickerData.getFirstText().getName());
+ adminData.setXian(pickerData.getSecondText().getName());
+ if (pickerData.getThirdText() != null) {
+ adminData.setZhen(pickerData.getThirdText().getName());
+ } else {
+ adminData.setZhen("");
}
+ if (pickerData.getFourthText() != null) {
+ adminData.setCun(pickerData.getFourthText().getName());
+ adminData.setAddressCode(pickerData.getFourthText().getCode());
+ } else {
+ adminData.setCun("");
+ adminData.setAddressCode(pickerData.getSecondText().getCode());
+ }
+ adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
+ adminBinding.adminAddressCode.setText(adminData.getAddressCode());
+ pickerView.dismiss();
});
} catch (Exception e) {
CrashReport.postCatchedException(e);
--
Gitblit v1.8.0