capacitor-rfid-plugin-ox 0.3.2 → 0.3.4

package/README.md

@@ -218,12 +218,12 @@ writeEpcString(options: { epc: string; password?: string; }) => Promise<{ value:
 ### startSearch(...)
 
 ```typescript
-startSearch(options: { searchableTags: string[]; }) => Promise<void>
+startSearch(options: { searchableTags: string[]; playSound: boolean; }) => Promise<void>
 ```
 
-| Param         | Type                                       |
-| ------------- | ------------------------------------------ |
-| **`options`** | <code>{ searchableTags: string[]; }</code> |
+| Param         | Type                                                           |
+| ------------- | -------------------------------------------------------------- |
+| **`options`** | <code>{ searchableTags: string[]; playSound: boolean; }</code> |
 
 --------------------
 

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/RFID.java

@@ -75,8 +75,8 @@ public class RFID {
         Log.d(TAG, "stop scan");
     }
 
-    public void startSearch(List<String> searchableTags) {
-        scan.startSearch(searchableTags);
+    public void startSearch(List<String> searchableTags, Boolean soundOnSearch) {
+        scan.startSearch(searchableTags, soundOnSearch);
         Log.d(TAG, "start scan");
     }
 

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

@@ -71,8 +71,9 @@ public class RFIDPlugin extends Plugin {
     @PluginMethod
     public void startSearch(PluginCall call) throws JSONException {
         JSArray searchableTags = call.getArray("searchableTags", JSArray.from(new String[] {}));
+        Boolean soundOnSearch = call.getBoolean("soundOnSearch", false);
 
-        implementation.startSearch(searchableTags.toList());
+        implementation.startSearch(searchableTags.toList(), soundOnSearch);
         call.resolve();
     }
 

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

@@ -6,18 +6,20 @@ 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;
     private final RFIDPlugin rfidPlugin;
 
+    private Boolean soundOnSearch = false;
+
     public Scan(RFID rfidWrapper, RFIDPlugin rfidPlugin) {
         this.rfid = rfidWrapper;
         this.rfidPlugin = rfidPlugin;
@@ -82,9 +84,10 @@ public class Scan extends Fragment {
 
     }
 
-    public void startSearch(List<String> searchableTags) {
+    public void startSearch(List<String> searchableTags, Boolean soundOnSearch) {
         if (rfid.RFID_INIT_STATUS) {
             if (!this.scanning) {
+                this.soundOnSearch = soundOnSearch;
                 setSearchCallback();
                 searchableTagsMap = new HashMap<>();
                 for (String tag : searchableTags) {
@@ -203,11 +206,9 @@ 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) {
-            SoundTool.getInstance(BaseApplication.getContext()).playBeep(2);
+            if (this.soundOnSearch && new Date().getTime() - lastBeepTime.getTime() > 100) {
+                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/dist/docs.json

@@ -187,12 +187,12 @@
       },
       {
         "name": "startSearch",
-        "signature": "(options: { searchableTags: string[]; }) => Promise<void>",
+        "signature": "(options: { searchableTags: string[]; playSound: boolean; }) => Promise<void>",
         "parameters": [
           {
             "name": "options",
             "docs": "",
-            "type": "{ searchableTags: string[]; }"
+            "type": "{ searchableTags: string[]; playSound: boolean; }"
           }
         ],
         "returns": "Promise<void>",

package/dist/esm/definitions.d.ts

@@ -51,6 +51,7 @@ export interface RFIDPlugin extends Plugin {
     }>;
     startSearch(options: {
         searchableTags: string[];
+        playSound: boolean;
     }): Promise<void>;
     stopSearch(): Promise<void>;
 }

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { Plugin } from '@capacitor/core';\n\nexport interface RFIDPlugin extends Plugin {\n  isConnected(): Promise<{ connected: boolean }>;\n\n  startScan(): Promise<void>;\n  stopScan(): Promise<void>;\n  clearData(): Promise<void>;\n\n  getScanData(): Promise<any>;\n  getOutputPower(): Promise<{ value: number }>;\n  setOutputPower(options: { power: number }): Promise<{ value: number }>;\n\n  getRange(): Promise<{ value: number }>;\n  setRange(options: { range: number }): Promise<{ value: number }>;\n\n  getQueryMode(): Promise<{ value: 0 | 1 | 2 | 3 }>;\n  setQueryMode(options: {\n    queryMode:\n      | 0 // epc\n      | 1 // epc+tid\n      | 2 // epc+user\n      | 3; // fasttid\n  }): Promise<{ value: number }>;\n\n  getReaderType(): Promise<{ value: number }>; // 80 - short, others - long distance mode\n  getFirmwareVersion(): Promise<{ value: string }>;\n\n  writeEpc(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }>;\n  writeEpcString(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }>;\n\n  startSearch(options: { searchableTags: string[] }): Promise<void>;\n  stopSearch(): Promise<void>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { Plugin } from '@capacitor/core';\n\nexport interface RFIDPlugin extends Plugin {\n  isConnected(): Promise<{ connected: boolean }>;\n\n  startScan(): Promise<void>;\n  stopScan(): Promise<void>;\n  clearData(): Promise<void>;\n\n  getScanData(): Promise<any>;\n  getOutputPower(): Promise<{ value: number }>;\n  setOutputPower(options: { power: number }): Promise<{ value: number }>;\n\n  getRange(): Promise<{ value: number }>;\n  setRange(options: { range: number }): Promise<{ value: number }>;\n\n  getQueryMode(): Promise<{ value: 0 | 1 | 2 | 3 }>;\n  setQueryMode(options: {\n    queryMode:\n      | 0 // epc\n      | 1 // epc+tid\n      | 2 // epc+user\n      | 3; // fasttid\n  }): Promise<{ value: number }>;\n\n  getReaderType(): Promise<{ value: number }>; // 80 - short, others - long distance mode\n  getFirmwareVersion(): Promise<{ value: string }>;\n\n  writeEpc(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }>;\n  writeEpcString(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }>;\n\n  startSearch(options: { searchableTags: string[], playSound: boolean }): Promise<void>;\n  stopSearch(): Promise<void>;\n}\n"]}

package/dist/esm/web.d.ts

@@ -52,6 +52,7 @@ export declare class RFIDWeb extends WebPlugin implements RFIDPlugin {
     }>;
     startSearch(options: {
         searchableTags: string[];
+        playSound: boolean;
     }): Promise<void>;
     stopSearch(): Promise<void>;
 }

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,MAAM,OAAO,OAAQ,SAAQ,SAAS;IACpC,WAAW;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS;QACP,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,QAAQ;QACN,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,SAAS;QACP,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,WAAW;QACT,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA0B;QAC7C,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAA0B;QACvC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAElB;QACC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAGd;QACC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEzB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAGpB;QACC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEzB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAqC;QACrD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\n\nimport type { RFIDPlugin } from './definitions';\n\nexport class RFIDWeb extends WebPlugin implements RFIDPlugin {\n  isConnected(): Promise<{ connected: boolean }> {\n    return Promise.resolve({ connected: false });\n  }\n\n  startScan(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  stopScan(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  clearData(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  getScanData(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  async getOutputPower(): Promise<{ value: number }> {\n    return { value: 0 };\n  }\n\n  async setOutputPower(options: { power: number }): Promise<{ value: number }> {\n    return { value: options.power };\n  }\n\n  async getRange(): Promise<{ value: number }> {\n    return { value: 0 };\n  }\n\n  async setRange(options: { range: number }): Promise<{ value: number }> {\n    return { value: options.range };\n  }\n\n  async getQueryMode(): Promise<{ value: 0 | 1 | 2 | 3 }> {\n    return { value: 0 };\n  }\n\n  async setQueryMode(options: {\n    queryMode: 0 | 1 | 2 | 3;\n  }): Promise<{ value: number }> {\n    return { value: options.queryMode };\n  }\n\n  async getReaderType(): Promise<{ value: number }> {\n    return { value: 0 };\n  }\n\n  async getFirmwareVersion(): Promise<{ value: string }> {\n    return { value: 'not implemented' };\n  }\n\n  async writeEpc(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }> {\n    console.log(options.epc);\n\n    return { value: -1 };\n  }\n\n  async writeEpcString(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }> {\n    console.log(options.epc);\n\n    return { value: -1 };\n  }\n\n  async startSearch(options: { searchableTags: string[] }): Promise<void> {\n    console.log(options.searchableTags);\n\n    return Promise.resolve();\n  }\n\n  async stopSearch(): Promise<void> {\n    return Promise.resolve();\n  }\n}\n"]}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,MAAM,OAAO,OAAQ,SAAQ,SAAS;IACpC,WAAW;QACT,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS;QACP,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,QAAQ;QACN,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,SAAS;QACP,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,WAAW;QACT,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA0B;QAC7C,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAA0B;QACvC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAElB;QACC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAGd;QACC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEzB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAGpB;QACC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEzB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAyD;QACzE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\n\nimport type { RFIDPlugin } from './definitions';\n\nexport class RFIDWeb extends WebPlugin implements RFIDPlugin {\n  isConnected(): Promise<{ connected: boolean }> {\n    return Promise.resolve({ connected: false });\n  }\n\n  startScan(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  stopScan(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  clearData(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  getScanData(): Promise<void> {\n    return Promise.resolve();\n  }\n\n  async getOutputPower(): Promise<{ value: number }> {\n    return { value: 0 };\n  }\n\n  async setOutputPower(options: { power: number }): Promise<{ value: number }> {\n    return { value: options.power };\n  }\n\n  async getRange(): Promise<{ value: number }> {\n    return { value: 0 };\n  }\n\n  async setRange(options: { range: number }): Promise<{ value: number }> {\n    return { value: options.range };\n  }\n\n  async getQueryMode(): Promise<{ value: 0 | 1 | 2 | 3 }> {\n    return { value: 0 };\n  }\n\n  async setQueryMode(options: {\n    queryMode: 0 | 1 | 2 | 3;\n  }): Promise<{ value: number }> {\n    return { value: options.queryMode };\n  }\n\n  async getReaderType(): Promise<{ value: number }> {\n    return { value: 0 };\n  }\n\n  async getFirmwareVersion(): Promise<{ value: string }> {\n    return { value: 'not implemented' };\n  }\n\n  async writeEpc(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }> {\n    console.log(options.epc);\n\n    return { value: -1 };\n  }\n\n  async writeEpcString(options: {\n    epc: string;\n    password?: string;\n  }): Promise<{ value: number }> {\n    console.log(options.epc);\n\n    return { value: -1 };\n  }\n\n  async startSearch(options: { searchableTags: string[], playSound: boolean }): Promise<void> {\n    console.log(options.searchableTags);\n\n    return Promise.resolve();\n  }\n\n  async stopSearch(): Promise<void> {\n    return Promise.resolve();\n  }\n}\n"]}

package/package.json

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