From 730e2cfa3ad269c3bfb0acd3a98f0be14b1db770 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 14 Jun 2024 17:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=90=8E=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 16 +++++-----
 .../com/example/jinyu_rfid/ReadActivity.java  |  4 +--
 .../example/jinyu_rfid/WriteUserActivity.java |  4 +--
 .../jinyu_rfid/rfid/AutoID9UDevice.java       | 29 +++++++++++++------
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9439152..46df7db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,10 +31,10 @@
         <activity
             android:name=".AppLoginActivity"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".ReadActivity"
@@ -47,10 +47,10 @@
         <activity
             android:name=".WriteUserActivity"
             android:exported="true">
-            <!--            <intent-filter>-->
-            <!--                <action android:name="android.intent.action.MAIN" />-->
-            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
-            <!--            </intent-filter>-->
+                        <intent-filter>
+                            <action android:name="android.intent.action.MAIN" />
+                            <category android:name="android.intent.category.LAUNCHER" />
+                        </intent-filter>
         </activity>
         <activity
             android:name=".ConfigurationTableActivity"
diff --git a/app/src/main/java/com/example/jinyu_rfid/ReadActivity.java b/app/src/main/java/com/example/jinyu_rfid/ReadActivity.java
index a08d480..19c1211 100644
--- a/app/src/main/java/com/example/jinyu_rfid/ReadActivity.java
+++ b/app/src/main/java/com/example/jinyu_rfid/ReadActivity.java
@@ -64,8 +64,8 @@ public class ReadActivity extends BaseActivity implements DataReturnCall {
         binding.setAdapter(adapter);
         // 名称
         stringArray = getResources().getStringArray(R.array.project_list);
-        rfidModel = new C5106Device(this,this);
-        // rfidModel=new AutoID9UDevice(this,this);
+        // rfidModel = new C5106Device(this,this);
+        rfidModel=new AutoID9UDevice(this,this);
 
     }
 
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 ac0de94..7b4fbba 100644
--- a/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
+++ b/app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
@@ -58,8 +58,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);
     }
 
 
diff --git a/app/src/main/java/com/example/jinyu_rfid/rfid/AutoID9UDevice.java b/app/src/main/java/com/example/jinyu_rfid/rfid/AutoID9UDevice.java
index 3a50850..4d0c056 100644
--- a/app/src/main/java/com/example/jinyu_rfid/rfid/AutoID9UDevice.java
+++ b/app/src/main/java/com/example/jinyu_rfid/rfid/AutoID9UDevice.java
@@ -85,21 +85,32 @@ public class AutoID9UDevice implements RFIDModel {
     public void sanUser(int len) {
         var power = uhfService.getPower();
         Log.e("TAG", "设备功率:" + power);
+        if (power==0){
+            uhfService.close();
+            uhfService = UHFService.getInstance();
+            uhfService.open();
+            Log.e("TAG", "设备功率:" + uhfService.getPower());
+        }
+        if (id==null){
+            String info = null;
+            EPC epc=new EPC();
+            var result = uhfService.inventoryOnce(epc, 100);
+            Log.e("TAG", "单次寻卡:" + result);
+            Log.e("TAG", "epcid:" + epc.getId());
+            id=epc.getId();
+            return;
+        }
 
-        String info = null;
-        EPC epc=new EPC();
-        var result = uhfService.inventoryOnce(epc, 100);
-        Log.e("TAG", "epcid:" + epc.getId());
-        if (result) {
+        // if (result) {
             var i = len * 2;
             byte[] data = new byte[i];
-            result = uhfService.readTagData(AutoID9UUtil.getHexByteArray(epc.getId()), password, 3, 0, i, data);
+           var result = uhfService.readTagData(AutoID9UUtil.getHexByteArray(id), password, 3, 0, i, data);
             Log.e("TAG", "按长度读取:" + result);
             if (result) {
-                info = Tools.Bytes2HexString(data, data.length);
+              var  info = Tools.Bytes2HexString(data, data.length);
             }
-        }
-        call.readUserInfo(info,result,null);
+        // }
+        // call.readUserInfo(info,result,null);
     }
 
     @Override