From 81d297dd33911dbfdc93dbc3fa9747e511b7ce8e Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期五, 08 十一月 2024 14:51:10 +0800
Subject: [PATCH] 优化透传数据解析
---
app/src/main/java/com/hdl/sdk/ttl_sdk/HDLApplication.java | 2 +-
.idea/deploymentTargetSelector.xml | 8 ++++++++
.idea/compiler.xml | 2 +-
HDL_TTLSDK485/build.gradle | 6 +++---
HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/SerialPortSendAndReceiveUtil.java | 10 ++++------
.idea/misc.xml | 2 +-
app/build.gradle | 6 +++---
7 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..b73660a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="1.8" />
+ <bytecodeTargetLevel target="15" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..ebc4157 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
+ <DropdownSelection timestamp="2024-09-23T05:28:34.940591100Z">
+ <Target type="DEFAULT_BOOT">
+ <handle>
+ <DeviceId pluginId="Default" identifier="serial=192.168.1.106:5555;connection=9ecb2e58" />
+ </handle>
+ </Target>
+ </DropdownSelection>
+ <DialogSelection />
</SelectionState>
</selectionStates>
</component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index af0d780..32cf620 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="corretto-15" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>
\ No newline at end of file
diff --git a/HDL_TTLSDK485/build.gradle b/HDL_TTLSDK485/build.gradle
index fdec5b7..fa0137c 100644
--- a/HDL_TTLSDK485/build.gradle
+++ b/HDL_TTLSDK485/build.gradle
@@ -2,11 +2,11 @@
//apply plugin: 'com.novoda.bintray-release'
android {
- buildToolsVersion '28.0.3'
- compileSdkVersion 28
+ buildToolsVersion '30.0.2'
+ compileSdkVersion 30
defaultConfig {
minSdkVersion 17
- targetSdkVersion 28
+ targetSdkVersion 30
versionCode 6
versionName "1.2.3"
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/SerialPortSendAndReceiveUtil.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/SerialPortSendAndReceiveUtil.java
index c975e28..92b725f 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/SerialPortSendAndReceiveUtil.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/SerialPortSendAndReceiveUtil.java
@@ -169,8 +169,8 @@
// 鏇存柊鍙戦�佹槸鍚︽垚鍔熺殑淇℃伅
SendDatas.ReceiveBytes(command, subnetID, deviceID, usefulBytes);
//2019-8-20 澧炲姞鐩爣瀛愮綉鍙疯澶囧彿鍒ゆ柇
- if ((desSubnetID == 0xFF && desSubnetID == 0xFF)
- || (desSubnetID == Crc.localSubnetID && desSubnetID == Crc.localDeviceID)) {
+ /*if ((desSubnetID == 0xFF && desSubnetID == 0xFF)
+ || (desSubnetID == Crc.localSubnetID && desSubnetID == Crc.localDeviceID)) {*/
//鍙傛暟
UdpDataBean udpDataBean = new UdpDataBean();
udpDataBean.sourceSubnetID = subnetID;
@@ -178,11 +178,9 @@
udpDataBean.desSubnetID = desSubnetID;
udpDataBean.desDeviceID = desDeviceID;
udpDataBean.command = command;
-
udpDataBean.addBytes = usefulBytes;
HDLSerialPortCore.HandleInsideData(udpDataBean);
- }
}
};
@@ -261,12 +259,12 @@
int desSubnetID = tempBytes[9] & 0xFF;
int desDeviceID = tempBytes[10] & 0xFF;
//濡傛灉涓嶆槸鍙戠粰鑷繁鐨勬暟鎹垨鑰呬笉鏄箍鎾殑鏁版嵁锛屼笉澶勭悊
- if (desSubnetID != Global.subnetID || desDeviceID != Global.deviceID) {
+ /*if (desSubnetID != Global.subnetID || desDeviceID != Global.deviceID) {
if (desSubnetID != 0xFF || desDeviceID != 0xFF) {
Log.d("涓插彛->鍥炲", "杩囨护鎺�=={鐩爣瀛愮綉:" + desSubnetID + ",鐩爣璁惧:" + desDeviceID + "}");
continue;
}
- }
+ }*/
byte[] usefulBytes = new byte[(tempBytes[2] & 0xFF) - 11];
// 澶嶅埗闄勫姞鏁版嵁
diff --git a/app/build.gradle b/app/build.gradle
index 00cd3d0..3c8b5c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 28
+ compileSdkVersion 30
defaultConfig {
applicationId "com.hdl.sdk.ttl_sdk"
minSdkVersion 17
- targetSdkVersion 28
+ targetSdkVersion 30
versionCode 3
versionName "1.0.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -16,7 +16,7 @@
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
- buildToolsVersion '28.0.3'
+ buildToolsVersion '30.0.2'
/**
* 鎵撳寘鑷姩鍛藉悕
diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/HDLApplication.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/HDLApplication.java
index 728c877..99d5609 100644
--- a/app/src/main/java/com/hdl/sdk/ttl_sdk/HDLApplication.java
+++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/HDLApplication.java
@@ -9,7 +9,7 @@
*/
public class HDLApplication extends Application {
- public static final String HDL_UART_PATH = "/dev/ttyS9"; //涓插彛璁惧璺緞鍚�
+ public static final String HDL_UART_PATH = "/dev/ttyS4"; //涓插彛璁惧璺緞鍚�
public static final int HDL_BAUDRATE = 115200; //娉㈢壒鐜�
@Override
--
Gitblit v1.8.0