Merge pull request #13 from akihiro0105/develop

udpのUWP側byte受信処理を修正
akihiro0105 · Jan 17, 2019 · 250b504 · 250b504
2 parents 9807b44 + f4976d2
commit 250b504
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/Assets/HoloLensModule/Network/UDP/UDPListenerManager.cs b/Assets/HoloLensModule/Network/UDP/UDPListenerManager.cs
@@ -57,13 +57,19 @@ public void ConnectListener(int port)
 #if WINDOWS_UWP
         async void MessageReceived(DatagramSocket sender, DatagramSocketMessageReceivedEventArgs args)
         {
-            var reader = new StreamReader(args.GetDataStream().AsStreamForRead());
-            var data = await reader.ReadLineAsync();
-            if (ListenerMessageEvent != null) ListenerMessageEvent(data, args.RemoteAddress.DisplayName);
-            using (var ms = new MemoryStream())
+            if (ListenerMessageEvent != null)
+            {
+                var reader = new StreamReader(args.GetDataStream().AsStreamForRead());
+                var data = await reader.ReadLineAsync();
+                ListenerMessageEvent(data, args.RemoteAddress.DisplayName);
+            }
+
+            if (ListenerByteEvent != null)
             {
-                await reader.BaseStream.CopyToAsync(ms);
-                if (ListenerByteEvent != null) ListenerByteEvent(ms.ToArray(), args.RemoteAddress.DisplayName);
+                var readData = args.GetDataReader();
+                var byteData = new byte[readData.UnconsumedBufferLength];
+                readData.ReadBytes(byteData);
+                ListenerByteEvent(byteData, args.RemoteAddress.DisplayName);
             }
         }
 #else