PDA/pda-web
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.18 瑞兴平板，rk3568_r，存在两个ttyS8、ttyS1，2G内存之前是ttyS8才可以接收，4G内存的ttyS8直接报错，导致打不开，需要缓存ttyS1，改成兼容模式

Browse Source 
支持霍尼韦尔eda52服务扫描修改成广播模式，医院那边不要所谓的服务连续扫描
This commit is contained in:
yao-1212
2026-04-16 09:50:41 +08:00
parent 2f8f958a6a
commit 3365972f83
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -11,7 +11,7 @@ android {
minSdk 28 minSdk 28
targetSdk 28 targetSdk 28
versionCode 1 versionCode 1
versionName "2.17" versionName "2.18"
// 1.0 IDATA广播模式处理 // 1.0 IDATA广播模式处理
// 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置 // 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置
@ -53,6 +53,8 @@ android {
// 2.15 添加文件选择和相机拍照功能 // 2.15 添加文件选择和相机拍照功能
// 2.16 暴露了一个直接调用相机的方法，非http input调用会出现默认的弹出窗口进行选择（相机、文件） // 2.16 暴露了一个直接调用相机的方法，非http input调用会出现默认的弹出窗口进行选择（相机、文件）
// 2.17 支持原生相机，默认压缩；支持霍尼韦尔eda52服务扫描 // 2.17 支持原生相机，默认压缩；支持霍尼韦尔eda52服务扫描
// 2.18 瑞兴平板，rk3568_r，存在两个ttyS8、ttyS1，2G内存之前是ttyS8才可以接收，4G内存的ttyS8直接报错，导致打不开，需要缓存ttyS1，改成兼容模式
// 支持霍尼韦尔eda52服务扫描修改成广播模式，医院那边不要所谓的服务连续扫描
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a'

2
app/src/main/java/chaoran/business/activity/MainActivity.java
View File

@ -167,7 +167,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener{
if ( if (
"eda50p".equals(Build.MODEL.toLowerCase()) "eda50p".equals(Build.MODEL.toLowerCase())
|| "eda51".equals(Build.MODEL.toLowerCase()) || "eda51".equals(Build.MODEL.toLowerCase())
|| "eda52".equals(Build.MODEL.toLowerCase()) // || "eda52".equals(Build.MODEL.toLowerCase()) // todo
|| "tc26".equals(Build.MODEL.toLowerCase()) || "tc26".equals(Build.MODEL.toLowerCase())
) { ) {
// 走服务模式 // 走服务模式

8
app/src/main/java/chaoran/business/adapter/RockChipAdapter.java
View File

@ -46,7 +46,7 @@ public class RockChipAdapter implements Adapter {
if (Build.MODEL.equalsIgnoreCase("rk3568_r")) { if (Build.MODEL.equalsIgnoreCase("rk3568_r")) {
fileName = "/dev/ttyS8"; fileName = "/dev/ttyS8";
} }
this.strategy = new Reader(new File(fileName), 115200, 0); this.strategy = new Reader(new File(fileName), 115200, 0, fileName);
} }
public class Reader implements Strategy { public class Reader implements Strategy {
@ -54,7 +54,7 @@ public class RockChipAdapter implements Adapter {
private FileInputStream mFileInputStream; private FileInputStream mFileInputStream;
private boolean running = true; private boolean running = true;
public Reader(File device, int baudrate, int flags) { public Reader(File device, int baudrate, int flags, String fileName) {
if (!device.canRead() || !device.canWrite()) { if (!device.canRead() || !device.canWrite()) {
try { try {
@ -73,6 +73,10 @@ public class RockChipAdapter implements Adapter {
} }
mFd = open(device.getAbsolutePath(), baudrate, flags); mFd = open(device.getAbsolutePath(), baudrate, flags);
if (mFd == null) { if (mFd == null) {
if (!"/dev/ttyS1".equals(fileName)) {
strategy = new Reader(new File("/dev/ttyS1"), 115200, 0, "/dev/ttyS1");
return;
}
System.out.println("获取文件描述符失败！"); System.out.println("获取文件描述符失败！");
} }
mFileInputStream = new FileInputStream(mFd); mFileInputStream = new FileInputStream(mFd);