Skip to content

Commit 4d17f31

Browse files
WallaceSitWallaceSit
WallaceSit
authored and
WallaceSit
committed
v2.14.7-9
v2.14.7-9: • App: revise display when bank is changed in Geiger search fragment. For kiloway and n2esl, fix as Tid bank when page entering. • App: add “exception handling when pressing special function before connection” • App: revise system environment v2.14.6-9: • App: try improving “app cannot reconnect mqtt broker after mobile phone sleep” problem • App: revise some debug messages, relocate some codes v2.14.5-9: • App: make foreground inventory continuously outputting the tag information, instead of one tags per second • App, Library108: add Foreground Duplication Elimination • Library108: correct “software crashes when disconnection after disabling foreground inventory” problem • App: relocate some codes, remove some unused codes • App, Library108: update some system environment codes v2.14.4-7: • App: update to v14.4 o App: add Mqtt procedure to foreground service and to Admin-Setting page o App: increase the Tid read size for N2ESL and Kiloway Tag in order to distinguish some EPC case o App: enable Kiloway fragment and revise Kiloway related handling similar to EL-N2ESL o App: Correct the layout of authenuation tab of UcodeDNA and Xerses o App: Add some procedures for Foreground service • Library108: update to v14.7 o Library108: add Mqtt setting procedures and routines o Library108: Solve “cannot vibrate for the no-barcode-with-vibrate-only module” problem o Library108: try solving “program crashes when battery is low” problem • App, Library108: o App, Library108: add more fore-ground service processing (generate notification, auto-connect, detect trigger key, start/stop inventory, send inventory to democloud) o App, Library108: remove some unused codes, relocate some codes, modify some debug messages
1 parent a721b95 commit 4d17f31

Some content is hidden

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

46 files changed

+4154
-1559
lines changed

‎app/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@ android {
99
compileSdk 34
1010
defaultConfig {
1111
applicationId "com.csl.cs108ademoapp"
12-
minSdk 21
12+
minSdk 23
1313
targetSdk 34
1414
versionCode 41
15-
versionName "2.14.0"
15+
versionName "2.14.7"
1616
}
1717
}
1818

1919
dependencies {
2020
implementation fileTree(include: ['*.jar'], dir: 'libs')
21-
implementation 'com.google.android.material:material:1.11.0'
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'
2225
implementation project(':cs108library4a')
2326
implementation project(':cslibrary4a')
24-
}
27+
}

‎app/release/cs108ademo-20240416-v2.14.0-app-release.zip

-13.6 MB
Binary file not shown.

‎app/release/cs108ademo-20240612-v2.14.7-9-app-release.zip

7.51 MB
Binary file not shown.

‎app/src/main/AndroidManifest.xml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,46 @@
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.POST_NOTIFICATIONS"/>
15+
16+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
17+
<uses-permission android:name="androdi.permission.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE"/>
18+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
19+
20+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
21+
<uses-permission android:name="android.permission.INTERNET" />
822
<uses-permission android:name="android.permission.STORAGE" />
23+
<uses-permission android:name="android.permission.WAKE_LOCK" />
24+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
925
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
1026
<uses-permission android:name="android.permission.NFC" />
1127

1228
<application
29+
android:usesCleartextTraffic="true" tools:targetApi="28"
1330
android:allowBackup="true"
1431
android:icon="@drawable/csl_logo"
1532
android:label="@string/app_name"
1633
android:supportsRtl="true"
1734
android:requestLegacyExternalStorage="true"
1835
android:theme="@style/AppTheme">
1936

37+
<service
38+
android:enabled="true"
39+
android:name=".MyForegroundService"
40+
android:foregroundServiceType="location"
41+
android:exported="false"
42+
android:stopWithTask="true" />
43+
2044
<service android:name="CustomIME"
2145
android:label="@string/app_ime"
2246
android:exported="true"

‎cslibrary4a/src/main/java/com/csl/cslibrary4a/CustomAlertDialog.java renamed to ‎app/src/main/java/com/csl/cs108ademoapp/CustomAlertDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.csl.cslibrary4a;
1+
package com.csl.cs108ademoapp;
22

33
import android.app.Activity;
44
import android.app.AlertDialog;

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ public static DrawerPositions toDrawerPosition(int x) {
5555
case 14: return BAPCARD;
5656
case 15: return COLDCHAIN;
5757
case 16: return AURASENSE;
58-
//case 17: return KILOWAY;
59-
case 17: return LONGJING;
60-
case 18: return AXZON;
58+
case 17: return KILOWAY;
59+
case 18: return LONGJING;
60+
case 19: return AXZON;
6161
//case 18: return RFMICRON;
62-
case 19: return FDMICRO;
63-
case 20: return CTESIUS;
64-
case 21: return ASYGNTAG;
65-
66-
case 22: return REGISTER;
67-
case 23: return READWRITEUSER;
68-
case 24: return WEDGE;
69-
case 25: return DIRECTWEDGE;
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;
7070
}
7171
return null;
7272
}
@@ -92,17 +92,17 @@ public static DrawerPositions toDrawerPosition(int x) {
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));
95-
//addItem(new DrawerItem("17", "Kiloway KX2005X-BL", R.drawable.dl_rr));
96-
addItem(new DrawerItem("17", "EL-N2ESL CS6861", R.drawable.dl_rr));
97-
addItem(new DrawerItem("18", "Axzon", 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));
95+
addItem(new DrawerItem("17", "Kiloway KX2005X-BL", 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) {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,11 +449,12 @@ void tagHandler() {
449449
else strTidCompared = "E28011";
450450
}
451451
MainActivity.csLibrary4A.appendToLog("strTidCompared = " + strTidCompared);
452-
if (strTidCompared.matches("E282402")) { }
452+
if (strTidCompared.matches("E28011")) { }
453+
else if (strTidCompared.matches("E2806894") && MainActivity.mDid.matches("E2806894C")) { }
454+
else if (strTidCompared.matches("E281D")) { }
455+
else if (strTidCompared.matches("E282402")) { }
453456
else if (strTidCompared.matches("E282403")) { }
454457
else if (strTidCompared.matches("E282405")) { }
455-
else if (strTidCompared.matches("E2806894") && MainActivity.mDid.matches("E2806894C")) { }
456-
else if (strTidCompared.matches("E28011")) { }
457458
else { //if (strMdid.matches("E280B0"))
458459
boolean bMatched = false;
459460
if (strExtra1 != null && strExtra1.indexOf(strTidCompared) == 0) {
@@ -584,12 +585,14 @@ else if (match == false) {
584585
if (bAdd2End) tagsList.add(readerDevice);
585586
else tagsList.add(0, readerDevice);
586587
SharedObjects.TagsIndex tagsIndex = new SharedObjects.TagsIndex(strAddresss, tagsList.size() - 1); MainActivity.sharedObjects.tagsIndexList.add(tagsIndex); Collections.sort(MainActivity.sharedObjects.tagsIndexList);
588+
MainActivity.csLibrary4A.appendToLog("openServer: serverConnectValid is " + serverConnectValid);
587589
if (serverConnectValid && ALLOW_RTSAVE && true) {
588590
try {
589591
// saveExternalTask = new SaveList2ExternalTask();
590592
// saveExternalTask.openServer();
591593
String msgOutput = saveExternalTask.createJSON(null, readerDevice).toString(); MainActivity.csLibrary4A.appendToLog("Json = " + msgOutput);
592594
saveExternalTask.write2Server(msgOutput);
595+
MainActivity.csLibrary4A.appendToLog("openServer: write2Server data = " + msgOutput);
593596

594597
// saveExternalTask.closeServer();
595598
MainActivity.csLibrary4A.appendToLog("write2Server is done");

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

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

3-
import android.app.PendingIntent;
43
import android.content.Context;
54
import android.content.Intent;
6-
import android.content.IntentFilter;
75
import android.net.Uri;
8-
import android.os.Handler;
9-
10-
import androidx.fragment.app.Fragment;
11-
import androidx.fragment.app.FragmentManager;
12-
import androidx.drawerlayout.widget.DrawerLayout;
136
import android.os.Bundle;
14-
import androidx.appcompat.app.AppCompatActivity;
7+
import android.os.Handler;
158
import android.util.Log;
169
import android.view.Gravity;
1710
import android.view.View;
@@ -20,9 +13,39 @@
2013
import android.widget.TextView;
2114
import android.widget.Toast;
2215

16+
import androidx.appcompat.app.AppCompatActivity;
17+
import androidx.drawerlayout.widget.DrawerLayout;
18+
import androidx.fragment.app.Fragment;
19+
import androidx.fragment.app.FragmentManager;
20+
2321
import com.csl.cs108ademoapp.DrawerListContent.DrawerPositions;
2422
import com.csl.cs108ademoapp.adapters.DrawerListAdapter;
25-
import com.csl.cs108ademoapp.fragments.*;
23+
import com.csl.cs108ademoapp.fragments.AboutFragment;
24+
import com.csl.cs108ademoapp.fragments.AccessReadWriteFragment;
25+
import com.csl.cs108ademoapp.fragments.AccessReadWriteUserFragment;
26+
import com.csl.cs108ademoapp.fragments.AccessRegisterFragment;
27+
import com.csl.cs108ademoapp.fragments.AccessSecurityFragment;
28+
import com.csl.cs108ademoapp.fragments.AuraSenseFragment;
29+
import com.csl.cs108ademoapp.fragments.AxzonSelectorFragment;
30+
import com.csl.cs108ademoapp.fragments.ColdChainFragment;
31+
import com.csl.cs108ademoapp.fragments.ConnectionFragment;
32+
import com.csl.cs108ademoapp.fragments.DirectWedgeFragment;
33+
import com.csl.cs108ademoapp.fragments.FdmicroFragment;
34+
import com.csl.cs108ademoapp.fragments.HomeFragment;
35+
import com.csl.cs108ademoapp.fragments.HomeSpecialFragment;
36+
import com.csl.cs108ademoapp.fragments.ImpinjFragment;
37+
import com.csl.cs108ademoapp.fragments.ImpinjM775Fragment;
38+
import com.csl.cs108ademoapp.fragments.InventoryFragment;
39+
import com.csl.cs108ademoapp.fragments.InventoryRfidSearchFragment;
40+
import com.csl.cs108ademoapp.fragments.InventoryRfidSimpleFragment;
41+
import com.csl.cs108ademoapp.fragments.InventoryRfidiMultiFragment;
42+
import com.csl.cs108ademoapp.fragments.KilowayFragment;
43+
import com.csl.cs108ademoapp.fragments.LongjingFragment;
44+
import com.csl.cs108ademoapp.fragments.SettingFilterFragment;
45+
import com.csl.cs108ademoapp.fragments.SettingFragment;
46+
import com.csl.cs108ademoapp.fragments.TestFragment;
47+
import com.csl.cs108ademoapp.fragments.Ucode8Fragment;
48+
import com.csl.cs108ademoapp.fragments.UcodeFragment;
2649
import com.csl.cs108library4a.Cs108Library4A;
2750
import com.csl.cslibrary4a.ReaderDevice;
2851

@@ -40,6 +63,7 @@ public class MainActivity extends AppCompatActivity {
4063
//Tag to identify the currently displayed fragment
4164
Fragment fragment = null;
4265
protected static final String TAG_CONTENT_FRAGMENT = "ContentFragment";
66+
public static boolean isHomeFragment = false;
4367

4468
public static TextView mLogView;
4569
private DrawerLayout mDrawerLayout;
@@ -51,11 +75,8 @@ public class MainActivity extends AppCompatActivity {
5175
public static SharedObjects sharedObjects;
5276
public static SensorConnector mSensorConnector;
5377
public static ReaderDevice tagSelected;
54-
Handler mHandler = new Handler();
5578

56-
PendingIntent mPendingIntent;
57-
IntentFilter writeTagFilters[];
58-
String[][] techList;
79+
Handler mHandler = new Handler();
5980

6081
public static String mDid; public static int selectHold; public static int selectFor;
6182
public static class Config {

0 commit comments

Comments
 (0)