Skip to content

Commit 3c5778f

Browse files
WallaceSitWallaceSit
WallaceSit
authored and
WallaceSit
committed
v2.14.34-46
 v2.14.34-46: • Library: Reduce delay time between package sending • Library: revise debug messages v2.14.34-45: • Library108: Revise “Connection package sending” • Library: Reduce mac address update in read/write • Library108, Library: remove some unused codes, revise debug messages v2.14.34-43: • Library: Solve “wrongly read EPC data” problem v2.14.34-42: • Library: try reducing the access write time and tag locate time • App, Library: Add new tag variables • App, Library108, Library: relocate some codes • Library: revise debug messages v2.14.33-40: • App, Library108, Library: try shortening the repeated Access Read/Write time • App: revise some debug messages • Library108, Library: revise some debug messages, remove some unused codes v2.14.32-38: • Library108: shortening connection time • App, Library108: relocate some codes, rename codes, revise some debug messages, adding some protection code to avoid possible exception • Library108: remove some unused codes
1 parent 3e939a6 commit 3c5778f

Some content is hidden

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

45 files changed

+2996
-4378
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 23
1313
targetSdk 35
1414
versionCode 42
15-
versionName "2.14.31"
15+
versionName "2.14.34"
1616
}
1717
}
1818

‎app/release/cs108ademo-20241202-v2.14.31-36-app-release.zip‎ renamed to ‎app/release/cs108ademo-20250103-v2.14.34-46-app-release.zip‎

9.17 MB
Binary file not shown.

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public enum TaskCancelRReason {
2525
Button button; String buttonText;
2626
TextView registerRunTime, registerTagGot, registerVoltageLevel;
2727
TextView registerYield, registerTotal;
28-
boolean invalidRequest;
28+
boolean invalidRequest, selectOne = false;
2929
String selectMask; int selectBank, selectOffset;
3030
String strPassword; int powerLevel;
3131
RfidReaderChipData.HostCommands hostCommand;
@@ -49,7 +49,7 @@ public enum TaskCancelRReason {
4949
int batteryCountInventory_old;
5050
boolean bSkipClearFilter = false;
5151

52-
public AccessTask(Button button, boolean invalidRequest,
52+
public AccessTask(Button button, boolean invalidRequest, boolean selectOne,
5353
String selectMask, int selectBank, int selectOffset,
5454
String strPassword, int powerLevel, RfidReaderChipData.HostCommands hostCommand,
5555
boolean bEnableErrorPopWindow, Runnable updateRunnable) {
@@ -58,6 +58,7 @@ public AccessTask(Button button, boolean invalidRequest,
5858
this.registerVoltageLevel = registerVoltageLevel;
5959

6060
this.invalidRequest = invalidRequest; MainActivity.csLibrary4A.appendToLog("invalidRequest = " + invalidRequest);
61+
this.selectOne = selectOne;
6162
this.selectMask = selectMask;
6263
this.selectBank = selectBank;
6364
this.selectOffset = selectOffset;
@@ -156,14 +157,14 @@ else if (hostCommand == RfidReaderChipData.HostCommands.CMD_18K6CKILL) {
156157
if (DEBUG) MainActivity.csLibrary4A.appendToLog("AccessTask(): powerLevel = " + powerLevel);
157158
int matchRep = 1;
158159
if (repeat > 1) matchRep = repeat;
159-
if (bSkipClearFilter == false) {
160+
if (false && bSkipClearFilter == false) {
160161
MainActivity.csLibrary4A.appendToLog("Going to setSelectCriteria disable");
161162
MainActivity.csLibrary4A.setSelectCriteriaDisable(-1);
162163
}
163164
if (powerLevel < 0 || powerLevel > 330) invalidRequest = true;
164165
else if (skipSelect == false) {
165-
MainActivity.csLibrary4A.appendToLog("setSelectCriteria: Going to setSelectTag");
166-
if (MainActivity.csLibrary4A.setSelectedTag(selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
166+
MainActivity.csLibrary4A.appendToLog("BtDataOut: AccessTask.preExecute goes to setSelectTag");
167+
if (MainActivity.csLibrary4A.setSelectedTag(selectOne, selectMask, selectBank, selectOffset, powerLevel, qValue, matchRep) == false) {
167168
invalidRequest = true; MainActivity.csLibrary4A.appendToLog("setSelectedTag is failed with selectMask = " + selectMask + ", selectBank = " + selectBank + ", selectOffset = " + selectOffset + ", powerLevel = " + powerLevel);
168169
}
169170
}
@@ -319,7 +320,7 @@ protected void onPostExecute(String result) {
319320
}
320321

321322
void DeviceConnectTask4RegisterEnding() {
322-
MainActivity.csLibrary4A.setAccessCount(0);
323+
//MainActivity.csLibrary4A.setAccessCount(0);
323324
String strErrorMessage = "";
324325
if (false) {
325326
boolean success = false;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void setup() {
196196
}
197197
MainActivity.csLibrary4A.appendToLog("HelloA: accOffset=" + accOffset + ", accSizeNow=" + accSizeNow + ", accSize=" + accSize);
198198
MainActivity.csLibrary4A.appendToLog("HelloK: invalidRequest=" + invalidRequest);
199-
accessTask = new AccessTask(button, invalidRequest,
199+
accessTask = new AccessTask(button, invalidRequest, true,
200200
selectMask, selectBank, selectOffset,
201201
strPassword, powerLevel, hostCommand, tryCount==tryCountMax, updateRunnable);
202202
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ else if (MainActivity.sharedObjects == null || MainActivity.csLibrary4A == null)
143143
String strSgtin = null;
144144
if (MainActivity.csLibrary4A.getWedgeOutput() == 1) {
145145
strSgtin = MainActivity.csLibrary4A.getUpcSerial(strEpc);
146-
MainActivity.csLibrary4A.appendToLog("strSgtin = " + (strSgtin == null ? "null" : strSgtin));
146+
appendToLog("strSgtin = " + (strSgtin == null ? "null" : strSgtin));
147147
if (strSgtin == null) strEpc = null;
148148
}
149149
boolean matched = false;
@@ -164,7 +164,7 @@ else if (MainActivity.sharedObjects == null || MainActivity.csLibrary4A == null)
164164
strValue = MainActivity.csLibrary4A.getWedgePrefix() + strValue;
165165
if (MainActivity.csLibrary4A.getWedgeSuffix() != null)
166166
strValue += MainActivity.csLibrary4A.getWedgeSuffix();
167-
MainActivity.csLibrary4A.appendToLog("CustomIME, serviceRunnable: wedgeDelimiter = " + MainActivity.csLibrary4A.getWedgeDelimiter());
167+
appendToLog("CustomIME, serviceRunnable: wedgeDelimiter = " + MainActivity.csLibrary4A.getWedgeDelimiter());
168168
switch (MainActivity.csLibrary4A.getWedgeDelimiter()) {
169169
default:
170170
strValue += "\n";
@@ -181,7 +181,7 @@ else if (MainActivity.sharedObjects == null || MainActivity.csLibrary4A == null)
181181
case -1:
182182
break;
183183
}
184-
MainActivity.csLibrary4A.appendToLog("CustomIME BtData to Keyboard: " + strValue);
184+
appendToLog("CustomIME BtData to Keyboard: " + strValue);
185185
ic.commitText(strValue, 1);
186186
}
187187
}
@@ -190,7 +190,7 @@ else if (MainActivity.sharedObjects == null || MainActivity.csLibrary4A == null)
190190
}
191191
int iDelayms = 500;
192192
if (inventoring) iDelayms = 100;
193-
MainActivity.csLibrary4A.appendToLog("CustomIME BtData set next time as " + iDelayms);
193+
appendToLog("CustomIME BtData set next time as " + iDelayms);
194194
mHandler.postDelayed(serviceRunnable, iDelayms);
195195
}
196196
};

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package com.csl.cs108ademoapp;
22

3+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_ALIEN;
4+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_ASYGNTAG;
5+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_CTESIUS;
6+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_EM_BAP;
7+
38
import android.content.Context;
49
import android.content.Intent;
510
import android.net.Uri;
@@ -48,6 +53,7 @@
4853
import com.csl.cs108ademoapp.fragments.UcodeFragment;
4954
import com.csl.cslibrary4a.Cs108Library4A;
5055
import com.csl.cslibrary4a.ReaderDevice;
56+
import com.csl.cslibrary4a.RfidReader;
5157

5258
public class MainActivity extends AppCompatActivity {
5359
final boolean DEBUG = false; final String TAG = "Hello";
@@ -73,6 +79,7 @@ public class MainActivity extends AppCompatActivity {
7379
Handler mHandler = new Handler();
7480

7581
public static String mDid; public static int selectHold; public static int selectFor;
82+
public static RfidReader.TagType tagType;
7683
public static class Config {
7784
public String configPassword, configPower, config0, config1, config2, config3;
7885
};
@@ -199,7 +206,7 @@ private void selectItem(DrawerPositions position) {
199206
fragment = new InventoryRfidSearchFragment(false);
200207
break;
201208
case MULTIBANK:
202-
fragment = InventoryRfidiMultiFragment.newInstance(true, null);
209+
fragment = InventoryRfidiMultiFragment.newInstance(true, null, null);
203210
break;
204211
case SIMINVENTORY:
205212
fragment = InventoryRfidSimpleFragment.newInstance(false, null);
@@ -224,7 +231,7 @@ private void selectItem(DrawerPositions position) {
224231
fragment = new ImpinjM775Fragment();
225232
break;
226233
case ALIEN:
227-
fragment = InventoryRfidiMultiFragment.newInstance(true, "E2003");
234+
fragment = InventoryRfidiMultiFragment.newInstance(true, TAG_ALIEN, "E2003");
228235
break;
229236
case UCODE8:
230237
fragment = new Ucode8Fragment();
@@ -233,7 +240,7 @@ private void selectItem(DrawerPositions position) {
233240
fragment = new UcodeFragment();
234241
break;
235242
case BAPCARD:
236-
fragment = InventoryRfidiMultiFragment.newInstance(true, "E200B0");
243+
fragment = InventoryRfidiMultiFragment.newInstance(true, TAG_EM_BAP, "E200B0");
237244
break;
238245
case COLDCHAIN:
239246
fragment = new ColdChainFragment();
@@ -257,10 +264,10 @@ private void selectItem(DrawerPositions position) {
257264
fragment = new FdmicroFragment();
258265
break;
259266
case CTESIUS:
260-
fragment = InventoryRfidiMultiFragment.newInstance(true, "E203510");
267+
fragment = InventoryRfidiMultiFragment.newInstance(true, TAG_CTESIUS, "E203510");
261268
break;
262269
case ASYGNTAG:
263-
fragment = InventoryRfidiMultiFragment.newInstance(true, "E283A");
270+
fragment = InventoryRfidiMultiFragment.newInstance(true, TAG_ASYGNTAG, "E283A");
264271
break;
265272

266273
case REGISTER:

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package com.csl.cs108ademoapp.fragments;
22

33
import static com.csl.cs108ademoapp.MainActivity.tagSelected;
4+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_EM;
5+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_EM_AURASENSE;
6+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_EM_AURASENSE_ATBOOT;
7+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_EM_AURASENSE_ATSELECT;
8+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_EM_BAP;
9+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_EM_COLDCHAIN;
410

511
import android.app.Activity;
612
import android.os.AsyncTask;
@@ -87,25 +93,25 @@ public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int
8793
if (MainActivity.csLibrary4A.get98XX() == 2) tableRow.setVisibility(View.GONE);
8894
LinearLayout layout4 = (LinearLayout) getActivity().findViewById(R.id.accessCustomReadWrite);
8995
if (position == eMicroTag.emAuraSense.ordinal()) {
90-
MainActivity.mDid = "E280B12";
96+
MainActivity.tagType = TAG_EM_AURASENSE; MainActivity.mDid = "E280B12";
9197
layout0.setVisibility(View.VISIBLE);
9298
layout1.setVisibility(View.VISIBLE);
9399
layout2.setVisibility(View.GONE);
94100
layout4.setVisibility(View.VISIBLE);
95101
} else if (position == eMicroTag.emColdChain.ordinal()) {
96-
MainActivity.mDid = "E280B0";
102+
MainActivity.tagType = TAG_EM_COLDCHAIN; MainActivity.mDid = "E280B0";
97103
layout0.setVisibility(View.VISIBLE);
98104
layout1.setVisibility(View.GONE);
99105
layout2.setVisibility(View.VISIBLE);
100106
layout4.setVisibility(View.VISIBLE);
101107
} else if (position == eMicroTag.emBap.ordinal()) {
102-
MainActivity.mDid = "E200B0";
108+
MainActivity.tagType = TAG_EM_BAP; MainActivity.mDid = "E200B0";
103109
layout0.setVisibility(View.GONE);
104110
layout1.setVisibility(View.GONE);
105111
layout2.setVisibility(View.GONE);
106112
layout4.setVisibility(View.GONE);
107113
} else {
108-
MainActivity.mDid = "E280B";
114+
MainActivity.tagType = TAG_EM; MainActivity.mDid = "E280B";
109115
layout0.setVisibility(View.GONE);
110116
layout1.setVisibility(View.GONE);
111117
layout2.setVisibility(View.GONE);
@@ -282,6 +288,7 @@ public void onClick(View v) {
282288
@Override
283289
public void onDestroy() {
284290
if (accessTask != null) accessTask.cancel(true);
291+
MainActivity.csLibrary4A.setSameCheck(true);
285292
super.onDestroy();
286293
}
287294

@@ -308,8 +315,12 @@ public void setUserVisibleHint(boolean isVisibleToUser) {
308315
else {
309316
if (spinnerTagSelect != null && spinnerTagSelect.getSelectedItemPosition() == eMicroTag.emAuraSense.ordinal()) {
310317
if (radioButtonAuraSensAtBoot != null && radioButtonAuraSensAtSelect != null) {
311-
if (radioButtonAuraSensAtBoot.isChecked()) MainActivity.mDid = "E280B12A";
312-
if (radioButtonAuraSensAtSelect.isChecked()) MainActivity.mDid = "E280B12B";
318+
if (radioButtonAuraSensAtBoot.isChecked()) {
319+
MainActivity.tagType = TAG_EM_AURASENSE_ATBOOT; MainActivity.mDid = "E280B12A";
320+
}
321+
if (radioButtonAuraSensAtSelect.isChecked()) {
322+
MainActivity.tagType = TAG_EM_AURASENSE_ATSELECT; MainActivity.mDid = "E280B12B";
323+
}
313324
}
314325
}
315326
userVisibleHint = false;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.csl.cs108ademoapp.fragments;
22

3+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_IMPINJ;
4+
35
import android.app.Activity;
46
import android.os.AsyncTask;
57
import android.os.Bundle;
@@ -673,7 +675,7 @@ public void setUserVisibleHint(boolean isVisibleToUser) {
673675
} else MainActivity.csLibrary4A.setTagGroup(MainActivity.csLibrary4A.getQuerySelect(), 0, 2);
674676
if (checkBoxFastId.isChecked()) iValue |= 0x20;
675677
if (spinnerTagSelect.getSelectedItemPosition() != impinjTag.others.ordinal()) iValue |= (spinnerTagSelect.getSelectedItemPosition() + 1);
676-
MainActivity.mDid = "E28011" + String.format("%02X", iValue);
678+
MainActivity.tagType = TAG_IMPINJ; /* need more tagType */ MainActivity.mDid = "E28011" + String.format("%02X", iValue);
677679
MainActivity.csLibrary4A.appendToLog(String.format("HelloK: iValue = 0x%02X, mDid = %s", iValue, MainActivity.mDid));
678680
MainActivity.csLibrary4A.setImpinJExtension(checkBoxTagFocus.isChecked(), checkBoxFastId.isChecked());
679681
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void run() {
144144
else rerunRequest = false;
145145
} else {
146146
accessTask = new AccessTask(
147-
buttonRead, invalid,
147+
buttonRead, invalid, false,
148148
editTextRWTagID.getText().toString(), 1, 32,
149149
"00000000", Integer.valueOf(editTextaccessRWAntennaPower.getText().toString()), RfidReaderChipData.HostCommands.CMD_18K6CREAD,
150150
false, null);

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package com.csl.cs108ademoapp.fragments;
22

3+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_AXZON;
4+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_MAGNUS_S2;
5+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_MAGNUS_S3;
6+
import static com.csl.cslibrary4a.RfidReader.TagType.TAG_XERXES;
7+
38
import androidx.lifecycle.Lifecycle;
49
import android.graphics.Color;
510
import android.os.AsyncTask;
@@ -120,16 +125,16 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l)
120125

121126
switch (spinnerTagType.getSelectedItemPosition()) {
122127
case 0:
123-
MainActivity.mDid = "E28240";
128+
MainActivity.tagType = TAG_AXZON; MainActivity.mDid = "E28240";
124129
break;
125130
case 1:
126-
MainActivity.mDid = "E282402";
131+
MainActivity.tagType = TAG_MAGNUS_S2; MainActivity.mDid = "E282402";
127132
break;
128133
case 2:
129-
MainActivity.mDid = "E282403";
134+
MainActivity.tagType = TAG_MAGNUS_S3; MainActivity.mDid = "E282403";
130135
break;
131136
case 3:
132-
MainActivity.mDid = "E282405";
137+
MainActivity.tagType = TAG_XERXES; MainActivity.mDid = "E282405";
133138
break;
134139
}
135140
if (btagTypeSelected) {

0 commit comments

Comments
 (0)