2.1.29 Release

v2.1.29
•	Try improving “other tags are still found in the Em4325 selectTag page” problem by adding selecting 4 more bits and by post filtering
•	Remove some unused codes

Author: WallaceSit

app/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 31
-        versionName "2.1.28"
+        versionName "2.1.29"
     }
 }
 

app/src/main/java/com/csl/cs108ademoapp/InventoryRfidTask.java

@@ -368,10 +368,10 @@ void inventoryHandler_tag() {
                                     extra2Bank = 2;
                                     data2_offset = 0;
                                 }
-                                if (strTid.contains("E2806894") == false) {
+                                /*if (strTid.contains("E2806894") == false) {
                                     MainActivity.mCs108Library4a.appendToLog("HelloK: Skip the record without strExtra1 E2806894: " + strEpc);
                                     return;
-                                }
+                                }*/
                             }
                         } else if (MainActivity.mDid.matches("E2806894C") || MainActivity.mDid.matches("E2806894d")) {
                             if (strEpc.length() >= 4) {
@@ -382,10 +382,10 @@ void inventoryHandler_tag() {
                                 if (strExtra1 != null || MainActivity.mDid.matches("E2806894d")) {
                                     if (!(strExtra1 != null && strExtra1.length() == 8 && strExtra1.contains("E2806894"))) {
                                         matched = false;
-                                        if (MainActivity.mDid.matches("E2806894d")) {
+                                        /*if (MainActivity.mDid.matches("E2806894d")) {
                                             MainActivity.mCs108Library4a.appendToLog("HelloK: Skip the record without strExtra1 E2806894: " + strEpc);
                                             return;
-                                        }
+                                        }*/
                                     }
                                 }
                                 if (matched) {
@@ -396,6 +396,26 @@ void inventoryHandler_tag() {
                             }
                         }
                     }
+
+                    MainActivity.mCs108Library4a.appendToLog("strTidCompared = " + strMdid + ", MainActivity.mDid = " + MainActivity.mDid + ", strExtra1 = " + strExtra1 + ", strExtra2 = " + strExtra2);
+                    if (strMdid != null) {
+                        String strTidCompared = strMdid;
+                        if (strTidCompared.indexOf("E28011") == 0) strTidCompared = "E28011";
+                        if (strTidCompared.matches("E282402")) { }
+                        else if (strTidCompared.matches("E282403")) { }
+                        else if (strTidCompared.matches("E282405")) { }
+                        else if (strTidCompared.matches("E2806894") && MainActivity.mDid.matches("E2806894C")) { }
+                        else { //if (strMdid.matches("E280B0"))
+                            boolean bMatched = false;
+                            if (strExtra1 != null && strExtra1.indexOf(strTidCompared) == 0) {
+                                bMatched = true; MainActivity.mCs108Library4a.appendToLog("strExtra1 contains strTidCompared");
+                            } else if (strExtra2 != null && strExtra2.indexOf(strTidCompared) == 0) {
+                                bMatched = true; MainActivity.mCs108Library4a.appendToLog("strEXTRA2 contains strTidCompared");
+                            }
+                            if (bMatched == false) return;
+                        }
+                    }
+
                     rssi = rx000pkgData.decodedRssi;
                     phase = rx000pkgData.decodedPhase;
                     chidx = rx000pkgData.decodedChidx;

app/src/main/java/com/csl/cs108ademoapp/adapters/ColdChainAdapter.java

@@ -26,7 +26,7 @@ public Fragment getItem(int index) {
                 fragment2 = fragment;
                 break;
             case 0:
-                fragment = InventoryRfidiMultiFragment.newInstance(true,"E280B");
+                fragment = InventoryRfidiMultiFragment.newInstance(true,"E280B0");
                 fragment0 = fragment;
                 break;
             default:

app/src/main/java/com/csl/cs108ademoapp/fragments/InventoryRfidiMultiFragment.java

@@ -401,7 +401,7 @@ void startInventoryTask() {
                 extra2Bank = 3;
                 extra2Offset = 0x120;
                 extra2Count = 1;
-            } else if (mDid.indexOf("E280B") == 0) {
+            } else if (mDid.indexOf("E280B0") == 0) {
                 extra1Bank = 3;
                 extra1Offset = 188;
                 extra1Count = 2;

cs108library4a/build.gradle

@@ -6,8 +6,8 @@ android {
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 31
-        versionName "2.1.21"
-        buildConfigField 'String', 'VERSION_NAME', "\"2.1.21\""
+        versionName "2.1.22"
+        buildConfigField 'String', 'VERSION_NAME', "\"2.1.22\""
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }

cs108library4a/src/main/java/com/csl/cs108library4a/BleConnector.java

@@ -160,8 +160,6 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
             if (true) appendToLog("status=" + status + ". restart discoverServices"); mBluetoothGatt.discoverServices();
         } else {
             UUID UUID_READER_SERVICE = UUID.fromString("00009800-0000-1000-8000-00805f9b34fb");
-            if (serviceUUID2p1 != 1) UUID_READER_SERVICE = UUID.fromString("00009802-0000-1000-8000-00805f9b34fb");
-            appendToLog("serviceUD1D2p1 = " + serviceUUID2p1);
             mReaderStreamOutCharacteristic = getCharacteristic(UUID_READER_SERVICE, UUID_READER_STREAM_OUT_CHARACTERISTIC);
             mReaderStreamInCharacteristic = getCharacteristic(UUID_READER_SERVICE, UUID_READER_STREAM_IN_CHARACTERISTIC);
             appendToLog("mReaderStreamOutCharacteristic flag = " + mReaderStreamOutCharacteristic.getProperties());

cs108library4a/src/main/java/com/csl/cs108library4a/BluetoothConnector.java

@@ -166,11 +166,7 @@ boolean isMatchBluetoothIcToWrite(Cs108Connector.Cs108ReadData cs108ReadData) {
                                 if (cs108ReadData.dataValues.length - 2 < length) length = cs108ReadData.dataValues.length - 2;
                                 System.arraycopy(cs108ReadData.dataValues, 2, mBluetoothIcVersion, 0, length);
                                 if (mBluetoothIcVersion[0] == 3) icsModel = 463;
-                                else if (mBluetoothIcVersion[0] == 1) {
-                                    if (mBluetoothIcVersion[1] == 0 && mBluetoothIcVersion[2] < 10) icsModel = 710;
-                                    else icsModel = 108;
-                                    appendToLog("New Checkpoint with icsModel = " + icsModel);
-                                }
+                                else if (mBluetoothIcVersion[0] == 1) icsModel = 108;
                                 mBluetoothIcVersionUpdated = true;
                                 if (true) appendToLog("mBluetoothIcVersionUpdated is true");
                             }

cs108library4a/src/main/java/com/csl/cs108library4a/ReaderDevice.java

@@ -211,7 +211,6 @@ public void setRssi(double rssi) {
     }
 
     public int getServiceUUID2p1() { return serviceUUID2p1; }
-    public void setServiceUUID2p1(int serviceUUID2p1) { this.serviceUUID2p1 = serviceUUID2p1; }
 
     public int getPhase() { return phase; }
     public void setPhase(int phase) { this.phase = phase; }