From 93f13e7b2e046c6d86d10e7abc2ecaa4c4adabc3 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 21 十二月 2021 11:47:38 +0800
Subject: [PATCH] 完善tcp
---
HDLSDK/hdl-common/build.gradle | 2 +-
/dev/null | 0
HDLSDK/hdl-connect/build.gradle | 2 +-
HDLSDK/hdl-socket/build.gradle | 2 +-
HDLSDK_DEMO/app/libs/hdl-socket-V1.0.3.aar | 0
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java | 2 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 4 +++-
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 3 ++-
HDLSDK_DEMO/app/libs/hdl-common-V1.0.3.aar | 0
HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar | 0
10 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index 2533b47..0c7d606 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -260,7 +260,8 @@
infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
infoBean.setAccessMode("WIFI");
infoBean.setIPGateway("192.168.88.1");
- infoBean.setIPAddress(IpUtils.getIP(this));
+ infoBean.setIPAddress("192.168.88.100");
+ infoBean.setGateway_type("music.standard");
infoBean.setHw_version("HW2.0");
infoBean.setFw_version("Fw1.0");
infoBean.setOID("010105000000FE08");
diff --git a/HDLSDK/hdl-common/build.gradle b/HDLSDK/hdl-common/build.gradle
index c3c6ca8..dc0beb2 100644
--- a/HDLSDK/hdl-common/build.gradle
+++ b/HDLSDK/hdl-common/build.gradle
@@ -9,7 +9,7 @@
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode 2
- versionName "1.0.2"
+ versionName "1.0.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
diff --git a/HDLSDK/hdl-connect/build.gradle b/HDLSDK/hdl-connect/build.gradle
index 0889a17..6391fed 100644
--- a/HDLSDK/hdl-connect/build.gradle
+++ b/HDLSDK/hdl-connect/build.gradle
@@ -9,7 +9,7 @@
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode 2
- versionName "1.0.2"
+ versionName "1.0.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
index 2048b61..e772421 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
@@ -82,7 +82,8 @@
return;
}
BroadcastRequest request = new BroadcastRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), "200");
- HDLAuthSocket.getInstance().udpSendMsg("/user/all/custom/gateway/broadcast", GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() {
+ HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request),true);
+ HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() {
@Override
public void onSuccess(LinkResponse msg) {
LogUtils.i("骞挎挱淇℃伅缁欎富缃戝叧鎴愬姛锛�");
@@ -93,6 +94,7 @@
}
});
+ HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request),true);
}
private static class SingletonInstance {
diff --git a/HDLSDK/hdl-socket/build.gradle b/HDLSDK/hdl-socket/build.gradle
index 21a9e32..c7d6c5c 100644
--- a/HDLSDK/hdl-socket/build.gradle
+++ b/HDLSDK/hdl-socket/build.gradle
@@ -9,7 +9,7 @@
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode 2
- versionName "1.0.2"
+ versionName "1.0.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
index 8126367..f1ae46d 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
@@ -59,7 +59,7 @@
try {
LogUtils.i("TCP杩炴帴");
client.onConnectStatus(ConnectStatus.CONNECTING);
- Thread.sleep(1500);
+ Thread.sleep(700);
client.connect();
connected=true;
client.onConnectStatus(ConnectStatus.CONNECTED);
diff --git a/HDLSDK_DEMO/app/libs/hdl-common-V1.0.2.aar b/HDLSDK_DEMO/app/libs/hdl-common-V1.0.2.aar
deleted file mode 100644
index fa3988c..0000000
--- a/HDLSDK_DEMO/app/libs/hdl-common-V1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/hdl-common-V1.0.3.aar b/HDLSDK_DEMO/app/libs/hdl-common-V1.0.3.aar
new file mode 100644
index 0000000..395037a
--- /dev/null
+++ b/HDLSDK_DEMO/app/libs/hdl-common-V1.0.3.aar
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.2.aar b/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.2.aar
deleted file mode 100644
index 1c47616..0000000
--- a/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar b/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar
new file mode 100644
index 0000000..7918ad1
--- /dev/null
+++ b/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/hdl-socket-V1.0.2.aar b/HDLSDK_DEMO/app/libs/hdl-socket-V1.0.2.aar
deleted file mode 100644
index 59ea7bf..0000000
--- a/HDLSDK_DEMO/app/libs/hdl-socket-V1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/hdl-socket-V1.0.3.aar b/HDLSDK_DEMO/app/libs/hdl-socket-V1.0.3.aar
new file mode 100644
index 0000000..f541a33
--- /dev/null
+++ b/HDLSDK_DEMO/app/libs/hdl-socket-V1.0.3.aar
Binary files differ
--
Gitblit v1.8.0