现场测试提交

master
CZ 4 months ago
parent a9b36c8c47
commit f27b840e2c

@ -3,6 +3,7 @@ using HybirdFrameworkCore.Autofac.Attribute;
using log4net;
using Newtonsoft.Json;
using Service.TBox.Msg.TBox;
using Service.TBox.Server;
namespace Service.TBox.Handler;
@ -15,5 +16,7 @@ public class SocMsgHandler : SimpleChannelInboundHandler<SocMsg>, IBaseHandler
protected override void ChannelRead0(IChannelHandlerContext ctx, SocMsg msg)
{
Log.Info($"receive SocMsg={JsonConvert.SerializeObject(msg)}");
var server = TBoxServerMgr.Server;
if (server != null) server.SocMsg = msg;
}
}

@ -191,7 +191,9 @@ public class TBoxServer : TcpServer<IBaseHandler, Decoder, Encoder>
public string? BatteryNo()
{
byte leng = BatteryOneSn.Length;
#region MyRegion
/*byte leng = BatteryOneSn.Length;
if (leng > 8)
{
byte[] bytes = new byte[leng];
@ -229,7 +231,7 @@ public class TBoxServer : TcpServer<IBaseHandler, Decoder, Encoder>
{
bytes[i] = lstByte[i];
}
if (BatteryOneSn.Sn1 != 0 && BatteryOneSn.Sn2 != 0
&& BatteryOneSn.Sn3 != 0 && BatteryOneSn.Sn4 != 0
&& BatteryOneSn.Sn5 != 0 && BatteryOneSn.Sn6 != 0
@ -239,9 +241,45 @@ public class TBoxServer : TcpServer<IBaseHandler, Decoder, Encoder>
{
return Encoding.ASCII.GetString(bytes);
}
}
}*/
return null;
#endregion
List<byte> list = new()
{
BatteryOneSn.Sn1,
BatteryOneSn.Sn2,
BatteryOneSn.Sn3,
BatteryOneSn.Sn4,
BatteryOneSn.Sn5,
BatteryOneSn.Sn6,
BatteryTwoSn.Sn1,
BatteryTwoSn.Sn2,
BatteryTwoSn.Sn3,
BatteryTwoSn.Sn4,
BatteryTwoSn.Sn5,
BatteryTwoSn.Sn6,
};
var count = list.Where(i => i <= 0).Count();
if (count > 6)
{
return null;
}
byte[] bytes = new byte[12];
bytes[0] = BatteryOneSn.Sn1;
bytes[1] = BatteryOneSn.Sn2;
bytes[2] = BatteryOneSn.Sn3;
bytes[3] = BatteryOneSn.Sn4;
bytes[4] = BatteryOneSn.Sn5;
bytes[5] = BatteryOneSn.Sn6;
bytes[6] = BatteryTwoSn.Sn1;
bytes[7] = BatteryTwoSn.Sn2;
bytes[8] = BatteryTwoSn.Sn3;
bytes[9] = BatteryTwoSn.Sn4;
bytes[10] = BatteryTwoSn.Sn5;
bytes[11] = BatteryTwoSn.Sn6;
return Encoding.ASCII.GetString(bytes);
}
#endregion

Loading…
Cancel
Save