2021-11-16 更新

JLChen

2021-11-16 c35181696815dcd3014892cd7ddfed62016431f0

2021-11-16 更新

 HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java

@@ -181,12 +181,13 @@
     */
    void sendAuthenticateRequest(){
        tv.setText("开始入网认证...");
        //认证提交参数准备

        String macStr = "AA000000000000BB";
        String secret = "87ae414b7a853f65";
        String spkStr = "ir.module";//产品spk
        String macStr = "AA000000000000BB";//设备唯一MAC地址
        String secret = "87ae414b7a853f65";//通过spk和mac提交云端认证后分配的secret
        String mac_key = stringToMD5(stringToMD5(macStr + secret));

        String versionString = "HDL_V1.0.1";
        String versionString = "HDL_V1.0.1";//
        String time = String.valueOf(System.currentTimeMillis());

        //1.设置认证信息
@@ -196,7 +197,7 @@
        requestBean.setFirmwareVersion(versionString);
        requestBean.setHardwareModel("1956F");
        AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean();
        authbean.setSpk("ir.module");
        authbean.setSpk(spkStr);
        authbean.setMACKey(mac_key);
        authbean.setRequest(requestBean);

@@ -204,11 +205,11 @@
        AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
        infoBean.setDeviceMAC(macStr);
        infoBean.setIPMAC(macStr);
        infoBean.setDeviceName("HDL面板");
        infoBean.setDeviceModel("HDL");
        infoBean.setDeviceName("HDL设备");//设备名字
        infoBean.setDeviceModel("HDL");//
        infoBean.setAccessMode("WIFI");
        infoBean.setIPGateway("192.168.10.1");
        infoBean.setIPAddress(IpUtils.getIP(this));


        infoBean.setOID("010105000000FE08");
        infoBean.setSid("010105000000FE08110100000000");
@@ -216,16 +217,12 @@
        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);

        String ip = IpUtils.getBroadcastAddress();
//        ip = "192.168.10.102";

        HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
            @Override
            public void onError(HDLLinkException e) {
                tv.setText("认证失败");
                responseTv.setText(e.getMsg());
//                Log.i("TAG", "onError: 认证失败");
                Log.i("TAG", "onError: 认证失败");
            }

            @Override
@@ -285,7 +282,6 @@
        tv.setText("获取功能列表中...");
        responseTv.setText("");
        HDLSocket.getInstance().getFunctionList(new HDLLinkCallBack() {

            @Override
            public void onError(HDLLinkException error) {
                tv.setText(error.getMsg());

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java

@@ -1,8 +1,6 @@
package com.hdl.sdk.connect;

import com.hdl.sdk.common.utils.IpUtils;
import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
import com.hdl.sdk.connect.config.HDLLinkConfig;
@@ -11,8 +9,6 @@
import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.socket.HDLAuthSocket;
import com.hdl.sdk.connect.socket.HDLSocket;
import com.hdl.sdk.connect.socket.HdlSocketHelper;
import com.hdl.sdk.socket.listener.SendListener;

import java.util.List;


 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java

@@ -36,7 +36,7 @@

    public static class AuthBean implements Serializable {
        private String mac_key;//(mac+secret)的两次md5值
        private String spk;//(mac+secret)的两次md5值
        private String spk;
        private RequestBean request;//设备相关信息

        public String getMACKey() { return mac_key; }
@@ -94,7 +94,7 @@
        private String ip_mac;
        private String ip_address;
        private String netmask = "255.255.255.0";
        private String ip_gateway = "192.168.10.1";
        private String ip_gateway;
        private String dns1 = "114.114.114.114";
        private String dns2 = "8.8.8.8";
        private VersionBean[] versions;