capacitor-rfid-plugin-ox 0.3.1 → 0.3.3

package/android/build.gradle

@@ -45,16 +45,20 @@ android {
 repositories {
     google()
     mavenCentral()
+
+    flatDir {
+        dirs("libs")
+    }
 }
 
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
     implementation project(':capacitor-android')
     implementation files('libs/platform_sdk_v3.1.221124.jar')
-    implementation project(':rfid-urovo-usdk')
+    api project(':rfid_urovo_usdk')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-}
+}

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:name="uz.ox.plugins.rfid.BaseApplication"
+        android:allowBackup="true">
+        <activity
+            android:name="uz.ox.plugins.rfid.MainActivity"
+            android:exported="true"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 </manifest>

package/android/src/main/java/uz/ox/plugins/rfid/Scan.java

@@ -6,13 +6,13 @@ import android.util.Log;
 import androidx.fragment.app.Fragment;
 
 import com.ubx.usdk.rfid.aidl.IRfidCallback;
-import com.ubx.usdk.util.SoundTool;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
 import uz.ox.plugins.rfid.pojo.TagScan;
+import uz.ox.plugins.rfid.utils.SoundTool;;
 
 public class Scan extends Fragment {
     private final RFID rfid;
@@ -203,10 +203,11 @@ public class Scan extends Fragment {
     }
 
     private void notiyDatasSearch(String s2, String TID, final String strRSSI) {
-        Log.d(TAG, "onInventoryTag: ............... epc: " + s2 + "  tid: " + TID + "  strRSSI: " + TID);
-
         if (searchableTagsMap.containsKey(s2)) {
-            if (new Date().getTime() - lastBeepTime.getTime() > 100) {
+            double beepInterval = (double) (100 - Integer.parseInt(strRSSI)) / 40 * 1500 + 10;
+
+            Log.d(TAG, "beepInterval: " + beepInterval);
+            if (new Date().getTime() - lastBeepTime.getTime() > beepInterval) {
             SoundTool.getInstance(BaseApplication.getContext()).playBeep(2);
                 lastBeepTime = new Date();
             }

package/android/src/main/java/uz/ox/plugins/rfid/utils/SoundTool.java

@@ -0,0 +1,56 @@
+package uz.ox.plugins.rfid.utils;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.SoundPool;
+import com.ubx.usdk.R.raw;
+
+public class SoundTool {
+    protected static volatile SoundTool instance;
+    protected final int SOUND_SWIPE_CARD;
+    protected final int SOUND_SWIPE_FACE;
+    protected SoundPool soundPool;
+
+    private SoundTool(Context context) {
+        AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                .setUsage(AudioAttributes.USAGE_NOTIFICATION_EVENT)
+                .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                .build();
+
+        this.soundPool = new SoundPool.Builder()
+                .setMaxStreams(3)
+                .setAudioAttributes(audioAttributes)
+                .build();
+
+        this.SOUND_SWIPE_CARD = this.soundPool.load(context, raw.scan_buzzer, 1);
+        this.SOUND_SWIPE_FACE = this.soundPool.load(context, raw.scan_new, 1);
+    }
+
+    public static synchronized SoundTool getInstance(Context context) {
+        if (instance == null) {
+            instance = new SoundTool(context);
+        }
+
+        return instance;
+    }
+
+    public void release() {
+        if (this.soundPool != null) {
+            this.soundPool.release();
+            this.soundPool = null;
+            instance = null;
+        }
+    }
+
+    public void playBeep(int mode) {
+        switch (mode) {
+            case 0:
+                return;
+            case 1:
+                this.soundPool.play(this.SOUND_SWIPE_CARD, 1.0F, 1.0F, 1, 0, 1.0F);
+                break;
+            case 2:
+                this.soundPool.play(this.SOUND_SWIPE_FACE, 1.0F, 1.0F, 1, 0, 1.0F);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-rfid-plugin-ox",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "rfid read-write",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",