From 832b0e336877fcc6a293a4a75c13b6b0ec02de2c Mon Sep 17 00:00:00 2001
From: jieyao <a2971306172@qq.com>
Date: Thu, 11 Jan 2024 17:27:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=8D=E5=B0=BC=E9=9F=A6=E5=B0=94EDA50p?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=BF=94=E5=9B=9E=E6=A1=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=86=E6=96=B0=E7=9A=84=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=87=BA=E7=8E=B0=E5=86=8D=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E7=A8=8B=E5=BA=8F(=E6=96=B0=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7)=E6=97=A0=E6=B3=95=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E8=80=8C=E5=AF=BC=E8=87=B4=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AAstop2?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C=E9=92=88=E5=AF=B9=E9=9C=8D?=
 =?UTF-8?q?=E5=B0=BC=E9=9F=A6=E5=B0=94eda50p=EF=BC=8C=E4=B8=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=94=80=E6=AF=81=EF=BC=8C=E5=9C=A8=E7=9C=9F=E6=AD=A3?=
 =?UTF-8?q?=E9=94=80=E6=AF=81=E7=9A=84=E6=96=B9=E6=B3=95=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E8=BF=98=E6=98=AF=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=BF=94=E5=9B=9E=E6=A1=8C=E9=9D=A2=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=89=AB=E6=8F=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E9=80=80=E5=87=BA=E7=A8=8B=E5=BA=8F=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E6=89=93=E5=BC=80=E7=A8=8B=E5=BA=8F=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  1 +
 .../business/activity/MainActivity.java       |  2 +-
 .../chaoran/business/adapter/Adapter.java     |  4 ++
 .../business/adapter/HoneywellAdapter.java    | 39 +++++++++++++++++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fd55c86..2be12eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 28
         targetSdk 28
         versionCode 1
-        versionName "1.7"
+        versionName "1.8"
 
         // 1.0 IDATA广播模式处理
         // 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5db51f9..e34e69b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <uses-permission android:name="com.symbol.emdk.permission.EMDK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="com.honeywell.decode.permission.DECODE" />
+    <uses-permission android:name="android.permission.STOP_SERVICE" />
 
     <application
             android:allowBackup="true"
diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java
index 024b7e4..3b08f46 100644
--- a/app/src/main/java/chaoran/business/activity/MainActivity.java
+++ b/app/src/main/java/chaoran/business/activity/MainActivity.java
@@ -208,7 +208,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener{
      //   voiceEngine.reload();
         super.onResume();
         if (adapter != null) {
-            adapter.stop();
+            adapter.stop2();
             adapter.start();
         }
     }
diff --git a/app/src/main/java/chaoran/business/adapter/Adapter.java b/app/src/main/java/chaoran/business/adapter/Adapter.java
index 2613467..b56ff88 100644
--- a/app/src/main/java/chaoran/business/adapter/Adapter.java
+++ b/app/src/main/java/chaoran/business/adapter/Adapter.java
@@ -29,4 +29,8 @@ public interface Adapter{
      */
     public void stop();
 
+    public default void stop2() {
+        stop();
+    }
+
 }
diff --git a/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java b/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java
index 89a70d0..c6ddbbc 100644
--- a/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java
+++ b/app/src/main/java/chaoran/business/adapter/HoneywellAdapter.java
@@ -1,12 +1,15 @@
 package chaoran.business.adapter;
 
 
+import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
 
+import java.util.List;
+
 import chaoran.business.activity.ResultListener;
 import chaoran.business.service.ScanServiceEDA50P;
 import chaoran.business.service.ScanServiceZEBRA;
@@ -31,10 +34,16 @@ public class HoneywellAdapter implements Adapter {
         openContinueScan();
     }
 
+    @Override
+    public void stop2() {
+
+    }
+
     @Override
     public void stop() {
         new ScanServiceEDA50P().onDestroy();
         strategy.exclusiveStrategy();
+        this.stopContinueScan();
     }
 
     public class Receiver extends BroadcastReceiver implements Strategy {
@@ -57,6 +66,36 @@ public class HoneywellAdapter implements Adapter {
         }
     }
 
+    public void stopContinueScan() {
+        Class clazz = null;
+        if("eda50p".equals(Build.MODEL.toLowerCase())){ // 扫描正常
+            intent = new Intent(context, ScanServiceEDA50P.class);
+            clazz = ScanServiceEDA50P.class;
+        }else if("eda51".equals(Build.MODEL.toLowerCase())){ // 扫描正常
+            intent = new Intent(context, ScanServiceEDA50P.class);
+            clazz = ScanServiceEDA50P.class;
+        }
+        else if("tc26".equals(Build.MODEL.toLowerCase())){
+            intent = new Intent(context, ScanServiceZEBRA.class);
+            clazz = ScanServiceZEBRA.class;
+        }
+        if (clazz != null && isServiceRunning(clazz)) {
+            context.stopService(intent);
+        }
+    }
+
+    private boolean isServiceRunning(Class<?> serviceClass) {
+        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningServiceInfo> runningServices = manager.getRunningServices(Integer.MAX_VALUE);
+
+        for (ActivityManager.RunningServiceInfo service : runningServices) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public void openContinueScan(){
 
         if("eda50p".equals(Build.MODEL.toLowerCase())){ // 扫描正常