From 0fe9cc9142484ea3818340ca709886c126faf986 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 15 三月 2024 18:53:28 +0800
Subject: [PATCH] 修复列表显示异常的bug 修复充值后用户卡结构翻译异常的bug
---
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 91d6565..1cd0373 100644
--- a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
@@ -1,5 +1,6 @@
package com.dayu.recharge.activity;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
@@ -12,13 +13,15 @@
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.SocketUtil;
+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;
import java.lang.reflect.Method;
+import java.util.Random;
import java.util.zip.CRC32;
/**
@@ -54,30 +57,29 @@
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())
+ if (!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());
+ adminBinding.adminAddressCode.setText(adminData.getAddressCode());
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();
+ IpBean ipBean = MyApplication.myApplication.ipBean;
if (ipBean != null) {
MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
}
-
+ TipUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
+ @Override
+ public void onCancle() {
+ AdminSetupActivity.this.finish();
+ }
+ });
} else {
- ToastUtil.show(AdminSetupActivity.this, "杈撳叆鐨勬暟瀛椾笉鑳借秴杩�16777215");
+ TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勬暟瀛椾笉鑳借秴杩�16777215");
}
} else {
- ToastUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ TipUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
}
});
@@ -108,11 +110,15 @@
if (adminData != null) {
this.adminData = adminData;
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("12" + generateUniqueNumber(getSN()));
+ // 鍒涘缓涓�涓殢鏈烘暟鐢熸垚鍣ㄥ璞�
+ Random random = new Random();
+ // 鐢熸垚 1 鍒� 12 涔嬮棿鐨勯殢鏈烘暟瀛�
+ int randomNumber = random.nextInt(12) + 1;
+ adminBinding.adminSerial.setText(randomNumber + generateUniqueNumber(getSN()));
+
}
} catch (Exception e) {
@@ -151,6 +157,7 @@
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();
}
});
@@ -161,6 +168,7 @@
}
}
+ @SuppressLint("MissingPermission")
public static String getSN() {
String serial = null;
try {
--
Gitblit v1.8.0