增加打印明文数据及系列化功能

hxb

2022-02-11 bbc94746ac599fc61379d91f3981ac72dff5d202

增加打印明文数据及系列化功能

 HDLSDK.zip

Binary files differ

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

@@ -276,15 +276,15 @@
        tv.setText("开始入网认证...");
        //认证提交参数准备

        //测试服务
        String spkStr = "ir.module";//产品spk
        String macStr = "AA000000000000BB";//设备唯一MAC地址
        String secret = "87ae414b7a853f65";//通过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 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";//
@@ -309,13 +309,14 @@
        infoBean.setDeviceModel("HDL");//
        infoBean.setAccessMode("WIFI");
        infoBean.setIPGateway("192.168.88.1");
        infoBean.setIPAddress(IpUtils.getIP(this));
        infoBean.setIPAddress(IpUtils.getIP(this));//根据真实的IP地址填写

        infoBean.setOID("010105000000FE08");
        infoBean.setSid("010105000000FE08110100000000");
        infoBean.setHw_version("1.0");
        infoBean.setFw_version("1.0");
//        infoBean.set
        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);
        HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
            @Override

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

@@ -4,6 +4,7 @@


import androidx.annotation.NonNull;



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

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

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

import com.hdl.sdk.connect.utils.AesUtil;

@@ -87,6 +88,7 @@
                String headString = "Topic:" + getTopic() + "\r\n" + "Length:" + dataBytes.length + "\r\n" + "\r\n";

                byte[] headBytes = headString.getBytes("utf-8");

                byte[] sendBytes = ByteUtils.concatBytes(headBytes, dataBytes);

                LogUtils.i(headString + "\r\n" + data);

                return sendBytes;



            } else {


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

@@ -34,15 +34,45 @@
        this.auth = auth;
    }

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

        /**
         * MAC key
         * @return
         */
        public String getMACKey() { return mac_key; }

        /**
         * MACkey
         * @param value
         */
        public void setMACKey(String value) { this.mac_key = value; }

        /**
         * SPK
         * @return
         */
        public String getSpk() { return spk; }

        /**
         * SPK
         * @param value
         */
        public void setSpk(String value) { this.spk = value; }

        public RequestBean getRequest() { return request; }
@@ -51,6 +81,13 @@
        public AuthBean() {

        }

        /**
         *  认证信息
         * @param mac_key mac key
         * @param spk 产品spk
         * @param request 请求对象
         */
        public AuthBean(String mac_key, String spk, RequestBean request) {
            this.mac_key = mac_key;
            this.spk = spk;
@@ -71,16 +108,52 @@
            this.firmware_version = firmware_version;
        }

        /**
         * 设备MAC
         * @return
         */
        public String getMAC() { return mac; }

        /**
         * 设备MAC
         * @param value
         */
        public void setMAC(String value) { this.mac = value; }

        /**
         * 厂家
         * @return
         */
        public String getSupplier() { return supplier; }

        /**
         * 厂家
         * @param value
         */
        public void setSupplier(String value) { this.supplier = value; }

        /**
         * 硬件版本
         * @return
         */
        public String getHardwareModel() { return hardware_model; }

        /**
         * 硬件版本
         * @param value
         */
        public void setHardwareModel(String value) { this.hardware_model = value; }

        /**
         * 软件版本
         * @return
         */
        public String getFirmwareVersion() { return firmware_version; }

        /**
         * 软件版本
         * @param value
         */
        public void setFirmwareVersion(String value) { this.firmware_version = value; }
    }


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

@@ -1,9 +1,12 @@
package com.hdl.sdk.connect.bean.request;



import java.io.Serializable;



/**

 * Created by Tong on 2021/10/8.

 */

public class PropertyReadRequest {

public class PropertyReadRequest implements Serializable

{



    private String sid;




 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java

@@ -112,7 +112,7 @@
    }



    @Override

    protected LinkResponse decoder(Object msg) throws Exception {

    protected synchronized LinkResponse decoder(Object msg) throws Exception {

        if (msg instanceof byte[]) {

            bytes.addAll(ByteUtils.toByteList((byte[]) msg));

            //如果多条命令打包在一条数据中，都需要处理完


 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java

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



import android.text.TextUtils;

import android.util.Log;



import com.google.gson.JsonObject;

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

@@ -406,6 +407,7 @@


    public SocketBoot getTcp() throws RuntimeException {

        if (TextUtils.isEmpty(getTcpIp())) {

            LogUtils.e("请搜索网关");

            throw new RuntimeException("请搜索网关");

        }

        //如果没有初始化，或者网关IP更改了，就重新初始化


 HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java

@@ -81,8 +81,8 @@
                    while (true) {

                        try {

                            SocketRequest socketRequest = mMessageQueue.take();

                            final String sendStr = new String(socketRequest.getData(), 0, socketRequest.getData().length);

                            LogUtils.i("发送数据：" + sendStr);

//                            final String sendStr = new String(socketRequest.getData(), 0, socketRequest.getData().length);

//                            LogUtils.i("发送数据：" + sendStr);

                            final String action = socketRequest.getAction();

                            try {

                                client.sendMsg(socketRequest.getData());


 HDLSDK_DEMO.zip

Binary files differ

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

Binary files differ