From 0a19e1f587693f93811dda4676cf5e09e28723f8 Mon Sep 17 00:00:00 2001
From: wujie <wujie>
Date: Tue, 13 Jun 2023 14:01:07 +0800
Subject: [PATCH] =?UTF-8?q?jdk11=E3=80=81gradle7.3=EF=BC=8C=E9=9C=8D?=
 =?UTF-8?q?=E5=B0=BC=E7=BB=B4=E5=B0=94EDA56=EF=BC=8C=E5=AE=89=E5=8D=9312?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 11 ++--
 .../business/activity/MainActivity.java       |  7 ++-
 .../adapter/HoneywellEda56Adapter.java        | 53 +++++++++++++++++++
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  6 +--
 5 files changed, 69 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/chaoran/business/adapter/HoneywellEda56Adapter.java

diff --git a/app/build.gradle b/app/build.gradle
index 483d502..12e9c91 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,18 +3,19 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdk 31
+    buildToolsVersion '33.0.0'
 
     defaultConfig {
         applicationId "chaoran.business.pda"
         minSdk 28
         targetSdk 28
         versionCode 1
-        versionName "1.1"
+        versionName "1.2"
 
         // 1.0 IDATA广播模式处理
         // 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置
+        // 1.2 霍尼韦尔EDA56、jdk11，gradle7.3、海信PDA广播支持
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -54,8 +55,8 @@ android {
 
     //编译选项
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 /*    repositories {
         flatDir {
diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java
index 27e004f..02e541c 100644
--- a/app/src/main/java/chaoran/business/activity/MainActivity.java
+++ b/app/src/main/java/chaoran/business/activity/MainActivity.java
@@ -87,8 +87,13 @@ public class MainActivity extends AppCompatActivity implements ResultListener{
                 adapter = new AlpsAdapter(this, this);
                 break;
             case HONEY_WELL_EDA50P:
+                // 51、56都是同一个code
             case HONEY_WELL_EDA51:
-                adapter = new HoneywellAdapter(this, this);
+                if ("eda56".equals(Build.MODEL.toLowerCase())) {
+                    adapter = new HoneywellEda56Adapter(this, this);
+                }else {
+                    adapter = new HoneywellAdapter(this, this);
+                }
                 break;
             case ZEBRA_TECHNOLOGIES:
                 adapter = new ZebraAdapter(this, this);
diff --git a/app/src/main/java/chaoran/business/adapter/HoneywellEda56Adapter.java b/app/src/main/java/chaoran/business/adapter/HoneywellEda56Adapter.java
new file mode 100644
index 0000000..699f431
--- /dev/null
+++ b/app/src/main/java/chaoran/business/adapter/HoneywellEda56Adapter.java
@@ -0,0 +1,53 @@
+package chaoran.business.adapter;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import chaoran.business.activity.ResultListener;
+import chaoran.business.strategy.Strategy;
+
+public class HoneywellEda56Adapter implements Adapter {
+    private Context context;
+    private ResultListener resultListener;
+    private Strategy strategy;
+
+
+    public HoneywellEda56Adapter(Context context, ResultListener resultListener) {
+        this.context = context;
+        this.resultListener = resultListener;
+        strategy = new HoneywellEda56Adapter.Receiver();
+    }
+
+    @Override
+    public void start() {
+        strategy.executeStrategy(resultListener);
+    }
+
+    @Override
+    public void stop() {
+        strategy.exclusiveStrategy();
+    }
+
+    public class Receiver extends BroadcastReceiver implements Strategy {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            resultListener.result(intent.getStringExtra("data"));
+        }
+
+        @Override
+        public void executeStrategy(ResultListener resultListener) {
+            IntentFilter filter = new IntentFilter();
+            filter.addAction("chaoran");
+            filter.setPriority(2);
+            context.registerReceiver(this, filter);
+        }
+
+        @Override
+        public void exclusiveStrategy() {
+            context.unregisterReceiver(this);
+        }
+    }
+}
diff --git a/build.gradle b/build.gradle
index 53524a2..11c8778 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a8543a4..884b08a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 01 13:41:10 CST 2021
+#Tue Jun 13 09:53:56 CST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME