From d949619023be2aa87d75c89960547f1cfc461b88 Mon Sep 17 00:00:00 2001 From: jieyao Date: Fri, 20 Jun 2025 17:23:29 +0800 Subject: [PATCH] =?UTF-8?q?2.7=20=E6=B5=B7=E5=BA=B7=E5=A8=81=E8=A7=86=20?= =?UTF-8?q?=20mv-idp5204=20=20=E9=80=82=E9=85=8D=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=9B=E5=92=8C=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?idp5102=E5=8E=82=E5=AE=B6code=E4=B8=8D=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 ++- app/src/main/java/chaoran/business/BrandEnum.java | 3 ++- app/src/main/java/chaoran/business/activity/MainActivity.java | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b660ad0..6e2f208 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 28 targetSdk 28 versionCode 1 - versionName "2.6" + versionName "2.7" // 1.0 IDATA广播模式处理 // 1.1 霍尼韦尔的监听修改(扫描网站二维码跳出程序,监听失效,调整)、斑马PDA广播模式设置 @@ -41,6 +41,7 @@ android { // 2.6 1、打开程序的时候清空缓存(为了程序更新的时候,不被缓存影响,不用手动清除、出现了用户手动清除的时候吧存储空间清除了); // 2、判断是否初始化成功(webview成功),如果已经加载完毕,那么apk不在拦截,调用js的方法让BS进行处理提示 // 3、根据官方文档,将code的判断进行修改,添加了一个网络错误的页面进行提示(并且添加了一个重新加载的按钮,执行webview重新加载) + // 2.7 海康威视 mv-idp5204 适配广播模式;和之前的idp5102厂家code不一样 宿州市立医院-李德 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { abiFilters 'armeabi-v7a' diff --git a/app/src/main/java/chaoran/business/BrandEnum.java b/app/src/main/java/chaoran/business/BrandEnum.java index 98d3b38..da94754 100644 --- a/app/src/main/java/chaoran/business/BrandEnum.java +++ b/app/src/main/java/chaoran/business/BrandEnum.java @@ -25,7 +25,8 @@ public enum BrandEnum { ZEBRA_TECHNOLOGIES("斑马TP26CK", "zebra technologies"), SEUIC("东集", "seuic"), ALPS("阿尔卑斯", "alps"), - HKWS("海康威视", "mv-idp5102"); + HKWS("海康威视", "mv-idp5102"), + HKWS2("海康威视", "droi"); // mv-idp5204 宿州市立医院 private String name; private String code; diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java index 1599c7e..2d976f8 100644 --- a/app/src/main/java/chaoran/business/activity/MainActivity.java +++ b/app/src/main/java/chaoran/business/activity/MainActivity.java @@ -169,6 +169,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener{ adapter = new UrovoAdapter(this, this); break; case HKWS: + case HKWS2: adapter = new HkwsAdapter(this, this); break; case NEW_LAND: