From d6a2ca78cc573243a44ff805ac01935fd36bb6d8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 07 十二月 2021 15:40:00 +0800
Subject: [PATCH] 2021-12-07 1.调整搜索网关机制
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 489 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 386 insertions(+), 103 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 8d89f55..44815ae 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -9,44 +9,64 @@
import androidx.recyclerview.widget.RecyclerView;
import android.Manifest;
-import android.app.Instrumentation;
+import android.content.Intent;
import android.os.Bundle;
+import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
+import android.widget.Toast;
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.AuthenticateConfig;
-import com.hdl.sdk.common.config.TopicConstant;
+import com.google.gson.reflect.TypeToken;
+import com.hdl.hdlsdk.device.DevicesListActivity;
+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.HDLAuthSocket;
-import com.hdl.sdk.connect.HDLSocket;
-import com.hdl.sdk.connect.bean.DeviceControlRequest;
-import com.hdl.sdk.connect.bean.GatewaySearchBean;
-import com.hdl.sdk.connect.bean.LinkRequest;
+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;
+import com.hdl.sdk.connect.socket.HDLAuthSocket;
+import com.hdl.sdk.connect.socket.HDLSocket;
+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.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.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
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";
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ removeAllTopicsListener();
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -56,8 +76,10 @@
tv = findViewById(R.id.state_tv);
rv = findViewById(R.id.rv);
rv.setLayoutManager(new LinearLayoutManager(this));
- AuthenticateConfig.getInstance().setLocalEncrypt(true);
- AuthenticateConfig.getInstance().setLocalSecret("5648d9b9cafd30dd");
+
+ checkIfCertified();
+
+ registerAllTopicsListener();
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@Override
@@ -69,128 +91,389 @@
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);
- final SocketOptions options = new SocketOptions();
-
+// final SocketOptions options = new SocketOptions();
+//
MessagePipeLine pipeLine = new MessagePipeLine();
- pipeLine.add(new LinkMessageDecoder());
- pipeLine.add(new LinkMessageEncoder());
- options.setHandleMessage(pipeLine);
- options.setEnabledHeartbeat(false);
+// options.setHandleMessage(pipeLine);
+// options.setEnabledHeartbeat(false);
demoAdapter.setOnItemClickListener(new OnItemClickListener() {
@Override
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:
- //鍏ョ綉璁よ瘉
- 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());
-// }
-// });
-
-
+ //鑾峰彇鍦烘櫙鍒楄〃
+ getSceneList();
+ break;
+ case 7:
+ //鑾峰彇鍦烘櫙鍒楄〃
+ controlScene();
+ break;
+ case 8:
+ //鍔熻兘鍒楄〃
+ startDevicesListActivity();
break;
}
}
});
}
+ public void showToast(String text) {
+ Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
+ }
+ /**
+ * 妫�娴嬫槸鍚﹁璇佽繃
+ */
+ void checkIfCertified(){
+ boolean isCertified = HDLLink.getInstance().checkIfCertified();
+ String mes = isCertified?"宸茬粡璁よ瘉杩�":"鏈璇�";
+ showToast(mes);
+ tv.setText(mes);
+ }
+
+ /**
+ * 娉ㄥ唽鎵�鏈変富棰樻暟鎹殑鐩戝惉
+ */
+ void registerAllTopicsListener(){
+ allTopicsListener = new EventListener() {
+ @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);
+ }
+
+ }
+ };
+ 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;
+ }
+
+ /**
+ * 绉婚櫎鎵�鏈変富棰樻暟鎹殑鐩戝惉
+ */
+ void removeAllTopicsListener(){
+ HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
+ }
+
+ /**
+ * 鍏ョ綉璁よ瘉
+ */
+ void sendAuthenticateRequest(){
+ tv.setText("寮�濮嬪叆缃戣璇�...");
+ //璁よ瘉鎻愪氦鍙傛暟鍑嗗
+
+ String spkStr = "ir.module";//浜у搧spk
+ String macStr = "AA000000000000BB";//璁惧鍞竴MAC鍦板潃
+ String secret = "87ae414b7a853f65";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+ String mac_key = stringToMD5(stringToMD5(macStr + secret));
+ String versionString = "HDL_V1.0.1";//
+ String time = String.valueOf(System.currentTimeMillis());
+
+ //1.璁剧疆璁よ瘉淇℃伅
+ AuthenticateRequest.RequestBean requestBean = new AuthenticateRequest.RequestBean();
+ requestBean.setMAC(macStr);
+ requestBean.setSupplier("HDL");
+ requestBean.setFirmwareVersion(versionString);
+ requestBean.setHardwareModel("1956F");
+ AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean();
+ authbean.setSpk(spkStr);
+ authbean.setMACKey(mac_key);
+ authbean.setRequest(requestBean);
+
+ //2.璁剧疆璁惧淇℃伅
+ AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
+ infoBean.setDeviceMAC(macStr);
+ infoBean.setIPMAC(macStr);
+ infoBean.setDeviceName("绾㈠瀹�");//璁惧鍚嶅瓧
+ infoBean.setDeviceModel("HDL");//
+ infoBean.setAccessMode("WIFI");
+ infoBean.setIPGateway("192.168.12.1");
+ infoBean.setIPAddress(IpUtils.getIP(this));
+
+ infoBean.setOID("010105000000FE08");
+ infoBean.setSid("010105000000FE08110100000000");
+// infoBean.set
+ AuthenticateRequest.VersionBean[] versionBeans = new AuthenticateRequest.VersionBean[]{new AuthenticateRequest.VersionBean("FW", versionString), new AuthenticateRequest.VersionBean("HW", "1956F")};
+ infoBean.setVersions(versionBeans);
+ AuthenticateRequest request = new AuthenticateRequest(IdUtils.getUUId(), time, infoBean, authbean);
+ HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
+ @Override
+ public void onError(HDLLinkException e) {
+ tv.setText("璁よ瘉澶辫触");
+ responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError: 璁よ瘉澶辫触");
+ }
+
+ @Override
+ public void onSuccess(String msg) {
+ tv.setText("璁よ瘉鎴愬姛");
+ responseTv.setText(msg.toString());
+ }
+ });
+ }
+
+ String stringToMD5(String text) {
+ byte[] hash;
+ try {
+ hash = MessageDigest.getInstance("MD5").digest(text.getBytes("UTF-8"));
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ return null;
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ return null;
+ }
+
+ StringBuilder hex = new StringBuilder(hash.length * 2);
+ for (byte b : hash) {
+ if ((b & 0xFF) < 0x10)
+ hex.append("0");
+ hex.append(Integer.toHexString(b & 0xFF));
+ }
+
+ return hex.toString();
+ }
+
+ /**
+ * 濡傛灉宸茬粡璁よ瘉鍚庯紝鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎
+ * 骞挎挱鎼滅储璁よ瘉杩囩殑缃戝叧鏄惁鍦ㄧ嚎
+ */
+ void searchGatewayBroadcast(){
+ tv.setText("鎼滅储缃戝叧涓�...");
+ HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() {
+ @Override
+ public void onError(HDLLinkException e) {
+ tv.setText("缃戝叧涓嶅湪绾�");
+ responseTv.setText(e.getMsg());
+ }
+ @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("");
+ HDLLink.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);
+ HDLLink.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
+ HDLLink.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());
+ }
+ });
+ }
+
+
+ void startDevicesListActivity(){
+ Intent intent = new Intent(this, DevicesListActivity.class);
+ startActivity(intent);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0