From 2485332d77f775d47dacbb2e74765c5249a9917e Mon Sep 17 00:00:00 2001
From: wujie <wujie>
Date: Mon, 10 Apr 2023 16:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=8D=E5=B0=BC=E7=BB=B4=E5=B0=94=E7=9A=84ED?=
 =?UTF-8?q?A51=E6=89=AB=E6=8F=8F=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/chaoran/business/BrandEnum.java   |  3 ++-
 .../chaoran/business/activity/MainActivity.java     |  3 ++-
 .../chaoran/business/adapter/HoneywellAdapter.java  | 13 +++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/chaoran/business/BrandEnum.java b/app/src/main/java/chaoran/business/BrandEnum.java
index ecfdb7c..fd9a253 100644
--- a/app/src/main/java/chaoran/business/BrandEnum.java
+++ b/app/src/main/java/chaoran/business/BrandEnum.java
@@ -14,7 +14,8 @@ public enum BrandEnum {
     ROCKCHIP("瑞芯微电子", "rockchip"),
     TEST("测试设备", "test"),
     IDATA("匿名设备", "idata"),
-    HONEY_WELL("霍尼维尔", "mobiwire"),
+    HONEY_WELL_EDA50P("霍尼维尔EDA50P", "mobiwire"),
+    HONEY_WELL_EDA51("霍尼维尔EDA51", "honeywell"),
     ALPS("阿尔卑斯", "alps");
 
     private String name;
diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java
index 7262a80..1bea598 100644
--- a/app/src/main/java/chaoran/business/activity/MainActivity.java
+++ b/app/src/main/java/chaoran/business/activity/MainActivity.java
@@ -86,7 +86,8 @@ public class MainActivity extends AppCompatActivity implements ResultListener{
             case ALPS:
                 adapter = new AlpsAdapter(this, this);
                 break;
-            case HONEY_WELL:
+            case HONEY_WELL_EDA50P:
+            case HONEY_WELL_EDA51:
                 adapter = new HoneywellAdapter(this, this);
                 break;
         }
diff --git a/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java b/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java
index 235a646..b2934d4 100644
--- a/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java
+++ b/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java
@@ -57,10 +57,15 @@ public class HoneywellAdapter implements Adapter {
     }
 
     public void openContinueScan(){
-        /**
-         * 扫描正常
-         */
-        if("eda50p".equals(Build.MODEL.toLowerCase())){
+
+        if("eda50p".equals(Build.MODEL.toLowerCase())){ // 扫描正常
+            intent = new Intent(context, ScanServiceEDA50P.class);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.getApplicationContext().startForegroundService(intent);
+            }else {
+                context.getApplicationContext().startService(intent);
+            }
+        }else if("eda51".equals(Build.MODEL.toLowerCase())){ // 扫描正常
             intent = new Intent(context, ScanServiceEDA50P.class);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 context.getApplicationContext().startForegroundService(intent);