From a4246a571c78ac6c46e7bf7dbfc123b7148caed8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 16 十一月 2021 13:43:48 +0800
Subject: [PATCH] 2021-11-16 1.更新
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/FunctionAttributeRequest.java | 2
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 17
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/NetworkAccessBroadcastResponse.java | 22
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 15
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java | 19
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java | 2
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 617 ++++++++++++--------
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java | 24
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/BaseLocalRequest.java | 2
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/AuthenticateResponse.java | 12
HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java | 10
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | 141 ++++
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java | 223 +++++--
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java | 3
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseResponse.java | 30 +
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyUpRequest.java | 2
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkResponseCallBack.java | 12
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseLocalResponse.java | 2
HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/config/TopicConstant.java | 19
HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkException.java | 63 ++
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/BaseCallBack.java | 12
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/GatewaySearchBean.java | 4
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkCallBack.java | 13
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java | 6
HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkCode.java | 44 +
HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java | 13
HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/utils/LogUtils.java | 56 +
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java | 7
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/DeviceControlRequest.java | 2
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 320 ++++++++--
30 files changed, 1,217 insertions(+), 497 deletions(-)
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
index 92aa5d2..f7e8f3c 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
@@ -5,23 +5,24 @@
import com.hdl.sdk.common.HDLSdk;
import com.hdl.sdk.common.event.EventListener;
+import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.connect.HDLLink;
+import com.hdl.sdk.connect.bean.LinkResponse;
/**
* Created by Tong on 2021/10/8.
*/
public class App extends Application {
+ private String deviceStatusUpdateTopic;
@Override
public void onCreate() {
super.onCreate();
+ //鍒濆鍖朣DK
HDLSdk.getInstance().init(this);
- HDLLink.getInstance().registerAllTopicsListener(new EventListener() {
- @Override
- public void onMessage(Object msg) {
- Log.i("TAG", "AllTopicsListener onMessage: "+msg.toString());
- }
- });
+ //鎺у埗SDK鏃ュ織鎵撳嵃
+ HDLSdk.getInstance().setLogEnabled(false);
+
}
@Override
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 4223f60..2a652c1 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -17,15 +17,20 @@
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemClickListener;
+import com.hdl.sdk.common.event.EventListener;
+import com.hdl.sdk.common.exception.HDLLinkException;
import com.hdl.sdk.common.utils.IdUtils;
import com.hdl.sdk.common.utils.IpUtils;
import com.hdl.sdk.connect.HDLLink;
-import com.hdl.sdk.connect.bean.AuthenticateRequest;
-import com.hdl.sdk.connect.bean.GatewaySearchBean;
-import com.hdl.sdk.connect.config.HDLLinkConfig;
+import com.hdl.sdk.connect.bean.LinkResponse;
+import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
+import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
+import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
+import com.hdl.sdk.connect.callback.HDLLinkCallBack;
+import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
import com.hdl.sdk.connect.socket.HDLAuthSocket;
import com.hdl.sdk.connect.socket.HDLSocket;
-import com.hdl.sdk.connect.bean.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
import com.hdl.sdk.connect.protocol.LinkMessageDecoder;
import com.hdl.sdk.connect.protocol.LinkMessageEncoder;
import com.hdl.sdk.socket.SocketOptions;
@@ -45,7 +50,14 @@
private TextView tv;
private TextView responseTv;
boolean isOn;
+ private EventListener allTopicsListener;
+ private String testLightSid = "000101B847C71B02020100010101";
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ removeAllTopicsListener();
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -57,6 +69,7 @@
rv.setLayoutManager(new LinearLayoutManager(this));
checkIfCertified();
+ registerAllTopicsListener();
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@Override
@@ -68,14 +81,14 @@
launcher.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE});
final List<DemoBean> beans = new ArrayList<>();
- beans.add(new DemoBean("鎼滅储缃戝叧"));
+ beans.add(new DemoBean("鍏ョ綉璁よ瘉"));
+ beans.add(new DemoBean("鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎"));
beans.add(new DemoBean("鑾峰彇鍔熻兘鍒楄〃"));
beans.add(new DemoBean("鍔熻兘灞炴�ц鍙�"));
beans.add(new DemoBean("璁惧鎺у埗"));
- beans.add(new DemoBean("鐘舵�佷笂鎶�"));
beans.add(new DemoBean("璇诲彇鐘舵��"));
- beans.add(new DemoBean("鍏ョ綉璁よ瘉"));
- beans.add(new DemoBean("鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎"));
+ beans.add(new DemoBean("鑾峰彇鍦烘櫙鍒楄〃"));
+ beans.add(new DemoBean("鍦烘櫙鎺у埗"));
demoAdapter = new DemoAdapter(beans);
rv.setAdapter(demoAdapter);
@@ -93,91 +106,36 @@
public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
switch (position) {
case 0:
- tv.setText("鎼滅储缃戝叧涓�");
- responseTv.setText("");
-
- HDLSocket.getInstance().searchGateway(new HDLSocket.CallBack() {
- @Override
- public void onError(String error) {
- tv.setText("缃戝叧鑾峰彇澶辫触");
- }
-
- @Override
- public void onResponse(String data) {
- tv.setText("鑾峰彇缃戝叧鎴愬姛");
- responseTv.setText(data);
- }
- });
-
+ //鍏ョ綉璁よ瘉
+ sendAuthenticateRequest();
break;
case 1:
-
- tv.setText("鑾峰彇鍔熻兘鍒楄〃涓�");
- responseTv.setText("");
- HDLSocket.getInstance().getFunctionList(new HDLSocket.CallBack() {
- @Override
- public void onError(String error) {
- tv.setText(error);
- }
-
- @Override
- public void onResponse(String data) {
- tv.setText("鑾峰彇鍔熻兘鍒楄〃鎴愬姛");
- responseTv.setText(data);
- }
- });
+ //鎼滅储缃戝叧
+ searchGatewayBroadcast();
break;
case 2:
- //鍔熻兘灞炴�ц鍙�
- // HDLSocket.getInstance().getFunctionAttribute();
-
+ //鑾峰彇鍔熻兘鍒楄〃
+ getFunctionList();
break;
case 3:
- //璁惧鎺у埗
- isOn = !isOn;
- List<DeviceControlRequest> requestList = new ArrayList<>();
- DeviceControlRequest request = new DeviceControlRequest();
- request.setSid("000101B847C71B02020100010101");
- List<DeviceControlRequest.StatusBean> statusBeanList= new ArrayList<>();
- DeviceControlRequest.StatusBean bean = new DeviceControlRequest.StatusBean();
- bean.setKey("on_off");
- bean.setValue(isOn ? "on" : "off");
- statusBeanList.add(bean);
- request.setStatus(statusBeanList);
- requestList.add(request);
- HDLAuthSocket.getInstance().propertyDown(requestList,null);
-
-
+ //鍔熻兘灞炴�ц鍙�
+ getFunctionAttribute();
break;
case 4:
- //鐘舵�佷笂鎶�
- //HDLSocket.getInstance().propertyUp();
+ //璁惧鎺у埗
+ controlDecide();
break;
case 5:
//璇诲彇鐘舵��
- // HDLSocket.getInstance().propertyRead();
+ propertyRead();
break;
case 6:
-// //鍏ョ綉璁よ瘉
- sendAuthenticateRequest();
+ //鑾峰彇鍦烘櫙鍒楄〃
+ getSceneList();
break;
case 7:
-// //濡傛灉宸茬粡璁よ瘉鍚庯紝鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎
- HDLLink.getInstance().searchGateway(new HDLAuthSocket.SearchGatewayCallBack() {
- @Override
- public void onEnd(String error) {
- tv.setText("缃戝叧涓嶅湪绾�");
- }
-
- @Override
- public void onSuccess(GatewaySearchBean gatewaySearchBean) {
- tv.setText("缃戝叧鍦ㄧ嚎");
- responseTv.setText("缃戝叧id锛�"+gatewaySearchBean.getGatewayId());
-// Log.i("TAG", "onSuccess: 鎼滅储鎴愬姛锛�"+gatewaySearchBean.getGatewayId());
- }
- });
-
-
+ //鑾峰彇鍦烘櫙鍒楄〃
+ controlScene();
break;
}
}
@@ -187,16 +145,42 @@
Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
}
-
+ /**
+ * 妫�娴嬫槸鍚﹁璇佽繃
+ */
void checkIfCertified(){
boolean isCertified = HDLLink.getInstance().checkIfCertified();
- showToast(isCertified?"宸茬粡璁よ瘉杩�":"鏈璇�");
+ String mes = isCertified?"宸茬粡璁よ瘉杩�":"鏈璇�";
+ showToast(mes);
+ tv.setText(mes);
+ }
+
+ /**
+ * 娉ㄥ唽鎵�鏈変富棰樻暟鎹殑鐩戝惉
+ */
+ void registerAllTopicsListener(){
+ allTopicsListener = new EventListener() {
+ @Override
+ public void onMessage(Object msg) {
+ LinkResponse response = (LinkResponse)msg;
+ Log.i("TAG", "AllTopicsListener onMessage: "+msg.toString());
+ }
+ };
+ HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);
+ }
+
+ /**
+ * 绉婚櫎鎵�鏈変富棰樻暟鎹殑鐩戝惉
+ */
+ void removeAllTopicsListener(){
+ HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
}
/**
* 鍏ョ綉璁よ瘉
*/
void sendAuthenticateRequest(){
+ tv.setText("寮�濮嬪叆缃戣璇�...");
String macStr = "AA000000000000BB";
String secret = "87ae414b7a853f65";
@@ -236,20 +220,21 @@
String ip = IpUtils.getBroadcastAddress();
// ip = "192.168.10.102";
- HDLLink.getInstance().sendAuthenticateRequest(ip, request, new HDLAuthSocket.CallBack() {
+ HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
@Override
- public void onError(String error) {
- Log.i("TAG", "onError: 璁よ瘉澶辫触");
+ public void onError(HDLLinkException e) {
+ tv.setText("璁よ瘉澶辫触");
+ responseTv.setText(e.getMsg());
+// Log.i("TAG", "onError: 璁よ瘉澶辫触");
}
@Override
- public void onSuccess(String data) {
+ public void onSuccess(String msg) {
tv.setText("璁よ瘉鎴愬姛");
- responseTv.setText(data.toString());
+ responseTv.setText(msg.toString());
}
});
}
-
String stringToMD5(String text) {
byte[] hash;
@@ -272,4 +257,167 @@
return hex.toString();
}
+
+ /**
+ * 濡傛灉宸茬粡璁よ瘉鍚庯紝鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎
+ * 骞挎挱鎼滅储璁よ瘉杩囩殑缃戝叧鏄惁鍦ㄧ嚎
+ */
+ void searchGatewayBroadcast(){
+ tv.setText("鎼滅储缃戝叧涓�...");
+ HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() {
+ @Override
+ public void onError(HDLLinkException e) {
+ tv.setText("缃戝叧涓嶅湪绾�");
+ }
+ @Override
+ public void onSuccess(GatewaySearchBean gatewaySearchBean) {
+ tv.setText("缃戝叧鍦ㄧ嚎");
+ responseTv.setText("鎼滅储鎴愬姛 缃戝叧id锛�"+gatewaySearchBean.getGatewayId());
+// LogUtils.i("TAG", "onSuccess: 鎼滅储鎴愬姛锛�"+gatewaySearchBean.getGatewayId());
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍔熻兘鍒楄〃
+ */
+ void getFunctionList(){
+ tv.setText("鑾峰彇鍔熻兘鍒楄〃涓�...");
+ responseTv.setText("");
+ HDLSocket.getInstance().getFunctionList(new HDLLinkCallBack() {
+
+ @Override
+ public void onError(HDLLinkException error) {
+ tv.setText(error.getMsg());
+ }
+
+ @Override
+ public void onSuccess(String data) {
+ tv.setText("鑾峰彇鍔熻兘鍒楄〃鎴愬姛");
+ responseTv.setText(data);
+ }
+ });
+ }
+
+ /**
+ * 鍔熻兘灞炴�ц鍙�
+ * 鏀寔鎵归噺璇诲彇
+ */
+ void getFunctionAttribute(){
+ tv.setText("鍔熻兘灞炴�ц鍙�");
+ List<String> sids = new ArrayList<>();
+ sids.add(testLightSid);
+ HDLSocket.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 璇诲彇璁惧鐘舵��
+ * 鏀寔鎵归噺璇诲彇
+ */
+ void propertyRead(){
+ tv.setText("璇诲彇鐘舵�佷腑...");
+ List<String> list = new ArrayList<>();
+ list.add(testLightSid);//瑕佽鍙栬澶囩殑sid
+ HDLSocket.getInstance().propertyRead(list, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String data) {
+ tv.setText("璇诲彇鎴愬姛");
+ responseTv.setText(data);
+ }
+ @Override
+ public void onError(HDLLinkException e) {
+ tv.setText("璇诲彇澶辫触");
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 鎺у埗澶辫触
+ * 鍥炲鍝嶅簲code涓�200 浠ｈ〃鎵ц鎴愬姛
+ */
+ void controlDecide(){
+ tv.setText("鎺у埗璁惧");
+ isOn = !isOn;
+ List<DeviceControlRequest> requestList = new ArrayList<>();
+ DeviceControlRequest request = new DeviceControlRequest();
+ request.setSid(testLightSid);
+ List<DeviceControlRequest.StatusBean> statusBeanList= new ArrayList<>();
+ DeviceControlRequest.StatusBean bean = new DeviceControlRequest.StatusBean();
+ bean.setKey("on_off");
+ bean.setValue(isOn ? "on" : "off");
+ statusBeanList.add(bean);
+ request.setStatus(statusBeanList);
+ requestList.add(request);
+ HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String data) {
+ responseTv.setText(data);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍦烘櫙鍒楄〃
+ */
+ void getSceneList(){
+ tv.setText("璇诲彇鍦烘櫙鍒楄〃");
+ HDLLink.getInstance().getSceneList(new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ //鍦烘櫙鍒楄〃
+ // {"id":"8a5eaa143ce943b987b577df5a66759b","time_stamp":"1637040217235","objects":[{"sid":"04010560D2C7170A0A0100000000","name":"鍥炲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634871490"},{"sid":"04010560D2C76E0A0A0100010000","name":"绂诲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634785823"}]}
+ /**
+ * 鎺у埗鍦烘櫙
+ * 鎵ц鎴愬姛鐨勮瘽 鍝嶅簲code涓�200
+ */
+ void controlScene(){
+ tv.setText("鍦烘櫙鎺у埗");
+ //鎺у埗鍦烘櫙sid鍒楄〃锛屾敮鎸佹壒閲忔帶鍒�
+ List<String> sids = new ArrayList<>();
+ isOn = !isOn;
+ if(isOn){
+ sids.add("04010560D2C7170A0A0100000000");
+ }else{
+ sids.add("04010560D2C76E0A0A0100010000");
+ }
+ HDLLink.getInstance().controlScene(sids,new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+
}
\ No newline at end of file
diff --git a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java
index 120fc9d..30fe78c 100644
--- a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java
+++ b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java
@@ -2,6 +2,8 @@
import android.content.Context;
+import com.hdl.sdk.common.utils.LogUtils;
+
/**
* Created by Tong on 2021/9/28.
*/
@@ -27,4 +29,12 @@
public Context getContext() {
return context;
}
+
+ /**
+ * 璁剧疆鎵撳嵃鏄惁寮�鍚�
+ * @param enable
+ */
+ public void setLogEnabled(boolean enable){
+ LogUtils.setEnabled(enable);
+ }
}
diff --git a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/config/TopicConstant.java b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/config/TopicConstant.java
index 23e240d..0ed30c0 100644
--- a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/config/TopicConstant.java
+++ b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/config/TopicConstant.java
@@ -58,4 +58,23 @@
//璇诲彇鐘舵�佸搷搴�
public static final String PROPERTY_READ_REPLY = "/base/%s/thing/property/read_reply";
+
+ //8.1鑾峰彇鍦烘櫙鍒楄〃
+ public static final String SCENE_LIST_GET = "/user/%s/custom/scene/list/get";
+
+ //8.2鑾峰彇鍦烘櫙
+ public static final String SCENE_GET = "/user/%s/custom/scene/get";
+
+ //8.3鎵ц鍦烘櫙
+ public static final String SCENE_CONTROL = "/user/%s/custom/scene/execute";
+
+ //8.4鍦烘櫙澧炲姞
+ public static final String SCENE_ADD = "/user/%s/custom/scene/add";
+
+ //8.5鍦烘櫙缂栬緫
+ public static final String SCENE_EDIT = "/user/%s/custom/scene/edit";
+
+ //8.6鍦烘櫙鍒犻櫎
+ public static final String SCENE_DELETE = "/user/%s/custom/scene/delete";
+
}
diff --git a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkCode.java b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkCode.java
new file mode 100644
index 0000000..908f391
--- /dev/null
+++ b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkCode.java
@@ -0,0 +1,44 @@
+package com.hdl.sdk.common.exception;
+
+/**
+ * Created by jlchen on 11/15/21.
+ *
+ * @Description : HDLError
+ */
+public enum HDLLinkCode {
+
+ HDL_DATA_ERROR(-2000,"鍙傛暟寮傚父"),
+ HDL_DATA_NULL_ERROR(-2001,"鍙傛暟涓嶈兘涓虹┖"),
+ HDL_AUTH_ERROR(-2002,"璁よ瘉澶辫触"),
+ HDL_SEND_ERROR(-2003,"鍙戦�佸け璐�"),
+ HDL_TIMEOUT_ERROR(-2004,"瓒呮椂"),
+ HDL_UNAUTHORIZED_ERROR(-2005,"鏈璇侊紝璇峰厛璁よ瘉"),
+ HDL_GET_DEVICE_LIST_ERROR(-2100,"鑾峰彇璁惧鍒楄〃澶辫触"),
+ HDL_GET_FUNCTION_LIST_ERROR(-2101,"鑾峰彇鍔熻兘鍒楄〃澶辫触"),
+ HDL_GET_FUNCTION_PROPERTIES_ERROR(-2102,"鑾峰彇鍔熻兘灞炴�уけ璐�"),
+ HDL_CONTROL_FAILURE_ERROR(-2103,"鎺у埗澶辫触");
+
+ private String msg;
+ private int code;
+
+ private HDLLinkCode(int code, String msg) {
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+}
diff --git a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkException.java b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkException.java
new file mode 100644
index 0000000..715cb3e
--- /dev/null
+++ b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/exception/HDLLinkException.java
@@ -0,0 +1,63 @@
+package com.hdl.sdk.common.exception;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Created by Tong on 2021/11/11.
+ */
+public class HDLLinkException extends RuntimeException {
+
+ private int code = 0;
+ private String msg = "";
+ private Throwable rawThrowable;
+
+ public HDLLinkException() {
+ }
+
+ public HDLLinkException(String msg) {
+ this.msg = msg;
+ }
+
+ public HDLLinkException(int code, String msg) {
+ this.code = code;
+ this.msg = msg;
+ }
+
+ public HDLLinkException(int code) {
+ this.code = code;
+ }
+
+ public HDLLinkException(Throwable rawThrowable) {
+ this.rawThrowable = rawThrowable;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public @NonNull
+ String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public Throwable getRawThrowable() {
+ return rawThrowable;
+ }
+
+ public void setRawThrowable(Throwable rawThrowable) {
+ this.rawThrowable = rawThrowable;
+ }
+
+ public static HDLLinkException getErrorWithCode(HDLLinkCode code){
+ return new HDLLinkException(code.getCode(), code.getMsg());
+ }
+}
+
diff --git a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/utils/LogUtils.java b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/utils/LogUtils.java
index 099e2df..46b1d5d 100644
--- a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/utils/LogUtils.java
+++ b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/utils/LogUtils.java
@@ -1,55 +1,63 @@
package com.hdl.sdk.common.utils;
+import android.util.Log;
+
/**
* Created by Tong on 2021/9/23.
*/
public class LogUtils {
- private static final String TAG = "HDLSocket";
+ private static final String TAG = "HDLSDK";
- private boolean isEnabled = true;
+ private static boolean isEnabled = true;
-
- private LogUtils() {
- }
-
- private static class SingletonInstance {
- private static final LogUtils INSTANCE = new LogUtils();
- }
-
- public static LogUtils getInstance() {
- return SingletonInstance.INSTANCE;
- }
-
- public boolean isEnabled() {
+ public static boolean isEnabled() {
return isEnabled;
}
- public void setEnabled(boolean enabled) {
+ public static void setEnabled(boolean enabled) {
isEnabled = enabled;
}
public static void d(String tag, String msg) {
-
+ if (tag != null && msg != null && isEnabled) {
+ Log.d(TAG, tag + "-- " + msg);
+ }
}
public static void e(String tag, String msg) {
-
- }
-
- public static void e(String msg, Throwable tr) {
-
+ if (tag != null && msg != null && isEnabled) {
+ Log.e(TAG, tag + "-- " + msg);
+ }
}
public static void w(String tag, String msg) {
-
+ if (tag != null && msg != null && isEnabled) {
+ Log.w(TAG, tag + "-- " + msg);
+ }
}
public static void v(String tag, String msg) {
-
+ if (tag != null && msg != null && isEnabled) {
+ Log.v(TAG, tag + "-- " + msg);
+ }
}
public static void i(String tag, String msg) {
+ if (tag != null && msg != null && isEnabled) {
+ Log.i(TAG, tag + "-- " + msg);
+ }
+ }
+ public static void i(String msg) {
+ if (msg != null && isEnabled) {
+ Log.i(TAG, msg);
+ }
+ }
+
+ public static void e(String msg) {
+ if (msg != null && isEnabled) {
+ Log.e(TAG, msg);
+ }
}
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
index 1d82c87..36ac8c9 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
@@ -1,10 +1,20 @@
package com.hdl.sdk.connect;
+import com.hdl.sdk.common.utils.IpUtils;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
+import com.hdl.sdk.connect.callback.HDLLinkCallBack;
+import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.common.event.EventDispatcher;
import com.hdl.sdk.common.event.EventListener;
-import com.hdl.sdk.connect.bean.AuthenticateRequest;
+import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.socket.HDLAuthSocket;
+import com.hdl.sdk.connect.socket.HDLSocket;
+import com.hdl.sdk.connect.socket.HdlSocketHelper;
+import com.hdl.sdk.socket.listener.SendListener;
+
+import java.util.List;
/**
* Created by jlchen on 11/15/21.
@@ -44,9 +54,11 @@
* @param listener
*/
public synchronized void removeAllTopicsListener(EventListener listener) {
+ if(listener == null) return;
EventDispatcher.getInstance().removeAllTopicsListener(listener);
}
+ /***********************涓夋柟璁惧鍜岀綉鍏抽�氫俊涔嬪墠鐨勮璇佹祦绋�****************************/
/**
* 妫�娴嬫槸鍚﹀凡缁忚璇佽繃
* 璁よ瘉閫氳繃鎵嶈兘杩涜璁惧鎺у埗
@@ -57,22 +69,137 @@
}
/**
+ * 寮�濮嬬洃鍚拰鍙戣捣鍏ョ綉鍙婅璇佽姹�
+ *
+ * @param request 璁よ瘉璇锋眰淇℃伅
+ * @param callBack 缁撴灉鍥炶皟
+ */
+ public void startAuthenticateRequest(AuthenticateRequest request, HDLLinkCallBack callBack) {
+ HDLAuthSocket.getInstance().startAuthenticateRequest(request,callBack);
+ }
+
+ /**
* 鍙戦�佸叆缃戝強璁よ瘉璇锋眰
*
* @param ip 缃戝叧IP
* @param request 璁よ瘉璇锋眰淇℃伅
* @param callBack 缁撴灉鍥炶皟
*/
- public void sendAuthenticateRequest(String ip, AuthenticateRequest request, HDLAuthSocket.CallBack callBack) {
- HDLAuthSocket.getInstance().sendAuthenticateRequest(ip,request,callBack);
+ public void sendAuthenticateRequest(String ip, AuthenticateRequest request, HDLLinkCallBack callBack) {
+ HDLAuthSocket.getInstance().sendAuthenticateRequest(ip, request, callBack);
+ }
+
+ // /**
+// * 寮�濮嬫悳绱㈡墍鏈夌綉鍏筹紝鏈夌綉鍏冲洖澶嶅氨鍥炶皟锛屼笂灞傝嚜宸卞仛鍘婚噸鍒ゆ柇
+// *
+// * @param callBack 鍥炶皟
+// */
+// public void startSearchAllGateway(HDLAuthSocket.SearchGatewayCallBack callBack) {
+//
+// }
+//
+// /**
+// * 鏆傚仠鎼滅储缃戝叧
+// */
+// public void endSearchAllGateway() {
+//
+// }
+
+ /***********************涓夋柟璁惧璇峰厛璁よ瘉鎴愬姛 鍐嶈皟鐢ㄤ笅闈㈢殑鎺ュ彛鍜岀綉鍏抽�氫俊****************************/
+ /**
+ * 缁勬挱鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎锛屾悳绱㈠埌鍒欒繑鍥炴寚瀹氱殑缃戝叧瀵硅薄
+ * @param callBack 鍥炶皟
+ */
+ public void searchGatewayMulticast(HDLAuthSocket.SearchGatewayCallBack callBack) {
+ HDLAuthSocket.getInstance().searchGatewayMulticast(callBack);
}
/**
- * 鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎锛屾悳绱㈠埌鍒欒繑鍥炴寚瀹氱殑缃戝叧瀵硅薄
- *
+ * 缁勬挱鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎锛屾悳绱㈠埌鍒欒繑鍥炴寚瀹氱殑缃戝叧瀵硅薄
* @param callBack 鍥炶皟
*/
- public void searchGateway(HDLAuthSocket.SearchGatewayCallBack callBack) {
- HDLAuthSocket.getInstance().searchGateway(HDLLinkConfig.getInstance().getGatewayId(), callBack);
+ public void searchGatewayBroadcast(HDLAuthSocket.SearchGatewayCallBack callBack) {
+ HDLAuthSocket.getInstance().searchGatewayBroadcast(callBack);
+ }
+
+ /**
+ * 鑾峰彇璁惧鍒楄〃
+ */
+ public void getDeviceList(HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().getDeviceList(callBack);
+ }
+
+ /**
+ * 鑾峰彇鍔熻兘鍒楄〃
+ */
+ public void getFunctionList(HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().getFunctionList(callBack);
+ }
+
+ /**
+ * 鑾峰彇鍔熻兘灞炴��
+ *
+ * @param sids
+ * @param callBack
+ */
+ public void getFunctionAttribute(List<String> sids, HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().getFunctionAttribute(sids, callBack);
+ }
+
+ /**
+ * 璁惧鎺у埗
+ * @param request 鎺у埗鐘舵�佸弬鏁�
+ * @param callBack 缁撴灉鍥炶皟
+ */
+ public void propertyDown(List<DeviceControlRequest> request, HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().propertyDown(request, callBack);
+ }
+
+ /**
+ * 璇诲彇鐘舵��
+ * @param sids 璇锋眰鍙傛暟 鎸囧畾璇诲彇鐨勮澶噑id鍒楄〃
+ * @param callBack 鍥炶皟
+ */
+ public void propertyRead(List<String> sids, HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().propertyRead(sids, callBack);
+ }
+
+ /**
+ * 鑾峰彇鍦烘櫙鍒楄〃
+ */
+ public void getSceneList(HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().getSceneList(callBack);
+ }
+
+ /**
+ * 鍦烘櫙鎺у埗
+ * @param sids 鍦烘櫙sid鍒楄〃
+ * @param callBack 鍥炶皟
+ */
+ public void controlScene(List<String> sids, HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().controlScene(sids, callBack);
+ }
+
+ /**
+ * 閫氱敤UDP骞挎挱鍙戦�佹寚浠�
+ * 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
+ * @param topic 鍙戦�佹暟鎹�
+ * @param bodyStr body鍐呭
+ * @param callBack 鍥炶皟
+ */
+ public void udpSendMsg(String topic, String bodyStr, HDLLinkResponseCallBack callBack) {
+ HDLAuthSocket.getInstance().udpSendMsg(topic, bodyStr, callBack);
+ }
+
+ /**
+ * 閫氱敤TCP鍙戦�佹寚浠�
+ * 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
+ *
+ * @param topic 鍙戦�佹暟鎹�
+ * @param bodyStr body鍐呭
+ * @param callBack 鍥炶皟
+ */
+ public void tcpSendMsg(String topic, String bodyStr, HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().tcpSendMsg(topic, bodyStr, callBack);
}
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java
index 71f80bc..7b9b253 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java
@@ -68,8 +68,7 @@
}
-
- private int getBytesLength(String str){
+ private int getBytesLength(String str) {
return ByteUtils.stringToBytes(str).length;
}
@@ -85,12 +84,11 @@
if (HDLLinkConfig.getInstance().ifNeedEncrypt(topic)) {
//闇�瑕佸姞瀵�
byte[] dataBytes = AesUtil.aesEncrypt(ByteUtils.stringToBytes(data), HDLLinkConfig.getInstance().getLocalSecret());
-// byte[] dataBytes = AESUtils.encryptAES(stringToBytes(data), AuthenticateConfig.getInstance().getLocalSecret());
-
String headString = "Topic:" + getTopic() + "\r\n" + "Length:" + dataBytes.length + "\r\n" + "\r\n";
byte[] headBytes = headString.getBytes("utf-8");
byte[] sendBytes = ByteUtils.concatBytes(headBytes, dataBytes);
return sendBytes;
+
} else {
return this.toString().getBytes("utf-8");
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/AuthenticateRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
similarity index 99%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/AuthenticateRequest.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
index 61f1bd4..f977fdc 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/AuthenticateRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.request;
import java.io.Serializable;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/BaseLocalRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/BaseLocalRequest.java
similarity index 94%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/BaseLocalRequest.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/BaseLocalRequest.java
index d2ae00f..7962b60 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/BaseLocalRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/BaseLocalRequest.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.request;
import java.io.Serializable;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/DeviceControlRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/DeviceControlRequest.java
similarity index 95%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/DeviceControlRequest.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/DeviceControlRequest.java
index 275b7fc..9de4dcf 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/DeviceControlRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/DeviceControlRequest.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.request;
import java.io.Serializable;
import java.util.List;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/FunctionAttributeRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/FunctionAttributeRequest.java
similarity index 89%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/FunctionAttributeRequest.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/FunctionAttributeRequest.java
index 03ad699..ad52485 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/FunctionAttributeRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/FunctionAttributeRequest.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.request;
import java.io.Serializable;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/PropertyReadRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java
similarity index 65%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/PropertyReadRequest.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java
index 43ddfdb..e26ebf4 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/PropertyReadRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.request;
/**
* Created by Tong on 2021/10/8.
@@ -7,6 +7,10 @@
private String sid;
+ public PropertyReadRequest(String sid) {
+ this.sid = sid;
+ }
+
public String getSid() {
return sid;
}
@@ -14,4 +18,5 @@
public void setSid(String sid) {
this.sid = sid;
}
+
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/PropertyUpRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyUpRequest.java
similarity index 95%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/PropertyUpRequest.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyUpRequest.java
index 61d660c..93b96b1 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/PropertyUpRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyUpRequest.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.request;
import java.io.Serializable;
import java.util.List;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/AuthenticateResponseBean.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/AuthenticateResponse.java
similarity index 77%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/AuthenticateResponseBean.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/AuthenticateResponse.java
index 895e416..e2b8b07 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/AuthenticateResponseBean.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/AuthenticateResponse.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.response;
import java.io.Serializable;
@@ -7,18 +7,10 @@
*
* @Description : AuthenticateResponseBean
*/
-public class AuthenticateResponseBean implements Serializable {
- private String id;
- private String time_stamp;
+public class AuthenticateResponse extends BaseResponse {
private String code;
private GatewayObjects objects;
private Auth auth;
-
- public String getID() { return id; }
- public void setID(String value) { this.id = value; }
-
- public String getTimeStamp() { return time_stamp; }
- public void setTimeStamp(String value) { this.time_stamp = value; }
public String getCode() { return code; }
public void setCode(String value) { this.code = value; }
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/BaseLocalResponse.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseLocalResponse.java
similarity index 93%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/BaseLocalResponse.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseLocalResponse.java
index 0a664a2..56126dd 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/BaseLocalResponse.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseLocalResponse.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.response;
import java.io.Serializable;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseResponse.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseResponse.java
new file mode 100644
index 0000000..f409b7e
--- /dev/null
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/BaseResponse.java
@@ -0,0 +1,30 @@
+package com.hdl.sdk.connect.bean.response;
+
+import java.io.Serializable;
+
+/**
+ * Created by jlchen on 11/15/21.
+ *
+ * @Description : BaseResponse
+ */
+public class BaseResponse implements Serializable {
+
+ private String id;
+ private String time_stamp;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getTime_stamp() {
+ return time_stamp;
+ }
+
+ public void setTime_stamp(String time_stamp) {
+ this.time_stamp = time_stamp;
+ }
+}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/GatewaySearchBean.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/GatewaySearchBean.java
similarity index 97%
rename from HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/GatewaySearchBean.java
rename to HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/GatewaySearchBean.java
index 5dca78e..b689546 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/GatewaySearchBean.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/GatewaySearchBean.java
@@ -1,4 +1,4 @@
-package com.hdl.sdk.connect.bean;
+package com.hdl.sdk.connect.bean.response;
import java.io.Serializable;
@@ -7,8 +7,6 @@
* 缃戝叧鎼滅储
*/
public class GatewaySearchBean implements Serializable {
-
-
private String device_model;
private String device_name;
private String device_mac;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/NetworkAccessBroadcastResponse.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/NetworkAccessBroadcastResponse.java
new file mode 100644
index 0000000..9e01eba
--- /dev/null
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/response/NetworkAccessBroadcastResponse.java
@@ -0,0 +1,22 @@
+package com.hdl.sdk.connect.bean.response;
+
+/**
+ * Created by jlchen on 11/15/21.
+ *
+ * @Description : NetworkAccessBroadcastResponse
+ */
+public class NetworkAccessBroadcastResponse extends BaseResponse {
+ private String ip_address;
+ private String oid;
+ private String homeId;
+
+ public String getIPAddress() { return ip_address; }
+ public void setIPAddress(String value) { this.ip_address = value; }
+
+ public String getOID() { return oid; }
+ public void setOID(String value) { this.oid = value; }
+
+ public String getHomeID() { return homeId; }
+ public void setHomeID(String value) { this.homeId = value; }
+
+}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/BaseCallBack.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/BaseCallBack.java
new file mode 100644
index 0000000..5110851
--- /dev/null
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/BaseCallBack.java
@@ -0,0 +1,12 @@
+package com.hdl.sdk.connect.callback;
+
+import com.hdl.sdk.common.exception.HDLLinkException;
+
+/**
+ * Created by Tong on 2021/11/11.
+ */
+public interface BaseCallBack {
+
+ void onError(HDLLinkException e);
+
+}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkCallBack.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkCallBack.java
new file mode 100644
index 0000000..3a0f1c3
--- /dev/null
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkCallBack.java
@@ -0,0 +1,13 @@
+package com.hdl.sdk.connect.callback;
+
+import com.hdl.sdk.common.exception.HDLLinkException;
+import com.hdl.sdk.connect.bean.LinkResponse;
+
+/**
+ * Created by jlchen on 11/16/21.
+ *
+ * @Description : HDLLinkCallBack
+ */
+public interface HDLLinkCallBack extends BaseCallBack{
+ void onSuccess(String msg);
+}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkResponseCallBack.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkResponseCallBack.java
new file mode 100644
index 0000000..1d33c3e
--- /dev/null
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/callback/HDLLinkResponseCallBack.java
@@ -0,0 +1,12 @@
+package com.hdl.sdk.connect.callback;
+
+import com.hdl.sdk.connect.bean.LinkResponse;
+
+/**
+ * Created by jlchen on 11/16/21.
+ *
+ * @Description : HDLLinkResponseCallBack
+ */
+public interface HDLLinkResponseCallBack extends BaseCallBack{
+ void onSuccess(LinkResponse msg);
+}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
index 426367b..a212728 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
@@ -4,7 +4,7 @@
import com.hdl.sdk.common.config.TopicConstant;
import com.hdl.sdk.common.utils.SPUtils;
-import com.hdl.sdk.connect.bean.GatewaySearchBean;
+import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
/**
@@ -13,9 +13,10 @@
* @Description : HDLLinkConfig
*/
public class HDLLinkConfig {
- private static final String Authenticate_LS_KEY = "auth_ls_key";
+ private static final String AUTHENTICATE_LS_KEY = "auth_ls_key";
private static final String AUTHENTICATE_GATEWAYID_KEY = "auth_gatewayid_key";
private static final String AUTHENTICATE_IPADDRESS_KEY = "auth_ipaddress_key";
+ private static final String AUTHENTICATE_IS_LS_KEY = "auth_isls_key";
private String localSecret;//鏈湴鍔犲瘑瀵嗛挜
private String gatewayId;
@@ -51,18 +52,21 @@
this.gatewayId = "";
this.ipAddress = "";
this.localSecret = "";
- SPUtils.remove(Authenticate_LS_KEY);
+ this.isLocalEncrypt = false;
+ SPUtils.remove(AUTHENTICATE_LS_KEY);
SPUtils.remove(AUTHENTICATE_GATEWAYID_KEY);
SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY);
+ SPUtils.remove(AUTHENTICATE_IS_LS_KEY);
}
/**
* 鍔犺浇缂撳瓨
*/
void loadConfig(){
- localSecret = SPUtils.getString(Authenticate_LS_KEY, "");
+ 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);
}
/**
@@ -75,7 +79,7 @@
this.localSecret = localSecret;
this.gatewayId = gatewayId;
this.ipAddress = ipAddress;
- SPUtils.put(Authenticate_LS_KEY, localSecret);
+ SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
SPUtils.put(AUTHENTICATE_GATEWAYID_KEY, gatewayId);
SPUtils.put(AUTHENTICATE_IPADDRESS_KEY, ipAddress);
}
@@ -93,7 +97,7 @@
public void setLocalSecret(String localSecret) {
this.localSecret = localSecret;
- SPUtils.put(Authenticate_LS_KEY, localSecret);
+ SPUtils.put(AUTHENTICATE_LS_KEY, localSecret);
}
public String getLocalSecret() {
@@ -114,6 +118,7 @@
public void setLocalEncrypt(boolean localEncrypt) {
isLocalEncrypt = localEncrypt;
+ SPUtils.put(AUTHENTICATE_IS_LS_KEY, isLocalEncrypt);
}
public GatewaySearchBean getCurrentGateway() {
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java
index 393aff1..2ce8c8d 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java
@@ -1,6 +1,7 @@
package com.hdl.sdk.connect.protocol;
+import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.common.event.EventDispatcher;
import com.hdl.sdk.common.utils.ByteUtils;
@@ -59,13 +60,19 @@
if (byteArray.length >= bodyLength + bodyStartIndex) {
byte[] body = ByteUtils.getRangeBytes(bytes, bodyStartIndex, bodyStartIndex + bodyLength);
- if(HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())){
+ if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) {
//闇�瑕佽В瀵�
byte[] bodyBytes = AesUtil.aesDecrypt(body, HDLLinkConfig.getInstance().getLocalSecret());
// byte[] bodyBytes = AESUtils.decryptAES(body,AuthenticateConfig.getInstance().getLocalSecret());
- response.setData(new String(bodyBytes, "utf-8"));
-// Log.i("TAG", "瑙ｅ瘑 涓婚锛�"+response.getTopic()+ " body: "+response.getData());
- }else{
+ if (bodyBytes != null) {
+ response.setData(new String(bodyBytes, "utf-8"));
+// LogUtils.i("TAG", "瑙ｅ瘑 涓婚锛�"+response.getTopic()+ " body: "+response.getData());
+ } else {
+ //瑙ｅ瘑澶辫触锛岃繑鍥炲師鏁版嵁
+ response.setData(new String(body, "utf-8"));
+ }
+
+ } else {
response.setData(new String(body, "utf-8"));
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
index 601806f..b6e525a 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
@@ -1,24 +1,29 @@
package com.hdl.sdk.connect.socket;
import android.text.TextUtils;
-import android.util.Log;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.sdk.common.event.EventDispatcher;
import com.hdl.sdk.common.event.EventListener;
-import com.hdl.sdk.connect.bean.AuthenticateResponseBean;
+import com.hdl.sdk.common.exception.HDLLinkCode;
+import com.hdl.sdk.common.exception.HDLLinkException;
+import com.hdl.sdk.common.utils.LogUtils;
+import com.hdl.sdk.connect.bean.response.AuthenticateResponse;
+import com.hdl.sdk.connect.bean.response.NetworkAccessBroadcastResponse;
+import com.hdl.sdk.connect.callback.BaseCallBack;
+import com.hdl.sdk.connect.callback.HDLLinkCallBack;
+import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.common.config.TopicConstant;
import com.hdl.sdk.common.utils.IdUtils;
import com.hdl.sdk.common.utils.IpUtils;
import com.hdl.sdk.common.utils.gson.GsonConvert;
-import com.hdl.sdk.connect.bean.AuthenticateRequest;
-import com.hdl.sdk.connect.bean.AuthenticateRequest.AuthenticateDeviceInfoBean;
-import com.hdl.sdk.connect.bean.BaseLocalResponse;
-import com.hdl.sdk.connect.bean.DeviceControlRequest;
-import com.hdl.sdk.connect.bean.GatewaySearchBean;
+import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
+import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
import com.hdl.sdk.connect.bean.LinkRequest;
import com.hdl.sdk.connect.bean.LinkResponse;
import com.hdl.sdk.connect.protocol.LinkMessageDecoder;
@@ -27,10 +32,9 @@
import com.hdl.sdk.socket.SocketOptions;
import com.hdl.sdk.socket.client.UdpClient;
import com.hdl.sdk.socket.codec.MessagePipeLine;
+import com.hdl.sdk.socket.listener.SendListener;
import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.List;
import static com.hdl.sdk.common.config.TopicConstant.DEIVCE_AUTH_REQUEST;
@@ -41,23 +45,26 @@
* @Description : HDLAuthSocket
*/
public class HDLAuthSocket {
+ private static final String TAG = "HDLAuth";
/**
* udp榛樿绔彛
*/
private static final int UDP_PORT = 8585;
private static SocketBoot updBoot;
+// private EventListener authEvent;
+ /**
+ * udp榛樿缁勬挱ip
+ */
+ private static final String UDP_GROUP_IP = "239.0.168.188";
+
/**
* instance
*/
private volatile static HDLAuthSocket instance;
- public interface CallBack {
-
- void onError(String error);
-
- void onSuccess(String msg);
-
- }
+// public interface CallBack extends BaseCallBack {
+// void onSuccess(String msg);
+// }
/**
* getInstance
@@ -94,24 +101,42 @@
}
/**
- * 寮�濮嬪叆缃戝強璁よ瘉璇锋眰
+ * 寮�濮嬬洃鍚拰鍙戣捣鍏ョ綉鍙婅璇佽姹�
*
* @param request 璁よ瘉璇锋眰淇℃伅
* @param callBack 缁撴灉鍥炶皟
*/
- public void startAuthenticateRequest(AuthenticateRequest request, CallBack callBack) {
+ public void startAuthenticateRequest(AuthenticateRequest request, HDLLinkCallBack callBack) {
+ HDLLinkConfig.getInstance().clearConfig();
//1.鍚姩Socket 寮�鍚洃鍚�
getUdpBoot(IpUtils.getBroadcastAddress());
- //鐩戝惉缃戝叧骞挎挱鐨勫叆缃戞寚浠�
+ //2.鏋勫缓鐩戝惉Listener
+// authEvent =
+ //3.鐩戝惉缃戝叧骞挎挱鐨勫叆缃戞寚浠�
EventDispatcher.getInstance().register(TopicConstant.GATEWAY_AUTH_BROADCAST, new EventListener() {
@Override
public void onMessage(Object msg) {
-
+ NetworkAccessBroadcastResponse bean = getNetworkAccessBroadcastResponse(msg);
+ if(bean != null){
+ LogUtils.i(TAG, "缃戝叧鍏ョ綉骞挎挱IP: " + bean.getIPAddress());
+ String ipStr = bean.getIPAddress();
+ if(!TextUtils.isEmpty(ipStr)){
+ sendAuthenticateRequest(ipStr, request, callBack);
+ }
+ }
//绉婚櫎鐩戝惉
-// EventDispatcher.getInstance().remove(this);
+ EventDispatcher.getInstance().remove(TopicConstant.GATEWAY_AUTH_BROADCAST);
+ LogUtils.i(TAG, "绉婚櫎鐩戝惉 authEvent");
}
});
+ }
+ /**
+ * 缁撴潫鐩戝惉鍏ョ綉鍙婅璇佸箍鎾�
+ */
+ public void endAuthenticateRequest(){
+ //绉婚櫎鐩戝惉
+ EventDispatcher.getInstance().remove(TopicConstant.GATEWAY_AUTH_BROADCAST);
}
/**
@@ -121,9 +146,9 @@
* @param request 璁よ瘉璇锋眰淇℃伅
* @param callBack 缁撴灉鍥炶皟
*/
- public void sendAuthenticateRequest(String ip, AuthenticateRequest request, CallBack callBack) {
+ public void sendAuthenticateRequest(String ip, AuthenticateRequest request, HDLLinkCallBack callBack) {
if (request == null) {
- callBack.onError("request null");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_NULL_ERROR));
}
String topic = DEIVCE_AUTH_REQUEST;
Gson gs = new Gson();
@@ -134,24 +159,24 @@
@Override
public void onSucceed(Object msg) {
if(callBack == null) return;
- AuthenticateResponseBean bean = getAuthenticateResponseBean(msg);
+ AuthenticateResponse bean = getAuthenticateResponseBean(msg);
if(bean != null){
String localSecret = bean.getAuth().getLocalSecret();
String gatewayId = bean.getObjects().getGatewayID();
String ipAddress = bean.getObjects().getIPAddress();
HDLLinkConfig.getInstance().saveConfig(localSecret,gatewayId,ipAddress);
- callBack.onSuccess("Success");
+ callBack.onSuccess("璁よ瘉鎴愬姛");
}else{
- callBack.onSuccess("鍙傛暟寮傚父");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_ERROR));
}
}
@Override
public void onFailure() {
- Log.i("TAG", "onFailure: ");
+ LogUtils.i(TAG, "onFailure: ");
if(callBack == null) return;
- callBack.onError("瓒呮椂");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_TIMEOUT_ERROR));
}
});
}
@@ -199,14 +224,7 @@
// sendAuthenticateRequest(ip, request, callBack);
// }
- public interface SearchGatewayCallBack {
- /**
- * 鎼滅储缁撴潫
- *
- * @param error
- */
- void onEnd(String error);
-
+ public interface SearchGatewayCallBack extends BaseCallBack{
/**
* 鎼滅储缃戝叧鎴愬姛
*
@@ -232,17 +250,34 @@
}
/**
+ * 缁勬挱鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎锛屾悳绱㈠埌鍒欒繑鍥炴寚瀹氱殑缃戝叧瀵硅薄
+ * @param callBack 鍥炶皟
+ */
+ public void searchGatewayMulticast(SearchGatewayCallBack callBack) {
+ searchGateway(HDLLinkConfig.getInstance().getGatewayId(), UDP_GROUP_IP, callBack);
+ }
+
+ /**
+ * 缁勬挱鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎锛屾悳绱㈠埌鍒欒繑鍥炴寚瀹氱殑缃戝叧瀵硅薄
+ * @param callBack 鍥炶皟
+ */
+ public void searchGatewayBroadcast(SearchGatewayCallBack callBack) {
+ String ip = IpUtils.getBroadcastAddress();
+ searchGateway(HDLLinkConfig.getInstance().getGatewayId(), ip, callBack);
+ }
+
+ /**
* 鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎锛屾悳绱㈠埌鍒欒繑鍥炴寚瀹氱殑缃戝叧瀵硅薄
*
* @param gatewayId 缃戝叧id
+ * @param ip 鎺ユ敹鐩爣鐨刬p鍦板潃
* @param callBack 鍥炶皟
*/
- public void searchGateway(String gatewayId, SearchGatewayCallBack callBack) {
+ public void searchGateway(String gatewayId, String ip, SearchGatewayCallBack callBack) {
String time = String.valueOf(System.currentTimeMillis());
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("id", IdUtils.getUUId());
jsonObject.addProperty("time_stamp", time);
- String ip = IpUtils.getBroadcastAddress();
LinkRequest message = new LinkRequest(TopicConstant.GATEWAY_SEARCH,
jsonObject.toString());
@@ -251,7 +286,7 @@
public void onSucceed(Object msg) {
GatewaySearchBean searchBean = getGatewaySearchBean(msg);
if (searchBean != null && searchBean.getGatewayId().contains(gatewayId)) {
- Log.i("TAG", "onSuccess: ");
+ LogUtils.i(TAG, "onSuccess: ");
HDLLinkConfig.getInstance().setCurrentGateway(searchBean);
HDLLinkConfig.getInstance().setLocalEncrypt(searchBean.isLocalEncrypt());
callBack.onSuccess(searchBean);
@@ -262,11 +297,76 @@
@Override
public void onFailure() {
- Log.i("TAG", "onFailure: ");
- callBack.onEnd("瓒呮椂");
+ LogUtils.i(TAG, "onFailure: ");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_TIMEOUT_ERROR));
}
});
}
+
+
+
+ /**
+ * 璁惧鎺у埗
+ */
+ public void propertyDown(List<DeviceControlRequest> request, HDLLinkCallBack callBack) {
+ String time = String.valueOf(System.currentTimeMillis());
+ final BaseLocalResponse<List<DeviceControlRequest>> data = new BaseLocalResponse<>();
+ data.setId(IdUtils.getUUId());
+ data.setTime_stamp(time);
+ data.setObjects(request);
+ String topic = HDLLinkConfig.getInstance().getFullTopic(TopicConstant.PROPERTY_DOWN);
+ LinkRequest message = new LinkRequest(topic,
+ GsonConvert.getGson().toJson(data));
+
+ String ip = IpUtils.getBroadcastAddress();
+ HdlSocketHelper.send(getUdpBoot(ip), message, new HdlSocketHelper.HdlSocketListener() {
+ @Override
+ public void onSucceed(Object msg) {
+ if(callBack == null) return;
+ callBack.onSuccess("鎺у埗鎴愬姛");
+ }
+
+ @Override
+ public void onFailure() {
+ if(callBack == null) return;
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_CONTROL_FAILURE_ERROR));
+ }
+ });
+
+ }
+
+ /**
+ * 閫氱敤鍙戦�佹寚浠�
+ * 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
+ * @param topic 鍙戦�佹暟鎹�
+ * @param bodyStr 鍥炲鐨勪富棰�
+ * @param callBack 鍥炶皟
+ */
+ public void udpSendMsg(String topic, String bodyStr, HDLLinkResponseCallBack callBack) {
+ if(TextUtils.isEmpty(topic) || TextUtils.isEmpty(bodyStr)) {
+ if(callBack != null){
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_NULL_ERROR));
+ }
+ return;
+ }
+ LinkRequest message = new LinkRequest(topic, bodyStr);
+ String ip = IpUtils.getBroadcastAddress();
+ HdlSocketHelper.send(getUdpBoot(ip), message, new HdlSocketHelper.HdlSocketListener() {
+ @Override
+ public void onSucceed(Object msg) {
+ if(callBack == null) return;
+ callBack.onSuccess((LinkResponse) msg);
+ }
+
+ @Override
+ public void onFailure() {
+ if(callBack == null) return;
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_TIMEOUT_ERROR));
+ }
+ }
+ );
+ }
+
private GatewaySearchBean getGatewaySearchBean(Object msg) {
GatewaySearchBean searchBean = null;
@@ -283,15 +383,14 @@
return searchBean;
}
- private AuthenticateResponseBean getAuthenticateResponseBean(Object msg) {
- AuthenticateResponseBean mBean = null;
+ private AuthenticateResponse getAuthenticateResponseBean(Object msg) {
+ AuthenticateResponse mBean = null;
if (msg instanceof LinkResponse) {
LinkResponse linkResponse = (LinkResponse) msg;
String data = linkResponse.getData();
if (!TextUtils.isEmpty(data)) {
- AuthenticateResponseBean response = GsonConvert.getGson().fromJson(data, new TypeToken<AuthenticateResponseBean>() {
+ AuthenticateResponse response = GsonConvert.getGson().fromJson(data, new TypeToken<AuthenticateResponse>() {
}.getType());
-
mBean = response;
}
@@ -299,29 +398,19 @@
return mBean;
}
- /**
- * 璁惧鎺у埗
- */
- public void propertyDown(List<DeviceControlRequest> request, HDLSocket.CallBack callBack) {
+ private NetworkAccessBroadcastResponse getNetworkAccessBroadcastResponse(Object msg){
+ NetworkAccessBroadcastResponse mBean = null;
+ if (msg instanceof LinkResponse) {
+ LinkResponse linkResponse = (LinkResponse) msg;
+ String data = linkResponse.getData();
+ if (!TextUtils.isEmpty(data)) {
+ NetworkAccessBroadcastResponse response = GsonConvert.getGson().fromJson(data, new TypeToken<NetworkAccessBroadcastResponse>() {
+ }.getType());
+ mBean = response;
+ }
- String time = String.valueOf(System.currentTimeMillis());
- final BaseLocalResponse<List<DeviceControlRequest>> data = new BaseLocalResponse<>();
- data.setId(IdUtils.getUUId());
- data.setTime_stamp(time);
- data.setObjects(request);
- String topic = HDLLinkConfig.getInstance().getFullTopic(TopicConstant.PROPERTY_DOWN);
- LinkRequest message = new LinkRequest(topic,
- GsonConvert.getGson().toJson(data));
-
- String ip = IpUtils.getBroadcastAddress();
- HdlSocketHelper.send(getUdpBoot(ip), message, null);
-
-
+ }
+ return mBean;
}
-
-
-
-
-
}
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 7c94a2f..5d7ddc0 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
@@ -7,19 +7,24 @@
import com.hdl.sdk.common.config.TopicConstant;
import com.hdl.sdk.common.event.EventDispatcher;
import com.hdl.sdk.common.event.EventListener;
+import com.hdl.sdk.common.exception.HDLLinkCode;
+import com.hdl.sdk.common.exception.HDLLinkException;
import com.hdl.sdk.common.utils.IdUtils;
import com.hdl.sdk.common.utils.IpUtils;
import com.hdl.sdk.common.utils.SPUtils;
import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.common.utils.gson.GsonConvert;
-import com.hdl.sdk.connect.bean.BaseLocalResponse;
-import com.hdl.sdk.connect.bean.DeviceControlRequest;
-import com.hdl.sdk.connect.bean.FunctionAttributeRequest;
-import com.hdl.sdk.connect.bean.GatewaySearchBean;
+import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;
+import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
import com.hdl.sdk.connect.bean.LinkRequest;
import com.hdl.sdk.connect.bean.LinkResponse;
-import com.hdl.sdk.connect.bean.PropertyReadRequest;
-import com.hdl.sdk.connect.bean.PropertyUpRequest;
+import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
+import com.hdl.sdk.connect.bean.request.PropertyUpRequest;
+import com.hdl.sdk.connect.callback.BaseCallBack;
+import com.hdl.sdk.connect.callback.HDLLinkCallBack;
+import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.connect.protocol.LinkMessageDecoder;
import com.hdl.sdk.connect.protocol.LinkMessageEncoder;
import com.hdl.sdk.socket.SocketBoot;
@@ -44,22 +49,14 @@
*/
public class HDLSocket {
- private static final String GATEWAY_KEY = "gateway_key";
- private static final String TCP_IP_KEY = "tcp_ip_key";
- private String gatewayId;
-
- public interface CallBack {
-
- void onError(String error);
-
- void onResponse(String data);
-
- }
-
- /**
- * udp榛樿缁勬挱ip
- */
- private static final String UDP_GROUP_IP = "239.0.168.188";
+// public interface CallBack extends BaseCallBack {
+// void onResponse(String data);
+// }
+//
+// /**
+// * udp榛樿缁勬挱ip
+// */
+// private static final String UDP_GROUP_IP = "239.0.168.188";
/**
* udp榛樿绔彛
@@ -71,21 +68,21 @@
*/
private static final int TCP_PORT = 8586;
- private String tcpIp;
- private int tcpPort;
+ // private String tcpIp;
+// private int tcpPort;
- private int udpPort;
- private String udpIp;
+// private int udpPort;
+// private String udpIp;
- private static SocketBoot updBoot;
+// private static SocketBoot updBoot;
private SocketBoot tcpBoot;
private ConnectStatusListener statusListener;
- private EventListener searchEvent;
- private CallBack searchCallBack;
- private ScheduledExecutorService searchGatewayThread;
- private final AtomicInteger searchCount = new AtomicInteger(0);
+// private EventListener searchEvent;
+// private CallBack searchCallBack;
+// private ScheduledExecutorService searchGatewayThread;
+// private final AtomicInteger searchCount = new AtomicInteger(0);
private HDLSocket() {
statusListener = new ConnectStatusListener() {
@@ -104,43 +101,43 @@
}
};
- searchEvent = new EventListener() {
- @Override
- public void onMessage(Object msg) {
- try {
- if (msg instanceof LinkResponse) {
- LinkResponse linkResponse = (LinkResponse) msg;
- String data = linkResponse.getData();
- if (!TextUtils.isEmpty(data)) {
- final BaseLocalResponse<GatewaySearchBean> response = GsonConvert.getGson().fromJson(data, new TypeToken<BaseLocalResponse<GatewaySearchBean>>() {
- }.getType());
- GatewaySearchBean searchBean = response.getObjects();
- if (searchBean != null) {
- gatewayId = searchBean.getGatewayId();
- if (!TextUtils.isEmpty(gatewayId)) {
- SPUtils.put(GATEWAY_KEY, gatewayId);
- }
- tcpIp = searchBean.getIp_address();
- if (!TextUtils.isEmpty(tcpIp)) {
- SPUtils.put(TCP_IP_KEY, tcpIp);
- }
- }
-
- if (searchCallBack != null) {
- searchCallBack.onResponse(linkResponse.toString());
- }
- }
-
- }
- } catch (Exception e) {
- if (searchCallBack != null) {
- searchCallBack.onError("瑙ｆ瀽澶辫触");
- }
- }
-
-
- }
- };
+// searchEvent = new EventListener() {
+// @Override
+// public void onMessage(Object msg) {
+// try {
+// if (msg instanceof LinkResponse) {
+// LinkResponse linkResponse = (LinkResponse) msg;
+// String data = linkResponse.getData();
+// if (!TextUtils.isEmpty(data)) {
+// final BaseLocalResponse<GatewaySearchBean> response = GsonConvert.getGson().fromJson(data, new TypeToken<BaseLocalResponse<GatewaySearchBean>>() {
+// }.getType());
+// GatewaySearchBean searchBean = response.getObjects();
+// if (searchBean != null) {
+//// gatewayId = searchBean.getGatewayId();
+//// if (!TextUtils.isEmpty(gatewayId)) {
+//// SPUtils.put(GATEWAY_KEY, gatewayId);
+//// }
+//// tcpIp = searchBean.getIp_address();
+//// if (!TextUtils.isEmpty(tcpIp)) {
+//// SPUtils.put(TCP_IP_KEY, tcpIp);
+//// }
+// }
+//
+// if (searchCallBack != null) {
+// searchCallBack.onResponse(linkResponse.toString());
+// }
+// }
+//
+// }
+// } catch (Exception e) {
+// if (searchCallBack != null) {
+// searchCallBack.onError("瑙ｆ瀽澶辫触");
+// }
+// }
+//
+//
+// }
+// };
}
private static class SingletonInstance {
@@ -152,15 +149,15 @@
}
- private SocketOptions getUdpOptions() {
- final SocketOptions options = new SocketOptions();
- final MessagePipeLine pipeLine = new MessagePipeLine();
- pipeLine.add(new LinkMessageDecoder());
- pipeLine.add(new LinkMessageEncoder());
- options.setHandleMessage(pipeLine);
- options.setEnabledHeartbeat(false);
- return options;
- }
+// private SocketOptions getUdpOptions() {
+// final SocketOptions options = new SocketOptions();
+// final MessagePipeLine pipeLine = new MessagePipeLine();
+// pipeLine.add(new LinkMessageDecoder());
+// pipeLine.add(new LinkMessageEncoder());
+// options.setHandleMessage(pipeLine);
+// options.setEnabledHeartbeat(false);
+// return options;
+// }
private SocketOptions getTcpOptions() {
final SocketOptions options = new SocketOptions();
@@ -181,107 +178,101 @@
}
public String getTcpIp() {
- if (!TextUtils.isEmpty(tcpIp)) {
- return tcpIp;
- }
- return SPUtils.getString(TCP_IP_KEY, "");
+ return HDLLinkConfig.getInstance().getIpAddress();
}
public String getGatewayId() {
- if (!TextUtils.isEmpty(gatewayId)) {
- return gatewayId;
- }
- return SPUtils.getString(GATEWAY_KEY, "");
+ return HDLLinkConfig.getInstance().getGatewayId();
}
- private String getUdpIp() {
- if (TextUtils.isEmpty(udpIp)) {
- udpIp = UDP_GROUP_IP;
- }
- return udpIp;
- }
+// private String getUdpIp() {
+// if (TextUtils.isEmpty(udpIp)) {
+// udpIp = UDP_GROUP_IP;
+// }
+// return udpIp;
+// }
- public void searchGateway() {
- searchGateway(null);
- }
-
- /**
- * 缁勬挱鎼滅储
- */
- public void searchGateway(CallBack callBack) {
- gatewayId = "";//閲嶇疆缃戝叧ID
- this.searchCallBack = callBack;
-
- if (searchGatewayThread != null) {
- searchGatewayThread.shutdownNow();
- }
-
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- while (TextUtils.isEmpty(gatewayId)) {
- //鎼滅储缃戝叧
- searchGateway(IdUtils.getUUId(), searchEvent);
- try {
- Thread.sleep(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
- }).start();
- }
-
-
- /**
- * 閫氳繃缁勬挱鎼滅储缃戝叧
- */
- public void searchGateway(String msgId, EventListener eventListener) {
- searchGateway(getUdpIp(), getUdpPort(), msgId, eventListener);
- }
-
- /**
- * 閫氳繃骞挎挱鎼滅储缃戝叧
- */
- public void searchGatewayByBroadcast(String msgId, EventListener eventListener) {
- searchGateway(IpUtils.getBroadcastAddress(), getUdpPort(), msgId, eventListener);
- }
-
- /**
- * 榛樿鏄粍鎾悳绱㈢綉鍏�
- */
- public void searchGateway(String ip, int port, String msgId, EventListener eventListener) {
-
- if (updBoot == null) {
- updBoot = UdpClient.init(ip, port, getUdpOptions());
- updBoot.connect();
- }
-
-
- String time = String.valueOf(System.currentTimeMillis());
- JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("id", msgId);
- jsonObject.addProperty("time_stamp", time);
-
- EventDispatcher.getInstance().registerIo(TopicConstant.GATEWAY_SEARCH_REPLY, eventListener);
- LinkRequest message = new LinkRequest(TopicConstant.GATEWAY_SEARCH,
- jsonObject.toString());
-
- try {
- updBoot.sendMsg(message.toString().getBytes("utf-8"));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
- }
+// public void searchGateway() {
+// searchGateway(null);
+// }
+//
+// /**
+// * 缁勬挱鎼滅储
+// */
+// public void searchGateway(CallBack callBack) {
+//// gatewayId = "";//閲嶇疆缃戝叧ID
+//// this.searchCallBack = callBack;
+////
+//// if (searchGatewayThread != null) {
+//// searchGatewayThread.shutdownNow();
+//// }
+////
+////
+//// new Thread(new Runnable() {
+//// @Override
+//// public void run() {
+//// while (TextUtils.isEmpty(gatewayId)) {
+//// //鎼滅储缃戝叧
+//// searchGateway(IdUtils.getUUId(), searchEvent);
+//// try {
+//// Thread.sleep(1000L);
+//// } catch (InterruptedException e) {
+//// e.printStackTrace();
+//// }
+//// }
+//// }
+//// }).start();
+// }
+//
+//
+// /**
+// * 閫氳繃缁勬挱鎼滅储缃戝叧
+// */
+// public void searchGateway(String msgId, EventListener eventListener) {
+// searchGateway(getUdpIp(), getUdpPort(), msgId, eventListener);
+// }
+//
+// /**
+// * 閫氳繃骞挎挱鎼滅储缃戝叧
+// */
+// public void searchGatewayByBroadcast(String msgId, EventListener eventListener) {
+// searchGateway(IpUtils.getBroadcastAddress(), getUdpPort(), msgId, eventListener);
+// }
+//
+// /**
+// * 榛樿鏄粍鎾悳绱㈢綉鍏�
+// */
+// public void searchGateway(String ip, int port, String msgId, EventListener eventListener) {
+//
+// if (updBoot == null) {
+// updBoot = UdpClient.init(ip, port, getUdpOptions());
+// updBoot.connect();
+// }
+//
+//
+// String time = String.valueOf(System.currentTimeMillis());
+// JsonObject jsonObject = new JsonObject();
+// jsonObject.addProperty("id", msgId);
+// jsonObject.addProperty("time_stamp", time);
+//
+// EventDispatcher.getInstance().registerIo(TopicConstant.GATEWAY_SEARCH_REPLY, eventListener);
+// LinkRequest message = new LinkRequest(TopicConstant.GATEWAY_SEARCH,
+// jsonObject.toString());
+//
+// try {
+// updBoot.sendMsg(message.getSendBytes());
+// } catch (UnsupportedEncodingException e) {
+// e.printStackTrace();
+// }
+//
+// }
/**
* 鑾峰彇璁惧鍒楄〃
*/
- public void getDeviceList(CallBack callBack) {
+ public void getDeviceList(HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
JsonObject jsonObject = new JsonObject();
@@ -295,7 +286,7 @@
String replyTopic = String.format(TopicConstant.GET_DEVICE_LIST_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -304,18 +295,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鑾峰彇璁惧鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_DEVICE_LIST_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鑾峰彇璁惧鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_DEVICE_LIST_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("ip鍦板潃涓㈠け");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
}
}
}
@@ -324,7 +315,7 @@
/**
* 鑾峰彇鍔熻兘鍒楄〃
*/
- public void getFunctionList(CallBack callBack) {
+ public void getFunctionList(HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
JsonObject jsonObject = new JsonObject();
@@ -338,7 +329,7 @@
String replyTopic = String.format(TopicConstant.GET_FUNCTION_LIST_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -347,18 +338,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("ip鍦板潃涓㈠け");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
}
}
}
@@ -367,10 +358,10 @@
/**
* 鑾峰彇鍔熻兘灞炴��
*
+ * @param sids
* @param callBack
- * @param sid
*/
- public void getFunctionAttribute(CallBack callBack, String... sid) {
+ public void getFunctionAttribute(List<String> sids, HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
@@ -378,7 +369,7 @@
data.setId(IdUtils.getUUId());
data.setTime_stamp(time);
List<FunctionAttributeRequest> list = new ArrayList<>();
- for (String s : sid) {
+ for (String s : sids) {
list.add(new FunctionAttributeRequest(s));
}
data.setObjects(list);
@@ -389,7 +380,7 @@
String replyTopic = String.format(TopicConstant.GET_FUNCTION_ATTRIBUTE_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -398,18 +389,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘灞炴�уけ璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_PROPERTIES_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘灞炴�уけ璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_PROPERTIES_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("ip鍦板潃涓㈠け");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
}
}
}
@@ -417,7 +408,7 @@
/**
* 璁惧鎺у埗
*/
- public void propertyDown(List<DeviceControlRequest> request, CallBack callBack) {
+ public void propertyDown(List<DeviceControlRequest> request, HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
@@ -427,10 +418,9 @@
data.setTime_stamp(time);
data.setObjects(request);
-
String topic = String.format(TopicConstant.PROPERTY_DOWN, getGatewayId());
LinkRequest message = new LinkRequest(topic,
- GsonConvert.getGson().toJson(request));
+ GsonConvert.getGson().toJson(data));
String replyTopic = String.format(TopicConstant.PROPERTY_DOWN_REPLY, getGatewayId());
try {
@@ -443,87 +433,90 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鎺у埗鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
} catch (Exception e) {
if (callBack != null) {
- callBack.onError("鎺у埗鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("鎺у埗鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
}
- /**
- * 鐘舵�佷笂鎶�
- */
- public void propertyUp(List<PropertyUpRequest> request, CallBack callBack) {
- if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
- String time = String.valueOf(System.currentTimeMillis());
-
- final BaseLocalResponse<List<PropertyUpRequest>> data = new BaseLocalResponse<>();
- data.setId(IdUtils.getUUId());
- data.setTime_stamp(time);
- data.setObjects(request);
-
-
- String topic = String.format(TopicConstant.PROPERTY_UP, getGatewayId());
- LinkRequest message = new LinkRequest(topic,
- GsonConvert.getGson().toJson(request));
-
- String replyTopic = String.format(TopicConstant.PROPERTY_UP_REPLY, getGatewayId());
- try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
- @Override
- public void onSucceed() {
-
- }
-
- @Override
- public void onError() {
- if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
- }
- }
- });
- } catch (UnsupportedEncodingException e) {
- if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
- }
- }
- } else {
- if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
- }
- }
- }
+// /**
+// * 鐘舵�佷笂鎶�
+// */
+// public void propertyUp(List<PropertyUpRequest> request, CallBack callBack) {
+// if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+// String time = String.valueOf(System.currentTimeMillis());
+//
+// final BaseLocalResponse<List<PropertyUpRequest>> data = new BaseLocalResponse<>();
+// data.setId(IdUtils.getUUId());
+// data.setTime_stamp(time);
+// data.setObjects(request);
+//
+//
+// String topic = String.format(TopicConstant.PROPERTY_UP, getGatewayId());
+// LinkRequest message = new LinkRequest(topic,
+// GsonConvert.getGson().toJson(request));
+//
+// String replyTopic = String.format(TopicConstant.PROPERTY_UP_REPLY, getGatewayId());
+// try {
+// sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+// @Override
+// public void onSucceed() {
+//
+// }
+//
+// @Override
+// public void onError() {
+// if (callBack != null) {
+// callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+// }
+// }
+// });
+// } catch (Exception e) {
+// if (callBack != null) {
+// callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+// }
+// }
+// } else {
+// if (callBack != null) {
+// callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+// }
+// }
+// }
/**
* 璇诲彇鐘舵��
*/
- public void propertyRead(List<PropertyReadRequest> request, CallBack callBack) {
+ public void propertyRead(List<String> sids, HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
-
final BaseLocalResponse<List<PropertyReadRequest>> data = new BaseLocalResponse<>();
data.setId(IdUtils.getUUId());
data.setTime_stamp(time);
- data.setObjects(request);
+ List<PropertyReadRequest> list = new ArrayList<>();
+ for (String s : sids) {
+ list.add(new PropertyReadRequest(s));
+ }
+ data.setObjects(list);
String topic = String.format(TopicConstant.PROPERTY_READ, getGatewayId());
LinkRequest message = new LinkRequest(topic,
- GsonConvert.getGson().toJson(request));
+ GsonConvert.getGson().toJson(data));
String replyTopic = String.format(TopicConstant.PROPERTY_READ_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -532,18 +525,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
}
@@ -559,11 +552,133 @@
}
/**
- * 娓呯┖缂撳瓨
+ * 鑾峰彇鍦烘櫙鍒楄〃
*/
- public void clearCache() {
- SPUtils.remove(TCP_IP_KEY);
- SPUtils.remove(GATEWAY_KEY);
+ public void getSceneList(HDLLinkCallBack callBack) {
+ if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+ String time = String.valueOf(System.currentTimeMillis());
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("id", IdUtils.getUUId());
+ jsonObject.addProperty("time_stamp", time);
+
+ String topic = String.format(TopicConstant.SCENE_LIST_GET, getGatewayId());
+
+ LinkRequest message = new LinkRequest(topic,
+ jsonObject.toString());
+ String replyTopic = topic + "_reply";
+ try {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+ @Override
+ public void onSucceed() {
+
+ }
+
+ @Override
+ public void onError() {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+ }
+ }
+ });
+ } catch (Exception e) {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+ }
+ }
+ } else {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
+ }
+ }
+ }
+
+ /**
+ * 鍦烘櫙鎺у埗
+ * @param sids 鍦烘櫙sid鍒楄〃
+ * @param callBack 鍥炶皟
+ */
+ public void controlScene(List<String> sids, HDLLinkCallBack callBack) {
+ if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+ String time = String.valueOf(System.currentTimeMillis());
+ final BaseLocalResponse<List<PropertyReadRequest>> data = new BaseLocalResponse<>();
+ data.setId(IdUtils.getUUId());
+ data.setTime_stamp(time);
+
+ List<PropertyReadRequest> list = new ArrayList<>();
+ for (String s : sids) {
+ list.add(new PropertyReadRequest(s));
+ }
+ data.setObjects(list);
+
+ String topic = String.format(TopicConstant.SCENE_CONTROL, getGatewayId());
+ LinkRequest message = new LinkRequest(topic,
+ GsonConvert.getGson().toJson(data));
+
+ String replyTopic = topic + "_reply";
+ try {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+ @Override
+ public void onSucceed() {
+
+ }
+
+ @Override
+ public void onError() {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ });
+ } catch (Exception e) {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ } else {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ }
+
+// /**
+// * 娓呯┖缂撳瓨
+// */
+// public void clearCache() {
+// SPUtils.remove(TCP_IP_KEY);
+// SPUtils.remove(GATEWAY_KEY);
+// }
+
+ /**
+ * 閫氱敤TCP鍙戦�佹寚浠�
+ * 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
+ *
+ * @param topic 鍙戦�佹暟鎹�
+ * @param bodyStr 鍥炲鐨勪富棰�
+ * @param callBack 鍥炶皟
+ */
+ public void tcpSendMsg(String topic, String bodyStr, HDLLinkCallBack callBack) {
+ try {
+ LinkRequest message = new LinkRequest(topic, bodyStr);
+ String replyTopic = topic + "_reply";
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+ @Override
+ public void onSucceed() {
+
+ }
+
+ @Override
+ public void onError() {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ });
+ } catch (Exception e) {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
}
@@ -571,7 +686,7 @@
* 鍙戦�佹寚浠�
* 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
*/
- public void sendMsg(byte[] data, String eventTag, CallBack callBack, SendListener sendListener) {
+ public void sendMsg(byte[] data, String eventTag, HDLLinkCallBack callBack, SendListener sendListener) {
try {
final AtomicInteger sendCount = new AtomicInteger(0);
@@ -583,7 +698,7 @@
if (msg instanceof LinkResponse) {
if (callBack != null) {
- callBack.onResponse(msg.toString());
+ callBack.onSuccess(msg.toString());
}
threadPool.shutdownNow();
}
@@ -603,7 +718,7 @@
@Override
public void run() {
if (callBack != null) {
- callBack.onError("鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
@@ -632,7 +747,7 @@
@Override
public void run() {
if (callBack != null) {
- callBack.onError("鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java
index f05ba51..53d8ca5 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java
@@ -82,17 +82,17 @@
byte[] result = cipher.doFinal(content);
return result;
} catch (NoSuchAlgorithmException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (InvalidKeyException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (NoSuchPaddingException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (BadPaddingException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (IllegalBlockSizeException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (InvalidAlgorithmParameterException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
}
return null;
}
@@ -126,17 +126,17 @@
byte[] result = cipher.doFinal(contentByte);
return result;
} catch (NoSuchAlgorithmException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (InvalidKeyException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (NoSuchPaddingException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (BadPaddingException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (IllegalBlockSizeException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
} catch (InvalidAlgorithmParameterException e) {
- LogUtils.e(e.getMessage(), e);
+ LogUtils.e(e.getMessage());
}
return null;
}
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 8d206f5..ac8ec9e 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
@@ -5,6 +5,7 @@
import androidx.collection.ArrayMap;
+import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.socket.annotation.ConnectStatus;
import com.hdl.sdk.socket.client.IClient;
@@ -67,7 +68,7 @@
final int maxRetry = client.getOptions().getMaxRetry();
if (maxRetry == 0 && resendCount.get() > 0 ||
(maxRetry > 0 && maxRetry + 1 < resendCount.get())) {
- Log.d("====", "===閲嶈繛娆℃暟杈惧埌鏈�澶�==");
+ LogUtils.d("====", "===閲嶈繛娆℃暟杈惧埌鏈�澶�==");
return;
}
if (!client.isConnect()) {
@@ -82,7 +83,7 @@
try {
resendCount.set(resendCount.get() + 1);
Thread.sleep(300L);
- Log.d("====", "==閲嶈繛绗�" + resendCount + "娆�==");
+ LogUtils.d("====", "==閲嶈繛绗�" + resendCount + "娆�==");
} catch (Exception ignored) {
}
}
@@ -90,7 +91,7 @@
client.connect();
isRun.set(true);
if (client.isConnect()) {
- Log.d("====", "====杩炴帴鎴愬姛====");
+ LogUtils.d("====", "====杩炴帴鎴愬姛====");
startHeartbeat();
initSendThread();
@@ -103,7 +104,7 @@
}
} catch (Exception e) {
e.printStackTrace();
- Log.d("====", "===杩炴帴澶辫触===" + e);
+ LogUtils.d("====", "===杩炴帴澶辫触===" + e);
//鍐嶅垽鏂竴涓嬫湁娌℃湁杩炴帴
if (!client.isConnect()) {
isRun.set(false);
@@ -126,12 +127,12 @@
public void run() {
while (isRun.get()) {
if (client.isConnect()) {
- Log.d("=====", "==鍙戦�佹暟鎹�==");
+ LogUtils.d("=====", "==鍙戦�佹暟鎹�==");
try {
SocketRequest socketRequest = mMessageQueue.take();
final String sendStr = new String(socketRequest.getData(), 0, socketRequest.getData().length);
- Log.d("=====", "==鍙戦�佹暟鎹�==锛�"+sendStr);
+ LogUtils.d("=====", "==鍙戦�佹暟鎹�==锛�"+sendStr);
final String action = socketRequest.getAction();
try {
client.sendMsg(socketRequest.getData());
@@ -165,7 +166,7 @@
}
}
- Log.d("=====", "==鍙戦�佺嚎绋嬪叧闂�==");
+ LogUtils.d("=====", "==鍙戦�佺嚎绋嬪叧闂�==");
}
});
@@ -185,7 +186,7 @@
client.onHandleResponse();
} catch (Exception e) {
e.printStackTrace();
- Log.d("====", "鏂紑杩炴帴" + e.getMessage());
+ LogUtils.d("====", "鏂紑杩炴帴" + e.getMessage());
disconnectError();
}
}
@@ -208,7 +209,7 @@
@Override
public void run() {
if (isRun.get()) {
- Log.d("====", "===鍙戦�佸績璺冲寘===");
+ LogUtils.d("====", "===鍙戦�佸績璺冲寘===");
if (client.getOptions() != null) {
final byte[] heartBeat = client.getOptions().getHeartbeatData();
if (heartBeat != null) {
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
index a2f7c2f..1279a7c 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
@@ -5,6 +5,7 @@
import com.hdl.sdk.common.HDLSdk;
import com.hdl.sdk.common.utils.IpUtils;
+import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.socket.SocketBoot;
import com.hdl.sdk.socket.SocketOptions;
@@ -148,7 +149,7 @@
}
final String receive = new String(receivePacket.getData(), 0, receivePacket.getLength());
- Log.d("---->", receive + " from " + receivePacket.getAddress().getHostAddress() + ":" + receivePacket.getPort());
+ LogUtils.d("---->", receive + " from " + receivePacket.getAddress().getHostAddress() + ":" + receivePacket.getPort());
//閲嶇疆闀垮害
if (receivePacket != null) {
--
Gitblit v1.8.0