Merge pull request #5 from cslrfid/release-1.14.0

RFMicron Temperature Tag Functions

Author: ksclam

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 18
-        versionName "1.13.0"
+        versionCode 19
+        versionName "1.14.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

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

@@ -1 +1 @@
-[{"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":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.14.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/release/cs108ademo-181022-v1.12.2-app-release.apk

@@ -10,7 +10,8 @@
 import java.util.ArrayList;
 
 public class AccessTask extends AsyncTask<Void, String, String> {
-    final boolean DEBUG = false;
+    final boolean DEBUG = true;
+    final boolean skipSelect = false;
     public enum TaskCancelRReason {
         NULL, INVALD_REQUEST, DESTORY, STOP, BUTTON_RELEASE, TIMEOUT
     }
@@ -37,6 +38,7 @@ public enum TaskCancelRReason {
     private String endingMessaage;
     int qValue;
     boolean repeat, nextNew;
+    boolean gotInventory;
     int batteryCountInventory_old;
 
     public AccessTask(Button button, TextView textViewWriteCount, boolean invalidRequest,
@@ -53,7 +55,7 @@ public AccessTask(Button button, TextView textViewWriteCount, boolean invalidReq
         this.registerYield = registerYieldView;
         this.registerTotal = registerTotalView;
 
-        this.invalidRequest = invalidRequest;
+        this.invalidRequest = invalidRequest; MainActivity.mCs108Library4a.appendToLog("invalidRequest = " + invalidRequest);
         this.selectMask = selectMask;
         this.selectBank = selectBank;
         this.selectOffset = selectOffset;
@@ -115,14 +117,17 @@ 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 (skipSelect) { }
             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);
             }
         }
+        gotInventory = false;
         taskCancelReason = TaskCancelRReason.NULL;
         if (invalidRequest) {
             cancel(true);
             taskCancelReason = TaskCancelRReason.INVALD_REQUEST;
+            MainActivity.mCs108Library4a.appendToLog("invalidRequest A= " + invalidRequest);
         } else {
             if (MainActivity.mCs108Library4a.checkHostProcessorVersion(MainActivity.mCs108Library4a.getMacVer(), 2, 6, 8)) {
                 MainActivity.mCs108Library4a.setInvModeCompact(false);
@@ -192,6 +197,7 @@ protected void onProgressUpdate(String... output) {
         if (output[0] != null) {
             if (output[0].length() == 2) {
                 if (output[0].contains("TT")) {
+                    gotInventory = true;
                   if (registerTagGot != null) registerTagGot.setText(output[1]);
                     boolean matched = false;
                     for (int i = 0; i < tagList.size(); i++) {
@@ -260,7 +266,7 @@ void DeviceConnectTask4RegisterEnding() {
             strErrorMessage = "";
             switch (taskCancelReason) {
                 case NULL:
-                    if (accessResult == null || (resultError != null && resultError.length() != 0) || (endingMessaage != null && endingMessaage.length() != 0)) 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 " + (gotInventory ? "WITH" : "WITHOUT") + " tag response");
                     else Toast.makeText(MainActivity.mContext, R.string.toast_abort_by_SUCCESS, Toast.LENGTH_SHORT).show();
                     break;
                 case STOP:

app/release/cs108ademo-181022-v1.12.2-app-release.zip

@@ -57,7 +57,7 @@ public static DrawerPositions toDrawerPosition(int x) {
         addItem(new DrawerItem("8", "Security", R.drawable.dl_access));
         addItem(new DrawerItem("9", "Register Tag", R.drawable.dl_rr));
         addItem(new DrawerItem("10", "Cold Chain CS8300", R.drawable.dl_loc));
-        addItem(new DrawerItem("11", "RFMicron Temperature", R.drawable.dl_loc));
+        addItem(new DrawerItem("11", "RFMicron", R.drawable.dl_loc));
         addItem(new DrawerItem("12", "UCODE DNA", R.drawable.dl_loc));
         addItem(new DrawerItem("13", "Wedge", R.drawable.dl_rr));
     }

app/release/cs108ademo-181022-v1.12.3-app-release.zip

@@ -257,6 +257,7 @@ else if (output[0].contains("WW")) {
                     String strEpc = MainActivity.mCs108Library4a.byteArrayToString(rx000pkgData.decodedEpc);
                     String strExtra2 = null; if (rx000pkgData.decodedData2 != null) strExtra2 = MainActivity.mCs108Library4a.byteArrayToString(rx000pkgData.decodedData2);
                     String strExtra1 = null; if (rx000pkgData.decodedData1 != null) strExtra1 = MainActivity.mCs108Library4a.byteArrayToString(rx000pkgData.decodedData1);
+                    String strAddresss = strEpc; // strEpc, strEpc + strExtra1 + strExtra2
                     String strCrc16 = null; if (rx000pkgData.decodedCrc != null) strCrc16 = MainActivity.mCs108Library4a.byteArrayToString(rx000pkgData.decodedCrc);
                     if (strExtra1 != null && strExtra1Filter != null) {
                         MainActivity.mCs108Library4a.appendToLog("strEpc = " + strEpc + ", strExtra1 = " + strExtra1 + ", strExtra1Filter = " + strExtra1Filter + ", strExtra2 = " + strExtra2 );
@@ -300,7 +301,7 @@ else if (output[0].contains("WW")) {
 //                        MainActivity.mCs108Library4a.appendToLog("Matching Epc = " + strEpc);
                         iMatchItem = -1;
                         if (true) {
-                            int index = Collections.binarySearch(MainActivity.sharedObjects.tagsIndexList, new SharedObjects.TagsIndex(strEpc+strExtra1+strExtra2, 0));
+                            int index = Collections.binarySearch(MainActivity.sharedObjects.tagsIndexList, new SharedObjects.TagsIndex(strAddresss, 0));
                             if (index >= 0) {
                                 iMatchItem = MainActivity.sharedObjects.tagsIndexList.size() - 1 - MainActivity.sharedObjects.tagsIndexList.get(index).getPosition();
 //                                MainActivity.mCs108Library4a.appendToLog("Binary matched index = " + index + ", iMatchItem = " + iMatchItem + ", Epc = " + tagsList.get(iMatchItem).getAddress());
@@ -322,6 +323,8 @@ else if (output[0].contains("WW")) {
                             readerDevice.setRssi(rssi);
                             readerDevice.setPhase(phase);
                             readerDevice.setChannel(chidx);
+                            readerDevice.setExtra1(strExtra1, extra1Bank, data1_offset);
+                            MainActivity.mCs108Library4a.appendToLog("setExtra1 with strExtra1 = " + strExtra1);
                             tagsList.set(iMatchItem, readerDevice);
                             match = true;
                             updated = true;
@@ -342,7 +345,7 @@ else if (output[0].contains("WW")) {
                                     1, rssi, phase, chidx);
                             if (bAdd2End) tagsList.add(readerDevice);
                             else tagsList.add(0, readerDevice);
-                            SharedObjects.TagsIndex tagsIndex = new SharedObjects.TagsIndex(strEpc+strExtra1+strExtra2, tagsList.size()-1); MainActivity.sharedObjects.tagsIndexList.add(tagsIndex); Collections.sort(MainActivity.sharedObjects.tagsIndexList);
+                            SharedObjects.TagsIndex tagsIndex = new SharedObjects.TagsIndex(strAddresss, tagsList.size()-1); MainActivity.sharedObjects.tagsIndexList.add(tagsIndex); Collections.sort(MainActivity.sharedObjects.tagsIndexList);
                             if (serverConnectValid && ALLOW_RTSAVE && true) {
                                 try {
 //                                    saveExternalTask = new SaveList2ExternalTask();

app/release/cs108ademo-181218-v1.12.4-app-release.zip

@@ -16,12 +16,13 @@ public class MicronAdapter extends FragmentStatePagerAdapter {
     public Fragment getItem(int index) {
         Fragment fragment = null;
         switch (index) {
-            case 0:
+            case 1:
                 fragment = new AccessMicronFragment();
                 fragment0 = fragment;
                 break;
-            case 1:
-                fragment = InventoryRfidiMultiFragment.newInstance(true,"E28240", false);
+            case 0:
+                String mDid = "E282403"; //"E28240", "E282403"
+                fragment = InventoryRfidiMultiFragment.newInstance(true, mDid, false);
                 fragment1 = fragment;
                 break;
             default: