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/SysIpActivity.java | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java b/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
index d0c2d12..0849796 100644
--- a/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
@@ -1,16 +1,15 @@
package com.dayu.recharge.activity;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
-import android.view.View;
import android.widget.Toast;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityIpBinding;
-import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.IpBean;
-import com.dayu.recharge.utils.DeviceNumberUtils;
-import com.dayu.recharge.utils.WSHelper;
+import com.dayu.recharge.utils.TipUtil;
+import com.dayu.recharge.utils.ToastUtil;
/**
* Copyright (C), 2022,
@@ -45,30 +44,35 @@
}
private void initView() {
- ipBinding.ipOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (ipBean != null) {
- String oldIp = ipBean.getIp();
- int oldPort = ipBean.getPort();
- if (!oldIp.equals(ipBinding.ip.getText().toString())|| oldPort != Integer.valueOf(ipBinding.port.getText().toString())) {
- DeviceNumberUtils.setDeviceNumber("");
- }
- }
- if (ipBean == null) {
- ipBean = new IpBean();
- }
- ipBean.setIp(ipBinding.ip.getText().toString());
- ipBean.setPort(Integer.parseInt(ipBinding.port.getText().toString()));
- baseDao.ipDao().insert(ipBean);
- AdminDataBean adminData = baseDao.adminDao().findFirst();
- //淇敼IP鍚庨噸鏂拌繛鎺�
- MyApplication.myApplication.initEasySocket(false, null);
- if (adminData != null) {
- MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
- }
- Toast.makeText(SysIpActivity.this, "淇濆瓨鎴愬姛", Toast.LENGTH_LONG).show();
+ ipBinding.ipOk.setOnClickListener(v -> {
+ if (TextUtils.isEmpty(ipBinding.port.getText().toString())) {
+ ToastUtil.show("璇疯緭鍏ョ鍙ｅ彿");
+ return;
}
+ int newPort = Integer.parseInt(ipBinding.port.getText().toString());
+ if (newPort <= 0 || newPort > 65535) {
+ TipUtil.show("璇疯緭鍏ユ纭殑绔彛鍙�");
+ return;
+ }
+ if (ipBean != null) {
+ String oldIp = ipBean.getIp();
+ int oldPort = ipBean.getPort();
+// if (!oldIp.equals(ipBinding.ip.getText().toString()) || oldPort != newPort) {
+//// DeviceNumberUtils.setDeviceNumber("");
+// }
+ }
+ if (ipBean == null) {
+ ipBean = new IpBean();
+ }
+ ipBean.setIp(ipBinding.ip.getText().toString());
+ ipBean.setPort(newPort);
+ baseDao.ipDao().insert(ipBean);
+ //淇敼IP鍚庨噸鏂拌繛鎺�
+ MyApplication.myApplication.initEasySocket(false, null);
+// if (adminData != null) {
+// MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
+// }
+ Toast.makeText(SysIpActivity.this, "淇濆瓨鎴愬姛", Toast.LENGTH_LONG).show();
});
}
--
Gitblit v1.8.0