| HDLSDK/hdl-common/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-connect/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-socket/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDLSDK/hdl-common/build.gradle
@@ -9,7 +9,7 @@ minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion versionCode 2 versionName "1.0.6" versionName "1.0.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java
@@ -19,7 +19,7 @@ return version; } private String version="1.0.6"; private String version="1.0.7"; private HDLSdk() { } HDLSDK/hdl-connect/build.gradle
@@ -9,7 +9,7 @@ minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion versionCode 2 versionName "1.0.6" versionName "1.0.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
@@ -1,5 +1,6 @@ package com.hdl.sdk.connect; import com.hdl.sdk.common.utils.ThreadToolUtils; import com.hdl.sdk.connect.bean.request.DeviceControlRequest; import com.hdl.sdk.connect.callback.HDLLinkCallBack; import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack; @@ -11,6 +12,7 @@ import com.hdl.sdk.connect.socket.HDLSocket; import java.util.List; import java.util.concurrent.TimeUnit; /** * Created by jlchen on 11/15/21. @@ -32,6 +34,12 @@ synchronized (HDLLink.class) { if (instance == null) { instance = new HDLLink(); // ThreadToolUtils.getInstance().newScheduledThreadPool(1).scheduleWithFixedDelay(new Runnable() { // @Override // public void run() { ////定期搜索网关，后面看有必要再做 // } // },0,10, TimeUnit.SECONDS); } } } HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
@@ -23,7 +23,6 @@ private String localSecret;//本地加密密钥 private String gatewayId; private String ipAddress; private boolean isLocalEncrypt;//网关是否需要加密通讯 private GatewaySearchBean currentGateway;//当前网关 private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//当前设备基本信息 @@ -57,7 +56,6 @@ this.gatewayId = ""; this.ipAddress = ""; this.localSecret = ""; this.isLocalEncrypt = false; SPUtils.remove(AUTHENTICATE_LS_KEY); SPUtils.remove(AUTHENTICATE_GATEWAYID_KEY); SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY); @@ -71,7 +69,6 @@ localSecret = SPUtils.getString(AUTHENTICATE_LS_KEY, ""); gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, ""); ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, ""); isLocalEncrypt = SPUtils.getBoolean(AUTHENTICATE_IS_LS_KEY, false); } /** @@ -115,7 +112,6 @@ } public String getLocalSecret() { LogUtils.i("HDLLinkConfig","密钥是:"+localSecret); return localSecret; } @@ -131,15 +127,6 @@ } public void setIpAddress(String ipAddress){ this.ipAddress = ipAddress; } public boolean isLocalEncrypt() { return isLocalEncrypt; } public void setLocalEncrypt(boolean localEncrypt) { isLocalEncrypt = localEncrypt; SPUtils.put(AUTHENTICATE_IS_LS_KEY, isLocalEncrypt); } public GatewaySearchBean getCurrentGateway() { @@ -169,7 +156,7 @@ && !topicStr.contains(TopicConstant.DEIVCE_AUTH_REQUEST) //入网认证 && !topicStr.contains(TopicConstant.GATEWAY_SEARCH) //搜索网关主题 && !topicStr.contains(TopicConstant.BROADCAST) && isLocalEncrypt//启用加密标志 && !TextUtils.isEmpty(localSecret) //有密钥就是加密 ); }
@@ -165,11 +165,13 @@ body = bodyBytes; } else { try { LogUtils.e("解密失败，数据内容是：\r\n"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) LogUtils.e(Base64.getEncoder().encodeToString(body)); else { LogUtils.e(new String(body, "utf-8")); //之前的版本这块是明文的 if (!topic.contains("heartbeat_reply")) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) LogUtils.e("解密失败，数据内容是：\r\n" + Base64.getEncoder().encodeToString(body)); else { LogUtils.e("解密失败，数据内容是：\r\n" + new String(body, "utf-8")); } } } catch (Exception e) { } HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
@@ -229,6 +229,7 @@ }); } // /** // * 发送入网及认证请求 // * @@ -496,7 +497,6 @@ isSearchGatewaySuccess.set(true);//搜索成功标记 searchGatewayCount.set(11);//次数标记 HDLLinkConfig.getInstance().setCurrentGateway(searchBean);//设置当前网关 HDLLinkConfig.getInstance().setLocalEncrypt(searchBean.isLocalEncrypt());//设置是否加密 if (mSearchGatewayCallBack != null) { mSearchGatewayCallBack.onSuccess(searchBean); } @@ -529,7 +529,6 @@ //主网关并且是当前绑定的网关 if ("true".equals(gateway.getMaster().toLowerCase()) && gateway.getGatewayId().equals(HDLLinkConfig.getInstance().getGatewayId())) { HDLLinkConfig.getInstance().setCurrentGateway(gateway);//设置当前网关 HDLLinkConfig.getInstance().setLocalEncrypt(gateway.isLocalEncrypt());//设置是否加密 HDLLinkConfig.getInstance().setIpAddress(gateway.getIp_address()); //更新当前网关的信息 HDLLinkConfig.getInstance().reSaveConfig(); HDLSDK/hdl-socket/build.gradle
@@ -9,7 +9,7 @@ minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion versionCode 2 versionName "1.0.6" versionName "1.0.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java
@@ -77,7 +77,7 @@ mSocket.setTcpNoDelay(true); mSocket.setReuseAddress(true); // mSocket.setKeepAlive(true); mSocket.setSoTimeout(20 * 1000); mSocket.setSoTimeout(25 * 1000); tcpClientList.add(this); }
