From 9d57ea9c1ca983a8990dfb3791165c6bae28f483 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 09 五月 2024 16:48:50 +0800
Subject: [PATCH] 1.修复河南版本不能自动连接服务器的bug 2.添加重新选择版本的功能
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
index 2037437..06ad0b6 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
@@ -11,15 +11,15 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.baselibrary.view.PassWordDialog;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
-import com.dayu.henanlibrary.utils.ExcelUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityMyBinding;
-import com.dayu.henanlibrary.dbBean.AdminDataBean;
-import com.dayu.henanlibrary.net.SocketNet;
+import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
+import com.dayu.henanlibrary.databinding.ActivityMyHnBinding;
+import com.dayu.henanlibrary.dbBean.AdminDataBean;
+import com.dayu.henanlibrary.net.SocketNet;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
+import com.dayu.henanlibrary.utils.ExcelUtil;
import java.io.File;
import java.util.ArrayList;
@@ -41,12 +41,12 @@
long endTime;
boolean isRechargeList = false;
- ActivityMyBinding myBinding;
+ ActivityMyHnBinding myBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- myBinding = ActivityMyBinding.inflate(LayoutInflater.from(this));
+ myBinding = ActivityMyHnBinding.inflate(LayoutInflater.from(this));
setContentView(myBinding.getRoot());
getVersion(this);
setData();
@@ -169,11 +169,13 @@
adminData = baseDao.adminDao().findFirst();
if (adminData.isHasAddressCode()) {
myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- myBinding.myVillageNum.setText(adminData.getSerial());
} else {
myBinding.myAdminName.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
- myBinding.myVillageNum.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
}
+ if (!TextUtils.isEmpty(adminData.getSerial())) {
+ myBinding.myVillageNum.setText(adminData.getSerial());
+ }
+
StringBuilder msgData = new StringBuilder();
String initCode = DeviceNumberUtils.getDeviceNumber();
--
Gitblit v1.8.0