Skip to content

Commit dd4b746

Browse files
WallaceSitWallaceSit
WallaceSit
authored and
WallaceSit
committed
v2.13.0A
v2.13.0A: This version is the version released to the google play. Version number/code is changed. v2.13.0-0: • App: Solve the “400 response code” problem when using democloud impinj authenuation demo server • Library108: remove “www.” in the default democloud impinj authenuation demo server • Library108: remove some unused codes, rename some variables
1 parent c637910 commit dd4b746

File tree

10 files changed

+38
-33
lines changed

10 files changed

+38
-33
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
applicationId "com.csl.cs108ademoapp"
1212
minSdk 21
1313
targetSdk 34
14-
versionCode 39
15-
versionName "2.12.1"
14+
versionCode 40
15+
versionName "2.13.0A"
1616
}
1717
}
1818

‎app/release/cs108ademo-20240408-v2.12.1-2-app-release.zip‎

-6.73 MB
Binary file not shown.

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

13.6 MB
Binary file not shown.

‎app/src/main/java/com/csl/cs108ademoapp/SaveList2ExternalTask.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,9 @@ public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) {
478478
}
479479
errorDisplay = "Error in setConnectTimeout()"; con.setConnectTimeout(MainActivity.csLibrary4A.getServerTimeout() * 1000);
480480
errorDisplay = "Error in setRequestMethod()"; con.setRequestMethod("POST");
481-
errorDisplay = "Error in setRequestProperty(User-Agent)"; con.setRequestProperty("User-Agent", "Mozilla/5.0");
482-
errorDisplay = "Error in setRequestProperty(text/plain)"; con.setRequestProperty("text/plain", "text/plain");
483-
errorDisplay = "Error in setRequestProperty(Accept-Language)"; con.setRequestProperty("Accept-Language", "en-US,en;q=0.5");
481+
//errorDisplay = "Error in setRequestProperty(User-Agent)"; con.setRequestProperty("User-Agent", "Mozilla/5.0");
482+
//errorDisplay = "Error in setRequestProperty(text/plain)"; con.setRequestProperty("text/plain", "text/plain");
483+
//errorDisplay = "Error in setRequestProperty(Accept-Language)"; con.setRequestProperty("Accept-Language", "en-US,en;q=0.5");
484484
MainActivity.csLibrary4A.appendToLog("authenticate in url position : " + url.indexOf("authenticate"));
485485
if (url.indexOf("authenticate") >= 0) {
486486
String string = strBearer;

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,21 @@ public void onClick(View view) {
284284
});
285285

286286
editTextAccessUCserverImpinj = (EditText) getActivity().findViewById(R.id.accessUCserverImpinj);
287-
editTextAccessUCserverImpinj.setText(csLibrary4A.getServerImpinjLocation());
288287
editTextAccessUCemail = (EditText) getActivity().findViewById(R.id.accessUCemail);
289-
editTextAccessUCemail.setText(csLibrary4A.getServerImpinjName()); //"wallace.sit@cne.com.hk");
290288
editTextAccessUCpassword = (EditText) getActivity().findViewById(R.id.accessUCpassword);
291-
editTextAccessUCpassword.setText(csLibrary4A.getServerImpinjPassword()); //"Cne12345678?");
289+
if (true) {
290+
editTextAccessUCserverImpinj.setText(csLibrary4A.getServerImpinjLocation());
291+
editTextAccessUCemail.setText(csLibrary4A.getServerImpinjName());
292+
editTextAccessUCpassword.setText(csLibrary4A.getServerImpinjPassword());
293+
} else if (false) {
294+
editTextAccessUCserverImpinj.setText("https://h9tqczg9-7275.asse.devtunnels.ms");
295+
editTextAccessUCemail.setText("wallace.sit@cne.com.hk");
296+
editTextAccessUCpassword.setText("Cne12345678?");
297+
} else {
298+
editTextAccessUCserverImpinj.setText("https://democloud.convergence.com.hk/ias");
299+
editTextAccessUCemail.setText("wallace.sit@cne.com.hk");
300+
editTextAccessUCpassword.setText("Cne12345678?");
301+
}
292302
}
293303

294304
SaveList2ExternalTask saveExternalTask; boolean bRunning = false; int bStep = 0; String strBearer = null;

‎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.12.1\""
13+
buildConfigField 'String', 'VERSION_NAME', "\"2.13.0\""
1414
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1515
}
1616
buildTypes {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.csl.cslibrary4a.CsReaderConnector108;
2424
import com.csl.cslibrary4a.NotificationConnector;
2525
import com.csl.cslibrary4a.ReaderDevice;
26-
import com.csl.cslibrary4a.RfidConnector;
2726
import com.csl.cslibrary4a.RfidReaderChipData;
2827
import com.csl.cslibrary4a.RfidReaderChipR2000;
2928
import com.csl.cslibrary4a.Utility;
@@ -410,7 +409,7 @@ public boolean isBleConnected() {
410409
if (DEBUG_CONNECT) appendToLog("Newly connected");
411410

412411
csReaderConnector108.cs108ConnectorDataInit();
413-
rfidReaderChip = csReaderConnector108.rfidReaderChip; //rfidConnector = csReaderConnector108.rfidConnector;
412+
rfidReaderChip = csReaderConnector108.rfidReaderChipR2000; //rfidConnector = csReaderConnector108.rfidConnector;
414413
barcodeNewland = csReaderConnector108.barcodeNewland; barcodeConnector = csReaderConnector108.barcodeConnector;
415414
notificationConnector = csReaderConnector108.notificationConnector;
416415
controllerConnector = csReaderConnector108.controllerConnector;
@@ -3910,7 +3909,7 @@ public boolean setServerTimeout(int serverTimeout) {
39103909
return true;
39113910
}
39123911
//String serverImpinjLocationDefault = "https://h9tqczg9-7275.asse.devtunnels.ms", serverImpinjLocation = serverImpinjLocationDefault;
3913-
String serverImpinjLocationDefault = "https://www.democloud.convergence.com.hk/ias", serverImpinjLocation = serverImpinjLocationDefault;
3912+
String serverImpinjLocationDefault = "https://democloud.convergence.com.hk/ias", serverImpinjLocation = serverImpinjLocationDefault;
39143913
public String getServerImpinjLocation() {
39153914
return serverImpinjLocation;
39163915
}

‎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', "\"1\""
13+
buildConfigField 'String', 'VERSION_NAME', "\"0\""
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616

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

Lines changed: 15 additions & 15 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-
rfidReaderChip.mRx000ToWrite.clear();
34+
rfidReaderChipR2000.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 (rfidReaderChip.isInventoring()) {
41+
if (rfidReaderChipR2000.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 rfidReaderChip; public RfidReader rfidReader;
322+
RfidConnector rfidConnector; public RfidReaderChipR2000 rfidReaderChipR2000; 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; rfidReaderChip = rfidReader.rfidReaderChipR2000;
345+
rfidConnector = rfidReader.rfidConnector; rfidReaderChipR2000 = rfidReader.rfidReaderChipR2000;
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=" + rfidReaderChip.mRx000ToRead.size());
405+
if (DEBUG) appendToLog("mReadWriteRunnable(): START, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReaderChipR2000.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 (rfidReaderChip == null) return;
427+
if (rfidReaderChipR2000 == 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 < rfidReaderChip.mRx000ToRead.size(); i++) {
448-
if (rfidReaderChip.mRx000ToRead.get(i).responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END)
447+
for (int i = 0; i < rfidReaderChipR2000.mRx000ToRead.size(); i++) {
448+
if (rfidReaderChipR2000.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-
rfidReaderChip.mRx000ToRead.clear(); if (DEBUG) appendToLog("mRx000ToRead.clear !!!");
453+
rfidReaderChipR2000.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 (rfidReaderChip.mRx000ToWrite.size() != 0 && rfidConnector.mRfidToWrite.size() == 0) {
515+
if (rfidReaderChipR2000.mRx000ToWrite.size() != 0 && rfidConnector.mRfidToWrite.size() == 0) {
516516
if (DEBUG)
517-
appendToLog("mReadWriteRunnable(): mRx000ToWrite.size=" + rfidReaderChip.mRx000ToWrite.size() + ", mRfidToWrite.size=" + rfidConnector.mRfidToWrite.size());
518-
rfidReader.addRfidToWrite(rfidReaderChip.mRx000ToWrite.get(0));
517+
appendToLog("mReadWriteRunnable(): mRx000ToWrite.size=" + rfidReaderChipR2000.mRx000ToWrite.size() + ", mRfidToWrite.size=" + rfidConnector.mRfidToWrite.size());
518+
rfidReader.addRfidToWrite(rfidReaderChipR2000.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 && rfidReaderChip.isInventoring()) {
575+
} else if (!bis108 && rfidReaderChipR2000.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());
@@ -724,12 +724,12 @@ else if (System.currentTimeMillis() - btSendTime > btSendTimeOut) {
724724
}
725725
}
726726
if (validBuffer) {
727-
if (DEBUG) appendToLog("mReadWriteRunnable: END, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReaderChip.mRx000ToRead.size());
727+
if (DEBUG) appendToLog("mReadWriteRunnable: END, timer2Write=" + timer2Write + ", streamInBufferSize = " + bluetoothGatt.getStreamInBufferSize() + ", mRfidToRead.size=" + rfidConnector.mRfidToRead.size() + ", mRx000ToRead.size=" + rfidReaderChipR2000.mRx000ToRead.size());
728728
}
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 (rfidReaderChip != null) rfidReader.mRx000UplinkHandler();
732+
if (rfidReaderChipR2000 != null) rfidReader.mRx000UplinkHandler();
733733
if (DEBUGTHREAD) appendToLog("mReadWriteRunnable: mReadWriteRunnable ends");
734734
}
735735
};

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
import android.content.Context;
77

8-
import com.csl.cslibrary4a.RfidConnector;
9-
import com.csl.cslibrary4a.RfidReaderChipData;
10-
import com.csl.cslibrary4a.Utility;
11-
128
import java.util.ArrayList;
139
import java.util.Arrays;
1410
import java.util.Date;
@@ -26,7 +22,7 @@ public RfidReaderChipR2000(Context context, Utility utility, CsReaderConnector10
2622
this.context = context;
2723
this.utility = utility; DEBUG_PKDATA = utility.DEBUG_PKDATA;
2824
appendToLog("csReaderConnector 1 is " + (csReaderConnector108 == null ? "null" : "valid"));
29-
appendToLog("csReaderConnector.rfidReaderChip 1 is " + (csReaderConnector108.rfidReaderChip == null ? "null" : "valid"));
25+
appendToLog("csReaderConnector.rfidReaderChip 1 is " + (csReaderConnector108.rfidReaderChipR2000 == null ? "null" : "valid"));
3026
//mRfidReaderChip = new RfidReaderChip();
3127
this.csReaderConnector108 = csReaderConnector108;
3228
this.DEBUGTHREAD = csReaderConnector108.DEBUGTHREAD;

0 commit comments

Comments
 (0)