PDA/chao-ran-pdaclient
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

部分修改

Browse Source
This commit is contained in:
方孝勇
2021-01-15 13:47:15 +08:00
parent f430d3abb7
commit 7b04a36f52
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -11,7 +11,7 @@ android {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 15 targetSdkVersion 15
versionCode 1 versionCode 1
versionName "1.0" versionName "V1.078"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -31,8 +31,16 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
//加载动态库
sourceSets{
main{
jniLibs.srcDir(['libs'])
}
}
} }
dependencies { dependencies {
//加载jar包
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
} }

2
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.chaoran" package="com.example.chaoran"
android:versionCode="1" android:versionCode="1"
android:versionName="V1.077" > android:versionName="V1.078" >
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />

34
app/src/main/java/com/example/chaoran/DjActivity.java
View File

@ -466,7 +466,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
androidHandheldTerminal.start(); androidHandheldTerminal.start();
if (nr510ScanControl != null) if (nr510ScanControl != null)
nr510ScanControl.start(DjActivity.this); nr510ScanControl.start(DjActivity.this);
if(uroBoScannerControl!=null){ if (uroBoScannerControl != null) {
uroBoScannerControl.start(); uroBoScannerControl.start();
} }
if (barcodeReader != null) { if (barcodeReader != null) {
@ -787,8 +787,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
//androidHandheldTerminal = new AndroidHandheldTerminal(); //androidHandheldTerminal = new AndroidHandheldTerminal();
} else if ("nr510".equals(phoneModel) || "android".equals(phoneModel)) { } else if ("nr510".equals(phoneModel) || "android".equals(phoneModel)) {
nr510ScanControl = new Nr510ScanControl(); nr510ScanControl = new Nr510ScanControl();
}else if("i6200series".equals(phoneModel)){ } else if ("i6200series".equals(phoneModel)) {
uroBoScannerControl=new UroBoScannerControl(); uroBoScannerControl = new UroBoScannerControl();
} else if ("scanpal eda50".equals(phoneModel)) { } else if ("scanpal eda50".equals(phoneModel)) {
// get bar code instance from MainActivity // get bar code instance from MainActivity
// DialogUtil.builder(DjActivity.this, "信息", "初始化失败:111111111111111111", 0); // DialogUtil.builder(DjActivity.this, "信息", "初始化失败:111111111111111111", 0);
@ -1054,7 +1054,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
androidHandheldTerminal0.start(); androidHandheldTerminal0.start();
} else if (haixinN1SDemoReceiver != null) { } else if (haixinN1SDemoReceiver != null) {
haixinN1sStart(); haixinN1sStart();
}else if(uroBoScannerControl!=null){ } else if (uroBoScannerControl != null) {
uroBoScannerControl.start(); uroBoScannerControl.start();
} }
if (seuicScanner != null) {// seuic PDA操作 if (seuicScanner != null) {// seuic PDA操作
@ -1088,10 +1088,9 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
seuicScanner.open(); seuicScanner.open();
} else if (cr5wScanControl != null) } else if (cr5wScanControl != null)
cr5wScanControl.start(DjActivity.this); cr5wScanControl.start(DjActivity.this);
else if(uroBoScannerControl!=null){ else if (uroBoScannerControl != null) {
uroBoScannerControl.start(); uroBoScannerControl.start();
} } else if (nr510ScanControl != null)
else if (nr510ScanControl != null)
nr510ScanControl.start(DjActivity.this); nr510ScanControl.start(DjActivity.this);
else if (androidHandheldTerminal != null) else if (androidHandheldTerminal != null)
androidHandheldTerminal.start(); androidHandheldTerminal.start();
@ -1124,7 +1123,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
androidHandheldTerminal0.stop(); androidHandheldTerminal0.stop();
} else if (haixinN1SDemoReceiver != null) { } else if (haixinN1SDemoReceiver != null) {
haixinN1sStop(); haixinN1sStop();
}else if(uroBoScannerControl!=null){ } else if (uroBoScannerControl != null) {
uroBoScannerControl.stop(); uroBoScannerControl.stop();
} }
System.out.println("onPause"); System.out.println("onPause");
@ -1577,7 +1576,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
nr510ScanControl.stop(DjActivity.this); nr510ScanControl.stop(DjActivity.this);
else if (haixinN1SDemoReceiver != null) { else if (haixinN1SDemoReceiver != null) {
haixinN1sStop(); haixinN1sStop();
}else if(uroBoScannerControl!=null){ } else if (uroBoScannerControl != null) {
uroBoScannerControl.stop(); uroBoScannerControl.stop();
} }
// else if (androidHandheldTerminal0 != null) // else if (androidHandheldTerminal0 != null)
@ -1605,7 +1604,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
androidHandheldTerminal.stop(); androidHandheldTerminal.stop();
else if (haixinN1SDemoReceiver != null) { else if (haixinN1SDemoReceiver != null) {
haixinN1sStop(); haixinN1sStop();
}else if(uroBoScannerControl!=null){ } else if (uroBoScannerControl != null) {
uroBoScannerControl.stop(); uroBoScannerControl.stop();
} }
// else if (androidHandheldTerminal0 != null) // 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 { public class UroBoScannerControl extends BroadcastReceiver {
private ScanManager mScanManager; private ScanManager mScanManager;
private Vibrator mVibrator; private Vibrator mVibrator;
@ -2471,20 +2471,16 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
soundPool.play(soundid, 1, 1, 0, 0, 1); soundPool.play(soundid, 1, 1, 0, 0, 1);
mVibrator.vibrate(100); mVibrator.vibrate(100);
byte[] barcode = intent.getByteArrayExtra("barocode"); String barcode = intent.getStringExtra("barcode_string");
int barocodelen = intent.getIntExtra("length", 0);
String barcodeStr = new String(barcode, 0, barocodelen);
handler.post(new Runnable() { handler.post(new Runnable() {
public void run() { public void run() {
View rootview = DjActivity.this.getWindow().getDecorView(); View rootview = DjActivity.this.getWindow().getDecorView();
View aaa = rootview.findFocus(); View aaa = rootview.findFocus();
if (aaa instanceof SelfEditText) { if (aaa instanceof SelfEditText) {
SelfEditText set = (SelfEditText) aaa; SelfEditText set = (SelfEditText) aaa;
if (set.closeKeyBoard) { set.setText(barcode);
set.setText(barcodeStr); set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER)); set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));
set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));
}
} }
} }
}); });