From ec798944adf21e4460e60428a98d16fa759ace2c Mon Sep 17 00:00:00 2001
From: jieyao <a2971306172@qq.com>
Date: Wed, 24 Jul 2024 10:04:56 +0800
Subject: [PATCH] =?UTF-8?q?1.14=20=E7=91=9E=E8=8A=AF=20rk3566=5Fr=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=95=E7=94=A8=20librockchip.so=EF=BC=9B?=
 =?UTF-8?q?=20=E6=96=B0=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=BD=93=E5=89=8DPDA=E7=9A=84?=
 =?UTF-8?q?=E5=8E=82=E5=AE=B6=E5=92=8C=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                      |  7 ++++++-
 .../java/chaoran/business/utils/LocalAddressUtil.java | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

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();
+    }
 }