From 935808a98e77acd9ded1f7af31185901ce68f401 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Wed, 31 Jul 2024 13:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=86=99=E5=85=A5?=
=?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 10 +++----
.../example/jinyu_rfid/WriteUserActivity.java | 28 +++++++++++--------
.../com/example/jinyu_rfid/base/MyResult.java | 8 ++++++
3 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1bc6568..2423a0e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,10 +48,7 @@
-
-
-
-
+
-
+
+
+
+
diff --git a/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java b/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
index 1852171..5e2de33 100644
--- a/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
+++ b/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
@@ -48,6 +48,7 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
private List list;
private PopupMenu popupMenu;
private MyAlertDialog myAlertDialog;
+
@SuppressLint("UnspecifiedRegisterReceiverFlag")
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -72,7 +73,7 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
myAlertDialog.setDialogCall(this);
var power = SharedPreferencesUtils.getInt("power", 30);
Log.e("TAG", "记忆功率:" + power);
- if (power!=30){
+ if (power != 30) {
rfidModel.setPower(power);
}
}
@@ -131,13 +132,18 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
public void onSuccess(Response response) {
super.onSuccess(response);
var body = response.body();
+ // 如果=1 直接是成功
if (body.getSaveFlag().equals("1")) {
- Toast.makeText(WriteUserActivity.this, getString(R.string.binding_success), Toast.LENGTH_SHORT).show();
+ // Toast.makeText(WriteUserActivity.this, getString(R.string.binding_success), Toast.LENGTH_SHORT).show();
+ writeUserState = true;
+ writeUser(user, epcStr);
+ } else if (body.getSaveFlagCF().equals("0")) {// 等于0的情况属于绑定后写入失败,可重新写入
writeUserState = true;
writeUser(user, epcStr);
- return;
+ }else {
+ tipDialog.shouDialog(false, body.getSaveMessage());
}
- tipDialog.shouDialog(false, body.getSaveMessage());
+
}
});
@@ -230,7 +236,7 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
} else if (itemId == R.id.menu_configuration) {
startActivity(intent2);
} else if (itemId == R.id.menu_setPower) {
- myAlertDialog.show(SharedPreferencesUtils.getInt("power",30));
+ myAlertDialog.show(SharedPreferencesUtils.getInt("power", 30));
}
@@ -240,12 +246,12 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
@Override
public void returnData(int power) {
- if (rfidModel.setPower(power)){
- Toast.makeText(context, getString(R.string.tip_set_success), Toast.LENGTH_SHORT).show();
- SharedPreferencesUtils.putInt("power",power);
- myAlertDialog.dismiss();
- return;
- }
+ if (rfidModel.setPower(power)) {
+ Toast.makeText(context, getString(R.string.tip_set_success), Toast.LENGTH_SHORT).show();
+ SharedPreferencesUtils.putInt("power", power);
+ myAlertDialog.dismiss();
+ return;
+ }
Toast.makeText(context, getString(R.string.tip_set_failed), Toast.LENGTH_SHORT).show();
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/jinyu_rfid/base/MyResult.java b/app/src/main/java/com/example/jinyu_rfid/base/MyResult.java
index 6c4e096..830de09 100644
--- a/app/src/main/java/com/example/jinyu_rfid/base/MyResult.java
+++ b/app/src/main/java/com/example/jinyu_rfid/base/MyResult.java
@@ -12,7 +12,15 @@ public class MyResult {
private String ResultFlag;
private String SaveFlag;
private String SaveMessage;
+ private String SaveFlagCF;
+ public String getSaveFlagCF() {
+ return SaveFlagCF;
+ }
+
+ public void setSaveFlagCF(String saveFlagCF) {
+ SaveFlagCF = saveFlagCF;
+ }
public String getSaveFlag() {
return SaveFlag;