2021.10.10

Author: “寧々”

MiniCarLib/Core/IComClient.cs

@@ -11,6 +11,8 @@ namespace MiniCarLib.Core
     public interface IComClient
     {
         bool IsAlive { get; set; }
+
+        void Disconnect();
     }
 
     public class CarUDPClient : IComClient
@@ -23,6 +25,11 @@ public CarUDPClient(IPEndPoint cl)
         public bool IsAlive { get { return true; } set { } }
 
         public IPEndPoint Client { get; }
+
+        public virtual void Disconnect()
+        {
+            //throw new NotImplementedException();
+        }
     }
 
     public class CarTCPClient : IComClient
@@ -33,6 +40,12 @@ public CarTCPClient(TcpClient cl)
         }
         public TcpClient Client { get; }
         public bool IsAlive { get ; set ; }
+
+        public void Disconnect()
+        {
+            Client.Close();
+            IsAlive = false;
+        }
         //public bool IsAlive => Client.Connected;
     }
 }

MiniCarLib/Properties/AssemblyInfo.cs

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

MiniCarLib/QianCar.cs

@@ -21,8 +21,8 @@ public class QianCar : ICar
 
         public int ID { get; set; }
 
-        public QianMapPoint CurrentPoint { get; set; }
-        public byte Direction { get; set; }
+        public virtual QianMapPoint CurrentPoint { get; set; }
+        public virtual byte Direction { get; set; }
 
         public ushort RouteRemain { get; set; }
     }

MiniCarLib/QianCarAPI.cs

@@ -15,9 +15,11 @@ namespace MiniCarLib
     public static class QianCarAPI
     {
         static QianCarController controller;
-        static QianCarController Controller => controller;
+        public static QianCarController Controller => controller;
         static bool _inited = false;
         public static bool IsInited => _inited;
+        public static QianCarMap Map => controller.Map;
+        public static CarList AllCars => controller.AllCars;
 
         public static event OnCustomDataEventHandler OnCustomData;
         public static event OnCarRegisteredHandler OnCarRegistered;
@@ -33,7 +35,7 @@ public static class QianCarAPI
         private static void InitEvents()
         {
             controller.OnCustomData += OnCustomData;
-            controller.AfterRegistered += (car, data) => OnCarRegistered?.Invoke((QianCar)car);
+            controller.AfterRegistered += (car, data) => { if (car != null) OnCarRegistered?.Invoke((QianCar)car); };
             controller.AfterReportState += (car, data) => OnCarStateReported?.Invoke((QianCar)car,((ReportCarStateData)data).IsACK);
             controller.OnApplyForEnter += (car, data) => OnCarApplyForEnter?.Invoke(
                 (QianCar)car, 

MiniCarLib/QianCarController.cs

@@ -232,6 +232,7 @@ public virtual void UnregisterResponseHandler(QianCar car, UnregisterResponseDat
             {
                 car.State = CarState.UnRegistered;
                 AllCars.RemoveCar(car);
+                Server.DisconnectClient(car.ComClient);
             }
         }
 
@@ -281,7 +282,8 @@ public virtual void QueryDataHandler(QianCar car, ReportCarStateData data)
             car.CurrentPoint = Map[data.PointID];
             car.Direction = data.Direction;
             car.RouteRemain = data.RouteRemain;
-           
+          
+            
         }
 
 

MiniCarLib/QianCarData.cs

@@ -29,9 +29,8 @@ public enum CarState : byte
     public enum CarErrorState : byte
     {
         None = 0,
-        ComError = 1,
+        ComDataError = 1,
         RunError = 2,
-        ServerError = 3
     }
 
     public enum DataFunctionType : byte

MiniCarLib/QianCarServer.cs

@@ -114,5 +114,10 @@ protected virtual void OnRegDataReceived(IComClient client, byte[] data)
 
             OnCarDataReceived?.Invoke(client, header, dataobj);
         }
+
+        public void DisconnectClient(IComClient client)
+        {
+            client.Disconnect();
+        }
     }
 }

MiniCarLibTester/Program.cs

@@ -4,6 +4,8 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
+using MiniCarLib;
+
 namespace MiniCarLibTester
 {
     static class Program
@@ -14,11 +16,16 @@ static class Program
         [STAThread]
         static void Main()
         {
+            
+
+            
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new Form1());
 
 
         }
+
+
     }
 }