From 7b04a36f524d73126d3652f821cb46ebf1d7f8b9 Mon Sep 17 00:00:00 2001 From: JOETION <1322874562@qq.com> Date: Fri, 15 Jan 2021 13:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +++++- app/src/main/AndroidManifest.xml | 2 +- .../java/com/example/chaoran/DjActivity.java | 34 ++++++++----------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9828d06..beb519e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdkVersion 8 targetSdkVersion 15 versionCode 1 - versionName "1.0" + versionName "V1.078" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -31,8 +31,16 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + //加载动态库 + sourceSets{ + main{ + jniLibs.srcDir(['libs']) + } + } } dependencies { + //加载jar包 compile fileTree(dir: 'libs', include: ['*.jar']) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e76315e..4f0d319 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionName="V1.078" > diff --git a/app/src/main/java/com/example/chaoran/DjActivity.java b/app/src/main/java/com/example/chaoran/DjActivity.java index f1e2a98..311e72b 100644 --- a/app/src/main/java/com/example/chaoran/DjActivity.java +++ b/app/src/main/java/com/example/chaoran/DjActivity.java @@ -466,7 +466,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf androidHandheldTerminal.start(); if (nr510ScanControl != null) nr510ScanControl.start(DjActivity.this); - if(uroBoScannerControl!=null){ + if (uroBoScannerControl != null) { uroBoScannerControl.start(); } if (barcodeReader != null) { @@ -787,8 +787,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf //androidHandheldTerminal = new AndroidHandheldTerminal(); } else if ("nr510".equals(phoneModel) || "android".equals(phoneModel)) { nr510ScanControl = new Nr510ScanControl(); - }else if("i6200series".equals(phoneModel)){ - uroBoScannerControl=new UroBoScannerControl(); + } else if ("i6200series".equals(phoneModel)) { + uroBoScannerControl = new UroBoScannerControl(); } else if ("scanpal eda50".equals(phoneModel)) { // get bar code instance from MainActivity // DialogUtil.builder(DjActivity.this, "信息", "初始化失败:111111111111111111", 0); @@ -1054,7 +1054,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf androidHandheldTerminal0.start(); } else if (haixinN1SDemoReceiver != null) { haixinN1sStart(); - }else if(uroBoScannerControl!=null){ + } else if (uroBoScannerControl != null) { uroBoScannerControl.start(); } if (seuicScanner != null) {// seuic PDA操作 @@ -1088,10 +1088,9 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf seuicScanner.open(); } else if (cr5wScanControl != null) cr5wScanControl.start(DjActivity.this); - else if(uroBoScannerControl!=null){ + else if (uroBoScannerControl != null) { uroBoScannerControl.start(); - } - else if (nr510ScanControl != null) + } else if (nr510ScanControl != null) nr510ScanControl.start(DjActivity.this); else if (androidHandheldTerminal != null) androidHandheldTerminal.start(); @@ -1124,7 +1123,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf androidHandheldTerminal0.stop(); } else if (haixinN1SDemoReceiver != null) { haixinN1sStop(); - }else if(uroBoScannerControl!=null){ + } else if (uroBoScannerControl != null) { uroBoScannerControl.stop(); } System.out.println("onPause"); @@ -1577,7 +1576,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf nr510ScanControl.stop(DjActivity.this); else if (haixinN1SDemoReceiver != null) { haixinN1sStop(); - }else if(uroBoScannerControl!=null){ + } else if (uroBoScannerControl != null) { uroBoScannerControl.stop(); } // else if (androidHandheldTerminal0 != null) @@ -1605,7 +1604,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf androidHandheldTerminal.stop(); else if (haixinN1SDemoReceiver != null) { haixinN1sStop(); - }else if(uroBoScannerControl!=null){ + } else if (uroBoScannerControl != null) { uroBoScannerControl.stop(); } // else if (androidHandheldTerminal0 != null) @@ -2429,7 +2428,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf /** * 优博讯控制器 */ - UroBoScannerControl uroBoScannerControl=null; + UroBoScannerControl uroBoScannerControl = null; + public class UroBoScannerControl extends BroadcastReceiver { private ScanManager mScanManager; private Vibrator mVibrator; @@ -2471,20 +2471,16 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf soundPool.play(soundid, 1, 1, 0, 0, 1); mVibrator.vibrate(100); - byte[] barcode = intent.getByteArrayExtra("barocode"); - int barocodelen = intent.getIntExtra("length", 0); - String barcodeStr = new String(barcode, 0, barocodelen); + String barcode = intent.getStringExtra("barcode_string"); handler.post(new Runnable() { public void run() { View rootview = DjActivity.this.getWindow().getDecorView(); View aaa = rootview.findFocus(); if (aaa instanceof SelfEditText) { SelfEditText set = (SelfEditText) aaa; - if (set.closeKeyBoard) { - set.setText(barcodeStr); - set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER)); - set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER)); - } + set.setText(barcode); + set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER)); + set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER)); } } });