@@ -31,14 +31,14 @@ public void disconnect() {
31
31
bluetoothGatt .disconnect ();
32
32
appendToLog ("abcc done" );
33
33
rfidConnector .mRfidToWrite .clear ();
34
- rfidReaderChipE710 .mRx000ToWrite .clear ();
34
+ rfidReader .mRx000ToWrite .clear ();
35
35
}
36
36
37
37
public long getStreamInRate () { return bluetoothGatt .getStreamInRate (); }
38
38
39
39
int writeDataCount ; int btSendTimeOut = 0 ; long btSendTime = 0 ;
40
40
boolean writeData (byte [] buffer , int timeout ) {
41
- if (rfidReaderChipE710 .isInventoring ()) {
41
+ if (rfidReader .isInventoring ()) {
42
42
utility .appendToLogView ("BtData: isInventoring is true when writeData " + byteArrayToString (buffer ));
43
43
}
44
44
boolean result = bluetoothGatt .writeBleStreamOut (buffer );
@@ -319,7 +319,7 @@ String getTimeStamp() {
319
319
}
320
320
public Cs108ConnectorData mCs108ConnectorData ;
321
321
322
- RfidConnector rfidConnector ; public RfidReaderChipE710 rfidReaderChipE710 ; public RfidReader rfidReader ;
322
+ RfidConnector rfidConnector ; public RfidReader rfidReader ;
323
323
public BarcodeConnector barcodeConnector ; public BarcodeNewland barcodeNewland ;
324
324
public NotificationConnector notificationConnector ;
325
325
public ControllerConnector controllerConnector ;
@@ -342,7 +342,7 @@ public void cs108ConnectorDataInit() {
342
342
mCs108ConnectorData = new Cs108ConnectorData ();
343
343
344
344
rfidReader = new RfidReader (context , utility , null , this , bis108 );
345
- rfidConnector = rfidReader .rfidConnector ; rfidReaderChipE710 = rfidReader . rfidReaderChipE710 ;
345
+ rfidConnector = rfidReader .rfidConnector ;
346
346
barcodeConnector = new BarcodeConnector (context , utility );
347
347
barcodeNewland = new BarcodeNewland (context , utility , barcodeConnector );
348
348
barcodeConnector .barcodeConnectorCallback = new BarcodeConnector .BarcodeConnectorCallback (){
@@ -402,7 +402,7 @@ public void run() {
402
402
if (DEBUGTHREAD ) appendToLog ("mReadWriteRunnable starts" );
403
403
if (timer2Write != 0 || bluetoothGatt .getStreamInBufferSize () != 0 || rfidConnector .mRfidToRead .size () != 0 ) {
404
404
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 ());
406
406
} else validBuffer = false ;
407
407
int intervalReadWrite = 250 ; //50; //50; //500; //500, 100;
408
408
if (rfidConnector .rfidPowerOnTimeOut >= intervalReadWrite ) {
@@ -424,7 +424,7 @@ public void run() {
424
424
if (DEBUGTHREAD ) appendToLog ("start new mReadWriteRunnable after " + intervalReadWrite + " ms" );
425
425
//appendToLog("postDelayed mReadWriteRunnable within mReadWriteRunnable");
426
426
mHandler .removeCallbacks (mReadWriteRunnable ); mHandler .postDelayed (mReadWriteRunnable , intervalReadWrite );
427
- if (rfidReaderChipE710 == null ) return ;
427
+ if (rfidReader == null ) return ;
428
428
429
429
boolean bFirst = true ;
430
430
mCs108DataReadRequest = false ;
@@ -444,13 +444,13 @@ public void run() {
444
444
if (DEBUG ) appendToLog ("mReadWriteRunnable(): mCs108DataRead.dataValues = " + byteArrayToString (connectorData .dataValues ));
445
445
if (rfidConnector .isMatchRfidToWrite (connectorData )) {
446
446
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 )
449
449
if (DEBUG ) appendToLog ("mRx0000ToRead with COMMAND_END is removed" );
450
450
}
451
451
if (DEBUG ) appendToLog ("mRx000ToRead.clear !!!" );
452
452
}
453
- rfidReaderChipE710 .mRx000ToRead .clear (); if (DEBUG ) appendToLog ("mRx000ToRead.clear !!!" );
453
+ rfidReader .mRx000ToRead .clear (); if (DEBUG ) appendToLog ("mRx000ToRead.clear !!!" );
454
454
if (writeDataCount > 0 ) writeDataCount --; if (bis108 ) ready2Write = true ; //btSendTime = 0; aborting = false;
455
455
} else if (barcodeConnector .isMatchBarcodeToWrite (connectorData )) {
456
456
if (writeDataCount > 0 ) writeDataCount --; if (bis108 ) ready2Write = true ; //btSendTime = 0;
@@ -493,7 +493,7 @@ public void run() {
493
493
rfidConnector .mRfidToWriteRemoved = false ; ready2Write = true ; btSendTime = 0 ; appendToLog ("ready2Write is set true after true mRfidDevice.mRfidToWriteRemoved " );
494
494
btSendTime = (lTime - btSendTimeOut + 60 );
495
495
if (DEBUGTHREAD ) appendToLog ("ready2Write: start new mReadWriteRunnable after " + 60 + " ms" );
496
- appendToLog ("post mReadWriteRunnable within mReadWriteRunnable 2" );
496
+ // appendToLog("postDelayed mReadWriteRunnable within mReadWriteRunnable 2");
497
497
mHandler .removeCallbacks (mReadWriteRunnable ); mHandler .postDelayed (mReadWriteRunnable , 60 + 2 );
498
498
if (DEBUG_PKDATA ) appendToLog ("PkData: mReadWriteRunnable: processed Rfidcode. btSendTime is set to 0 to allow new sending with systime = " + lTime );
499
499
}
@@ -512,10 +512,10 @@ public void run() {
512
512
timer2Write = 0 ;
513
513
if (rfidConnector .rfidFailure ) rfidConnector .mRfidToWrite .clear ();
514
514
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 ) {
516
516
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 ));
519
519
}
520
520
boolean bisRfidCommandStop = false , bisRfidCommandExecute = false ;
521
521
if (rfidConnector .mRfidToWrite .size () != 0 && DEBUG )
@@ -723,24 +723,25 @@ else if (System.currentTimeMillis() - btSendTime > btSendTimeOut) {
723
723
}
724
724
}
725
725
}
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
+ }*/
729
729
//appendToLog("mRfidDevice is " + (mRfidDevice == null ? "null" : "valid"));
730
730
//appendToLog("mRfidDevice.mRfidReaderChip is " + (mRfidDevice.mRfidReaderChip == null ? "null" : "valid"));
731
731
//appendToLog("mRfidDevice.mRfidReaderChip.mRfidReaderChip is " + (mRfidDevice.mRfidReaderChip.mRfidReaderChip == null ? "null" : "valid"));
732
- if (rfidReaderChipE710 != null ) rfidReader .mRx000UplinkHandler ();
732
+ if (rfidReader != null ) rfidReader .mRx000UplinkHandler ();
733
733
if (DEBUGTHREAD ) appendToLog ("mReadWriteRunnable: mReadWriteRunnable ends" );
734
734
}
735
735
};
736
736
737
737
int intervalRx000UplinkHandler = 250 ;
738
- private final Runnable runnableRx000UplinkHandler = new Runnable () {
738
+ /* private final Runnable runnableRx000UplinkHandler = new Runnable() {
739
739
@Override
740
740
public void run() {
741
741
// mRfidDevice.mRx000Device.mRx000UplinkHandler();
742
742
mHandler.postDelayed(runnableRx000UplinkHandler, intervalRx000UplinkHandler);
743
743
}
744
744
};
745
+ */
745
746
}
746
747
0 commit comments