Merge pull request #48 from cslrfid/develop

Develop

Author: ksclam

app/build.gradle

@@ -1,18 +1,24 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    namespace 'com.csl.cs108ademoapp'
+    buildFeatures {
+        buildConfig true
+    }
+
+    compileSdk 34
     defaultConfig {
         applicationId "com.csl.cs108ademoapp"
-        minSdkVersion 19
-        targetSdkVersion 33
-        versionCode 38
-        versionName "2.8.22"
+        minSdk 21
+        targetSdk 34
+        versionCode 41
+        versionName "2.14.0"
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.google.android.material:material:1.11.0'
     implementation project(':cs108library4a')
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation project(':cslibrary4a')
 }

app/libs/cs108ademo-20220811-v2.7.0-cs108library4a-debug.zip

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 38,
-      "versionName": "2.8.22",
+      "versionCode": 39,
+      "versionName": "2.10.5",
       "outputFile": "app-release.apk"
     }
   ],

app/libs/cs108ademo-20230718-v2.9.0-cs108library4a-debug.zip

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.csl.cs108ademoapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -18,7 +17,7 @@
         android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme">
 
-        <service android:name=".CustomIME"
+        <service android:name="CustomIME"
             android:label="@string/app_ime"
             android:exported="true"
             android:permission="android.permission.BIND_INPUT_METHOD">
@@ -29,7 +28,7 @@
         </service>
 
         <activity
-            android:name=".MainActivity"
+            android:name="MainActivity"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>

app/release/cs108ademo-20220811-v2.7.0-app-debug.zip

@@ -6,7 +6,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.csl.cs108library4a.Cs108Library4A;
+import com.csl.cslibrary4a.RfidReaderChipData;
 
 import java.util.ArrayList;
 
@@ -18,6 +18,7 @@ public enum TaskCancelRReason {
     }
     public TaskCancelRReason taskCancelReason;
     public String accessResult;
+    public String accessTagEpc;
     Handler mHandler = new Handler();
     Runnable updateRunnable = null;
 
@@ -27,7 +28,7 @@ public enum TaskCancelRReason {
     boolean invalidRequest;
     String selectMask; int selectBank, selectOffset;
     String strPassword; int powerLevel;
-    Cs108Library4A.HostCommands hostCommand;
+    RfidReaderChipData.HostCommands hostCommand;
 
     CustomMediaPlayer playerO, playerN;
 
@@ -46,10 +47,11 @@ public enum TaskCancelRReason {
 
     boolean gotInventory;
     int batteryCountInventory_old;
+    boolean bSkipClearFilter = false;
 
     public AccessTask(Button button, boolean invalidRequest,
                       String selectMask, int selectBank, int selectOffset,
-                      String strPassword, int powerLevel, Cs108Library4A.HostCommands hostCommand,
+                      String strPassword, int powerLevel, RfidReaderChipData.HostCommands hostCommand,
                       boolean bEnableErrorPopWindow, Runnable updateRunnable) {
         this.button = button;
         this.registerTagGot = registerTagGot;
@@ -72,10 +74,9 @@ public AccessTask(Button button, boolean invalidRequest,
     }
     public AccessTask(Button button, TextView textViewWriteCount, boolean invalidRequest,
                       String selectMask, int selectBank, int selectOffset,
-                      String strPassword, int powerLevel, Cs108Library4A.HostCommands hostCommand,
-                      int qValue, int repeat, boolean resetCount,
-                      TextView registerRunTime, TextView registerTagGot, TextView registerVoltageLevel,
-                      TextView registerYieldView, TextView registerTotalView) {
+                      String strPassword, int powerLevel, RfidReaderChipData.HostCommands hostCommand,
+                      int qValue, int repeat, boolean resetCount, boolean bSkipClearFilter,
+                      TextView registerRunTime, TextView registerTagGot, TextView registerVoltageLevel, TextView registerYieldView, TextView registerTotalView) {
         this.button = button;
         this.registerTotal = textViewWriteCount;
         this.registerRunTime = registerRunTime;
@@ -94,6 +95,7 @@ public AccessTask(Button button, TextView textViewWriteCount, boolean invalidReq
         this.qValue = qValue;
         if (repeat > 255) repeat = 255;
         this.repeat = repeat;
+        this.bSkipClearFilter = bSkipClearFilter;
         if (resetCount) {
             total = 0;
             tagList.clear();
@@ -105,7 +107,7 @@ public void setRunnable(Runnable updateRunnable) {
     }
 
     void preExecute() {
-        accessResult = null;
+        accessResult = null; MainActivity.csLibrary4A.appendToLog("accessResult is set null");
         playerO = MainActivity.sharedObjects.playerO;
         playerN = MainActivity.sharedObjects.playerN;
         //playerN.start();
@@ -135,7 +137,7 @@ void preExecute() {
 
         if (invalidRequest == false) {
             if (strPassword.length() != 8) { invalidRequest = true; MainActivity.csLibrary4A.appendToLog("strPassword.length = " + strPassword.length() + " (not 8)."); }
-            else if (hostCommand == Cs108Library4A.HostCommands.CMD_18K6CKILL) {
+            else if (hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CKILL) {
                 if (MainActivity.csLibrary4A.setRx000KillPassword(strPassword) == false) {
                     invalidRequest = true; MainActivity.csLibrary4A.appendToLog("setRx000KillPassword is failed");
                 }
@@ -149,14 +151,21 @@ else if (hostCommand == Cs108Library4A.HostCommands.CMD_18K6CKILL) {
                 invalidRequest = true; MainActivity.csLibrary4A.appendToLog("setAccessRetry is failed");
             }
         }
+        MainActivity.csLibrary4A.appendToLog("setSelectCriteria: invalidRequest = " + invalidRequest + ", repeat = " + repeat + ", bSkipClearFilter = " + bSkipClearFilter + ", powerLevel = " + powerLevel + ", skipSelect = " + skipSelect);
         if (invalidRequest == false) {
             if (DEBUG) MainActivity.csLibrary4A.appendToLog("AccessTask(): powerLevel = " + powerLevel);
             int matchRep = 1;
             if (repeat > 1) matchRep = repeat;
+            if (bSkipClearFilter == false) {
+                MainActivity.csLibrary4A.appendToLog("Going to setSelectCriteria disable");
+                MainActivity.csLibrary4A.setSelectCriteriaDisable(-1);
+            }
             if (powerLevel < 0 || powerLevel > 330) invalidRequest = true;
-            else if (skipSelect) { }
-            else if (MainActivity.csLibrary4A.setSelectedTag(selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
-                invalidRequest = true; MainActivity.csLibrary4A.appendToLog("setSelectedTag is failed with selectMask = " + selectMask + ", selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", powerLevel = " + powerLevel);
+            else if (skipSelect == false) {
+                MainActivity.csLibrary4A.appendToLog("setSelectCriteria: Going to setSelectTag");
+                if (MainActivity.csLibrary4A.setSelectedTag(selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
+                    invalidRequest = true; MainActivity.csLibrary4A.appendToLog("setSelectedTag is failed with selectMask = " + selectMask + ", selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", powerLevel = " + powerLevel);
+                }
             }
         }
         gotInventory = false;
@@ -173,10 +182,13 @@ else if (MainActivity.csLibrary4A.setSelectedTag(selectMask, selectBank, selectO
         }
     }
 
+    boolean accessCompleteReceived = false;
+
     @Override
     protected String doInBackground(Void... a) {
         boolean ending = false;
         int iTimeOut = 5000;
+        accessCompleteReceived = false;
 
         while (MainActivity.csLibrary4A.isBleConnected() && isCancelled() == false && ending == false) {
             int batteryCount = MainActivity.csLibrary4A.getBatteryCount();
@@ -189,12 +201,13 @@ protected String doInBackground(Void... a) {
                 publishProgress("WW");
             }
             byte[] notificationData = MainActivity.csLibrary4A.onNotificationEvent();
-            Cs108Library4A.Rx000pkgData rx000pkgData = MainActivity.csLibrary4A.onRFIDEvent();
+            RfidReaderChipData.Rx000pkgData rx000pkgData = MainActivity.csLibrary4A.onRFIDEvent();
             if (MainActivity.csLibrary4A.mrfidToWriteSize() != 0)   timeMillis = System.currentTimeMillis();
             else if (rx000pkgData != null) {
                 if (rx000pkgData.responseType == null) {
                     publishProgress("null response");
-                } else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_18K6C_TAG_ACCESS) {
+                } else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_18K6C_TAG_ACCESS) {
+                    accessCompleteReceived = true;
                     MainActivity.csLibrary4A.appendToLog("rx000pkgData.dataValues = " + MainActivity.csLibrary4A.byteArrayToString(rx000pkgData.dataValues));
                     if (rx000pkgData.decodedError == null) {
                         if (done == false) {
@@ -207,7 +220,8 @@ else if (rx000pkgData != null) {
                         done = true;
                     } else publishProgress(rx000pkgData.decodedError);
                     iTimeOut = 1000;
-                } else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_COMMAND_END) {
+                } else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END) {
+                    if (hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CKILL && accessCompleteReceived == false) accessResult = "";
                     MainActivity.csLibrary4A.appendToLog("BtData: repeat = " + repeat + ", decodedError = " + rx000pkgData.decodedError + ", resultError = " + resultError);
                     if (rx000pkgData.decodedError != null) { endingMessaage = rx000pkgData.decodedError; ending = true; }
                     else if (repeat > 0 && resultError.length() == 0) {
@@ -218,7 +232,8 @@ else if (repeat > 0 && resultError.length() == 0) {
                         endingMessaage = "";
                         ending = true;
                     }
-                } else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_18K6C_INVENTORY) {
+                } else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_18K6C_INVENTORY) {
+                    accessTagEpc = MainActivity.csLibrary4A.byteArrayToString(rx000pkgData.decodedEpc);
                     done = false;
                     publishProgress("TT", MainActivity.csLibrary4A.byteArrayToString(rx000pkgData.decodedEpc));
                 } else {