diff --git a/app/build.gradle b/app/build.gradle index c6dbf64..cd5b862 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 28 targetSdk 28 versionCode 1 - versionName "1.13" + versionName "1.14" // 1.0 IDATA广播模式处理 // 1.1 霍尼韦尔的监听修改(扫描网站二维码跳出程序,监听失效,调整)、斑马PDA广播模式设置 @@ -27,7 +27,11 @@ android { // 1.11 霍尼韦尔EDA52 // 1.12 屏幕旋转,采取配置化模式(只能竖屏、横屏);取消旋转屏幕就重置activity生命周期 // 1.13 新大陆pda 兼容广播模式;NLS-NFT10 + // 1.14 瑞芯 rk3566_r 添加引用 librockchip.so; 新加一个方法,返回当前PDA的厂家和型号 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + ndk { + abiFilters 'armeabi-v7a' + } } //签名配置 @@ -85,4 +89,5 @@ dependencies { //implementation fileTree(include: ['*.aar'], dir: 'libs') // 全屏,没有状态栏 api 'com.readystatesoftware.systembartint:systembartint:1.0.3' + implementation files('libs/armeabi-v7a/librockchip.so') } \ No newline at end of file diff --git a/app/src/main/java/chaoran/business/utils/LocalAddressUtil.java b/app/src/main/java/chaoran/business/utils/LocalAddressUtil.java index ad9a80f..bc0d457 100644 --- a/app/src/main/java/chaoran/business/utils/LocalAddressUtil.java +++ b/app/src/main/java/chaoran/business/utils/LocalAddressUtil.java @@ -18,6 +18,7 @@ import java.net.NetworkInterface; import java.net.SocketException; import java.util.Enumeration; +import chaoran.business.BrandEnum; import chaoran.business.BuildConfig; import chaoran.business.R; import chaoran.business.activity.MainActivity; @@ -164,4 +165,14 @@ public class LocalAddressUtil { public String getApkVersion() { return BuildConfig.VERSION_NAME; } + + /** + * 暴露PDA的厂家和型号 + * @return String 格式:厂家:型号 + */ + @SuppressLint("JavascriptInterface") + @JavascriptInterface + public String getPdaInfo() { + return Build.MANUFACTURER + ":" + Build.MODEL.toLowerCase(); + } }