Merge remote-tracking branch 'origin/master'

liuhaonan

2022-06-28 8d0d0ca7d0d40223181067fde7afc697fa3e54fb

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3QrCodeReqInnerFrame.java

@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.request;

import cn.hutool.core.util.HexUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.IRequestInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.MQTTConnectTypeEnum;
@@ -14,13 +15,14 @@
    private final String payload;

    public C3QrCodeReqInnerFrame(String c3Mac, String qrCodeData) {
        payload = c3Mac + qrCodeData;

        System.out.println("qrCodeData:    " + qrCodeData);
        String encodeHexStr = HexUtil.encodeHexStr(qrCodeData).toUpperCase();
        payload = c3Mac + encodeHexStr;
    }

    @Override
    public String getEncodeFrame() {
        String functionCode = C3ChargingEnum.QR_CODE_REQUEST.getCode();
        String functionCode = C3ChargingEnum.QrCode.getCode();
        //长度可变，不定长
        String payloadLength = SupplementUtils.suppleZero(Integer.toHexString((payload.length() / 2)).toUpperCase(), 4);
        String frame = functionCode + payloadLength + payload;