jdk11、gradle7.3,霍尼维尔EDA56,安卓12
This commit is contained in:
@ -3,18 +3,19 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 30
|
compileSdk 31
|
||||||
buildToolsVersion "30.0.3"
|
buildToolsVersion '33.0.0'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "chaoran.business.pda"
|
applicationId "chaoran.business.pda"
|
||||||
minSdk 28
|
minSdk 28
|
||||||
targetSdk 28
|
targetSdk 28
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.1"
|
versionName "1.2"
|
||||||
|
|
||||||
// 1.0 IDATA广播模式处理
|
// 1.0 IDATA广播模式处理
|
||||||
// 1.1 霍尼韦尔的监听修改(扫描网站二维码跳出程序,监听失效,调整)、斑马PDA广播模式设置
|
// 1.1 霍尼韦尔的监听修改(扫描网站二维码跳出程序,监听失效,调整)、斑马PDA广播模式设置
|
||||||
|
// 1.2 霍尼韦尔EDA56、jdk11,gradle7.3、海信PDA广播支持
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
@ -54,8 +55,8 @@ android {
|
|||||||
|
|
||||||
//编译选项
|
//编译选项
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_11
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_11
|
||||||
}
|
}
|
||||||
/* repositories {
|
/* repositories {
|
||||||
flatDir {
|
flatDir {
|
||||||
|
|||||||
@ -87,8 +87,13 @@ public class MainActivity extends AppCompatActivity implements ResultListener{
|
|||||||
adapter = new AlpsAdapter(this, this);
|
adapter = new AlpsAdapter(this, this);
|
||||||
break;
|
break;
|
||||||
case HONEY_WELL_EDA50P:
|
case HONEY_WELL_EDA50P:
|
||||||
|
// 51、56都是同一个code
|
||||||
case HONEY_WELL_EDA51:
|
case HONEY_WELL_EDA51:
|
||||||
|
if ("eda56".equals(Build.MODEL.toLowerCase())) {
|
||||||
|
adapter = new HoneywellEda56Adapter(this, this);
|
||||||
|
}else {
|
||||||
adapter = new HoneywellAdapter(this, this);
|
adapter = new HoneywellAdapter(this, this);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case ZEBRA_TECHNOLOGIES:
|
case ZEBRA_TECHNOLOGIES:
|
||||||
adapter = new ZebraAdapter(this, this);
|
adapter = new ZebraAdapter(this, this);
|
||||||
|
|||||||
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -5,7 +5,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
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
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
6
gradle/wrapper/gradle-wrapper.properties
vendored
6
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Mon Feb 01 13:41:10 CST 2021
|
#Tue Jun 13 09:53:56 CST 2023
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
Reference in New Issue
Block a user