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 | 61 +++---------------------------
1 files changed, 7 insertions(+), 54 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 ea90450..fcac387 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -10,7 +10,6 @@
import android.Manifest;
import android.os.Bundle;
-import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -18,17 +17,14 @@
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.google.gson.reflect.TypeToken;
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.common.utils.gson.GsonConvert;
import com.hdl.sdk.connect.HDLLink;
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.BaseLocalResponse;
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
@@ -47,18 +43,15 @@
import java.util.List;
import java.util.Map;
-import static com.hdl.sdk.common.config.TopicConstant.GATEWAY_SEARCH_REPLY;
-
public class MainActivity extends AppCompatActivity {
- private static final String TAG = "MainActivity";
private DemoAdapter demoAdapter;
private RecyclerView rv;
private TextView tv;
private TextView responseTv;
boolean isOn;
private EventListener allTopicsListener;
- private String testLightSid = "0001010D48C71B02020100010101";
+ private String testLightSid = "000101B847C71B02020100010101";
@Override
protected void onDestroy() {
@@ -76,7 +69,6 @@
rv.setLayoutManager(new LinearLayoutManager(this));
checkIfCertified();
-
registerAllTopicsListener();
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@@ -103,7 +95,9 @@
// final SocketOptions options = new SocketOptions();
//
- MessagePipeLine pipeLine = new MessagePipeLine();
+// MessagePipeLine pipeLine = new MessagePipeLine();
+// // pipeLine.add(new LinkMessageDecoder());
+// pipeLine.add(new LinkMessageEncoder());
// options.setHandleMessage(pipeLine);
// options.setEnabledHeartbeat(false);
@@ -169,52 +163,11 @@
@Override
public void onMessage(Object msg) {
LinkResponse response = (LinkResponse)msg;
- if(response != null){
- Log.i(TAG, "AllTopicsListener"
- + "\nTopic: " + response.getTopic()
- +"\n Data: " + response.getData());
- handleLinkResponse(response);
- }
-
+ //response.getData() 浣跨敤杩欎釜鏂规硶鑾峰彇鏁版嵁杞琷son灏卞彲浠ヤ簡
+// Log.i("TAG", "AllTopicsListener onMessage: "+msg.toString());
}
};
HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);
- }
-
- /**
- * 澶勭悊鏀跺埌鐨勪富棰�
- * @param response
- */
- private void handleLinkResponse(LinkResponse response){
- //缃戝叧鎼滅储鍥炲
- if(response.getTopic().contains("/user/all/custom/gateway/search_reply")){
- String data = response.getData();
- if (!TextUtils.isEmpty(data)) {
- Log.i("handleLinkResponse", "data:"+data);
- final BaseLocalResponse<GatewaySearchBean> bean = GsonConvert.getGson().fromJson(data, new TypeToken<BaseLocalResponse<GatewaySearchBean>>() {
- }.getType());
- GatewaySearchBean searchBean = bean.getObjects();
- Log.i("handleLinkResponse", "GatewaySearchBean: "+searchBean.getGatewayId());
- }
- }else{
- //鍏跺畠涓婚
-
- }
- }
-
- private GatewaySearchBean getGatewaySearchBean(Object msg) {
- GatewaySearchBean searchBean = null;
- 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());
- searchBean = response.getObjects();
- }
-
- }
- return searchBean;
}
/**
@@ -256,7 +209,7 @@
infoBean.setDeviceName("绾㈠瀹�");//璁惧鍚嶅瓧
infoBean.setDeviceModel("HDL");//
infoBean.setAccessMode("WIFI");
- infoBean.setIPGateway("192.168.12.1");
+ infoBean.setIPGateway("192.168.10.1");
infoBean.setIPAddress(IpUtils.getIP(this));
infoBean.setOID("010105000000FE08");
--
Gitblit v1.8.0