Skip to content

Commit f448a84

Browse files
WallaceSitWallaceSit
WallaceSit
authored and
WallaceSit
committed
v2.13.1-2
 v2.13.1-2: • App: Solve “after changing EPC of the selected tag, do inventory again without clearing all. Then sort. It crashes” problem • App: relocate some codes • Library108: remove some unused codes, rename some codes, relocate some codes, revise some debug codes
1 parent dd4b746 commit f448a84

File tree

14 files changed

+2440
-659
lines changed

14 files changed

+2440
-659
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
minSdk 21
1313
targetSdk 34
1414
versionCode 40
15-
versionName "2.13.0A"
15+
versionName "2.13.1"
1616
}
1717
}
1818

‎app/release/cs108ademo-20240409-v2.13.0A-app-release.zip‎

-13.6 MB
Binary file not shown.

‎app/release/cs108ademo-20240412-v2.13.1-2-app-release.zip‎

6.73 MB
Binary file not shown.

‎app/src/main/java/com/csl/cs108ademoapp/fragments/AccessReadWriteFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ void updatePCEpc(String strPCValue, String strEpcValue) {
227227
String strTemp = editTextAccessRWEpc.getText().toString();
228228
if (selectTag.editTextTagID.getText().toString().matches(strTemp) == false) {
229229
// needPopup = true;
230-
tagSelected.setAddress(strEpcValue); if (spinnerSelectBank.getSelectedItemPosition() == 0) selectTag.editTextTagID.setText(strTemp);
230+
tagSelected.setAddress(strTemp); if (spinnerSelectBank.getSelectedItemPosition() == 0) selectTag.editTextTagID.setText(strTemp);
231231
}
232232
}
233233
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
232232
}
233233
}
234234
MainActivity.sharedObjects.tagsList.set(position, readerDevice);
235-
if (readerDevice.getSelected()) MainActivity.tagSelected = readerDevice;
236-
else MainActivity.tagSelected = null;
235+
if (readerDevice.getSelected()) MainActivity.tagSelected = readerDevice;
236+
else MainActivity.tagSelected = null;
237237
for (int i = 0; i < MainActivity.sharedObjects.tagsList.size(); i++) {
238238
if (i != position) {
239239
ReaderDevice readerDevice1 = MainActivity.sharedObjects.tagsList.get(i);

‎cs108library4a/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
defaultConfig {
1111
minSdk 21
1212
targetSdk 34
13-
buildConfigField 'String', 'VERSION_NAME', "\"2.13.0\""
13+
buildConfigField 'String', 'VERSION_NAME', "\"2.13.1\""
1414
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1515
}
1616
buildTypes {

‎cs108library4a/src/main/java/com/csl/cs108library4a/Cs108Library4A.java‎

Lines changed: 646 additions & 614 deletions
Large diffs are not rendered by default.

‎cslibrary4a/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
defaultConfig {
1111
minSdk 21
1212
targetSdk 34
13-
buildConfigField 'String', 'VERSION_NAME', "\"0\""
13+
buildConfigField 'String', 'VERSION_NAME', "\"1\""
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616

‎cslibrary4a/src/main/java/com/csl/cslibrary4a/CsReaderConnector.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public void disconnect() {
3131
bluetoothGatt.disconnect();
3232
appendToLog("abcc done");
3333
rfidConnector.mRfidToWrite.clear();
34-
rfidReaderChipE710.mRx000ToWrite.clear();
34+
rfidReader.mRx000ToWrite.clear();
3535
}
3636

3737
public long getStreamInRate() { return bluetoothGatt.getStreamInRate(); }
3838

3939
int writeDataCount; int btSendTimeOut = 0; long btSendTime = 0;
4040
boolean writeData(byte[] buffer, int timeout) {
41-
if (rfidReaderChipE710.isInventoring()) {
41+
if (rfidReader.isInventoring()) {
4242
utility.appendToLogView("BtData: isInventoring is true when writeData " + byteArrayToString(buffer));
4343
}
4444
boolean result = bluetoothGatt.writeBleStreamOut(buffer);
@@ -319,7 +319,7 @@ String getTimeStamp() {
319319
}
320320
public Cs108ConnectorData mCs108ConnectorData;
321321

322-
RfidConnector rfidConnector; public RfidReaderChipE710 rfidReaderChipE710; public RfidReader rfidReader;
322+
RfidConnector rfidConnector; public RfidReader rfidReader;
323323
public BarcodeConnector barcodeConnector; public BarcodeNewland barcodeNewland;
324324
public NotificationConnector notificationConnector;
325325
public ControllerConnector controllerConnector;
@@ -342,7 +342,7 @@ public void cs108ConnectorDataInit() {
342342
mCs108ConnectorData = new Cs108ConnectorData();
343343

344344
rfidReader = new RfidReader(context, utility, null, this, bis108);
345-
rfidConnector = rfidReader.rfidConnector; rfidReaderChipE710 = rfidReader.rfidReaderChipE710;
345+
rfidConnector = rfidReader.rfidConnector;
346346
barcodeConnector = new BarcodeConnector(context, utility);
347347
barcodeNewland = new BarcodeNewland(context, utility, barcodeConnector);
348348
barcodeConnector.barcodeConnectorCallback = new BarcodeConnector.BarcodeConnectorCallback(){
@@ -402,7 +402,7 @@ public void run() {
402402
if (DEBUGTHREAD) appendToLog("mReadWriteRunnable starts");
403403
if (timer2Write != 0 || bluetoothGatt.getStreamInBufferSize() != 0 || rfidConnector.mRfidToRead.size() != 0) {
404404
validBuffer = true;
405-
if (DEBUG) appendToLog("mReadWriteRunnable(): START, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReaderChipE710.mRx000ToRead.size());
405+
if (DEBUG) appendToLog("mReadWriteRunnable(): START, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReader.mRx000ToRead.size());
406406
} else validBuffer = false;
407407
int intervalReadWrite = 250; //50; //50; //500; //500, 100;
408408
if (rfidConnector.rfidPowerOnTimeOut >= intervalReadWrite) {
@@ -424,7 +424,7 @@ public void run() {
424424
if (DEBUGTHREAD) appendToLog("start new mReadWriteRunnable after " + intervalReadWrite + " ms");
425425
//appendToLog("postDelayed mReadWriteRunnable within mReadWriteRunnable");
426426
mHandler.removeCallbacks(mReadWriteRunnable); mHandler.postDelayed(mReadWriteRunnable, intervalReadWrite);
427-
if (rfidReaderChipE710 == null) return;
427+
if (rfidReader == null) return;
428428

429429
boolean bFirst = true;
430430
mCs108DataReadRequest = false;
@@ -444,13 +444,13 @@ public void run() {
444444
if (DEBUG) appendToLog("mReadWriteRunnable(): mCs108DataRead.dataValues = " + byteArrayToString(connectorData.dataValues));
445445
if (rfidConnector.isMatchRfidToWrite(connectorData)) {
446446
if (false) {
447-
for (int i = 0; i < rfidReaderChipE710.mRx000ToRead.size(); i++) {
448-
if (rfidReaderChipE710.mRx000ToRead.get(i).responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END)
447+
for (int i = 0; i < rfidReader.mRx000ToRead.size(); i++) {
448+
if (rfidReader.mRx000ToRead.get(i).responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END)
449449
if (DEBUG) appendToLog("mRx0000ToRead with COMMAND_END is removed");
450450
}
451451
if (DEBUG) appendToLog("mRx000ToRead.clear !!!");
452452
}
453-
rfidReaderChipE710.mRx000ToRead.clear(); if (DEBUG) appendToLog("mRx000ToRead.clear !!!");
453+
rfidReader.mRx000ToRead.clear(); if (DEBUG) appendToLog("mRx000ToRead.clear !!!");
454454
if (writeDataCount > 0) writeDataCount--; if (bis108) ready2Write = true; //btSendTime = 0; aborting = false;
455455
} else if (barcodeConnector.isMatchBarcodeToWrite(connectorData)) {
456456
if (writeDataCount > 0) writeDataCount--; if (bis108) ready2Write = true; //btSendTime = 0;
@@ -493,7 +493,7 @@ public void run() {
493493
rfidConnector.mRfidToWriteRemoved = false; ready2Write = true; btSendTime = 0; appendToLog("ready2Write is set true after true mRfidDevice.mRfidToWriteRemoved ");
494494
btSendTime = (lTime - btSendTimeOut + 60);
495495
if (DEBUGTHREAD) appendToLog("ready2Write: start new mReadWriteRunnable after " + 60 + " ms");
496-
appendToLog("post mReadWriteRunnable within mReadWriteRunnable 2");
496+
//appendToLog("postDelayed mReadWriteRunnable within mReadWriteRunnable 2");
497497
mHandler.removeCallbacks(mReadWriteRunnable); mHandler.postDelayed(mReadWriteRunnable, 60 + 2);
498498
if (DEBUG_PKDATA) appendToLog("PkData: mReadWriteRunnable: processed Rfidcode. btSendTime is set to 0 to allow new sending with systime = " + lTime);
499499
}
@@ -512,10 +512,10 @@ public void run() {
512512
timer2Write = 0;
513513
if (rfidConnector.rfidFailure) rfidConnector.mRfidToWrite.clear();
514514
if (barcodeConnector.barcodeFailure) { barcodeConnector.barcodeToWrite.clear(); appendToLog("barcodeToWrite is clear"); }
515-
if (rfidReaderChipE710.mRx000ToWrite.size() != 0 && rfidConnector.mRfidToWrite.size() == 0) {
515+
if (rfidReader.mRx000ToWrite.size() != 0 && rfidConnector.mRfidToWrite.size() == 0) {
516516
if (DEBUG)
517-
appendToLog("mReadWriteRunnable(): mRx000ToWrite.size=" + rfidReaderChipE710.mRx000ToWrite.size() + ", mRfidToWrite.size=" + rfidConnector.mRfidToWrite.size());
518-
rfidReader.addRfidToWrite(rfidReaderChipE710.mRx000ToWrite.get(0));
517+
appendToLog("mReadWriteRunnable(): mRx000ToWrite.size=" + rfidReader.mRx000ToWrite.size() + ", mRfidToWrite.size=" + rfidConnector.mRfidToWrite.size());
518+
rfidReader.addRfidToWrite(rfidReader.mRx000ToWrite.get(0));
519519
}
520520
boolean bisRfidCommandStop = false, bisRfidCommandExecute = false;
521521
if (rfidConnector.mRfidToWrite.size() != 0 && DEBUG)
@@ -723,24 +723,25 @@ else if (System.currentTimeMillis() - btSendTime > btSendTimeOut) {
723723
}
724724
}
725725
}
726-
if (validBuffer) {
727-
if (DEBUG) appendToLog("mReadWriteRunnable: END, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReaderChipE710.mRx000ToRead.size());
728-
}
726+
/*if (validBuffer) {
727+
if (DEBUG) appendToLog("mReadWriteRunnable: END, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReader.mRx000ToRead.size());
728+
}*/
729729
//appendToLog("mRfidDevice is " + (mRfidDevice == null ? "null" : "valid"));
730730
//appendToLog("mRfidDevice.mRfidReaderChip is " + (mRfidDevice.mRfidReaderChip == null ? "null" : "valid"));
731731
//appendToLog("mRfidDevice.mRfidReaderChip.mRfidReaderChip is " + (mRfidDevice.mRfidReaderChip.mRfidReaderChip == null ? "null" : "valid"));
732-
if (rfidReaderChipE710 != null) rfidReader.mRx000UplinkHandler();
732+
if (rfidReader != null) rfidReader.mRx000UplinkHandler();
733733
if (DEBUGTHREAD) appendToLog("mReadWriteRunnable: mReadWriteRunnable ends");
734734
}
735735
};
736736

737737
int intervalRx000UplinkHandler = 250;
738-
private final Runnable runnableRx000UplinkHandler = new Runnable() {
738+
/*private final Runnable runnableRx000UplinkHandler = new Runnable() {
739739
@Override
740740
public void run() {
741741
// mRfidDevice.mRx000Device.mRx000UplinkHandler();
742742
mHandler.postDelayed(runnableRx000UplinkHandler, intervalRx000UplinkHandler);
743743
}
744744
};
745+
*/
745746
}
746747

‎cslibrary4a/src/main/java/com/csl/cslibrary4a/CsReaderConnector108.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public void disconnect() {
3131
bluetoothGatt.disconnect();
3232
appendToLog("abcc done");
3333
rfidConnector.mRfidToWrite.clear();
34-
rfidReaderChipR2000.mRx000ToWrite.clear();
34+
rfidReader.mRx000ToWrite.clear();
3535
}
3636

3737
public long getStreamInRate() { return bluetoothGatt.getStreamInRate(); }
3838

3939
int writeDataCount; int btSendTimeOut = 0; long btSendTime = 0;
4040
boolean writeData(byte[] buffer, int timeout) {
41-
if (rfidReaderChipR2000.isInventoring()) {
41+
if (rfidReader.isInventoring()) {
4242
utility.appendToLogView("BtData: isInventoring is true when writeData " + byteArrayToString(buffer));
4343
}
4444
boolean result = bluetoothGatt.writeBleStreamOut(buffer);
@@ -319,7 +319,7 @@ String getTimeStamp() {
319319
}
320320
public Cs108ConnectorData mCs108ConnectorData;
321321

322-
RfidConnector rfidConnector; public RfidReaderChipR2000 rfidReaderChipR2000; public RfidReader rfidReader;
322+
RfidConnector rfidConnector; public RfidReader rfidReader;
323323
public BarcodeConnector barcodeConnector; public BarcodeNewland barcodeNewland;
324324
public NotificationConnector notificationConnector;
325325
public ControllerConnector controllerConnector;
@@ -342,7 +342,7 @@ public void cs108ConnectorDataInit() {
342342
mCs108ConnectorData = new Cs108ConnectorData();
343343

344344
rfidReader = new RfidReader(context, utility, this, null, bis108);
345-
rfidConnector = rfidReader.rfidConnector; rfidReaderChipR2000 = rfidReader.rfidReaderChipR2000;
345+
rfidConnector = rfidReader.rfidConnector;
346346
barcodeConnector = new BarcodeConnector(context, utility);
347347
barcodeNewland = new BarcodeNewland(context, utility, barcodeConnector);
348348
barcodeConnector.barcodeConnectorCallback = new BarcodeConnector.BarcodeConnectorCallback(){
@@ -402,7 +402,7 @@ public void run() {
402402
if (DEBUGTHREAD) appendToLog("mReadWriteRunnable starts");
403403
if (timer2Write != 0 || bluetoothGatt.getStreamInBufferSize() != 0 || rfidConnector.mRfidToRead.size() != 0) {
404404
validBuffer = true;
405-
if (DEBUG) appendToLog("mReadWriteRunnable(): START, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReaderChipR2000.mRx000ToRead.size());
405+
if (DEBUG) appendToLog("mReadWriteRunnable(): START, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReader.mRx000ToRead.size());
406406
} else validBuffer = false;
407407
int intervalReadWrite = 250; //50; //50; //500; //500, 100;
408408
if (rfidConnector.rfidPowerOnTimeOut >= intervalReadWrite) {
@@ -424,7 +424,7 @@ public void run() {
424424
if (DEBUGTHREAD) appendToLog("start new mReadWriteRunnable after " + intervalReadWrite + " ms");
425425
//appendToLog("postDelayed mReadWriteRunnable within mReadWriteRunnable");
426426
mHandler.removeCallbacks(mReadWriteRunnable); mHandler.postDelayed(mReadWriteRunnable, intervalReadWrite);
427-
if (rfidReaderChipR2000 == null) return;
427+
if (rfidReader == null) return;
428428

429429
boolean bFirst = true;
430430
mCs108DataReadRequest = false;
@@ -444,13 +444,13 @@ public void run() {
444444
if (DEBUG) appendToLog("mReadWriteRunnable(): mCs108DataRead.dataValues = " + byteArrayToString(connectorData.dataValues));
445445
if (rfidConnector.isMatchRfidToWrite(connectorData)) {
446446
if (false) {
447-
for (int i = 0; i < rfidReaderChipR2000.mRx000ToRead.size(); i++) {
448-
if (rfidReaderChipR2000.mRx000ToRead.get(i).responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END)
447+
for (int i = 0; i < rfidReader.mRx000ToRead.size(); i++) {
448+
if (rfidReader.mRx000ToRead.get(i).responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END)
449449
if (DEBUG) appendToLog("mRx0000ToRead with COMMAND_END is removed");
450450
}
451451
if (DEBUG) appendToLog("mRx000ToRead.clear !!!");
452452
}
453-
rfidReaderChipR2000.mRx000ToRead.clear(); if (DEBUG) appendToLog("mRx000ToRead.clear !!!");
453+
rfidReader.mRx000ToRead.clear(); if (DEBUG) appendToLog("mRx000ToRead.clear !!!");
454454
if (writeDataCount > 0) writeDataCount--; if (bis108) ready2Write = true; //btSendTime = 0; aborting = false;
455455
} else if (barcodeConnector.isMatchBarcodeToWrite(connectorData)) {
456456
if (writeDataCount > 0) writeDataCount--; if (bis108) ready2Write = true; //btSendTime = 0;
@@ -512,10 +512,10 @@ public void run() {
512512
timer2Write = 0;
513513
if (rfidConnector.rfidFailure) rfidConnector.mRfidToWrite.clear();
514514
if (barcodeConnector.barcodeFailure) { barcodeConnector.barcodeToWrite.clear(); appendToLog("barcodeToWrite is clear"); }
515-
if (rfidReaderChipR2000.mRx000ToWrite.size() != 0 && rfidConnector.mRfidToWrite.size() == 0) {
515+
if (rfidReader.mRx000ToWrite.size() != 0 && rfidConnector.mRfidToWrite.size() == 0) {
516516
if (DEBUG)
517-
appendToLog("mReadWriteRunnable(): mRx000ToWrite.size=" + rfidReaderChipR2000.mRx000ToWrite.size() + ", mRfidToWrite.size=" + rfidConnector.mRfidToWrite.size());
518-
rfidReader.addRfidToWrite(rfidReaderChipR2000.mRx000ToWrite.get(0));
517+
appendToLog("mReadWriteRunnable(): mRx000ToWrite.size=" + rfidReader.mRx000ToWrite.size() + ", mRfidToWrite.size=" + rfidConnector.mRfidToWrite.size());
518+
rfidReader.addRfidToWrite(rfidReader.mRx000ToWrite.get(0));
519519
}
520520
boolean bisRfidCommandStop = false, bisRfidCommandExecute = false;
521521
if (rfidConnector.mRfidToWrite.size() != 0 && DEBUG)
@@ -572,7 +572,7 @@ public void run() {
572572
}
573573
}
574574
}
575-
} else if (!bis108 && rfidReaderChipR2000.isInventoring()) {
575+
} else if (!bis108 && rfidReader.isInventoring()) {
576576
appendToLog("BtDataOut: done sendRfidToWrite with isInventoring is true");
577577
if (rfidConnector.rfidPowerOnTimeOut != 0) {
578578
if (DEBUG) appendToLog("rfidPowerOnTimeOut = " + rfidConnector.rfidPowerOnTimeOut + ", mRfidToWrite.size() = " + rfidConnector.mRfidToWrite.size());
@@ -723,24 +723,25 @@ else if (System.currentTimeMillis() - btSendTime > btSendTimeOut) {
723723
}
724724
}
725725
}
726-
if (validBuffer) {
727-
if (DEBUG) appendToLog("mReadWriteRunnable: END, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReaderChipR2000.mRx000ToRead.size());
728-
}
726+
/*if (validBuffer) {
727+
if (DEBUG) appendToLog("mReadWriteRunnable: END, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReader.mRx000ToRead.size());
728+
}*/
729729
//appendToLog("mRfidDevice is " + (mRfidDevice == null ? "null" : "valid"));
730730
//appendToLog("mRfidDevice.mRfidReaderChip is " + (mRfidDevice.mRfidReaderChip == null ? "null" : "valid"));
731731
//appendToLog("mRfidDevice.mRfidReaderChip.mRfidReaderChip is " + (mRfidDevice.mRfidReaderChip.mRfidReaderChip == null ? "null" : "valid"));
732-
if (rfidReaderChipR2000 != null) rfidReader.mRx000UplinkHandler();
732+
if (rfidReader != null) rfidReader.mRx000UplinkHandler();
733733
if (DEBUGTHREAD) appendToLog("mReadWriteRunnable: mReadWriteRunnable ends");
734734
}
735735
};
736736

737737
int intervalRx000UplinkHandler = 250;
738-
private final Runnable runnableRx000UplinkHandler = new Runnable() {
738+
/*private final Runnable runnableRx000UplinkHandler = new Runnable() {
739739
@Override
740740
public void run() {
741741
// mRfidDevice.mRx000Device.mRx000UplinkHandler();
742742
mHandler.postDelayed(runnableRx000UplinkHandler, intervalRx000UplinkHandler);
743743
}
744744
};
745+
*/
745746
}
746747

0 commit comments

Comments
 (0)