Skip to content

Commit 41f5747

Browse files
ksclamksclam
authored
Merge pull request #2 from cslrfid/develop
Develop
2 parents 77908eb + b837c06 commit 41f5747

File tree

173 files changed

+28750
-16822
lines changed

Some content is hidden

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

173 files changed

+28750
-16822
lines changed

‎app/build.gradle‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 33
4+
namespace 'com.csl.cs710awedgeapp'
5+
buildFeatures {
6+
buildConfig true
7+
}
8+
9+
compileSdk 34
510
defaultConfig {
611
applicationId "com.csl.cs710awedgeapp"
7-
minSdkVersion 21
8-
targetSdkVersion 33
9-
versionCode 5
10-
versionName "5.9.11"
12+
minSdk 23
13+
targetSdk 34
14+
versionCode 13
15+
versionName "5.14.23"
1116
}
12-
namespace 'com.csl.cs710awedgeapp'
1317
}
1418

1519
dependencies {
1620
implementation fileTree(include: ['*.jar'], dir: 'libs')
17-
implementation 'com.google.android.material:material:1.9.0'
18-
implementation project(path: ':cs710library4a')
19-
}
21+
implementation 'com.google.android.material:material:1.12.0'
22+
implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
23+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
24+
implementation 'com.github.hannesa2:paho.mqtt.android:4.3.beta2'
25+
implementation project(':cslibrary4a')
26+
}

‎app/release/JAVAwedgeCS710SCS108-20230915-v5.9.11-2-6-7-app-release.apk‎

-7.86 MB
Binary file not shown.

‎app/release/JAVAwedgeCS710SCS108-20230915-v5.9.11-2-6-7-app-release.zip‎

-6.44 MB
Binary file not shown.

‎app/release/JAVAwedgeCS710SCS108-20240826-v5.14.23-6.26.25-app-release.aab‎

7.72 MB
Binary file not shown.

‎app/release/JAVAwedgeCS710SCS108-20240826-v5.14.23-6.26.25-app-release.zip‎

7.38 MB
Binary file not shown.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
34

4-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
5-
<uses-permission android:name="android.permission.INTERNET" />
65
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
76
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
7+
8+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
9+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
10+
11+
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
12+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
13+
14+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
15+
<uses-permission android:name="android.permission.INTERNET" />
816
<uses-permission android:name="android.permission.STORAGE" />
9-
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
10-
<uses-permission android:name="android.permission.NFC" />
17+
<uses-permission android:name="android.permission.WAKE_LOCK" />
18+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1119

1220
<application
1321
android:allowBackup="true"
22+
android:label="@string/app_name_simplewedge"
1423
android:icon="@mipmap/ic_launcher"
15-
android:label="@string/app_newname1"
1624
android:supportsRtl="true"
1725
android:requestLegacyExternalStorage="true"
1826
android:theme="@style/AppTheme">
1927

2028
<service android:name="CustomIME"
21-
android:label="@string/app_ime1"
29+
android:label="@string/app_ime_simplewedge1"
2230
android:exported="true"
2331
android:permission="android.permission.BIND_INPUT_METHOD">
32+
2433
<intent-filter>
2534
<action android:name="android.view.InputMethod" />
2635
</intent-filter>
@@ -31,16 +40,17 @@
3140
android:name="MainActivity"
3241
android:exported="true"
3342
android:screenOrientation="portrait">
34-
<intent-filter>
35-
<action android:name="android.intent.action.MAIN" />
36-
<category android:name="android.intent.category.LAUNCHER" />
37-
</intent-filter>
3843

3944
<intent-filter>
4045
<action android:name="android.nfc.action.ACTION_TAG_DISCOVERED" />
4146
<category android:name="android.intent.category.DEFAULT" />
4247
<data android:mimeType="text/plain" />
4348
</intent-filter>
49+
50+
<intent-filter>
51+
<action android:name="android.intent.action.MAIN" />
52+
<category android:name="android.intent.category.LAUNCHER" />
53+
</intent-filter>
4454
</activity>
4555
</application>
4656
</manifest>

‎cs108library4a/src/main/java/com/csl/cs108library4a/CustomAlertDialog.java‎ renamed to ‎app/src/main/java/com/csl/cs710awedgeapp/CustomAlertDialog.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.csl.cs108library4a;
1+
package com.csl.cs710awedgeapp;
22

33
import android.app.Activity;
44
import android.app.AlertDialog;
@@ -28,7 +28,7 @@ public void onClick(DialogInterface dialog, int buttonId) {
2828
ans_false.run();
2929
}
3030
});
31-
dialog.setIcon(android.R.drawable.ic_dialog_alert);
31+
dialog.setIcon(R.drawable.alert);
3232
dialog.show();
3333
return true;
3434
}

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

Lines changed: 91 additions & 58 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.cs710library4a.CsLibrary4A;
13+
import com.csl.cslibrary4a.RfidReaderChipData;
1414

1515
import java.util.ArrayList;
1616

@@ -46,70 +46,94 @@ public void onDestroy() {
4646

4747
ArrayList<String> epcArrayList = new ArrayList<String>();
4848
InventoryRfidTask inventoryRfidTask;
49+
InventoryBarcodeTask inventoryBarcodeTask;
4950
boolean inventoring = false;
5051
private Runnable serviceRunnable = new Runnable() {
5152
@Override
5253
public void run() {
5354
String strCurrentIME = Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
5455
String strCompare = getPackageName();
5556
appendToLog("CustomIME Debug 0 with strCurrentIME = " + strCurrentIME + ", strCompare = " + strCompare);
56-
if (strCurrentIME.contains(strCompare) == false) return;
57-
58-
mHandler.postDelayed(serviceRunnable, 1000);
59-
if (MainActivity.sharedObjects == null) return;
60-
if (MainActivity.csLibrary4A == null) return;
61-
62-
if (inventoring == false) { MainActivity.sharedObjects.serviceArrayList.clear(); epcArrayList.clear(); }
63-
if (MainActivity.mContext == null) return;
64-
appendToLog("CustomIME Debug 1 with activityActive = " + MainActivity.activityActive + ", wedged = " + MainActivity.wedged + ", isBleConnected = " + MainActivity.csLibrary4A.isBleConnected());
65-
if (MainActivity.activityActive == false /*&& MainActivity.wedged*/ && MainActivity.csLibrary4A.isBleConnected()) {
66-
if (MainActivity.csLibrary4A.getTriggerButtonStatus() == false) {
67-
appendToLog("CustomIME Debug 2");
68-
startStopHandler();
69-
inventoring = false;
70-
} else if (inventoring == false) {
71-
appendToLog("CustomIME Debug 3");
72-
if (MainActivity.sharedObjects.runningInventoryRfidTask == false && MainActivity.sharedObjects.runningInventoryBarcodeTask == false && MainActivity.csLibrary4A.mrfidToWriteSize() == 0) {
57+
if (strCurrentIME.contains(strCompare) == false) { }
58+
else if (MainActivity.sharedObjects == null || MainActivity.csLibrary4A == null) { }
59+
else if (MainActivity.mContext == null) return;
60+
else {
61+
if (inventoring == false) {
62+
MainActivity.sharedObjects.serviceArrayList.clear();
63+
epcArrayList.clear();
64+
}
65+
appendToLog("CustomIME Debug 1 with activityActive = " + MainActivity.activityActive + ", wedged = " + MainActivity.wedged + ", isBleConnected = " + MainActivity.csLibrary4A.isBleConnected());
66+
if (MainActivity.activityActive == false /*&& MainActivity.wedged*/ && MainActivity.csLibrary4A.isBleConnected()) {
67+
if (MainActivity.csLibrary4A.getTriggerButtonStatus() == false) {
68+
appendToLog("CustomIME Debug 2 with runningInventoryRfidTask = " + MainActivity.sharedObjects.runningInventoryRfidTask);
69+
appendToLog("CustomIME Debug 2 with runningInventoryBarcodeTask = " + MainActivity.sharedObjects.runningInventoryBarcodeTask);
7370
startStopHandler();
74-
inventoring = true;
75-
}
76-
} else {
77-
appendToLog("CustomIME Debug 4");
78-
while (MainActivity.sharedObjects.serviceArrayList.size() != 0) {
79-
String strEpc = MainActivity.sharedObjects.serviceArrayList.get(0); MainActivity.sharedObjects.serviceArrayList.remove(0);
80-
boolean matched = false;
81-
for (int i = 0; i < epcArrayList.size(); i++) {
82-
if (epcArrayList.get(i).matches(strEpc)) {
83-
matched = true;
84-
break;
85-
}
71+
inventoring = false;
72+
} else if (inventoring == false) {
73+
appendToLog("CustomIME Debug 3 with runningInventoryRfidTask = " + MainActivity.sharedObjects.runningInventoryRfidTask + ", and mrfidToWriteSize = " + MainActivity.csLibrary4A.mrfidToWriteSize());
74+
appendToLog("CustomIME Debug 3 with runningInventoryBarcodeTask = " + MainActivity.sharedObjects.runningInventoryBarcodeTask);
75+
if (MainActivity.sharedObjects.runningInventoryRfidTask == false && MainActivity.sharedObjects.runningInventoryBarcodeTask == false && MainActivity.csLibrary4A.mrfidToWriteSize() == 0) {
76+
startStopHandler();
77+
inventoring = true;
8678
}
87-
if (matched == false && strEpc != null) {
88-
epcArrayList.add(strEpc);
89-
InputConnection ic = getCurrentInputConnection();
90-
if (MainActivity.wedgePrefix != null) strEpc = MainActivity.wedgePrefix + strEpc;
91-
if (MainActivity.wedgeSuffix != null) strEpc += MainActivity.wedgeSuffix;
92-
switch (MainActivity.wedgeDelimiter) {
93-
default:
94-
strEpc += "\n";
95-
break;
96-
case 0x09:
97-
strEpc += "\t";
98-
break;
99-
case 0x2C:
100-
strEpc += ",";
101-
break;
102-
case 0x20:
103-
strEpc += " ";
104-
break;
105-
case -1:
106-
break;
79+
} else {
80+
appendToLog("CustomIME Debug 4");
81+
while (MainActivity.sharedObjects.serviceArrayList.size() != 0) {
82+
String strEpc = MainActivity.sharedObjects.serviceArrayList.get(0);
83+
MainActivity.sharedObjects.serviceArrayList.remove(0);
84+
appendToLog("CustomIME Debug 4A with strEpc = " + strEpc);
85+
String strSgtin = null;
86+
if (MainActivity.wedgeOutput == 1) {
87+
strSgtin = MainActivity.csLibrary4A.getUpcSerial(strEpc);
88+
MainActivity.csLibrary4A.appendToLog("strSgtin = " + (strSgtin == null ? "null" : strSgtin));
89+
if (strSgtin == null) strEpc = null;
90+
}
91+
boolean matched = false;
92+
if (epcArrayList != null && strEpc != null) {
93+
for (int i = 0; i < epcArrayList.size(); i++) {
94+
if (epcArrayList.get(i).matches(strEpc)) {
95+
matched = true;
96+
break;
97+
}
98+
}
99+
}
100+
if (matched == false && strEpc != null) {
101+
epcArrayList.add(strEpc);
102+
InputConnection ic = getCurrentInputConnection();
103+
String strValue = strEpc;
104+
if (strSgtin != null) strValue = strSgtin;
105+
if (MainActivity.wedgePrefix != null)
106+
strValue = MainActivity.wedgePrefix + strValue;
107+
if (MainActivity.wedgeSuffix != null)
108+
strValue += MainActivity.wedgeSuffix;
109+
MainActivity.csLibrary4A.appendToLog("CustomIME, serviceRunnable: wedgeDelimiter = " + MainActivity.wedgeDelimiter);
110+
switch (MainActivity.wedgeDelimiter) {
111+
default:
112+
strValue += "\n";
113+
break;
114+
case 0x09:
115+
strValue += "\t";
116+
break;
117+
case 0x2C:
118+
strValue += ",";
119+
break;
120+
case 0x20:
121+
strValue += " ";
122+
break;
123+
case -1:
124+
break;
125+
}
126+
MainActivity.csLibrary4A.appendToLog("CustomIME BtData to Keyboard: " + strValue);
127+
ic.commitText(strValue, 1);
107128
}
108-
ic.commitText(strEpc, 1);
109129
}
110130
}
111131
}
112132
}
133+
int iDelayms = 500;
134+
if (inventoring) iDelayms = 100;
135+
MainActivity.csLibrary4A.appendToLog("CustomIME BtData set next time as " + iDelayms);
136+
mHandler.postDelayed(serviceRunnable, iDelayms);
113137
}
114138
};
115139

@@ -121,17 +145,26 @@ void startStopHandler() {
121145
if (inventoryRfidTask != null) {
122146
if (inventoryRfidTask.getStatus() == AsyncTask.Status.RUNNING) started = true;
123147
}
148+
if (inventoryBarcodeTask != null) {
149+
if (inventoryBarcodeTask.getStatus() == AsyncTask.Status.RUNNING) started = true;
150+
}
124151
appendToLog("CustomIME Debug 10");
125152
if ((started && MainActivity.csLibrary4A.getTriggerButtonStatus()) || (started == false && MainActivity.csLibrary4A.getTriggerButtonStatus() == false)) return;
126153
if (started == false) {
154+
appendToLog("CustomIME Debug 11 with BtData wedgeOutput = " + MainActivity.wedgeOutput);
155+
if (MainActivity.wedgeOutput == 2) {
156+
inventoryBarcodeTask = new InventoryBarcodeTask();
157+
inventoryBarcodeTask.execute();
158+
} else {
159+
MainActivity.csLibrary4A.setPowerLevel(MainActivity.wedgePower);
160+
MainActivity.csLibrary4A.startOperation(RfidReaderChipData.OperationTypes.TAG_INVENTORY_COMPACT);
161+
inventoryRfidTask = new InventoryRfidTask();
162+
inventoryRfidTask.execute();
163+
}
164+
} else {
127165
appendToLog("CustomIME Debug 11");
128-
MainActivity.csLibrary4A.startOperation(CsLibrary4A.OperationTypes.TAG_INVENTORY);
129-
inventoryRfidTask = new InventoryRfidTask();
130-
inventoryRfidTask.execute();
131-
}
132-
else {
133-
appendToLog("CustomIME Debug 11");
134-
inventoryRfidTask.taskCancelReason = InventoryRfidTask.TaskCancelRReason.BUTTON_RELEASE;
166+
if (inventoryRfidTask != null) inventoryRfidTask.taskCancelReason = InventoryRfidTask.TaskCancelRReason.BUTTON_RELEASE;
167+
if (inventoryBarcodeTask != null) inventoryBarcodeTask.taskCancelReason = InventoryBarcodeTask.TaskCancelRReason.BUTTON_RELEASE;
135168
}
136169
}
137170
}

‎app/src/main/java/com/csl/cs710awedgeapp/DrawerListContent.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public enum DrawerPositions {
2626
UCODE8, UCODEDNA,
2727
BAPCARD, COLDCHAIN, AURASENSE,
2828
KILOWAY,
29+
LONGJING,
2930
AXZON, RFMICRON,
3031
FDMICRO,
3132
CTESIUS,
@@ -55,16 +56,17 @@ public static DrawerPositions toDrawerPosition(int x) {
5556
case 15: return COLDCHAIN;
5657
case 16: return AURASENSE;
5758
case 17: return KILOWAY;
58-
case 18: return AXZON;
59-
//case 15: return RFMICRON;
60-
case 19: return FDMICRO;
61-
case 20: return CTESIUS;
62-
case 21: return ASYGNTAG;
63-
64-
case 22: return REGISTER;
65-
case 23: return READWRITEUSER;
66-
case 24: return WEDGE;
67-
case 25: return DIRECTWEDGE;
59+
case 18: return LONGJING;
60+
case 19: return AXZON;
61+
//case 18: return RFMICRON;
62+
case 20: return FDMICRO;
63+
case 21: return CTESIUS;
64+
case 22: return ASYGNTAG;
65+
66+
case 23: return REGISTER;
67+
case 24: return READWRITEUSER;
68+
case 25: return WEDGE;
69+
case 26: return DIRECTWEDGE;
6870
}
6971
return null;
7072
}
@@ -84,25 +86,23 @@ public static DrawerPositions toDrawerPosition(int x) {
8486
addItem(new DrawerItem("9", "Security", R.drawable.dl_access));
8587

8688
addItem(new DrawerItem("10", "Impinj Special Features", R.drawable.dl_loc));
87-
//addItem(new DrawerItem("10", "Impinj M775", R.drawable.dl_loc));
88-
//addItem(new DrawerItem("11", "Impinj Autotune", R.drawable.dl_loc));
8989
addItem(new DrawerItem("11", "Alien", R.drawable.dl_loc));
9090
addItem(new DrawerItem("12", "NXP UCODE 8", R.drawable.dl_loc));
9191
addItem(new DrawerItem("13", "NXP UCODE DNA", R.drawable.dl_loc));
9292
addItem(new DrawerItem("14", "uEm CS9010 BAP ID Card", R.drawable.dl_loc));
9393
addItem(new DrawerItem("15", "uEm Cold Chain CS8300", R.drawable.dl_loc));
9494
addItem(new DrawerItem("16", "uEm Aura-sense", R.drawable.dl_loc));
9595
addItem(new DrawerItem("17", "Kiloway KX2005X-BL", R.drawable.dl_rr));
96-
addItem(new DrawerItem("18", "Axzon", R.drawable.dl_loc));
97-
//addItem(new DrawerItem("18", "Axzon Magnus", R.drawable.dl_loc));
98-
addItem(new DrawerItem("19", "FM13DT160", R.drawable.dl_loc));
99-
addItem(new DrawerItem("20", "Landa CTESIUS", R.drawable.dl_loc));
100-
addItem(new DrawerItem("21", "Asygn AS321x", R.drawable.dl_loc));
101-
102-
addItem(new DrawerItem("22", "Register Tag", R.drawable.dl_rr));
103-
addItem(new DrawerItem("23", "Large sized memory read/write", R.drawable.dl_rr));
104-
addItem(new DrawerItem("24", "Wedge", R.drawable.dl_rr));
105-
addItem(new DrawerItem("25", "Direct Wedge", R.drawable.dl_rr));
96+
addItem(new DrawerItem("18", "EL-N2ESL CS6861", R.drawable.dl_rr));
97+
addItem(new DrawerItem("19", "Axzon", R.drawable.dl_loc));
98+
addItem(new DrawerItem("20", "FM13DT160", R.drawable.dl_loc));
99+
addItem(new DrawerItem("21", "Landa CTESIUS", R.drawable.dl_loc));
100+
addItem(new DrawerItem("22", "Asygn AS321x", R.drawable.dl_loc));
101+
102+
addItem(new DrawerItem("23", "Register Tag", R.drawable.dl_rr));
103+
addItem(new DrawerItem("24", "Large sized memory read/write", R.drawable.dl_rr));
104+
addItem(new DrawerItem("25", "Wedge", R.drawable.dl_rr));
105+
addItem(new DrawerItem("26", "Direct Wedge", R.drawable.dl_rr));
106106
}
107107

108108
private static void addItem(DrawerItem item) {

0 commit comments

Comments
 (0)