2021-12-10 1.更新

JLChen

2021-12-10 4a4ed8210c58dba28deea1a6e69c3671ae1a7dd0

2021-12-10 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

@@ -19,14 +19,17 @@

import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlsdk.device.DevicesListActivity;
import com.hdl.sdk.common.config.TopicConstant;
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.common.utils.gson.GsonConvert;
import com.hdl.sdk.connect.HDLLink;
import com.hdl.sdk.connect.bean.LinkRequest;
import com.hdl.sdk.connect.bean.LinkResponse;
import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
@@ -100,13 +103,17 @@
        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发送，不回调不重发"));
        demoAdapter = new DemoAdapter(beans);
        rv.setAdapter(demoAdapter);


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

@@ -150,10 +157,29 @@
                        //功能列表
                        startDevicesListActivity();
                        break;
                    case 9:
                        //UDP发送
                        udpSendWithCallback();
                        break;
                    case 10:
                        //TCP发送
                        tcpSendWithCallback();
                    case 11:
                        //UDP发送
                        udpSend();
                        break;
                    case 12:
                        //TCP发送
                        tcpSend();
                        break;
                }
            }
        });
    }




    public void showToast(String text) {
        Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
    }
@@ -176,13 +202,6 @@
            @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);
@@ -238,9 +257,9 @@
        tv.setText("开始入网认证...");
        //认证提交参数准备

        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());
@@ -248,7 +267,7 @@
        //1.设置认证信息
        AuthenticateRequest.RequestBean requestBean = new AuthenticateRequest.RequestBean();
        requestBean.setMAC(macStr);
        requestBean.setSupplier("HDL");
        requestBean.setSupplier("raysgem");
        requestBean.setFirmwareVersion(versionString);
        requestBean.setHardwareModel("1956F");
        AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean();
@@ -263,7 +282,7 @@
        infoBean.setDeviceName("红外宝");//设备名字
        infoBean.setDeviceModel("HDL");//
        infoBean.setAccessMode("WIFI");
        infoBean.setIPGateway("192.168.12.1");
        infoBean.setIPGateway("192.168.88.1");
        infoBean.setIPAddress(IpUtils.getIP(this));

        infoBean.setOID("010105000000FE08");
@@ -476,4 +495,70 @@
        Intent intent = new Intent(this, DevicesListActivity.class);
        startActivity(intent);
    }

    /**
     * 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);
            }

            @Override
            public void onError(HDLLinkException e) {
                responseTv.setText(e.getMsg());
            }
        });
    }

    /**
     * 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() {
            @Override
            public void onSuccess(LinkResponse linkResponse) {
                if(linkResponse != null){
                    responseTv.setText(linkResponse.getData());
                }
            }

            @Override
            public void onError(HDLLinkException e) {
                responseTv.setText(e.getMsg());
            }
        });
    }

    /**
     * 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 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());
    }
}

 HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/device/DevicesListAdapter.java

@@ -1,16 +1,34 @@
package com.hdl.hdlsdk.device;



import android.content.Context;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.CompoundButton;

import android.widget.Switch;

import android.widget.TextView;





import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.recyclerview.widget.RecyclerView;



import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;

import com.chad.library.adapter.base.viewholder.BaseViewHolder;

import com.hdl.hdlsdk.DemoBean;

import com.hdl.hdlsdk.R;

import com.hdl.sdk.common.config.TopicConstant;

import com.hdl.sdk.common.exception.HDLLinkException;

import com.hdl.sdk.common.utils.IdUtils;

import com.hdl.sdk.common.utils.LogUtils;

import com.hdl.sdk.common.utils.gson.GsonConvert;

import com.hdl.sdk.connect.HDLLink;

import com.hdl.sdk.connect.bean.request.DeviceControlRequest;

import com.hdl.sdk.connect.bean.response.BaseLocalResponse;

import com.hdl.sdk.connect.callback.HDLLinkCallBack;

import com.hdl.sdk.connect.config.HDLLinkConfig;



import java.util.ArrayList;

import java.util.List;



public class DevicesListAdapter extends RecyclerView.Adapter<DevicesListAdapter.ViewHolder> {

@@ -46,6 +64,12 @@
    @Override

    public void onBindViewHolder(ViewHolder holder, int position) {

        holder.item_tv.setText(mList.get(position).getName());

        holder.device_on_off_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {

            @Override

            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {

                propertyDown(mList.get(position), isChecked);

            }

        });

    }



    @Override

@@ -56,10 +80,39 @@
    //自定义的ViewHolder，持有每个Item的的所有界面元素

    public static class ViewHolder extends RecyclerView.ViewHolder {

        public TextView item_tv;

        public Switch device_on_off_switch;



        public ViewHolder(View view) {

            super(view);

            item_tv = (TextView) view.findViewById(R.id.device_title_tv);

            device_on_off_switch = view.findViewById(R.id.device_on_off_switch);

        }

    }



    private void propertyDown(FunctionBean functionBean, Boolean isOn){

        List<DeviceControlRequest> requestList = new ArrayList<>();

        DeviceControlRequest request = new DeviceControlRequest();

        request.setSid(functionBean.getSid());

        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());



        HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {

            @Override

            public void onSuccess(String data) {

                Log.i("propertyDown",data);

            }



            @Override

            public void onError(HDLLinkException e) {

                Log.e("propertyDown", "ERROR :"+ e.getMsg());

            }

        });



    }

}