Write final report and fix reconnecting when disconnected

KwDrama · Jun 6, 2021 · 9816cf7 · 9816cf7
1 parent a9e4f28
commit 9816cf7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/Client/Forms/ControlChat.cs b/Client/Forms/ControlChat.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
 
 namespace Client.Forms
@@ -117,6 +116,9 @@ public ControlChat(Chat chat, bool continuous)
                 lblTime.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
                 lblTime.Left = Math.Min(dataControl.Left, Width - Padding.Right - lblTime.Width);
             }
+
+            // 채팅 하나하나가 분리 되게 보일수 있는 코드
+            //BackColor = Color.FromArgb(new Random(DateTime.Now.Millisecond).Next());
         }
 
         public void SetContinuous()

diff --git a/Client/Panels/PanelRegister.cs b/Client/Panels/PanelRegister.cs
@@ -79,11 +79,11 @@ void ReceiveChat(Packet p)
             {
                 if ((p as RegisterPacket).success)
                 {
-                    MetroMessageBox.Show(this, "성공", "회원가입", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MetroMessageBox.Show(this, "성공", "사원 등록", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     Swipe(false);
                 }
                 else
-                    MetroMessageBox.Show(this, "실패", "회원가입", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MetroMessageBox.Show(this, "실패", "사원 등록", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }));
         }
     }

diff --git a/Client/Program.cs b/Client/Program.cs
@@ -54,7 +54,7 @@ static void Main()
         static void Recieve()
         {
             byte[] readBuffer = null, lengthBuffer = new byte[4];
-            while (true)
+            while (client.Connected)
             {
                 // 패킷 읽기
                 try
@@ -88,12 +88,7 @@ static void Recieve()
 
                     // 패킷 받는 도중 예외가 발생했을 때
                     // 서버와 연결이 종료되었다면 재시작 후 접속 시도
-                    if (!client.Connected)
-                    {
-                        Application.Exit();
-                        Process.Start(Application.ExecutablePath);
-                        return;
-                    }
+                    break;
                 }
 
                 // 패킷 번역
@@ -108,8 +103,9 @@ static void Recieve()
                         MessageBox.Show(formMain, ex.ToString(), "Deserialize",
                         MessageBoxButtons.OK, MessageBoxIcon.Error)));
 
-                    // 수신 버퍼 리셋
-                    while (ns.ReadByte() != -1) ;
+                    // 패킷 받는 도중 예외가 발생했을 때
+                    // 서버와 연결이 종료되었다면 재시작 후 접속 시도
+                    break;
                 }
                 if (pakcetObj == null) continue;
 
@@ -119,6 +115,9 @@ static void Recieve()
                 if (callback.ContainsKey(packet.type))
                     callback[packet.type].Invoke(packet);
             }
+
+            Application.Exit();
+            Process.Start(Application.ExecutablePath);
         }
         public static void Send(Packet packet)
         {

diff --git a/Document/OSS_Team5_Project_Final.pptx b/Document/OSS_Team5_Project_Final.pptx
diff --git a/Document/free-powerpoint-ppt-template-1012.pptx b/Document/free-powerpoint-ppt-template-1012.pptx