From 5a8278faefaefaa90cbe438c1643c987da2f473b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 08 十二月 2023 11:27:08 +0800
Subject: [PATCH] Changes
---
app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 9722629..9d3dd15 100644
--- a/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
@@ -9,6 +9,7 @@
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;
/**
@@ -47,10 +48,12 @@
ipBinding.ipOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- String oldIp = WSHelper.getInstance(SysIpActivity.this).get("local_ip", "");
- int oldPort = WSHelper.getInstance(SysIpActivity.this).get("local_port", 0);
- if (!oldIp.equals(ipBinding.ip.getText().toString()) && oldPort != Integer.valueOf(ipBinding.port.getText().toString())) {
- WSHelper.getInstance(SysIpActivity.this).put("initCode", "");
+ 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();
@@ -61,9 +64,9 @@
AdminDataBean adminData = baseDao.adminDao().findFirst();
//淇敼IP鍚庨噸鏂拌繛鎺�
MyApplication.myApplication.initEasySocket(false, null);
- if (adminData != null) {
- MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
- }
+// if (adminData != null) {
+// MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
+// }
Toast.makeText(SysIpActivity.this, "淇濆瓨鎴愬姛", Toast.LENGTH_LONG).show();
}
});
--
Gitblit v1.8.0