Merge pull request #51 from cslrfid/develop

Develop

Author: ksclam

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdk 23
         targetSdk 35
-        versionCode 42
-        versionName "2.14.38"
+        versionCode 44
+        versionName "2.15.0"
     }
 }
 

app/release/cs108ademo-20250120-v2.14.38-54-app-release.zip

@@ -14,9 +14,9 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="androdi.permission.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
+    <!--uses-permission android:name="android.permission.FOREGROUND_SERVICE"/-->
+    <!--uses-permission android:name="androdi.permission.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE"/-->
+    <!--uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/-->
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -35,12 +35,12 @@
         android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme">
 
-        <service
+        <!--service
             android:enabled="true"
             android:name="MyForegroundService"
             android:foregroundServiceType="location"
             android:exported="false"
-            android:stopWithTask="true" />
+            android:stopWithTask="true" /-->
 
         <service android:name="CustomIME"
             android:label="@string/app_ime_cs108"

app/release/cs108ademo-20250207-v2.15.0-app-release-44.zip

@@ -88,7 +88,7 @@ public String deformatWriteAccessData(String strIn) {
         return strOut;
     }
 
-    boolean isResultReady = false; int tryCount = 0, tryCountMax = 3;
+    boolean isResultReady = false; int tryCount = 0, tryCountMax = 8;
     public boolean isResultReady() {
         boolean bValue = false;
         if (accessTask == null) { }

app/src/main/AndroidManifest.xml

@@ -57,6 +57,7 @@
 
 public class MainActivity extends AppCompatActivity {
     final boolean DEBUG = false; final String TAG = "Hello";
+    public static boolean foregroundServiceEnable = false;
     public static boolean activityActive = false;
     public static DrawerPositions drawerPositionsDefault = DrawerPositions.MAIN;
 

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

@@ -1,7 +1,6 @@
 package com.csl.cs108ademoapp.fragments;
 
 import static com.csl.cslibrary4a.RfidReader.TagType.TAG_NXP;
-import static com.csl.cslibrary4a.RfidReader.TagType.TAG_NXP_UCODE8;
 import static com.csl.cslibrary4a.RfidReader.TagType.TAG_NXP_UCODE8_EPC;
 import static com.csl.cslibrary4a.RfidReader.TagType.TAG_NXP_UCODE8_EPCBRAND;
 import static com.csl.cslibrary4a.RfidReader.TagType.TAG_NXP_UCODE8_EPCBRANDTID;

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

@@ -37,7 +37,7 @@ public class ConnectionFragment extends CommonFragment {
     private ScanCallback mScanCallback;
     private ArrayList<ReaderDevice> readersList = MainActivity.sharedObjects.readersList;
 
-    private ArrayList<BluetoothGatt.Cs108ScanData> mScanResultList = new ArrayList<>();
+    private ArrayList<BluetoothGatt.CsScanData> mScanResultList = new ArrayList<>();
     private Handler mHandler = new Handler();
     private DeviceConnectTask deviceConnectTask;
 
@@ -179,8 +179,8 @@ private class DeviceScanTask extends AsyncTask<Void, String, String> {
         protected String doInBackground(Void... a) {
             while (isCancelled() == false) {
                 if (wait4process == false) {
-                    BluetoothGatt.Cs108ScanData cs108ScanData = MainActivity.csLibrary4A.getNewDeviceScanned();
-                    if (cs108ScanData != null) mScanResultList.add(cs108ScanData);
+                    BluetoothGatt.CsScanData csScanData = MainActivity.csLibrary4A.getNewDeviceScanned();
+                    if (csScanData != null) mScanResultList.add(csScanData);
                     if (scanning == false || mScanResultList.size() != 0 || System.currentTimeMillis() - timeMillisUpdate > 10000) {
                         wait4process = true; publishProgress("");
                     }
@@ -198,7 +198,7 @@ protected void onProgressUpdate(String... output) {
             }
             boolean listUpdated = false;
             while (mScanResultList.size() != 0) {
-                BluetoothGatt.Cs108ScanData scanResultA = mScanResultList.get(0);
+                BluetoothGatt.CsScanData scanResultA = mScanResultList.get(0);
                 mScanResultList.remove(0);
                 if (getActivity() == null) continue;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {

app/src/main/java/com/csl/cs108ademoapp/MyForegroundService.java

@@ -367,9 +367,9 @@ public void run() {
                     listUpdated = true;
                 } else {
                     while (true) {
-                        BluetoothGatt.Cs108ScanData cs108ScanData = MainActivity.csLibrary4A.getNewDeviceScanned();
-                        if (cs108ScanData != null) {
-                            BluetoothGatt.Cs108ScanData scanResultA = cs108ScanData;
+                        BluetoothGatt.CsScanData csScanData = MainActivity.csLibrary4A.getNewDeviceScanned();
+                        if (csScanData != null) {
+                            BluetoothGatt.CsScanData scanResultA = csScanData;
                             if (getActivity() == null) continue;
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                                 if (ActivityCompat.checkSelfPermission(getActivity().getApplicationContext(), BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {