From ebc06a3ae3a42bd6ac1359a59c55d5e6f1a0e2f0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 26 三月 2024 16:18:08 +0800
Subject: [PATCH] 优化通讯 写卡界面添加二次确认 优化用户写卡逻辑，提高写卡速度。
---
app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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..31dc483 100644
--- a/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
@@ -1,6 +1,7 @@
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;
@@ -9,6 +10,9 @@
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.TipUtil;
+import com.dayu.recharge.utils.ToastUtil;
import com.dayu.recharge.utils.WSHelper;
/**
@@ -47,23 +51,34 @@
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 (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(Integer.parseInt(ipBinding.port.getText().toString()));
+ ipBean.setPort(newPort);
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());
- }
+// if (adminData != null) {
+// MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
+// }
Toast.makeText(SysIpActivity.this, "淇濆瓨鎴愬姛", Toast.LENGTH_LONG).show();
}
});
--
Gitblit v1.8.0