From 5568cb2fa02cdbfc1071682b8ecf760be77583e2 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Thu, 5 Sep 2024 14:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  3 +-
 .idea/misc.xml                                |  2 +-
 .../example/jinyu_rfid/WriteUserActivity.java | 32 ++++++++++++++-----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index abe205d..a058051 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,12 +4,11 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$PROJECT_DIR$/../../../android gradle version/gradle-8.0.2" />
-        <option name="gradleJvm" value="17" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f85ddd4..0f86676 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
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 5e2de33..3900c81 100644
--- a/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
+++ b/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
@@ -61,8 +61,8 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
         popupMenu = new PopupMenu(this, binding.writeMenu);
         popupMenu.setOnMenuItemClickListener(this);
         getMenuInflater().inflate(R.menu.activity_menu, popupMenu.getMenu());
-        rfidModel = new C5106Device(this, this);
-        // rfidModel = new AutoID9UDevice(this, this);
+        // rfidModel = new C5106Device(this, this);
+        rfidModel = new AutoID9UDevice(this, this);
         if (rfidModel instanceof C5106Device) {
             intent1 = new Intent(this, ReadActivity.class);
         } else {
@@ -118,11 +118,12 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
             tagUserStr.append("~");
         }
         String user = ASCIIUtil.str2Hex(tagUserStr.toString());
+        String tyreNo = list.get(0).getPropertyContent();
         if (!writeUserState) {
             Log.e("TAG", "请求");
             Map<String, String> map = new HashMap<>();
             map.put("EpcCode", epcStr);
-            map.put("TyreNo", list.get(0).getPropertyContent());
+            map.put("TyreNo", tyreNo);
             map.put("token", "123456");
             map.put("Language", SharedPreferencesUtils.getstring("languageIndex", "0"));
             Log.e("TAG", "writeUser:" + 2);
@@ -136,11 +137,11 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
                     if (body.getSaveFlag().equals("1")) {
                         // Toast.makeText(WriteUserActivity.this, getString(R.string.binding_success), Toast.LENGTH_SHORT).show();
                         writeUserState = true;
-                        writeUser(user, epcStr);
+                        writeUser(user, epcStr,tyreNo);
                     } else if (body.getSaveFlagCF().equals("0")) {// 等于0的情况属于绑定后写入失败，可重新写入
                         writeUserState = true;
-                        writeUser(user, epcStr);
-                    }else {
+                        writeUser(user, epcStr,tyreNo);
+                    } else {
                         tipDialog.shouDialog(false, body.getSaveMessage());
                     }
 
@@ -148,16 +149,17 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
             });
 
         } else {
-            writeUser(user, epcStr);
+            writeUser(user, epcStr, tyreNo);
         }
 
 
     }
 
-    private void writeUser(String user, String epcStr) {
+    private void writeUser(String user, String epcStr,String tyreNo) {
         Log.e("TAG", "写入");
         var writeState = rfidModel.writeUser(validateDataLength(user), epcStr);
         tipDialog.shouDialog(writeState, getString(writeState ? R.string.write_success : R.string.write_failed));
+        // 成功还是失败
         if (writeState) {
             list.clear();
             adapter.notifyDataSetChanged();
@@ -165,6 +167,20 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
             binding.writeTire.setText(null);
             writeUserState = false;
         }
+        Map backMap = new HashMap();
+        backMap.put("TyreNo",tyreNo);
+        backMap.put("Flag",writeState?1:2);
+        backMap.put("token","123456");
+        OkGo.<MyResult>post("http://" + url + "/rfid/Back")
+                .upRequestBody(RequestBody.create(JSON, gson.toJson(backMap)))
+                .execute(new MyRecultCall(dialog, this) {
+                    @SuppressLint("NotifyDataSetChanged")
+                    @Override
+                    public void onSuccess(Response<MyResult> response) {
+
+                    }
+                });
+
     }