第一次优化调整

hxb

2021-12-07 05552c8b73a16b69aded2d4d877fa968c29e7cce

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

@@ -93,13 +93,13 @@
        rv.setAdapter(demoAdapter);


        final SocketOptions options = new SocketOptions();

        MessagePipeLine pipeLine = new MessagePipeLine();
        pipeLine.add(new LinkMessageDecoder());
        pipeLine.add(new LinkMessageEncoder());
        options.setHandleMessage(pipeLine);
        options.setEnabledHeartbeat(false);
//        final SocketOptions options = new SocketOptions();
//
//        MessagePipeLine pipeLine = new MessagePipeLine();
//       // pipeLine.add(new LinkMessageDecoder());
//        pipeLine.add(new LinkMessageEncoder());
//        options.setHandleMessage(pipeLine);
//        options.setEnabledHeartbeat(false);

        demoAdapter.setOnItemClickListener(new OnItemClickListener() {
            @Override
@@ -163,7 +163,8 @@
            @Override
            public void onMessage(Object msg) {
                LinkResponse response = (LinkResponse)msg;
                Log.i("TAG", "AllTopicsListener onMessage: "+msg.toString());
                //response.getData()  使用这个方法获取数据转json就可以了
//                Log.i("TAG", "AllTopicsListener onMessage: "+msg.toString());
            }
        };
        HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);
@@ -181,12 +182,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 +198,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 +206,11 @@
        AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
        infoBean.setDeviceMAC(macStr);
        infoBean.setIPMAC(macStr);
        infoBean.setDeviceName("HDL面板");
        infoBean.setDeviceModel("HDL");
        infoBean.setDeviceName("红外宝");//设备名字
        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 +218,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
@@ -284,8 +282,7 @@
    void getFunctionList(){
        tv.setText("获取功能列表中...");
        responseTv.setText("");
        HDLSocket.getInstance().getFunctionList(new HDLLinkCallBack() {

        HDLLink.getInstance().getFunctionList(new HDLLinkCallBack() {
            @Override
            public void onError(HDLLinkException error) {
                tv.setText(error.getMsg());
@@ -307,7 +304,7 @@
        tv.setText("功能属性读取");
        List<String> sids = new ArrayList<>();
        sids.add(testLightSid);
        HDLSocket.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
        HDLLink.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
                responseTv.setText(msg);
@@ -328,7 +325,7 @@
        tv.setText("读取状态中...");
        List<String> list = new ArrayList<>();
        list.add(testLightSid);//要读取设备的sid
        HDLSocket.getInstance().propertyRead(list, new HDLLinkCallBack() {
        HDLLink.getInstance().propertyRead(list, new HDLLinkCallBack() {
            @Override
            public void onSuccess(String data) {
                tv.setText("读取成功");