V1.04 Add VerInfo

Author: “寧々”

MiniCarLib/Core/Util.cs

@@ -93,6 +93,15 @@ public static IPAddress GetLocalIpInSameSubnet(IPAddress ip)
             return IPAddress.Any;
         }
 
+        public static int[] GetLibVersion()
+        {
+            int[] rt = new int[2];
+            var ver = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+            rt[0] = ver.Major;
+            rt[1] = ver.Minor;
+            return rt;
+        }
+
         public static string SourceCodeURL => "https://www.google.com";
         public static string AuthorBlogURL => "https://blog.jloli.cc";
     }
@@ -138,6 +147,8 @@ public static bool IsInSameSubnet(this IPAddress address2, IPAddress address, IP
 
             return network1.Equals(network2);
         }
+
+  
     }
 
     public class NetWorkInterfaceInfo

MiniCarLib/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.04.0.0")]
+[assembly: AssemblyFileVersion("1.04.0.0")]

MiniCarLib/QianCar.cs

@@ -11,6 +11,7 @@ namespace MiniCarLib
     public class QianCar : ICar
     {
         public CarType carType => CarType.QianCar;
+        public byte CarVersion { get; set; }
         public string CarName { get; set; }
         public CarState State { get; set; }
         public int Speed { get; set; }

MiniCarLib/QianCarAPI.cs

@@ -108,5 +108,7 @@ public static void Init(QianCarController ct, string mapfile, byte[] password =
         public static void UnregisterCar(QianCar car) => controller.UnregisterCar(car);
         public static void ConfirmUnregteration(QianCar car, bool allow, bool removecar = true) => controller.ConfirmUnregteration(car, allow, removecar);
         public static void EmergencyStopCar(QianCar car) => controller.EmergencyStopCar(car, 0x00);
+        public static void SendCustomData(QianCar car,byte[] data)=> controller.SendCustomData(car, new CustomData() { UserData = data });
+
     }
 }

MiniCarLib/QianCarController.cs

@@ -99,6 +99,9 @@ public virtual void ConfirmRegisteration(QianCar car,bool conf,ushort id)
             else
                 res.ServerIP = Util.GetLocalIpInSameSubnet(((CarUDPClient)car.ComClient).Client.Address);
             res.ServerPort = Server.DataServer.ListenPort;
+            int[] ver = Util.GetLibVersion();
+            int vv = ver[0] * 100 + ver[1];
+            res.ServerVersion = (ushort)vv;
             SendCarDataPack(car, res);
         }
 
@@ -166,7 +169,8 @@ protected virtual void Server_OnCarDataReceived(IComClient client, QianComHeader
             if(header.FuncType == DataFunctionType.RegisterRequest)
             {
                 BeforeRegistering?.Invoke(null, data);
-                RegisrationHandler(client, header, (RegisterRequestData)data);
+                var c = RegisrationHandler(client, header, (RegisterRequestData)data);
+                AfterRegistered?.Invoke(c, data);
                 return;
             }
 
@@ -242,12 +246,13 @@ public virtual void CarEnterConfirmHandler(QianCar car,CarEnterConfirmData data)
             car.State = CarState.Idle;
         }
 
+        public virtual void SendCustomData(QianCar car,CustomData data)
+        {
+            SendCarDataPack(car, data);
+        }       
 
-       
-
-        public virtual void RegisrationHandler(IComClient client, QianComHeader header, RegisterRequestData data)
+        public virtual ICar RegisrationHandler(IComClient client, QianComHeader header, RegisterRequestData data)
         {
-            BeforeRegistering?.Invoke(null, data);
             if (CheckRegisteration(data))
             {
                 ICar car = CreateCarFunc(data.carType);
@@ -256,13 +261,16 @@ public virtual void RegisrationHandler(IComClient client, QianComHeader header,
                 else
                     car.ID = header.LocalAddress;
                 ((QianCar)car).State = CarState.OutSide;
+                ((QianCar)car).CarVersion = data.CarVersion;
                 AllCars.AddorAlterCar(car);
                 ConfirmRegisteration((QianCar)car, true, (ushort)car.ID);
-                AfterRegistered?.Invoke(car, data);
+                return car;
             }
             else
+            {
                 Server.SendPack(client, header.LocalAddress, new RegisterResponseData { AllowRegister = false });
-
+                return null;
+            }
         }
 
         public virtual void QueryDataHandler(QianCar car, ReportCarStateData data)

MiniCarLib/QianCarData.cs

@@ -138,18 +138,20 @@ public void ParseByteData(byte[] data)
     public class RegisterRequestData : QianComData
     {
         public CarType carType { get; set; } 
+        public byte CarVersion { get; set; }
         public byte TokenLen => (byte)(Token?.Length ?? 0);
         public byte[] Token { get; set; }
         public bool NeedAllocID { get; set; }
 
-        public override byte DataLen => (byte)(TokenLen + 3);
+        public override byte DataLen => (byte)(TokenLen + 4);
 
         public override DataFunctionType FuncType => DataFunctionType.RegisterRequest;
 
         public override void FillByteData(byte[] data, int offset)
         {
             ComDataWriter dw = new ComDataWriter(data, offset);
             dw.WriteEnum<CarType>(carType);
+            dw.WriteByte(CarVersion);
             dw.WriteByte(TokenLen);
             if (TokenLen > 0)
                 dw.WriteByteArray(Token, 0, Token.Length);
@@ -160,6 +162,7 @@ public override void ParseByteData(byte[] data, int offset)
         {
             ComDataReader dr = new ComDataReader(data, offset);
             carType = dr.ReadEnum<CarType>();
+            CarVersion = dr.ReadByte();
             byte len = dr.ReadByte();
             if (len > 0)
                 dr.ReadByteArray(Token = new byte[len], 0, len);
@@ -174,8 +177,9 @@ public class RegisterResponseData : QianComData
 
         public IPAddress ServerIP { get; set; }
         public ushort ServerPort { get; set; }
+        public ushort ServerVersion { get; set; }
 
-        public override byte DataLen => 9;
+        public override byte DataLen => 11;
 
         public override DataFunctionType FuncType => DataFunctionType.RegisterResponse;
 
@@ -189,6 +193,7 @@ public override void FillByteData(byte[] data, int offset)
             else
                 dw.SeekRelevant(4);
             dw.WriteHalfWord(ServerPort);
+            dw.WriteHalfWord(ServerVersion);
         }
 
         public override void ParseByteData(byte[] data, int offset)
@@ -200,6 +205,7 @@ public override void ParseByteData(byte[] data, int offset)
             dr.ReadByteArray(arr, 0, 4);
             ServerIP = new IPAddress(arr);
             ServerPort = dr.ReadHalfWord();
+            ServerVersion = dr.ReadHalfWord();
         }
     }
 

MiniCarLibTester/Form1.cs

@@ -126,8 +126,8 @@ private void button8_Click(object sender, EventArgs e)
 
         private void button9_Click(object sender, EventArgs e)
         {
-            QianCarMap map = new QianCarMap();
-            map.ParseMapFile(@"D:\QianZong\2021Natu\小车调度\SampleMap.txt");
+            var ver = Util.GetLibVersion();
+            textBox1.Text = ver[0].ToString() + "." + ver[1].ToString();
         }
     }
 }