Merge pull request #38 from cslrfid/release-2.6.0

Release 2.6.0
cslrfid · Mar 30, 2022 · 57b2f26 · 57b2f26
2 parents 4ddcf89 + 85386ac
commit 57b2f26
Show file tree

Hide file tree

Showing 31 changed files with 663 additions and 386 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 31
-        versionCode 35
-        versionName "2.4.0"
+        versionCode 37
+        versionName "2.6.0"
     }
 }
 

diff --git a/app/libs/cs108ademo-20220301-v2.4.0-cs108library4a-debug.zip b/app/libs/cs108ademo-20220301-v2.4.0-cs108library4a-debug.zip
diff --git a/app/libs/cs108ademo-20220329-v2.6.0-cs108library4a-debug.zip b/app/libs/cs108ademo-20220329-v2.6.0-cs108library4a-debug.zip
diff --git a/app/release/cs108ademo-20220301-v2.4.0-app-debug.zip b/app/release/cs108ademo-20220301-v2.4.0-app-debug.zip
diff --git a/app/release/cs108ademo-20220301-v2.4.0-app-release.zip b/app/release/cs108ademo-20220301-v2.4.0-app-release.zip
diff --git a/app/release/cs108ademo-20220329-v2.6.0-app-debug.zip b/app/release/cs108ademo-20220329-v2.6.0-app-debug.zip
diff --git a/app/release/cs108ademo-20220329-v2.6.0-app-release.zip b/app/release/cs108ademo-20220329-v2.6.0-app-release.zip
diff --git a/app/src/main/java/com/csl/cs108ademoapp/AccessTask.java b/app/src/main/java/com/csl/cs108ademoapp/AccessTask.java
@@ -41,7 +41,7 @@ public enum TaskCancelRReason {
     private String endingMessaage;
 
     int qValue=0;
-    boolean repeat=false, nextNew=false;
+    int repeat=0;
     boolean bEnableErrorPopWindow=true;
 
     boolean gotInventory;
@@ -73,7 +73,7 @@ public AccessTask(Button button, boolean invalidRequest,
     public AccessTask(Button button, TextView textViewWriteCount, boolean invalidRequest,
                       String selectMask, int selectBank, int selectOffset,
                       String strPassword, int powerLevel, Cs108Connector.HostCommands hostCommand,
-                      int qValue, boolean repeat, boolean nextNew, boolean resetCount,
+                      int qValue, int repeat, boolean resetCount,
                       TextView registerRunTime, TextView registerTagGot, TextView registerVoltageLevel,
                       TextView registerYieldView, TextView registerTotalView) {
         this.button = button;
@@ -92,8 +92,8 @@ public AccessTask(Button button, TextView textViewWriteCount, boolean invalidReq
         this.powerLevel = powerLevel;
         this.hostCommand = hostCommand;
         this.qValue = qValue;
+        if (repeat > 255) repeat = 255;
         this.repeat = repeat;
-        this.nextNew = nextNew;
         if (resetCount) {
             total = 0;
             tagList.clear();
@@ -121,7 +121,7 @@ void preExecute() {
                 buttonText1 += buttonText1.substring(buttonText.length() - 1);
             } else buttonText1 = buttonText;
         }
-        if (repeat || buttonText.length() == 0) button.setText("Stop");
+        if (repeat > 1 || buttonText.length() == 0) button.setText("Stop");
         else {
             if (Character.isUpperCase(strLastChar.charAt(0))) button.setText(buttonText1 + "ING");
             else button.setText(buttonText1 + "ing");
@@ -151,8 +151,8 @@ else if (hostCommand == Cs108Connector.HostCommands.CMD_18K6CKILL) {
         }
         if (invalidRequest == false) {
             if (DEBUG) MainActivity.mCs108Library4a.appendToLog("AccessTask(): powerLevel = " + powerLevel);
-            int matchRep = 0;
-            if (repeat == false || nextNew) matchRep = 1;
+            int matchRep = 1;
+            if (repeat > 1) matchRep = repeat;
             if (powerLevel < 0 || powerLevel > 330) invalidRequest = true;
             else if (skipSelect) { }
             else if (MainActivity.mCs108Library4a.setSelectedTag(selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
@@ -192,38 +192,32 @@ protected String doInBackground(Void... a) {
             Cs108Connector.Rx000pkgData rx000pkgData = MainActivity.mCs108Library4a.onRFIDEvent();
             if (MainActivity.mCs108Library4a.mrfidToWriteSize() != 0)   timeMillis = System.currentTimeMillis();
             else if (rx000pkgData != null) {
-                //MainActivity.mCs108Library4a.appendToLog("rx000pkgData.responseType = " + rx000pkgData.responseType.toString());
                 if (rx000pkgData.responseType == null) {
                     publishProgress("null response");
                 } else if (rx000pkgData.responseType == Cs108Connector.HostCmdResponseTypes.TYPE_18K6C_TAG_ACCESS) {
-                    if (true) {
-                        if (rx000pkgData.decodedError == null) {
-                            if (done == false) {
-                                accessResult = rx000pkgData.decodedResult;
-                                //MainActivity.mCs108Library4a.appendToLog("StreamOut, accResult=" + accessResult);
-                                if (updateRunnable != null) {
-                                    //MainActivity.mCs108Library4a.appendToLog("StreamOut: start updateRunnable");
-                                    mHandler.post(updateRunnable);
-                                }
-                            }
-                            done = true;
+                    if (rx000pkgData.decodedError == null) {
+                        if (done == false) {
+                            accessResult = rx000pkgData.decodedResult;
+                            if (repeat > 0) repeat--;
+                            if (updateRunnable != null) mHandler.post(updateRunnable);
                             publishProgress(null, rx000pkgData.decodedResult);
-                        } else {
-                            //MainActivity.mCs108Library4a.appendToLog("decodeError = " + rx000pkgData.decodedError + ", length = " + rx000pkgData.decodedError.length());
-                            publishProgress(rx000pkgData.decodedError);
                         }
-                        iTimeOut = 1000;
-                    }
+                        done = true;
+                    } else publishProgress(rx000pkgData.decodedError);
+                    iTimeOut = 1000;
                 } else if (rx000pkgData.responseType == Cs108Connector.HostCmdResponseTypes.TYPE_COMMAND_END) {
+                    MainActivity.mCs108Library4a.appendToLog("BtData: repeat = " + repeat + ", decodedError = " + rx000pkgData.decodedError + ", resultError = " + resultError);
                     if (rx000pkgData.decodedError != null) { endingMessaage = rx000pkgData.decodedError; ending = true; }
-                    else if (repeat && (nextNew == false || resultError.length() != 0)) {
+                    else if (repeat > 0 && resultError.length() == 0) {
                         resultError = "";
+                        MainActivity.mCs108Library4a.setMatchRep(repeat);
                         MainActivity.mCs108Library4a.sendHostRegRequestHST_CMD(hostCommand);
                     } else {
                         endingMessaage = "";
                         ending = true;
                     }
                 } else if (rx000pkgData.responseType == Cs108Connector.HostCmdResponseTypes.TYPE_18K6C_INVENTORY) {
+                    done = false;
                     publishProgress("TT", MainActivity.mCs108Library4a.byteArrayToString(rx000pkgData.decodedEpc));
                 } else {
                     publishProgress("Unhandled Response: " + rx000pkgData.responseType.toString());
@@ -252,8 +246,7 @@ else if (notificationData != null) {
     String tagInventoried = null;
     @Override
     protected void onProgressUpdate(String... output) {
-        if (true) progressUpdate(output);
-        else if (output[0] != null) {
+        if (output[0] != null) {
             MainActivity.mCs108Library4a.appendToLog("onProgressUpdate output[0] = " + output[0]);
             if (output[0].length() == 2) {
                 if (output[0].contains("TT")) {
@@ -279,7 +272,6 @@ else if (output[0] != null) {
                 resultError += output[0];
                 if (true)
                     MainActivity.mCs108Library4a.appendToLog("output[0]: " + output[0] + ", resultError = " + resultError);
-                taskCancelReason = TaskCancelRReason.ERROR;
             }
         } else {
             MainActivity.mCs108Library4a.appendToLog("onProgressUpdate output[1] = " + output[1]);
@@ -298,7 +290,6 @@ else if (output[0] != null) {
     protected void onCancelled() {
         super.onCancelled();
         if (DEBUG) MainActivity.mCs108Library4a.appendToLog("endingMesssage: taskCancelReason = " + taskCancelReason);
-        //if (taskCancelReason != TaskCancelRReason.NULL) MainActivity.mCs108Library4a.abortOperation1(); else
         MainActivity.mCs108Library4a.abortOperation();
         if (taskCancelReason == TaskCancelRReason.NULL)  taskCancelReason = TaskCancelRReason.DESTORY;
         DeviceConnectTask4RegisterEnding();
@@ -307,58 +298,16 @@ protected void onCancelled() {
     @Override
     protected void onPostExecute(String result) {
         if (DEBUG) MainActivity.mCs108Library4a.appendToLog("AccessSecurityLockFragment.InventoryRfidTask.onPostExecute(): " + result);
-
         DeviceConnectTask4RegisterEnding();
     }
 
-    protected void progressUpdate(String... output) {
-        if (output[0] != null) {
-            MainActivity.mCs108Library4a.appendToLog("onProgressUpdate output[0] = " + output[0]);
-            if (output[0].length() == 2) {
-                if (output[0].contains("TT")) {
-                    gotInventory = true;
-                    boolean matched = false;
-                    for (int i = 0; i < tagList.size(); i++) {
-                        if (output[1].matches(tagList.get(i))) {
-                            matched = true;
-                            break;
-                        }
-                    }
-                    if (registerTagGot != null) registerTagGot.setText(output[1]);
-                    if (matched == false) tagInventoried = output[1];
-                } else if (output[0].contains("WW")) {
-                    long timePeriod = (System.currentTimeMillis() - startTimeMillis) / 1000;
-                    if (timePeriod > 0) {
-                        if (registerRunTime != null) registerRunTime.setText(String.format("Run time: %d sec", timePeriod));
-                    }
-                } else if (taskCancelReason == TaskCancelRReason.NULL) {
-                    if (registerVoltageLevel != null) registerVoltageLevel.setText(MainActivity.mCs108Library4a.getBatteryDisplay(true));
-                }
-            } else {
-                resultError += output[0];
-                if (true)
-                    MainActivity.mCs108Library4a.appendToLog("output[0]: " + output[0] + ", resultError = " + resultError);
-            }
-        } else {
-            MainActivity.mCs108Library4a.appendToLog("onProgressUpdate output[1] = " + output[1]);
-            if (registerYield != null) {
-                if (tagInventoried != null) {
-                    tagList.add(tagInventoried);
-                    tagInventoried = null;
-                }
-                registerYield.setText("Unique:" + Integer.toString(tagList.size()));
-            }
-            if (registerTotal != null) registerTotal.setText("Total:" + Integer.toString(++total));
-        }
-    }
-
     void DeviceConnectTask4RegisterEnding() {
         String strErrorMessage = "";
         if (false) {
             boolean success = false;
             MainActivity.mCs108Library4a.appendToLog("repeat = " + repeat + ", taskCancelReason = " + taskCancelReason.toString()
                     + ", backscatterError = " + backscatterError + ", accessError =" + accessError + ", accessResult = " + accessResult + ", resultError = " + resultError);
-            if ((repeat == false && taskCancelReason != TaskCancelRReason.NULL) || backscatterError != 0 || accessError != 0 || accessResult == null || resultError.length() != 0) {
+            if ((repeat <= 1 && taskCancelReason != TaskCancelRReason.NULL) || backscatterError != 0 || accessError != 0 || accessResult == null || resultError.length() != 0) {
                 MainActivity.mCs108Library4a.appendToLog("FAILURE"); Toast.makeText(MainActivity.mContext, R.string.toast_abort_by_FAILURE, Toast.LENGTH_SHORT).show();
                 playerO.start();
             } else {

diff --git a/app/src/main/java/com/csl/cs108ademoapp/SaveList2ExternalTask.java b/app/src/main/java/com/csl/cs108ademoapp/SaveList2ExternalTask.java
@@ -10,6 +10,7 @@
 import android.os.Build;
 import android.os.Environment;
 import android.provider.Settings;
+import android.widget.Toast;
 
 import com.csl.cs108library4a.Cs108Library4A;
 import com.csl.cs108library4a.ReaderDevice;
@@ -380,6 +381,7 @@ public String save2File(String messageStr, boolean requestPermission) {
                 if (requestPermission) {
                     mCs108Library4a.appendToLog("requestPermissions WRITE_EXTERNAL_STORAGE 1");
                     MainActivity.permissionRequesting = true; requestPermissions((Activity) mContext, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+                    Toast.makeText(mContext, com.csl.cs108library4a.R.string.toast_permission_not_granted, Toast.LENGTH_SHORT).show();
                     return null;
                 }
             } else mCs108Library4a.appendToLog("WRITE_EXTERNAL_STORAGE Permission is GRANTED !!!");

diff --git a/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessAuraSenseFragment.java b/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessAuraSenseFragment.java
@@ -178,7 +178,7 @@ else if (taskRequest) {
                             selectTag.editTextAccessRWAccPassword.getText().toString(),
                             Integer.valueOf(selectTag.editTextaccessRWAntennaPower.getText().toString()),
                             (operationRead ? Cs108Connector.HostCommands.CMD_18K6CREAD: Cs108Connector.HostCommands.CMD_18K6CWRITE),
-                            0, false, false,true,
+                            0, 0, true,
                             null, null, null, null, null);
                     accessTask.execute();
                     rerunRequest = true;

diff --git a/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessColdChainFragment.java b/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessColdChainFragment.java
@@ -301,7 +301,7 @@ else if (taskRequest) {
                             editTextAccessRWAccPassword.getText().toString(),
                             Integer.valueOf(editTextaccessRWAntennaPower.getText().toString()),
                             hostCommand,
-                            0, false, false,true,
+                            0, 0, true,
                             null, null, null, null, null);
                     accessTask.execute();
                     rerunRequest = true;

diff --git a/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessEm4325PassiveFragment.java b/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessEm4325PassiveFragment.java
@@ -160,7 +160,7 @@ else if (taskRequest) {
                             editTextAccessRWAccPassword.getText().toString(),
                             Integer.valueOf(editTextaccessRWAntennaPower.getText().toString()),
                             hostCommand,
-                            0, false, false,true,
+                            0, 0, true,
                             null, null, null, null, null);
                     accessTask.execute();
                     rerunRequest = true;

diff --git a/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessFdmicroFragment.java b/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessFdmicroFragment.java
@@ -550,7 +550,7 @@ void doAccessTask(Cs108Connector.HostCommands hostCommand) {
                 selectTag.editTextAccessRWAccPassword.getText().toString(),
                 Integer.valueOf(selectTag.editTextaccessRWAntennaPower.getText().toString()),
                 hostCommand,
-                0, false, false, true,
+                0, 0, true,
                 null, null, null, null, null);
         accessTask.setRunnable(updateRunnable);
         accessTask.execute();

diff --git a/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessMicronFragment.java b/app/src/main/java/com/csl/cs108ademoapp/fragments/AccessMicronFragment.java
@@ -400,7 +400,7 @@ else if (taskRequest) {
                             editTextAccessRWAccPassword.getText().toString(),
                             Integer.valueOf(editTextaccessRWAntennaPower.getText().toString()),
                             (operationRead ? Cs108Connector.HostCommands.CMD_18K6CREAD: Cs108Connector.HostCommands.CMD_18K6CWRITE),
-                            0, false, false,true,
+                            0, 0, true,
                             null, null, null, null, null);
                     accessTask.execute();
                     rerunRequest = true;