From 6d908915d558ec457db8a50b03ed8746f4e73a48 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com <562935844@qq.com>
Date: 星期五, 28 六月 2024 14:53:35 +0800
Subject: [PATCH] 代码优化

---
 HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java |   28 ++++++++++++++++------------
 1 files changed, 16 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 3d1386e..a8e0116 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -330,8 +330,10 @@
             @Override
             public void onMessage(Object msg) {
                 LinkResponse response = (LinkResponse) msg;
+                Log.i("onMessage", "response.getTopic():" + response.getTopic());
                 if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())) {
                     localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
+
                 }
             }
         };
@@ -381,22 +383,23 @@
         HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
     }
 
-    void initDeviceInfo()
-    {
+    void initDeviceInfo() {
         AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
-        infoBean.setDeviceMAC("AA00000000000100");
-        infoBean.setIPMAC("AA00000000000100");
-        infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧
-        infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
+        infoBean.setDeviceMAC("f2c5d8bad48f");
+        infoBean.setIPMAC("f2c5d8bad48f");
+        infoBean.setDeviceName("榄旈暅");//璁惧鍚嶅瓧
+        infoBean.setDeviceModel("HDLSDK");//璁惧鍨嬪彿
         infoBean.setAccessMode("WIFI");
         infoBean.setIPGateway("192.168.1.1");
-        infoBean.setIPAddress("192.168.1.116");
-        infoBean.setGateway_type("music.standard");
+        infoBean.setIPAddress("192.168.1.103");
+        infoBean.setGateway_type("screen.touch");
         infoBean.setHw_version("HW2.0");
         infoBean.setFw_version("Fw1.0");
         infoBean.setOID("010105000000FE11");//姣忎釜璁惧oid閮借涓嶄竴鏍�
         infoBean.setSid("110105000000FE08110100000011");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
+        infoBean.setSupplier("JINMAOYUN");
         HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
+
     }
 
     /**
@@ -413,8 +416,8 @@
 
 //        姝e紡鏈嶅姟鍣�
         String spkStr = "screen.mirror";//浜у搧spk
-        String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
-        String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+        String macStr = "f2c5d8bad48f";//璁惧鍞竴MAC鍦板潃
+//        String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
 
         String mac_key = stringToMD5(stringToMD5(macStr + secret));
         String versionString = "HDL_V1.0.1";//
@@ -424,7 +427,7 @@
         //1.璁剧疆璁よ瘉淇℃伅
         AuthenticateRequest.RequestBean requestBean = new AuthenticateRequest.RequestBean();
         requestBean.setMAC(macStr);
-        requestBean.setSupplier("WISE");
+        requestBean.setSupplier("JINMAOYUN");
         requestBean.setFirmwareVersion(versionString);
         requestBean.setHardwareModel("1956F");
         AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean();
@@ -578,6 +581,7 @@
         statusBeanList.add(bean);
         request.setStatus(statusBeanList);
         requestList.add(request);
+
         HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {
             @Override
             public void onSuccess(String data) {
@@ -828,7 +832,7 @@
         AttributesRequest attributes = new AttributesRequest();
         attributes.setKey("on_off");
         attributes.setData_type("string");
-        List<Object> valueList=new ArrayList<>();
+        List<Object> valueList = new ArrayList<>();
         valueList.add("on");
         valueList.add("off");
         attributes.setValue(valueList);

--
Gitblit v1.8.0