Merge remote-tracking branch 'refs/remotes/public/develop' into feature/YunKuaiChongV160

# Conflicts:
#	jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java
This commit is contained in:
三丙
2024-10-22 16:25:12 +08:00
31 changed files with 232 additions and 135 deletions

View File

@@ -138,7 +138,7 @@ public class YunKuaiChongProtocolMessageProcessor extends ProtocolMessageProcess
csTemp.writeBytes(byCheckSum);
checkSum = csTemp.readUnsignedShortLE();
checkResult = checkCrcSum(checkData, checkSum);
log.info("云快充检验和 第二次检查: checkResult:{}, checkSum:{}", checkResult, checkSum);
log.debug("云快充检验和 第二次检查: checkResult:{}, checkSum:{}", checkResult, checkSum);
}
if (Boolean.FALSE.equals(checkResult.getFirst())) {

View File

@@ -4,6 +4,7 @@
*/
package sanbing.jcpp.protocol.yunkuaichong.v150;
import cn.hutool.core.util.RandomUtil;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import lombok.extern.slf4j.Slf4j;
@@ -42,7 +43,7 @@ public class YunKuaiChongV150LoginAckDLCmd extends YunKuaiChongDownlinkCmdExe {
@Override
public void execute(TcpSession tcpSession, YunKuaiChongDwonlinkMessage yunKuaiChongDwonlinkMessage, ProtocolContext ctx) {
log.info("{} 云快充1.5.0登录认证应答", tcpSession);
log.debug("{} 云快充1.5.0登录认证应答", tcpSession);
if (!yunKuaiChongDwonlinkMessage.getMsg().hasLoginResponse()) {
return;
@@ -95,7 +96,7 @@ public class YunKuaiChongV150LoginAckDLCmd extends YunKuaiChongDownlinkCmdExe {
log.info("{} 云快充1.5.0开始注册定时对时任务", tcpSession);
return PROTOCOL_SESSION_SCHEDULED.scheduleAtFixedRate(() ->
syncTime(tcpSession, pileCodeBytes, requestData),
0, 8, TimeUnit.HOURS);
0, RandomUtil.randomInt(420, 480), TimeUnit.MINUTES);
}
);
}

View File

@@ -29,7 +29,7 @@ public class YunKuaiChongV150LoginULCmd extends YunKuaiChongUplinkCmdExe {
@Override
public void execute(TcpSession tcpSession, YunKuaiChongUplinkMessage yunKuaiChongUplinkMessage, ProtocolContext ctx) {
log.info("{} 云快充1.5.0登录认证请求", tcpSession);
log.debug("{} 云快充1.5.0登录认证请求", tcpSession);
ByteBuf byteBuf = Unpooled.copiedBuffer(yunKuaiChongUplinkMessage.getMsgBody());
ObjectNode additionalInfo = JacksonUtil.newObjectNode();