From 1323c0b3463c5486be9d5e5310782aeb9023697c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 15 十一月 2021 11:31:56 +0800
Subject: [PATCH] 2021-11-15 1.更新
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 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 31d24e3..be3022f 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -9,27 +9,22 @@
import androidx.recyclerview.widget.RecyclerView;
import android.Manifest;
-import android.app.Instrumentation;
import android.os.Bundle;
+import android.util.Log;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.google.gson.JsonObject;
-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.connect.HDLSocket;
-import com.hdl.sdk.connect.bean.LinkRequest;
+import com.hdl.sdk.common.config.AuthenticateConfig;
+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.protocol.LinkMessageDecoder;
import com.hdl.sdk.connect.protocol.LinkMessageEncoder;
-import com.hdl.sdk.socket.SocketBoot;
import com.hdl.sdk.socket.SocketOptions;
-import com.hdl.sdk.socket.client.UdpClient;
import com.hdl.sdk.socket.codec.MessagePipeLine;
-import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -40,7 +35,7 @@
private RecyclerView rv;
private TextView tv;
private TextView responseTv;
-
+ boolean isOn;
@Override
@@ -51,6 +46,8 @@
tv = findViewById(R.id.state_tv);
rv = findViewById(R.id.rv);
rv.setLayoutManager(new LinearLayoutManager(this));
+ AuthenticateConfig.getInstance().setLocalEncrypt(true);
+ AuthenticateConfig.getInstance().setLocalSecret("5648d9b9cafd30dd");
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@Override
@@ -68,6 +65,7 @@
beans.add(new DemoBean("璁惧鎺у埗"));
beans.add(new DemoBean("鐘舵�佷笂鎶�"));
beans.add(new DemoBean("璇诲彇鐘舵��"));
+ beans.add(new DemoBean("鍏ョ綉璁よ瘉"));
demoAdapter = new DemoAdapter(beans);
rv.setAdapter(demoAdapter);
@@ -126,7 +124,20 @@
break;
case 3:
//璁惧鎺у埗
- // HDLSocket.getInstance().propertyDown();
+ 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);
+
+
break;
case 4:
//鐘舵�佷笂鎶�
@@ -136,6 +147,37 @@
//璇诲彇鐘舵��
// HDLSocket.getInstance().propertyRead();
break;
+ case 6:
+ //鍏ョ綉璁よ瘉
+ HDLAuthSocket.getInstance().sendAuthenticateRequest(new HDLAuthSocket.CallBack() {
+ @Override
+ public void onError(String error) {
+ Log.i("TAG", "onError: 璁よ瘉澶辫触");
+// tv.setText("璁よ瘉澶辫触");
+// responseTv.setText(error);
+ }
+
+ @Override
+ public void onSuccess(String data) {
+ tv.setText("璁よ瘉鎴愬姛");
+ responseTv.setText(data);
+ }
+ });
+
+// HDLAuthSocket.getInstance().searchGateway("1406844230123372545", new HDLAuthSocket.SearchGatewayCallBack() {
+// @Override
+// public void onEnd(String error) {
+//
+// }
+//
+// @Override
+// public void onSuccess(GatewaySearchBean gatewaySearchBean) {
+// Log.i("TAG", "onSuccess: 鎼滅储鎴愬姛锛�"+gatewaySearchBean.getGatewayId());
+// }
+// });
+
+
+ break;
}
}
});
--
Gitblit v1.8.0