Merge branch 'develop' of https://github.com/KwDrama/OST into develop

KwDrama · Jun 7, 2021 · 9c47487 · 9c47487
2 parents 3d2de45 + 9816cf7
commit 9c47487
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 16 deletions.
diff --git a/Client/Forms/ControlChat.cs b/Client/Forms/ControlChat.cs
@@ -2,6 +2,7 @@
 using OSTLibrary.Chats;
 using OSTLibrary.Classes;
 using System;
+using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -36,10 +37,12 @@ public ControlChat(Chat chat, bool continuous)
             {
                 PictureBox pic = new PictureBox();
 
-                // 이미지
+                // 디자인 및 이벤트
                 pic.Image = chat.image;
+                pic.Cursor = Cursors.Hand;
                 pic.BackColor = Color.Transparent;
                 pic.SizeMode = PictureBoxSizeMode.Zoom;
+                pic.MouseClick += Pic_Click;
 
                 // 위치 및 크기
                 pic.Location = lblText.Location;
@@ -108,11 +111,14 @@ public ControlChat(Chat chat, bool continuous)
                 dataControl.Left = Width - dataControl.Width - Padding.Right;
                 dataControl.Anchor = AnchorStyles.Top | AnchorStyles.Right;
                 dataControl.BackColor = Color.LemonChiffon;
-
+                
                 // 시계 위치
                 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()
@@ -125,5 +131,19 @@ public void OwnerRoom_Resize(object sender, EventArgs e)
         {
             Width = (sender as Form).Width - 20;
         }
+        private void Pic_Click(object sender, MouseEventArgs e)
+        {
+            string filename = "OST_" + chat.date.ToString("yyyyMMdd_HHmmss") + ".png";
+
+            if (e.Button == MouseButtons.Left)
+            {
+
+                PictureBox pic = sender as PictureBox;
+                pic.Image.Save(filename);
+                Process.Start(filename);
+            }
+            else if (e.Button == MouseButtons.Right)
+                Process.Start(Environment.CurrentDirectory);
+        }
     }
 }
diff --git a/Client/Panels/PanelRegister.cs b/Client/Panels/PanelRegister.cs
@@ -1,4 +1,5 @@
 using Client.Forms;
+using MetroFramework;
 using OSTLibrary.Classes;
 using OSTLibrary.Networks;
 using OSTLibrary.Securities;
@@ -19,7 +20,7 @@ public PanelRegister(Form owner, SlidingType type) : base(owner, type)
             Init();
 
             organization = new Dictionary<string, string[]>();
-            organization.Add("지원본부", new string[] { "지원1팀", "지원2팀", "지원3팀" });
+            organization.Add("자원본부", new string[] { "자원1팀", "자원2팀", "자원3팀" });
             organization.Add("철강본부", new string[] { "철강1팀", "철강2팀", "철강3팀" });
             organization.Add("섬유본부", new string[] { "섬유1팀", "섬유2팀", "섬유3팀" });
             organization.Add("영업본부", new string[] { "영업1팀", "영업2팀", "영업3팀" });
@@ -62,11 +63,28 @@ private void tleSubmit_Click(object sender, EventArgs e)
         {
             try
             {
+                Program.callback.Add(PacketType.Register, ReceiveChat);
                 Program.Send(new RegisterPacket(new Employee(picProfile.Image, int.Parse(txtempId.Text),
                     SHA512.Encrypt(txtPassword.Text), txtName.Text, txtPhone.Text,
                     cmbCentral.SelectedItem as string, cmbTeam.SelectedItem as string, txtRank.Text)));
             }
             catch (FormatException) { }
         }
+
+        void ReceiveChat(Packet p)
+        {
+            Program.callback.Remove(PacketType.Register);
+
+            Invoke(new MethodInvoker(() =>
+            {
+                if ((p as RegisterPacket).success)
+                {
+                    MetroMessageBox.Show(this, "성공", "사원 등록", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    Swipe(false);
+                }
+                else
+                    MetroMessageBox.Show(this, "실패", "사원 등록", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }));
+        }
     }
 }
diff --git a/Client/Program.cs b/Client/Program.cs
@@ -55,7 +55,7 @@ static void Main()
         static void Recieve()
         {
             byte[] readBuffer = null, lengthBuffer = new byte[4];
-            while (true)
+            while (client.Connected)
             {
                 // 패킷 읽기
                 try
@@ -89,12 +89,7 @@ static void Recieve()
 
                     // 패킷 받는 도중 예외가 발생했을 때
                     // 서버와 연결이 종료되었다면 재시작 후 접속 시도
-                    if (!client.Connected)
-                    {
-                        Application.Exit();
-                        Process.Start(Application.ExecutablePath);
-                        return;
-                    }
+                    break;
                 }
 
                 // 패킷 번역
@@ -109,8 +104,9 @@ static void Recieve()
                         MessageBox.Show(formMain, ex.ToString(), "Deserialize",
                         MessageBoxButtons.OK, MessageBoxIcon.Error)));
 
-                    // 수신 버퍼 리셋
-                    while (ns.ReadByte() != -1) ;
+                    // 패킷 받는 도중 예외가 발생했을 때
+                    // 서버와 연결이 종료되었다면 재시작 후 접속 시도
+                    break;
                 }
                 if (pakcetObj == null) continue;
 
@@ -120,6 +116,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
diff --git a/OSTLibrary/Networks/RegisterPacket.cs b/OSTLibrary/Networks/RegisterPacket.cs
@@ -7,15 +7,13 @@ namespace OSTLibrary.Networks
     public class RegisterPacket : Packet
     {
         public bool success = false;
-        public string result;
 
         public Employee employee;
 
-        public RegisterPacket(bool success, string result = "")
+        public RegisterPacket(bool success)
         {
             type = PacketType.Register;
             this.success = success;
-            this.result = result;
         }
 
         public RegisterPacket(Employee employee)

diff --git a/Server/Classes/Client.cs b/Server/Classes/Client.cs
@@ -157,13 +157,14 @@ public void Recieve()
                 else if (packet.type == PacketType.Register)
                 {
                     RegisterPacket p = packet as RegisterPacket;
-                    if (Database.Register(p.employee))
+                    if (p.success = Database.Register(p.employee))
                     {
                         Program.employees.Add(p.employee.id, employee = p.employee);
                         Log("Register", "회원가입 성공");
                     }
                     else
                         Log("Register", "회원가입 실패");
+                    Send(p);
                 }
 
                 // 채팅