Updates for v1.13.0

- Changed the access message display for more information
- Updated battery percentage checking curves and the battery low threshold
- Improved version checking routine

Author: ksclam

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 17
-        versionName "1.12.0"
+        versionCode 18
+        versionName "1.13.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -17,6 +17,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile project(':cs108library4a')
     compile 'com.android.support:design:26.1.0'
-    implementation project(':cs108library4a-debug')
 }

app/libs/cs108library4a-debug.aar

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":17,"versionName":"1.12.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":18,"versionName":"1.13.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/libs/cs108library4a-release.aar

@@ -21,7 +21,7 @@ public enum TaskCancelRReason {
     TextView registerRunTime, registerTagGot, registerVoltageLevel;
     TextView registerYield, registerTotal;
     boolean invalidRequest;
-    String tagPcValue; String selectMask; int selectBank, selectOffset;
+    String selectMask; int selectBank, selectOffset;
     String strPassword; int powerLevel;
     Cs108Connector.HostCommands hostCommand;
 
@@ -40,7 +40,7 @@ public enum TaskCancelRReason {
     int batteryCountInventory_old;
 
     public AccessTask(Button button, TextView textViewWriteCount, boolean invalidRequest,
-                      String tagPcValue, String selectMask, int selectBank, int selectOffset,
+                      String selectMask, int selectBank, int selectOffset,
                       String strPassword, int powerLevel, Cs108Connector.HostCommands hostCommand,
                       int qValue, boolean repeat, boolean nextNew, boolean resetCount,
                       TextView registerRunTime, TextView registerTagGot, TextView registerVoltageLevel,
@@ -54,7 +54,6 @@ public AccessTask(Button button, TextView textViewWriteCount, boolean invalidReq
         this.registerTotal = registerTotalView;
 
         this.invalidRequest = invalidRequest;
-        this.tagPcValue = tagPcValue;
         this.selectMask = selectMask;
         this.selectBank = selectBank;
         this.selectOffset = selectOffset;
@@ -78,11 +77,16 @@ public AccessTask(Button button, TextView textViewWriteCount, boolean invalidReq
     @Override
     protected void onPreExecute() {
         buttonText = button.getText().toString().trim();
-        String buttonText1 = null;
-        if (buttonText.substring(buttonText.length()-1).toUpperCase().matches("E")) buttonText1 = buttonText.substring(0, buttonText.length()-1);
+        String buttonText1 = null; String strLastChar = buttonText.substring(buttonText.length()-1);
+        if (strLastChar.toUpperCase().matches("E")) {
+            buttonText1 = buttonText.substring(0, buttonText.length()-1);
+            if (strLastChar.matches("E")) buttonText1 += "ING";
+            else buttonText1 += "ing";
+        }
         if (repeat || buttonText.length() == 0) button.setText("Stop");
-        else if (buttonText1 != null) button.setText(buttonText1 + "ING");
-        else button.setText(buttonText + "ING");
+        else if (buttonText1 != null) button.setText(buttonText1);
+        else if (Character.isUpperCase(strLastChar.charAt(0))) button.setText(buttonText + "ING");
+        else button.setText(buttonText + "ing");
         if (registerYield != null && tagList.size()==0) registerYield.setText("");
         if (registerTotal != null && total == 0) registerTotal.setText("");
 
@@ -111,8 +115,8 @@ else if (hostCommand == Cs108Connector.HostCommands.CMD_18K6CKILL) {
             int matchRep = 0;
             if (repeat == false || nextNew) matchRep = 1;
             if (powerLevel < 0 || powerLevel > 330) invalidRequest = true;
-            else if (MainActivity.mCs108Library4a.setSelectedTag(tagPcValue, selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
-                invalidRequest = true; MainActivity.mCs108Library4a.appendToLog("setSelectedTag is failed with tagPcValue = " + tagPcValue + ", selectMask = " + selectMask + ", selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", powerLevel = " + powerLevel);
+            else if (MainActivity.mCs108Library4a.setSelectedTag(null, selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
+                invalidRequest = true; MainActivity.mCs108Library4a.appendToLog("setSelectedTag is failed with selectMask = " + selectMask + ", selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", powerLevel = " + powerLevel);
             }
         }
         taskCancelReason = TaskCancelRReason.NULL;
@@ -241,7 +245,7 @@ protected void onPostExecute(String result) {
 
     void DeviceConnectTask4RegisterEnding() {
         String strErrorMessage = "";
-        if (true) {
+        if (false) {
             boolean success = false;
             MainActivity.mCs108Library4a.appendToLog("repeat = " + repeat + ", taskCancelReason = " + taskCancelReason.toString()
                     + ", backscatterError = " + backscatterError + ", accessError =" + accessError + ", accessResult = " + accessResult + ", resultError = " + resultError);
@@ -253,27 +257,27 @@ void DeviceConnectTask4RegisterEnding() {
                 playerN.start();
             }
         } else {
-            MainActivity.mCs108Library4a.appendToLog("AAA");
             strErrorMessage = "";
             switch (taskCancelReason) {
                 case NULL:
-                    strErrorMessage += "Finish as COMMAND END is received";
+                    if (accessResult == null || (resultError != null && resultError.length() != 0) || (endingMessaage != null && endingMessaage.length() != 0)) strErrorMessage += "Finish as COMMAND END is received";
+                    else Toast.makeText(MainActivity.mContext, R.string.toast_abort_by_SUCCESS, Toast.LENGTH_SHORT).show();
                     break;
                 case STOP:
-                    strErrorMessage += "Finish as STOP is pressed";
+                    strErrorMessage += "Finish as STOP is pressed. ";
                     break;
                 case BUTTON_RELEASE:
-                    strErrorMessage += "Finish as BUTTON is released";
+                    strErrorMessage += "Finish as BUTTON is released. ";
                     break;
                 case TIMEOUT:
-                    strErrorMessage += "Finish as TIMEOUT";
+                    strErrorMessage += "TIMEOUT without COMMAND_END. ";
                     break;
                 case INVALD_REQUEST:
-                    strErrorMessage += "Invalid sendHostRequest. Operation is cancelled.";
+                    strErrorMessage += "Invalid request. Operation is cancelled. ";
                     break;
             }
-            MainActivity.mCs108Library4a.appendToLog("resultError = " + resultError + ", taskCancelReason = " + taskCancelReason.toString() + ", strErrorMessage = " + strErrorMessage + ", endingMessaage = " + endingMessaage);
-            if (resultError.length() != 0) strErrorMessage += " with Error " + resultError;
+            MainActivity.mCs108Library4a.appendToLog("taskCancelReason = " + taskCancelReason.toString() + ", accessResult = " + (accessResult == null ? "NULL": accessResult) + ", endingMessaage = " + (endingMessaage == null ? "NULL" : endingMessaage) + ", resultError = " + (resultError == null ? "NULL" : resultError));
+            if (resultError.length() != 0) strErrorMessage += resultError;
             if (strErrorMessage.length() != 0) strErrorMessage += ". ";
         }
         if (endingMessaage != null) if (endingMessaage.length() != 0) strErrorMessage += "Received CommandEND Error = " + endingMessaage;

app/release/cs108ademo-181005-v1.11.1-app-release.zip

@@ -211,14 +211,10 @@ else if (taskRequest) {
                 MainActivity.mCs108Library4a.appendToLog("processTickItems, invalid = " + invalid);
                 if (bankProcessing++ != 0 && invalid == true)   rerunRequest = false;
                 else {
-/*                    if (restartAccessBank != accessBank) {
-                        restartAccessBank = accessBank;
-                        restartCounter = 3;
-                    }*/
                     accessTask = new AccessTask(
                             (operationRead ? buttonRead : buttonWrite), null,
                             invalid,
-                            null, editTextRWTagID.getText().toString(), 1, 32,
+                            editTextRWTagID.getText().toString(), 1, 32,
                             editTextAccessRWAccPassword.getText().toString(),
                             Integer.valueOf(editTextaccessRWAntennaPower.getText().toString()),
                             (operationRead ? Cs108Connector.HostCommands.CMD_18K6CREAD: Cs108Connector.HostCommands.CMD_18K6CWRITE),

app/release/cs108ademo-181012-v1.11.2-app-release.zip

@@ -197,7 +197,7 @@ else if (taskRequest) {
                     accessTask = new AccessTask(
                             buttonRead, null,
                             invalid,
-                            null, selectMask, selectBank, selectOffset,
+                            selectMask, selectBank, selectOffset,
                             editTextAccessRWAccPassword.getText().toString(),
                             Integer.valueOf(editTextaccessRWAntennaPower.getText().toString()),
                             Cs108Connector.HostCommands.CMD_18K6CREAD,

app/release/cs108ademo-181012-v1.12.0-app-release.zip

@@ -7,9 +7,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -21,14 +23,15 @@
 import com.csl.cs108library4a.ReaderDevice;
 
 public class AccessReadWriteFragment extends CommonFragment {
-    EditText editTextRWTagID, editTextAccessRWAccPassword, editTextAccessRWKillPwd, editTextAccessRWAccPwd, editTextAccPc, editTextAccessRWEpc, editTExtAccessRWXpc;
+    Spinner spinnerSelectBank;
+    EditText editTextRWSelectOffset, editTextRWTagID, editTextAccessRWAccPassword, editTextAccessRWKillPwd, editTextAccessRWAccPwd, editTextAccPc, editTextAccessRWEpc, editTExtAccessRWXpc;
     EditText editTextTidValue, editTextUserValue, editTextEpcValue, editTextaccessRWAntennaPower;
     TextView textViewEpcLength;
     private Button buttonRead;
     private Button buttonWrite;
     Handler mHandler = new Handler();
 
-    String tagPcValue = ""; String accPcValue = ""; String accEpcValue = ""; String accXpcValue = ""; String accTidValue = ""; String accUserValue = "";
+    String accPcValue = ""; String accEpcValue = ""; String accXpcValue = ""; String accTidValue = ""; String accUserValue = "";
     enum ReadWriteTypes {
         NULL, RESERVE, EPC, XPC, TID, USER, EPC1
     }
@@ -52,6 +55,12 @@ public void onActivityCreated(Bundle savedInstanceState) {
         actionBar.setIcon(R.drawable.dl_access);
         actionBar.setTitle(R.string.title_activity_readwrite);
 
+        spinnerSelectBank = (Spinner) getActivity().findViewById(R.id.accessRWSelectBank);
+        ArrayAdapter<CharSequence> targetAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.read_memoryBank_options, R.layout.custom_spinner_layout);
+        targetAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinnerSelectBank.setAdapter(targetAdapter);
+        editTextRWSelectOffset = (EditText) getActivity().findViewById(R.id.accessRWSelectOffset);
+
         editTextRWTagID = (EditText) getActivity().findViewById(R.id.accessRWTagID);
         editTextAccessRWAccPassword = (EditText) getActivity().findViewById(R.id.accessRWAccPasswordValue);
         editTextAccessRWAccPassword.addTextChangedListener(new GenericTextWatcher(editTextAccessRWAccPassword, 8));
@@ -115,7 +124,6 @@ public void onClick(View v) {
                 String header = "PC=";
                 int index = detail.indexOf(header) + header.length();
                 String strPCValue = detail.substring(index, index + 4);
-                tagPcValue = strPCValue;
                 if (true) {
                     updatePCEpc(strPCValue, strEpcValue);
                 } else {
@@ -172,18 +180,22 @@ public void run() {
             }
             if (processResult()) { rerunRequest = true; }
             else if (taskRequest) {
+                bcheckBoxAll = false;
                 boolean invalid = processTickItems();
-                if (bankProcessing++ != 0 && invalid == true)   rerunRequest = false;
+                if (bankProcessing == 0 && bcheckBoxAll) rerunRequest = false;
+                else if (bankProcessing++ != 0 && invalid == true)   rerunRequest = false;
                 else {
                     if (restartAccessBank != accessBank) {
                         restartAccessBank = accessBank;
                         restartCounter = 3;
                     }
                     if (DEBUG) MainActivity.mCs108Library4a.appendToLog("AccessReadWriteFragment().InventoryRfidTask(): tagID=" + editTextRWTagID.getText() + ", operationrRead=" + operationRead + ", accessBank=" + accessBank + ", accOffset=" + accOffset + ", accSize=" + accSize);
+                    int selectOffset = 0;
+                    selectOffset = Integer.parseInt(editTextRWSelectOffset.getText().toString());
                     accessTask = new AccessTask(
                             (operationRead ? buttonRead : buttonWrite), null,
                             invalid,
-                            tagPcValue, editTextRWTagID.getText().toString(), 1, 32,
+                            editTextRWTagID.getText().toString(), spinnerSelectBank.getSelectedItemPosition() + 1, selectOffset,
                             editTextAccessRWAccPassword.getText().toString(),
                             Integer.valueOf(editTextaccessRWAntennaPower.getText().toString()),
                             (operationRead ? Cs108Connector.HostCommands.CMD_18K6CREAD: Cs108Connector.HostCommands.CMD_18K6CWRITE),
@@ -197,7 +209,12 @@ else if (taskRequest) {
                 mHandler.postDelayed(updateRunnable, 500);
                 if (DEBUG) MainActivity.mCs108Library4a.appendToLog("AccessReadWriteFragment().updateRunnable(): Restart");
             }
-            else    updating = false;
+            else {
+                if (bankProcessing == 0 && bcheckBoxAll) {
+                    Toast.makeText(MainActivity.mContext, "no choice selected yet", Toast.LENGTH_SHORT).show();
+                }
+                updating = false;
+            }
         }
     };
 
@@ -312,6 +329,7 @@ boolean processResult() {
             return true;
         }
     }
+    boolean bcheckBoxAll = false;
     boolean processTickItems() {
         String writeData = "";
         boolean invalidRequest1 = false;
@@ -349,10 +367,8 @@ boolean processTickItems() {
             if (DEBUG) MainActivity.mCs108Library4a.appendToLog("processTickItems(): start EPC operation");
             if (operationRead) {
                 String detail = editTextAccPc.getText().toString();
-                if (detail.length() != 4) {
-                    accOffset = 1;
-                    accSize = 1;
-                } else {
+                if (detail.length() != 4) accSize = 1;
+                else {
                     String detail2 = detail.substring(0, 1);
                     int number2 = Integer.valueOf(detail2, 16) * 2;
                     String detail3 = detail.substring(1, 2);
@@ -364,21 +380,24 @@ boolean processTickItems() {
                 }
             } else {
                 String strValue = editTextAccPc.getText().toString();
-                if (DEBUG) MainActivity.mCs108Library4a.appendToLog("processTickItems(): strValue =  " + strValue + ", accPcValue = " + accPcValue);
-                if (strValue.length() == 4 && strValue.matches(accPcValue) == false) {
-//                        accOffset = 1;
-                    accSize = 1;
-                    writeData = strValue;
-                    editTextAccessRWEpc.setText("");
-                } else  strValue = "";
                 String strValue1 = editTextAccessRWEpc.getText().toString();
-                if (DEBUG) MainActivity.mCs108Library4a.appendToLog("processTickItems(): strValue1 =  " + strValue1 + ", accEpcValue = " + accEpcValue);
-                if (strValue1.length() >= 4 && strValue1.matches(accEpcValue) == false) {
-                    if (strValue.length() == 0) accOffset = 2;
+                if (DEBUG) MainActivity.mCs108Library4a.appendToLog("TestDebug111(): strValue =  " + strValue + ", accPcValue = " + accPcValue);
+                if (strValue1.length() == 0) {
+                    if (strValue.length() != 4) invalidRequest1 = true;
+                    else {
+                        accSize = 1;
+                        writeData = strValue;
+                    }
+                } else {
                     accSize += strValue1.length() / 4;
                     if (strValue1.length() % 4 != 0) accSize++;
-                    writeData = strValue + strValue1;
-                    if (DEBUG) MainActivity.mCs108Library4a.appendToLog("processTickItems(): accOffset =  " + accOffset + ", accSize = " + accSize);
+                    if (strValue.length() == 4) {
+                        accSize++;
+                        writeData = strValue + strValue1;
+                    } else {
+                        accOffset = 2;
+                        writeData = strValue1;
+                    }
                 }
             }
         } else if (checkBoxTid.isChecked() == true) {
@@ -464,6 +483,7 @@ boolean processTickItems() {
             }
         } else {
             invalidRequest1 = true;
+            bcheckBoxAll = true;
         }
 
         if (restartAccessBank == accessBank) {

app/release/cs108ademo-181018-v1.12.1-app-release.apk

@@ -380,7 +380,7 @@ void startAccessTask() {
         MainActivity.mCs108Library4a.appendToLog("selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", selectOffset1= " + selectOffset1 + ", invalidRequest1 = " + invalidRequest1);
 
         accessTask = new AccessTask(buttonWrite, textViewWriteCount, invalidRequest1,
-                "", selectMask, selectBank + 1, (selectBank == 0 ? selectOffset + 32 : selectOffset),
+                selectMask, selectBank + 1, (selectBank == 0 ? selectOffset + 32 : selectOffset),
                 password, antennaPower, Cs108Connector.HostCommands.CMD_18K6CWRITE, selectQValue, checkBoxAutoRun.isChecked(), checkBoxNewBarcode.isChecked(), resetCount,
                 textViewRunTime, textViewTagGot, textViewVoltageLevel,
                 textViewYield, textViewTotal);

app/release/cs108ademo-181018-v1.12.1-app-release.zip

@@ -123,7 +123,7 @@ void startAccessTask() {
         String strTagID = editTextTagID.getText().toString();
         String strPassword = editTextPassword.getText().toString();
         int powerLevel = Integer.valueOf(editTextAntennaPower.getText().toString());
-        accessTask = new AccessTask(button, null, invalidRequest, "", strTagID, 1, 32, strPassword, powerLevel, Cs108Connector.HostCommands.CMD_18K6CKILL, 0, false, false, true, null, null, null, null, null);
+        accessTask = new AccessTask(button, null, invalidRequest, strTagID, 1, 32, strPassword, powerLevel, Cs108Connector.HostCommands.CMD_18K6CKILL, 0, false, false, true, null, null, null, null, null);
         accessTask.execute();
     }
 }