重构

Mozi.HttpEmbedded/HttpServer.cs

@@ -252,7 +252,7 @@ namespace Mozi.HttpEmbedded
                     {
                         //TODO 此处是否会形成死循环
                         //继续读流
-                        args.Socket.BeginReceive(args.State.Buffer, 0, args.State.Buffer.Length, SocketFlags.None, _sc.CallbackReceive, args.State);
+                        args.Socket.BeginReceive(args.State.Buffer, 0, args.State.Buffer.Length, SocketFlags.None, _sc.CallbackReceived, args.State);
                         return;
                     }
 

Mozi.HttpEmbedded/SocketServer.cs

@@ -140,7 +140,7 @@ namespace Mozi.HttpEmbedded
             _socketDocker.TryAdd(so.Id, client);
             try
             {
-                client.BeginReceive(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, CallbackReceive, so);
+                client.BeginReceive(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, CallbackReceived, so);
                 if (OnReceiveStart != null)
                 {
                     OnReceiveStart.BeginInvoke(this, new DataTransferArgs(), null, null);
@@ -155,7 +155,7 @@ namespace Mozi.HttpEmbedded
         /// 接收数据回调
         /// </summary>
         /// <param name="iar"></param>
-        internal void CallbackReceive(IAsyncResult iar)
+        internal void CallbackReceived(IAsyncResult iar)
         {
             StateObject so = (StateObject)iar.AsyncState;
             Socket client = so.WorkSocket;
@@ -170,7 +170,7 @@ namespace Mozi.HttpEmbedded
                     if (client.Available > 0)
                     {
                         //Thread.Sleep(10);
-                        client.BeginReceive(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, CallbackReceive, so);
+                        client.BeginReceive(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, CallbackReceived, so);
                     }
                     else
                     {

Mozi.SSDP/UDPSocket.cs

@@ -152,7 +152,7 @@ namespace Mozi.SSDP
             }
             try
             {
-                _sc.BeginReceiveFrom(so.Buffer, 0, StateObject.BufferSize, SocketFlags.None, ref so.RemoteEndPoint, CallbackReceive, so);
+                _sc.BeginReceiveFrom(so.Buffer, 0, StateObject.BufferSize, SocketFlags.None, ref so.RemoteEndPoint, CallbackReceived, so);
                 if (OnReceiveStart != null)
                 {
                     OnReceiveStart(this, new DataTransferArgs());
@@ -167,7 +167,7 @@ namespace Mozi.SSDP
         /// 接收数据回调
         /// </summary>
         /// <param name="iar"></param>
-        protected void CallbackReceive(IAsyncResult iar)
+        protected void CallbackReceived(IAsyncResult iar)
         {
             UDPStateObject so = (UDPStateObject)iar.AsyncState;
             Socket client = so.WorkSocket;
@@ -183,7 +183,7 @@ namespace Mozi.SSDP
                 if (client.Available > 0)
                 {
                     so.RemoteEndPoint = remote;
-                    client.BeginReceiveFrom(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, ref so.RemoteEndPoint,new AsyncCallback(CallbackReceive), so);
+                    client.BeginReceiveFrom(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, ref so.RemoteEndPoint,new AsyncCallback(CallbackReceived), so);
                 }
                 else
                 {
@@ -223,7 +223,7 @@ namespace Mozi.SSDP
                 //RemotePort = ((System.Net.IPEndPoint)client.RemoteEndPoint).Port,
                 RemoteEndPoint = new IPEndPoint(_bindingAddress, 0)
             };
-            _sc.BeginReceiveFrom(stateobject.Buffer, 0, stateobject.Buffer.Length, SocketFlags.None, ref stateobject.RemoteEndPoint, new AsyncCallback(CallbackReceive), stateobject);
+            _sc.BeginReceiveFrom(stateobject.Buffer, 0, stateobject.Buffer.Length, SocketFlags.None, ref stateobject.RemoteEndPoint, new AsyncCallback(CallbackReceived), stateobject);
         }
     }
 }

Mozi.StateService/Others.cs → Mozi.StateService/Generic/Others.cs

 using System;
 
-namespace Mozi.StateService
+namespace Mozi.StateService.Generic
 {
     internal static class Others
     {
@@ -26,7 +26,7 @@ namespace Mozi.StateService
         }
         public static DateTime ToDateTime(this long timestamp)
         {
-            var dtMin= new DateTime(1970, 1, 1, 0, 0, 0);
+            var dtMin = new DateTime(1970, 1, 1, 0, 0, 0);
             return dtMin.AddMilliseconds(timestamp).ToLocalTime();
         }
         public static byte[] ToBytes(this ushort num)

Mozi.StateService/HeartBeatPackage.cs

-using System;
+using Mozi.StateService.Generic;
+using System;
 using System.Collections.Generic;
 
 namespace Mozi.StateService

Mozi.StateService/Mozi.StateService.csproj

@@ -40,7 +40,7 @@
     <Compile Include="HeartBeatPackage.cs" />
     <Compile Include="HeartBeatGateway.cs" />
     <Compile Include="HeartBeatSubscriber.cs" />
-    <Compile Include="Others.cs" />
+    <Compile Include="Generic\Others.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="HeartBeatService.cs" />
     <Compile Include="ServerEvent.cs" />

Mozi.StateService/UDPSocket.cs

@@ -107,7 +107,7 @@ namespace Mozi.StateService
             }
             try
             {
-                _sc.BeginReceiveFrom(so.Buffer, 0, StateObject.BufferSize, SocketFlags.None, ref so.RemoteEndPoint, CallbackReceive, so);
+                _sc.BeginReceiveFrom(so.Buffer, 0, StateObject.BufferSize, SocketFlags.None, ref so.RemoteEndPoint, CallbackReceived, so);
                 if (OnReceiveStart != null)
                 {
                     OnReceiveStart(this, new DataTransferArgs());
@@ -122,7 +122,7 @@ namespace Mozi.StateService
         /// 接收数据回调
         /// </summary>
         /// <param name="iar"></param>
-        protected void CallbackReceive(IAsyncResult iar)
+        protected void CallbackReceived(IAsyncResult iar)
         {
             UDPStateObject so = (UDPStateObject)iar.AsyncState;
             Socket client = so.WorkSocket;
@@ -138,7 +138,7 @@ namespace Mozi.StateService
                 if (client.Available > 0)
                 {
                     so.RemoteEndPoint = remote;
-                    client.BeginReceiveFrom(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, ref so.RemoteEndPoint, new AsyncCallback(CallbackReceive), so);
+                    client.BeginReceiveFrom(so.Buffer, 0, so.Buffer.Length, SocketFlags.None, ref so.RemoteEndPoint, new AsyncCallback(CallbackReceived), so);
                 }
                 else
                 {
@@ -170,7 +170,7 @@ namespace Mozi.StateService
                 //IP = ((IPEndPoint)remote).Address.ToString(),
                 RemoteEndPoint = new IPEndPoint(IPAddress.Any, 0)
             };
-            _sc.BeginReceiveFrom(stateobject.Buffer, 0, stateobject.Buffer.Length, SocketFlags.None, ref stateobject.RemoteEndPoint, new AsyncCallback(CallbackReceive), stateobject);
+            _sc.BeginReceiveFrom(stateobject.Buffer, 0, stateobject.Buffer.Length, SocketFlags.None, ref stateobject.RemoteEndPoint, new AsyncCallback(CallbackReceived), stateobject);
         }
     }
 }