Skip to content

Commit fd0cb88

Browse files
WallaceSitWallaceSit
WallaceSit
authored and
WallaceSit
committed
v2.10.5-8
v2.10.5-8: • App: update to the v10.5 o Solve software crash when pressing back during led tag blinking causing o Solve software crash when going back to main after inventory and sort/clear tag in Simple inventory o Correct the UI for Wedge • Library108: update to the v10.8 v2.10.4-6: • App: update to the v10.4 o Remove “LongJing” in the N2ESL button text in “Special Functions” o Solve EPC sorting in Simple inventory causing software crash o Clear the tag list before starting inventory with sgtin-only selected to avoid mixing previous non-sgtin tags • Library108: update to the v10.6 v2.10.2-4: • Library108: add barcode Itf-14 checksum display setting during connection
1 parent 9ba73f9 commit fd0cb88

File tree

60 files changed

+3042
-7822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3042
-7822
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 39
15-
versionName "2.10.2"
15+
versionName "2.10.5"
1616
}
1717
}
1818

‎app/release/cs108ademo-20240129-v2.10.2-3-app-release.zip‎

-6.67 MB
Binary file not shown.

‎app/release/cs108ademo-20240227-v2.10.5-8-app-release.zip‎

6.67 MB
Binary file not shown.

‎app/release/output-metadata.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 38,
15-
"versionName": "2.8.22",
14+
"versionCode": 39,
15+
"versionName": "2.10.5",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.TextView;
77
import android.widget.Toast;
88

9-
import com.csl.cs108library4a.Cs108Library4A;
9+
import com.csl.cslibrary4a.RfidReaderChipData;
1010

1111
import java.util.ArrayList;
1212

@@ -28,7 +28,7 @@ public enum TaskCancelRReason {
2828
boolean invalidRequest;
2929
String selectMask; int selectBank, selectOffset;
3030
String strPassword; int powerLevel;
31-
Cs108Library4A.HostCommands hostCommand;
31+
RfidReaderChipData.HostCommands hostCommand;
3232

3333
CustomMediaPlayer playerO, playerN;
3434

@@ -51,7 +51,7 @@ public enum TaskCancelRReason {
5151

5252
public AccessTask(Button button, boolean invalidRequest,
5353
String selectMask, int selectBank, int selectOffset,
54-
String strPassword, int powerLevel, Cs108Library4A.HostCommands hostCommand,
54+
String strPassword, int powerLevel, RfidReaderChipData.HostCommands hostCommand,
5555
boolean bEnableErrorPopWindow, Runnable updateRunnable) {
5656
this.button = button;
5757
this.registerTagGot = registerTagGot;
@@ -74,7 +74,7 @@ public AccessTask(Button button, boolean invalidRequest,
7474
}
7575
public AccessTask(Button button, TextView textViewWriteCount, boolean invalidRequest,
7676
String selectMask, int selectBank, int selectOffset,
77-
String strPassword, int powerLevel, Cs108Library4A.HostCommands hostCommand,
77+
String strPassword, int powerLevel, RfidReaderChipData.HostCommands hostCommand,
7878
int qValue, int repeat, boolean resetCount, boolean bSkipClearFilter,
7979
TextView registerRunTime, TextView registerTagGot, TextView registerVoltageLevel, TextView registerYieldView, TextView registerTotalView) {
8080
this.button = button;
@@ -137,7 +137,7 @@ void preExecute() {
137137

138138
if (invalidRequest == false) {
139139
if (strPassword.length() != 8) { invalidRequest = true; MainActivity.csLibrary4A.appendToLog("strPassword.length = " + strPassword.length() + " (not 8)."); }
140-
else if (hostCommand == Cs108Library4A.HostCommands.CMD_18K6CKILL) {
140+
else if (hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CKILL) {
141141
if (MainActivity.csLibrary4A.setRx000KillPassword(strPassword) == false) {
142142
invalidRequest = true; MainActivity.csLibrary4A.appendToLog("setRx000KillPassword is failed");
143143
}
@@ -201,12 +201,12 @@ protected String doInBackground(Void... a) {
201201
publishProgress("WW");
202202
}
203203
byte[] notificationData = MainActivity.csLibrary4A.onNotificationEvent();
204-
Cs108Library4A.Rx000pkgData rx000pkgData = MainActivity.csLibrary4A.onRFIDEvent();
204+
RfidReaderChipData.Rx000pkgData rx000pkgData = MainActivity.csLibrary4A.onRFIDEvent();
205205
if (MainActivity.csLibrary4A.mrfidToWriteSize() != 0) timeMillis = System.currentTimeMillis();
206206
else if (rx000pkgData != null) {
207207
if (rx000pkgData.responseType == null) {
208208
publishProgress("null response");
209-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_18K6C_TAG_ACCESS) {
209+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_18K6C_TAG_ACCESS) {
210210
accessCompleteReceived = true;
211211
MainActivity.csLibrary4A.appendToLog("rx000pkgData.dataValues = " + MainActivity.csLibrary4A.byteArrayToString(rx000pkgData.dataValues));
212212
if (rx000pkgData.decodedError == null) {
@@ -220,8 +220,8 @@ else if (rx000pkgData != null) {
220220
done = true;
221221
} else publishProgress(rx000pkgData.decodedError);
222222
iTimeOut = 1000;
223-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_COMMAND_END) {
224-
if (hostCommand == Cs108Library4A.HostCommands.CMD_18K6CKILL && accessCompleteReceived == false) accessResult = "";
223+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END) {
224+
if (hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CKILL && accessCompleteReceived == false) accessResult = "";
225225
MainActivity.csLibrary4A.appendToLog("BtData: repeat = " + repeat + ", decodedError = " + rx000pkgData.decodedError + ", resultError = " + resultError);
226226
if (rx000pkgData.decodedError != null) { endingMessaage = rx000pkgData.decodedError; ending = true; }
227227
else if (repeat > 0 && resultError.length() == 0) {
@@ -232,7 +232,7 @@ else if (repeat > 0 && resultError.length() == 0) {
232232
endingMessaage = "";
233233
ending = true;
234234
}
235-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_18K6C_INVENTORY) {
235+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_18K6C_INVENTORY) {
236236
accessTagEpc = MainActivity.csLibrary4A.byteArrayToString(rx000pkgData.decodedEpc);
237237
done = false;
238238
publishProgress("TT", MainActivity.csLibrary4A.byteArrayToString(rx000pkgData.decodedEpc));

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.widget.Button;
55
import android.widget.Toast;
66

7-
import com.csl.cs108library4a.Cs108Library4A;
7+
import com.csl.cslibrary4a.RfidReaderChipData;
88

99
public class AccessTask1 {
1010
Button button;
@@ -14,24 +14,24 @@ public class AccessTask1 {
1414
int selectBank, selectOffset;
1515
String strPassword;
1616
int powerLevel;
17-
Cs108Library4A.HostCommands hostCommand;
17+
RfidReaderChipData.HostCommands hostCommand;
1818
Runnable updateRunnable = null;
1919

2020
AccessTask accessTask;
2121
public AccessTask1(Button button, boolean invalidRequest,
2222
int accBank, int accOffset, int accSize, int accBlockCount, String accWriteData,
2323
String selectMask, int selectBank, int selectOffset,
24-
String strPassword, int powerLevel, Cs108Library4A.HostCommands hostCommand, Runnable updateRunnable) {
24+
String strPassword, int powerLevel, RfidReaderChipData.HostCommands hostCommand, Runnable updateRunnable) {
2525
this.button = button;
2626
this.invalidRequest = invalidRequest;
2727
MainActivity.csLibrary4A.appendToLog("HelloK: invalidRequest=" + invalidRequest);
2828
this.accBank = accBank;
2929
this.accOffset = accOffset;
30-
if (hostCommand == Cs108Library4A.HostCommands.CMD_18K6CWRITE) { if (accBlockCount > 16) accBlockCount = 16; }
30+
if (hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CWRITE) { if (accBlockCount > 16) accBlockCount = 16; }
3131
else if (accBlockCount > 255) accBlockCount = 255;
3232
this.accBlockCount = accBlockCount;
3333
if (accWriteData == null) accWriteData = "";
34-
if (hostCommand == Cs108Library4A.HostCommands.CMD_18K6CWRITE) {
34+
if (hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CWRITE) {
3535
MainActivity.csLibrary4A.appendToLog("strOut: accWriteData=" + accWriteData);
3636
accWriteData = deformatWriteAccessData(accWriteData);
3737
if (accWriteData.length() < accSize * 4) {
@@ -96,7 +96,7 @@ else if (accessTask.getStatus() != AsyncTask.Status.FINISHED) { }
9696
else if (button.getText().toString().indexOf("ING") > 0) { }
9797
else if (isResultReady == false) {
9898
String strAccessResult = "";
99-
if (hostCommand != Cs108Library4A.HostCommands.CMD_18K6CREAD || accBank != 3) strAccessResult = accessTask.accessResult;
99+
if (hostCommand != RfidReaderChipData.HostCommands.CMD_18K6CREAD || accBank != 3) strAccessResult = accessTask.accessResult;
100100
else {
101101
int word4line = 7;
102102
for (int i = 0; i < accSizeNow; i=i+word4line) {
@@ -187,7 +187,7 @@ void setup() {
187187
}
188188
}
189189
}
190-
if (invalidRequest == false && hostCommand == Cs108Library4A.HostCommands.CMD_18K6CWRITE) {
190+
if (invalidRequest == false && hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CWRITE) {
191191
if (accWriteData.length() > accSizeNow * 4) accWriteDataNow = accWriteData.substring(0, accSizeNow*4);
192192
else accWriteDataNow = accWriteData;
193193
if (MainActivity.csLibrary4A.setAccessWriteData(accWriteDataNow) == false) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.view.View;
1111
import android.view.inputmethod.InputConnection;
1212

13-
import com.csl.cs108library4a.Cs108Library4A;
13+
import com.csl.cslibrary4a.RfidReaderChipData;
1414

1515
import java.util.ArrayList;
1616

@@ -125,7 +125,7 @@ void startStopHandler() {
125125
if ((started && MainActivity.csLibrary4A.getTriggerButtonStatus()) || (started == false && MainActivity.csLibrary4A.getTriggerButtonStatus() == false)) return;
126126
if (started == false) {
127127
appendToLog("CustomIME Debug 11");
128-
MainActivity.csLibrary4A.startOperation(Cs108Library4A.OperationTypes.TAG_INVENTORY);
128+
MainActivity.csLibrary4A.startOperation(RfidReaderChipData.OperationTypes.TAG_INVENTORY);
129129
inventoryRfidTask = new InventoryRfidTask();
130130
inventoryRfidTask.execute();
131131
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import android.widget.Toast;
99

1010
import com.csl.cs108ademoapp.adapters.ReaderListAdapter;
11-
import com.csl.cs108library4a.Cs108Library4A;
1211
import com.csl.cslibrary4a.ReaderDevice;
12+
import com.csl.cslibrary4a.RfidReaderChipData;
1313

1414
import java.text.SimpleDateFormat;
1515
import java.util.ArrayList;
@@ -55,7 +55,7 @@ public enum TaskCancelRReason {
5555

5656
boolean requestSound = false; boolean requestNewSound = false; boolean requestNewVibrate = false; long timeMillisNewVibrate;
5757
String strEpcOld = "";
58-
private ArrayList<Cs108Library4A.Rx000pkgData> rx000pkgDataArrary = new ArrayList<Cs108Library4A.Rx000pkgData>();
58+
private ArrayList<RfidReaderChipData.Rx000pkgData> rx000pkgDataArrary = new ArrayList<RfidReaderChipData.Rx000pkgData>();
5959
private String endingMessaage;
6060

6161
SaveList2ExternalTask saveExternalTask;
@@ -124,7 +124,7 @@ protected void onPreExecute() {
124124
@Override
125125
protected String doInBackground(Void... a) {
126126
boolean ending = false, triggerReleased = false; long triggerReleaseTime = 0;
127-
Cs108Library4A.Rx000pkgData rx000pkgData = null;
127+
RfidReaderChipData.Rx000pkgData rx000pkgData = null;
128128
while (MainActivity.csLibrary4A.onRFIDEvent() != null) { } //clear up possible message before operation
129129
while (MainActivity.csLibrary4A.isBleConnected() && isCancelled() == false && ending == false && MainActivity.csLibrary4A.isRfidFailure() == false) {
130130
int batteryCount = MainActivity.csLibrary4A.getBatteryCount();
@@ -142,7 +142,7 @@ protected String doInBackground(Void... a) {
142142
if (rx000pkgData != null && MainActivity.csLibrary4A.mrfidToWriteSize() == 0) {
143143
if (rx000pkgData.responseType == null) {
144144
publishProgress("null response");
145-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_18K6C_INVENTORY) {
145+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_18K6C_INVENTORY) {
146146
{
147147
if (rx000pkgData.decodedError != null) publishProgress(rx000pkgData.decodedError);
148148
else {
@@ -151,24 +151,24 @@ protected String doInBackground(Void... a) {
151151
rx000pkgDataArrary.add(rx000pkgData); publishProgress(null, "", "");
152152
}
153153
}
154-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_18K6C_INVENTORY_COMPACT) {
154+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_18K6C_INVENTORY_COMPACT) {
155155
{
156156
if (rx000pkgData.decodedError != null) publishProgress(rx000pkgData.decodedError);
157157
else {
158158
if (firstTime == 0) firstTime = rx000pkgData.decodedTime;
159159
rx000pkgDataArrary.add(rx000pkgData); publishProgress(null, "", "");
160160
}
161161
}
162-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_ANTENNA_CYCLE_END) {
162+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_ANTENNA_CYCLE_END) {
163163
timeMillis = System.currentTimeMillis();
164-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_COMMAND_ABORT_RETURN) {
164+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_ABORT_RETURN) {
165165
MainActivity.csLibrary4A.appendToLog("AAA: Abort return is received !!!");
166166
ending = true;
167-
} else if (rx000pkgData.responseType == Cs108Library4A.HostCmdResponseTypes.TYPE_COMMAND_END) {
167+
} else if (rx000pkgData.responseType == RfidReaderChipData.HostCmdResponseTypes.TYPE_COMMAND_END) {
168168
if (rx000pkgData.decodedError != null) endingMessaage = rx000pkgData.decodedError;
169169
if (continousRequest) {
170170
MainActivity.csLibrary4A.batteryLevelRequest();
171-
MainActivity.csLibrary4A.startOperation(Cs108Library4A.OperationTypes.TAG_INVENTORY_COMPACT);
171+
MainActivity.csLibrary4A.startOperation(RfidReaderChipData.OperationTypes.TAG_INVENTORY_COMPACT);
172172
} else ending = true;
173173
}
174174
} else if (false && notificationData != null) {
@@ -280,7 +280,7 @@ void tagHandler() {
280280
long currentTime = 0;
281281
{
282282
while (rx000pkgDataArrary.size() != 0) {
283-
Cs108Library4A.Rx000pkgData rx000pkgData = rx000pkgDataArrary.get(0);
283+
RfidReaderChipData.Rx000pkgData rx000pkgData = rx000pkgDataArrary.get(0);
284284
rx000pkgDataArrary.remove(0);
285285
if (rx000pkgData == null) {
286286
if (DEBUG) MainActivity.csLibrary4A.appendToLog("InventoryRfidTask: null rx000pkgData !!!");

0 commit comments

Comments
 (0)