2021-12-13 1.更新

JLChen

2021-12-13 285ea3f0c42b2240a3b3e0d4fda083aa8bbbba17

2021-12-13 1.更新

 HDLSDK_DEMO/app/libs/hdl-common-V1.0.1.aar

Binary files differ

 HDLSDK_DEMO/app/libs/hdl-connect-V1.0.1.aar

Binary files differ

 HDLSDK_DEMO/app/libs/hdl-socket-V1.0.1.aar

Binary files differ

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

@@ -37,6 +37,7 @@
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.config.HDLLinkConfig;
import com.hdl.sdk.connect.socket.HDLAuthSocket;
import com.hdl.sdk.connect.socket.HDLSocket;
import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
@@ -103,10 +104,10 @@
        beans.add(new DemoBean("获取场景列表"));
        beans.add(new DemoBean("场景控制"));
        beans.add(new DemoBean("设备功能列表"));
        beans.add(new DemoBean("UDP发送"));
        beans.add(new DemoBean("TCP发送"));
        beans.add(new DemoBean("UDP发送，监听主题回复，带重发带回调"));
        beans.add(new DemoBean("TCP发送，监听主题回复，带重发带回调"));
        beans.add(new DemoBean("UDP发送，不回调不重发"));
        beans.add(new DemoBean("TCP发送，不回调不重发"));
        demoAdapter = new DemoAdapter(beans);
        rv.setAdapter(demoAdapter);

@@ -159,25 +160,24 @@
                        break;
                    case 9:
                        //UDP发送
                        udpSendWithCallback();
                        udpSend();
                        break;
                    case 10:
                        //TCP发送
                        tcpSendWithCallback();
                        tcpSend();
                        break;
                    case 11:
                        //UDP发送
                        udpSend();
                        //UDP发送，监听主题回复，带重发带回调
                        udpSendWithCallback();
                        break;
                    case 12:
                        //TCP发送
                        tcpSend();
                        //TCP发送，监听主题回复，带重发带回调
                        tcpSendWithCallback();
                        break;
                }
            }
        });
    }




    public void showToast(String text) {
@@ -209,6 +209,7 @@

    /**
     * 处理收到的主题
     *
     * @param response
     */
    private void handleLinkResponse(LinkResponse response){
@@ -238,7 +239,6 @@
                }.getType());
                searchBean = response.getObjects();
            }

        }
        return searchBean;
    }
@@ -257,9 +257,16 @@
        tv.setText("开始入网认证...");
        //认证提交参数准备

        String spkStr = "screen.mirror";//产品spk
        String macStr = "AA000000000000AC";//设备唯一MAC地址
        String secret = "ee62124c151b737c";//通过spk和mac提交云端认证后分配的secret
        //测试服务
        String spkStr = "ir.module";//产品spk
        String macStr = "AA000000000000BB";//设备唯一MAC地址
        String secret = "87ae414b7a853f65";//通过spk和mac提交云端认证后分配的secret

        //正式服务器
//        String spkStr = "screen.mirror";//产品spk
//        String macStr = "AA000000000000AC";//设备唯一MAC地址
//        String secret = "ee62124c151b737c";//通过spk和mac提交云端认证后分配的secret

        String mac_key = stringToMD5(stringToMD5(macStr + secret));
        String versionString = "HDL_V1.0.1";//
        String time = String.valueOf(System.currentTimeMillis());
@@ -341,6 +348,7 @@
                tv.setText("网关不在线");
                responseTv.setText(e.getMsg());
            }

            @Override
            public void onSuccess(GatewaySearchBean gatewaySearchBean) {
                tv.setText("网关在线");
@@ -405,6 +413,7 @@
                tv.setText("读取成功");
                responseTv.setText(data);
            }

            @Override
            public void onError(HDLLinkException e) {
                tv.setText("读取失败");
@@ -463,6 +472,7 @@

    //场景列表
    // {"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
@@ -497,40 +507,59 @@
    }

    /**
     * TCP发送，监听主题回复，带重发带回调
     * TCP发送 只发一次，不监听回复，不重发
     */
    private void tcpSendWithCallback() {
        String time = String.valueOf(System.currentTimeMillis());
        JsonObject jsonObject = new JsonObject();
        jsonObject.addProperty("id", IdUtils.getUUId());
        jsonObject.addProperty("time_stamp", time);
        HDLLink.getInstance().tcpSendMsg(TopicConstant.GATEWAY_SEARCH, jsonObject.toString(), new HDLLinkCallBack() {
            @Override
            public void onSuccess(String data) {
                responseTv.setText(data);
    private void tcpSend() {
        tv.setText("TCP发送 只发一次，不监听回复，不重发");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr);
            }

            @Override
            public void onError(HDLLinkException e) {
                responseTv.setText(e.getMsg());
    /**
     * UDP只发一次，不监听回复，不重发
     */
    private void udpSend() {
        tv.setText("UDP发送 只发一次，不监听回复，不重发");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr);
            }
        });

    private String getPropertyDownBodyStr() {
        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);
        String time = String.valueOf(System.currentTimeMillis());

        final BaseLocalResponse<List<DeviceControlRequest>> data = new BaseLocalResponse<>();
        data.setId(IdUtils.getUUId());
        data.setTime_stamp(time);
        data.setObjects(requestList);

        return GsonConvert.getGson().toJson(data);
    }

    /**
     * UDP发送，监听主题回复，带重发带回调
     */
    private void udpSendWithCallback() {
        String time = String.valueOf(System.currentTimeMillis());
        JsonObject jsonObject = new JsonObject();
        jsonObject.addProperty("id", IdUtils.getUUId());
        jsonObject.addProperty("time_stamp", time);
        HDLLink.getInstance().udpSendMsg(TopicConstant.GATEWAY_SEARCH, jsonObject.toString(), new HDLLinkResponseCallBack() {
        tv.setText("UDP发送，监听主题回复，带重发带回调");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr, new HDLLinkResponseCallBack() {
            @Override
            public void onSuccess(LinkResponse linkResponse) {
                if(linkResponse != null){
                    responseTv.setText(linkResponse.getData());
                }
            public void onSuccess(LinkResponse msg) {
                Log.i("udpSendWithCallback", "udpSendWithCallback");
                responseTv.setText(GsonConvert.getGson().toJson(msg));
            }

            @Override
@@ -541,24 +570,23 @@
    }

    /**
     * TCP发送 只发一次，不监听回复，不重发
     * TCP发送，监听主题回复，带重发带回调
     */
    private void tcpSend() {
        String time = String.valueOf(System.currentTimeMillis());
        JsonObject jsonObject = new JsonObject();
        jsonObject.addProperty("id", IdUtils.getUUId());
        jsonObject.addProperty("time_stamp", time);
        HDLLink.getInstance().tcpSendMsg(TopicConstant.GATEWAY_SEARCH, jsonObject.toString());
    private void tcpSendWithCallback() {
        tv.setText("TCP发送，监听主题回复，带重发带回调");
        String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
        String bodyStr = getPropertyDownBodyStr();
        HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr, new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
                Log.i("tcpSendWithCallback", "tcpSendWithCallback");
                responseTv.setText(msg);
    }

    /**
     * 只发一次，不监听回复，不重发
     */
    private void udpSend() {
        String time = String.valueOf(System.currentTimeMillis());
        JsonObject jsonObject = new JsonObject();
        jsonObject.addProperty("id", IdUtils.getUUId());
        jsonObject.addProperty("time_stamp", time);
        HDLLink.getInstance().udpSendMsg(TopicConstant.GATEWAY_SEARCH, jsonObject.toString());
            @Override
            public void onError(HDLLinkException e) {
                responseTv.setText(e.getMsg());
            }
        });
    }
}