Skip to content

Commit

Permalink
Merge pull request #4 from KwDrama/feature-chat
Browse files Browse the repository at this point in the history
Feature chat
  • Loading branch information
geoje authored May 29, 2021
2 parents 117fcb5 + 2b7619c commit 277267f
Show file tree
Hide file tree
Showing 36 changed files with 823 additions and 179 deletions.
23 changes: 19 additions & 4 deletions Client/Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Forms\ControlRoom.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Forms\ControlRoom.Designer.cs">
<DependentUpon>ControlRoom.cs</DependentUpon>
</Compile>
<Compile Include="Forms\FormChat.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -82,10 +88,10 @@
<Compile Include="Forms\FormMain.Designer.cs">
<DependentUpon>FormMain.cs</DependentUpon>
</Compile>
<Compile Include="Panels\ControlChat.cs">
<Compile Include="Forms\ControlChat.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Panels\ControlChat.Designer.cs">
<Compile Include="Forms\ControlChat.Designer.cs">
<DependentUpon>ControlChat.cs</DependentUpon>
</Compile>
<Compile Include="Panels\PanelPlus.cs">
Expand Down Expand Up @@ -114,6 +120,9 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Forms\ControlRoom.resx">
<DependentUpon>ControlRoom.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormChat.resx">
<DependentUpon>FormChat.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -214,10 +223,16 @@
<None Include="Resources\back.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\department.png" />
<None Include="Resources\treenode.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\central.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\treenode.png" />
<None Include="Resources\office-building.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\team.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
File renamed without changes.
File renamed without changes.
129 changes: 129 additions & 0 deletions Client/Forms/ControlRoom.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions Client/Forms/ControlRoom.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
using Client.Properties;
using MetroFramework.Controls;
using OSTLibrary.Chats;
using OSTLibrary.Classes;
using System;
using System.Drawing;

namespace Client.Forms
{
public partial class ControlRoom : MetroUserControl
{
public DateTime dclick;

public ControlRoom(Room room)
{
InitializeComponent();

if (room.scopeIdx == 3)
{
Employee otherEmp = Program.employees[room.FindOtherEmployeeId(Program.employee)];
picProfile.Image = otherEmp.profile;
lblTitle.Text = otherEmp.name;
lblTeamRank.Text = otherEmp.team + " " + otherEmp.rank;
}
else
{
picProfile.Image =
room.scopeIdx == 0 ? Resources.office_building :
room.scopeIdx == 1 ? Resources.central :
room.scopeIdx == 2 ? Resources.team : Resources.profile;

lblTitle.Text = Room.Scope[room.scopeIdx];

lblTeamRank.Text =
room.scopeIdx == 0 ? "KwDrama" :
room.scopeIdx == 1 ? Program.employee.central :
room.scopeIdx == 2 ? Program.employee.team : "";
}
}

private void ControlRoom_MouseEnter(object sender, EventArgs e)
{
BackColor = Color.FromArgb(238, 238, 238);
}
private void ControlRoom_MouseLeave(object sender, EventArgs e)
{
if (ClientRectangle.Contains(PointToClient(MousePosition)))
return;
BackColor = Color.White;
}

public void UpdateInfo(Chat chat)
{
if (chat.empId == 0)
{
lblChat.Text = "채팅내역 없음";
lblTime.Text = "";
return;
}

lblChat.Text =
chat.type == ChatType.Text ? chat.text :
chat.type == ChatType.Image ? "사진" : "";

if (chat.date.Year < DateTime.Now.Year)
lblTime.Text = $"{DateTime.Now.Year - chat.date.Year}년 전";
else if (chat.date.Month < DateTime.Now.Month)
lblTime.Text = $"{DateTime.Now.Month - chat.date.Month}달 전";
else if (chat.date.Day < DateTime.Now.Day)
lblTime.Text = $"{DateTime.Now.Month - chat.date.Month}일 전";
else
lblTime.Text = chat.date.ToShortTimeString();
}
}
}
120 changes: 120 additions & 0 deletions Client/Forms/ControlRoom.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
2 changes: 1 addition & 1 deletion Client/Forms/FormChat.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 277267f

Please sign in to comment.