| .idea/compiler.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .idea/deploymentTargetSelector.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .idea/misc.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_TTLSDK485/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/SerialPortSendAndReceiveUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/sdk/ttl_sdk/HDLApplication.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.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> .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> .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> 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"
@@ -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]; // 复制附加数据 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' /** * 打包自动命名 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
