Merge pull request #49 from cslrfid/develop

Develop

Author: ksclam

android/FakeDependency.jar

@@ -6,19 +6,21 @@ android {
         buildConfig true
     }
 
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.csl.cs108ademoapp"
-        minSdk 21
-        targetSdk 34
-        versionCode 41
-        versionName "2.14.0"
+        minSdk 23
+        targetSdk 35
+        versionCode 42
+        versionName "2.14.31"
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation project(':cs108library4a')
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.github.hannesa2:paho.mqtt.android:4.3.beta2'
     implementation project(':cslibrary4a')
-}
+}

app/build.gradle

@@ -1,26 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
+    <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.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.NFC" />
 
     <application
+        android:usesCleartextTraffic="true" tools:targetApi="28"
         android:allowBackup="true"
+        android:label="@string/app_name_cs108"
         android:icon="@drawable/csl_logo"
-        android:label="@string/app_name"
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme">
 
+        <service
+            android:enabled="true"
+            android:name="MyForegroundService"
+            android:foregroundServiceType="location"
+            android:exported="false"
+            android:stopWithTask="true" />
+
         <service android:name="CustomIME"
-            android:label="@string/app_ime"
+            android:label="@string/app_ime_cs108"
             android:exported="true"
             android:permission="android.permission.BIND_INPUT_METHOD">
+
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>
@@ -31,16 +57,17 @@
             android:name="MainActivity"
             android:exported="true"
             android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
 
             <intent-filter>
                 <action android:name="android.nfc.action.ACTION_TAG_DISCOVERED" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
     </application>
 </manifest>

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

@@ -1,4 +1,4 @@
-package com.csl.cslibrary4a;
+package com.csl.cs108ademoapp;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -28,7 +28,7 @@ public void onClick(DialogInterface dialog, int buttonId) {
                         ans_false.run();
                     }
                 });
-        dialog.setIcon(android.R.drawable.ic_dialog_alert);
+        dialog.setIcon(R.drawable.alert);
         dialog.show();
         return true;
     }