From 3365972f83dcd4d6d3898b87c09d5c5f1af2084c Mon Sep 17 00:00:00 2001 From: yao-1212 <59220794+yao-1212@users.noreply.github.com> Date: Thu, 16 Apr 2026 09:50:41 +0800 Subject: [PATCH] =?UTF-8?q?2.18=20=E7=91=9E=E5=85=B4=E5=B9=B3=E6=9D=BF?= =?UTF-8?q?=EF=BC=8Crk3568=5Fr=EF=BC=8C=E5=AD=98=E5=9C=A8=E4=B8=A4?= =?UTF-8?q?=E4=B8=AAttyS8=E3=80=81ttyS1=EF=BC=8C2G=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=98=AFttyS8=E6=89=8D=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=EF=BC=8C4G=E5=86=85=E5=AD=98=E7=9A=84ttyS8?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=8A=A5=E9=94=99=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=89=93=E4=B8=8D=E5=BC=80=EF=BC=8C=E9=9C=80=E8=A6=81=E7=BC=93?= =?UTF-8?q?=E5=AD=98ttyS1=EF=BC=8C=E6=94=B9=E6=88=90=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=20=20=20=20=20=E6=94=AF=E6=8C=81=E9=9C=8D?= =?UTF-8?q?=E5=B0=BC=E9=9F=A6=E5=B0=94eda52=E6=9C=8D=E5=8A=A1=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BF=AE=E6=94=B9=E6=88=90=E5=B9=BF=E6=92=AD=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=8C=BB=E9=99=A2=E9=82=A3=E8=BE=B9=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E6=89=80=E8=B0=93=E7=9A=84=E6=9C=8D=E5=8A=A1=E8=BF=9E?= =?UTF-8?q?=E7=BB=AD=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +++- .../main/java/chaoran/business/activity/MainActivity.java | 2 +- .../java/chaoran/business/adapter/RockChipAdapter.java | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 864c620..c7b181e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 28 targetSdk 28 versionCode 1 - versionName "2.17" + versionName "2.18" // 1.0 IDATA广播模式处理 // 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置 @@ -53,6 +53,8 @@ android { // 2.15 添加文件选择和相机拍照功能 // 2.16 暴露了一个直接调用相机的方法，非http input调用会出现默认的弹出窗口进行选择（相机、文件） // 2.17 支持原生相机，默认压缩；支持霍尼韦尔eda52服务扫描 + // 2.18 瑞兴平板，rk3568_r，存在两个ttyS8、ttyS1，2G内存之前是ttyS8才可以接收，4G内存的ttyS8直接报错，导致打不开，需要缓存ttyS1，改成兼容模式 + // 支持霍尼韦尔eda52服务扫描修改成广播模式，医院那边不要所谓的服务连续扫描 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { abiFilters 'armeabi-v7a' diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java index 0f1669b..276c127 100644 --- a/app/src/main/java/chaoran/business/activity/MainActivity.java +++ b/app/src/main/java/chaoran/business/activity/MainActivity.java @@ -167,7 +167,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener{ if ( "eda50p".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()) ) { // 走服务模式 diff --git a/app/src/main/java/chaoran/business/adapter/RockChipAdapter.java b/app/src/main/java/chaoran/business/adapter/RockChipAdapter.java index 64b1164..617cab5 100644 --- a/app/src/main/java/chaoran/business/adapter/RockChipAdapter.java +++ b/app/src/main/java/chaoran/business/adapter/RockChipAdapter.java @@ -46,7 +46,7 @@ public class RockChipAdapter implements Adapter { if (Build.MODEL.equalsIgnoreCase("rk3568_r")) { 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 { @@ -54,7 +54,7 @@ public class RockChipAdapter implements Adapter { private FileInputStream mFileInputStream; 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()) { try { @@ -73,6 +73,10 @@ public class RockChipAdapter implements Adapter { } mFd = open(device.getAbsolutePath(), baudrate, flags); if (mFd == null) { + if (!"/dev/ttyS1".equals(fileName)) { + strategy = new Reader(new File("/dev/ttyS1"), 115200, 0, "/dev/ttyS1"); + return; + } System.out.println("获取文件描述符失败！"); } mFileInputStream = new FileInputStream(mFd);