From c238bf89a89eec5030539c12d9902dbbd8ce3851 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 15 三月 2024 08:54:19 +0800
Subject: [PATCH] 序列号显示10进制的
---
app/src/main/java/com/dayu/recharge/activity/MyActivity.java | 2 +-
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 2 +-
app/src/main/AndroidManifest.xml | 2 +-
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java | 2 +-
local.properties | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 39721f4..c151d2d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,7 +93,7 @@
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.nfc.action.ACTION_NDEF_DISCOVERED" />
- <category android:name="android.intent.category.DEFAULT"/>
+<!-- <category android:name="android.intent.category.DEFAULT"/>-->
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
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 7cc1970..580bc5e 100644
--- a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
@@ -109,7 +109,7 @@
if (adminData != null) {
this.adminData = adminData;
- adminBinding.adminSerial.setText(SocketUtil.getXuLie(this));
+ adminBinding.adminSerial.setText(adminData.getSerial());
adminBinding.adminAddressCode.setText(adminData.getAddressCode());
adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
} else {
diff --git a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
index 291a879..1d1fe5a 100644
--- a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
@@ -222,7 +222,7 @@
adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- myBinding.myVillageNum.setText(SocketUtil.getXuLie(this));
+ myBinding.myVillageNum.setText(adminData.getSerial());
} else {
myBinding.myAdminName.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
myBinding.myVillageNum.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
diff --git a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
index 3a5170e..7242c4d 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -233,7 +233,7 @@
try {
adminData = baseDao.adminDao().findFirst();
- newCardBinding.newCardVillageNum.setText(SocketUtil.getXuLie(this));
+ newCardBinding.newCardVillageNum.setText(adminData.getSerial());
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/local.properties b/local.properties
index 95b3ee2..b21f6f6 100644
--- a/local.properties
+++ b/local.properties
@@ -4,6 +4,6 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Tue Dec 19 11:21:25 CST 2023
-sdk.dir=D\:\\android\\sdk
-ndk.dir=D\:\\android\\sdk\\ndk\\android-ndk-r21
\ No newline at end of file
+#Tue Feb 27 10:36:34 CST 2024
+sdk.dir=D\:\\AndroidStudio\\sdk
+ndk.dir=D\:\\android\\sdk\\ndk\\android-ndk-r21
--
Gitblit v1.8.0