From 05552c8b73a16b69aded2d4d877fa968c29e7cce Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 07 十二月 2021 14:32:34 +0800
Subject: [PATCH] 第一次优化调整
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 4927419..fcac387 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -93,13 +93,13 @@
rv.setAdapter(demoAdapter);
- final SocketOptions options = new SocketOptions();
-
- MessagePipeLine pipeLine = new MessagePipeLine();
- pipeLine.add(new LinkMessageDecoder());
- pipeLine.add(new LinkMessageEncoder());
- options.setHandleMessage(pipeLine);
- options.setEnabledHeartbeat(false);
+// final SocketOptions options = new SocketOptions();
+//
+// MessagePipeLine pipeLine = new MessagePipeLine();
+// // pipeLine.add(new LinkMessageDecoder());
+// pipeLine.add(new LinkMessageEncoder());
+// options.setHandleMessage(pipeLine);
+// options.setEnabledHeartbeat(false);
demoAdapter.setOnItemClickListener(new OnItemClickListener() {
@Override
@@ -163,7 +163,8 @@
@Override
public void onMessage(Object msg) {
LinkResponse response = (LinkResponse)msg;
- Log.i("TAG", "AllTopicsListener onMessage: "+msg.toString());
+ //response.getData() 浣跨敤杩欎釜鏂规硶鑾峰彇鏁版嵁杞琷son灏卞彲浠ヤ簡
+// Log.i("TAG", "AllTopicsListener onMessage: "+msg.toString());
}
};
HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);
@@ -205,7 +206,7 @@
AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
infoBean.setDeviceMAC(macStr);
infoBean.setIPMAC(macStr);
- infoBean.setDeviceName("HDL璁惧");//璁惧鍚嶅瓧
+ infoBean.setDeviceName("绾㈠瀹�");//璁惧鍚嶅瓧
infoBean.setDeviceModel("HDL");//
infoBean.setAccessMode("WIFI");
infoBean.setIPGateway("192.168.10.1");
@@ -281,7 +282,7 @@
void getFunctionList(){
tv.setText("鑾峰彇鍔熻兘鍒楄〃涓�...");
responseTv.setText("");
- HDLSocket.getInstance().getFunctionList(new HDLLinkCallBack() {
+ HDLLink.getInstance().getFunctionList(new HDLLinkCallBack() {
@Override
public void onError(HDLLinkException error) {
tv.setText(error.getMsg());
@@ -303,7 +304,7 @@
tv.setText("鍔熻兘灞炴�ц鍙�");
List<String> sids = new ArrayList<>();
sids.add(testLightSid);
- HDLSocket.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
+ HDLLink.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
responseTv.setText(msg);
@@ -324,7 +325,7 @@
tv.setText("璇诲彇鐘舵�佷腑...");
List<String> list = new ArrayList<>();
list.add(testLightSid);//瑕佽鍙栬澶囩殑sid
- HDLSocket.getInstance().propertyRead(list, new HDLLinkCallBack() {
+ HDLLink.getInstance().propertyRead(list, new HDLLinkCallBack() {
@Override
public void onSuccess(String data) {
tv.setText("璇诲彇鎴愬姛");
--
Gitblit v1.8.0