From eb969042ec3c86477b670e846a99695263a23cdd Mon Sep 17 00:00:00 2001
From: JeromeTseng <jeromewontstop@163.com>
Date: Wed, 25 Dec 2024 11:40:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E5=B9=BF=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  4 +++-
 README.md                                     |  2 +-
 .../pdascanner/core/ActionContainer.kt        | 24 ++++++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d99af97..9a01605 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,4 +19,6 @@
 ## 2.0.3
 * 增加部分新型号
 ## 3.0.0
-* 对代码进行重构，增加部分新的机型广播。
\ No newline at end of file
+* 对代码进行重构，增加部分新的机型广播。
+## 3.0.1
+* 增加部分新的机型广播。
\ No newline at end of file
diff --git a/README.md b/README.md
index da42c0c..ad31400 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <img src="./photos/LOGO.png" alt="flutter_plugin_pda_scanner" style="zoom: 67%;" />
 
 <h2 style="text-align:center;font-weight: bold;margin-top:-20px">flutter_plugin_pda_scanner
-v3.0.0</h1>
+v3.0.1</h1>
 
 <h4 style="margin-top: -5px;text-align:center;">一款基于Flutter开发的支持多种PDA扫码的插件</h4>
 
diff --git a/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt b/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt
index ade37c0..1687f1a 100644
--- a/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt
+++ b/android/src/main/kotlin/io/github/jerometseng/pdascanner/core/ActionContainer.kt
@@ -11,7 +11,7 @@ class ActionContainer {
     companion object {
         /**
          * 广播行为和数据标签容器
-         * 如果已经集成的型号匹配不上 则加载该扫码配置，加入一下所有广播
+         * 如果已经集成的型号匹配不上 则加载该扫码配置，加入以下所有广播
          */
         val broadCastActionAndDataLabelMap = mapOf(
             // ChainWay 广播
@@ -32,26 +32,35 @@ class ActionContainer {
             "barcode_broadcast" to listOf(BroadcastTag("scannerdata")),
             // 优博讯广播
             "android.intent.ACTION_DECODE_DATA" to listOf(
+                BroadcastTag("value"),
                 BroadcastTag("barcode_string"),
-                BroadcastTag("barcode")
+                BroadcastTag("barcode"),
+                BroadcastTag("scannerdata")
             ),
             "android.senraise.scan" to listOf(BroadcastTag("result")),
-            // SUNMI商米广播分
+            // SUNMI商米广播
             "com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED" to listOf(BroadcastTag("data")),
             // NewBland
-            "nlscan.action.SCANNER_RESULT" to listOf(BroadcastTag("SCAN_BARCODE1")),
+            "nlscan.action.SCANNER_RESULT" to listOf(
+                BroadcastTag("SCAN_BARCODE1"),
+                BroadcastTag("android.intent.extra.SCAN_BROADCAST_DATA")
+            ),
             // IDATA 盈达
             "android.intent.action.SCANRESULT" to listOf(BroadcastTag("value")),
             // MOBYDATA
             "com.android.decodewedge.decode_action" to listOf(BroadcastTag("com.android.decode.intentwedge.barcode_string")),
             // JOYREE 巨历
             "android.intent.action.BARCODEDATA" to listOf(BroadcastTag("barcode_result")),
-            // "N60"
+            // N60
             "scan.rcv.message" to listOf(
                 BroadcastTag("barcodeData"),
                 BroadcastTag("barocode", dataType = DataUtil.IntentDataType.BYTE_ARRAY)
             ),
-            // "ALPS"
+            // ALPS
+            "android.intent.action.RECEIVE_SCANDATA_BROADCAST" to listOf(
+                BroadcastTag("SCAN_BARCODE1"),
+                BroadcastTag("android.intent.extra.SCAN_BROADCAST_DATA")
+            ),
             "com.barcode.sendBroadcast" to listOf(BroadcastTag("BARCODE")),
             // SHINIOW
             "com.android.server.scannerservice.shinow" to listOf(BroadcastTag("scannerdata")),
@@ -59,6 +68,9 @@ class ActionContainer {
             "com.ehsy.warehouse.action.BARCODE_DATA" to listOf(BroadcastTag("data")),
             // 霍尼韦尔
             "com.honeywell.decode.intent.action.EDIT_DATA" to listOf(BroadcastTag("data")),
+            "com.honeywell.scan.broadcast" to listOf(BroadcastTag("data")),
+            // 凯立
+            "com.android.receive_scan_action" to listOf(BroadcastTag("data"))
         )
     }
 }
\ No newline at end of file
-- 
Gitee