Compare commits
No commits in common. "34d79871dd8eadb49f2fbffc15852c0fc2dd7ff5" and "20be6f66132ee5e76e7b83bc899b33a9b67dd536" have entirely different histories.
34d79871dd
...
20be6f6613
@ -1,18 +1,18 @@
|
||||
<Application x:Class="chatclient.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:local="clr-namespace:chatclient"
|
||||
StartupUri="MainWindow.xaml">
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:local="clr-namespace:chatclient"
|
||||
StartupUri="MainWindow.xaml">
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
</ResourceDictionary>
|
||||
</Application.Resources>
|
||||
</ResourceDictionary>
|
||||
</Application.Resources>
|
||||
</Application>
|
||||
|
@ -1,53 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Media;
|
||||
using System.Windows;
|
||||
using System.Windows.Media.Imaging;
|
||||
|
||||
namespace chatclient.Data
|
||||
{
|
||||
/// <summary>
|
||||
/// 聊天消息类,表示一条消息的内容和显示属性
|
||||
/// </summary>
|
||||
public class ChatMessage
|
||||
{
|
||||
/// <summary>
|
||||
/// 发送者名称
|
||||
/// </summary>
|
||||
public required string Sender { get; set; }
|
||||
/// <summary>
|
||||
/// 消息类型(文本、图片、文件、系统消息等)
|
||||
/// </summary>
|
||||
public required MessageType Type { get; set; } = MessageType.Text;
|
||||
/// <summary>
|
||||
/// 消息发送者的头像图片
|
||||
/// </summary>
|
||||
public required BitmapImage Image { get; set; }
|
||||
/// <summary>
|
||||
/// 消息内容
|
||||
/// </summary>
|
||||
public required string Content { get; set; }
|
||||
/// <summary>
|
||||
/// 消息发送时间
|
||||
/// </summary>
|
||||
public DateTime Timestamp { get; set; }
|
||||
/// <summary>
|
||||
/// 消息在界面中的对齐方式(左/右)
|
||||
/// </summary>
|
||||
public HorizontalAlignment Alignment { get; set; } = HorizontalAlignment.Left;
|
||||
/// <summary>
|
||||
/// 发送者名称的显示颜色
|
||||
/// </summary>
|
||||
public Brush SenderColor { get; set; } = Brushes.Black;
|
||||
}
|
||||
public enum MessageType
|
||||
{
|
||||
Text,
|
||||
Image,//图片
|
||||
File,//文件
|
||||
System//系统信息
|
||||
}
|
||||
}
|
@ -6,9 +6,9 @@ using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Net.Sockets;
|
||||
using log4net;
|
||||
using chatapi;
|
||||
using System.Net.Http;
|
||||
using Microsoft.Win32;
|
||||
using chatclient.Data;
|
||||
|
||||
|
||||
namespace chatclient
|
||||
@ -126,7 +126,7 @@ namespace chatclient
|
||||
string SignJsonData = JsonSerializer.Serialize(SignData);
|
||||
byte[] dataBytes = Encoding.UTF8.GetBytes(SignJsonData);
|
||||
var content = new StringContent(SignJsonData, Encoding.UTF8, "application/json");
|
||||
var response = await MainWindow.HttpClient.PostAsync($"{Server.ServerUrl}/api/register", content);
|
||||
var response = await MainWindow.HttpClient.PostAsync($"{chatapi.Server.ServerUrl}/api/register", content);
|
||||
var responseBody = await response.Content.ReadAsStringAsync();
|
||||
log.Info($"注册请求已发送,响应内容: {responseBody}");
|
||||
var signresponse = JsonSerializer.Deserialize<SignResultData>(responseBody);
|
||||
|
@ -1,11 +1,10 @@
|
||||
<Window
|
||||
<Window x:Class="chatclient.MainWindow"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:local="clr-namespace:chatclient"
|
||||
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" x:Class="chatclient.MainWindow"
|
||||
mc:Ignorable="d"
|
||||
Title="ChatWindow" Height="450" Width="800" MinHeight="240" MinWidth="380"
|
||||
Style="{StaticResource MaterialDesignWindow}">
|
||||
@ -15,7 +14,7 @@
|
||||
<materialDesign:NavigationRailAssist.FloatingContent>
|
||||
<StackPanel>
|
||||
<Button Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}" Margin="12" >
|
||||
<Image Source="/resource/user.png" />
|
||||
<Image Source="/user.png" />
|
||||
</Button>
|
||||
<TextBlock Text="{Binding Username}"/>
|
||||
</StackPanel>
|
||||
@ -28,106 +27,7 @@
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Grid>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<!-- 标题栏 -->
|
||||
<RowDefinition Height="*"/>
|
||||
<!-- 消息区域 -->
|
||||
<RowDefinition Height="Auto"/>
|
||||
<!-- 输入区域 -->
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- 标题栏 -->
|
||||
<materialDesign:Card Grid.Row="0" Padding="10" Margin="0,0,0,5">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="聊天室" FontSize="16" FontWeight="Bold"
|
||||
VerticalAlignment="Center" Margin="5,0" Cursor="Hand"/>
|
||||
<!--<Button x:Name="btnRefresh" Style="{StaticResource MaterialDesignIconButton}"
|
||||
ToolTip="刷新列表" Click="RefreshContacts_Click" Margin="5,0,10,0">
|
||||
<materialDesign:PackIcon Kind="Refresh"/>
|
||||
</Button>-->
|
||||
<!--<ComboBox x:Name="cmbContacts" Width="150" Margin="5,0"
|
||||
materialDesign:HintAssist.Hint="选择联系人"
|
||||
DisplayMemberPath="DisplayName"/>-->
|
||||
</StackPanel>
|
||||
</materialDesign:Card>
|
||||
|
||||
<!-- 消息区域 -->
|
||||
<ScrollViewer x:Name="messageScroller" Grid.Row="1" VerticalScrollBarVisibility="Auto"
|
||||
Padding="10" Background="{DynamicResource MaterialDesignPaper}">
|
||||
<ItemsControl x:Name="messageList">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid HorizontalAlignment="{Binding Alignment}" Margin="0,5">
|
||||
<Grid.ColumnDefinitions>
|
||||
<!-- 左侧列:头像或空白 -->
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<!-- 中间列:消息卡片 -->
|
||||
<ColumnDefinition Width="*"/>
|
||||
<!-- 右侧列:头像或空白 -->
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<!-- 左侧头像(仅当Alignment=Left时显示) -->
|
||||
<Border x:Name="leftAvatar" Grid.Column="0" Width="40" Height="40" Margin="10,0,10,0" CornerRadius="20" VerticalAlignment="Top">
|
||||
<!-- 图片头像 -->
|
||||
<Image Source="{Binding Image}" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Image.Clip>
|
||||
<EllipseGeometry Center="20,20" RadiusX="20" RadiusY="20"/>
|
||||
</Image.Clip>
|
||||
</Image>
|
||||
</Border>
|
||||
<!-- 消息卡片(始终在中间列) -->
|
||||
<materialDesign:Card Grid.Column="1" Padding="10" HorizontalAlignment="{Binding Alignment}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="{Binding Sender}" FontWeight="Bold" Foreground="{Binding SenderColor}"/>
|
||||
<TextBlock Text="{Binding Content}" TextWrapping="Wrap" Margin="0,5,0,0"/>
|
||||
<TextBlock Text="{Binding Timestamp, StringFormat='HH:mm:ss'}" Foreground="Gray" FontSize="10" HorizontalAlignment="Right" Margin="0,5,0,0"/>
|
||||
</StackPanel>
|
||||
</materialDesign:Card>
|
||||
<!-- 右侧头像(仅当Alignment=Right时显示) -->
|
||||
<Border x:Name="rightAvatar" Grid.Column="2" Width="40" Height="40" Margin="10,0,10,0" CornerRadius="20" VerticalAlignment="Top">
|
||||
<Image Source="{Binding Image}" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Image.Clip>
|
||||
<EllipseGeometry Center="20,20" RadiusX="20" RadiusY="20"/>
|
||||
</Image.Clip>
|
||||
</Image>
|
||||
</Border>
|
||||
</Grid>
|
||||
<!-- 根据Alignment显示正确的头像 -->
|
||||
<DataTemplate.Triggers>
|
||||
<!-- 左对齐消息:显示左侧头像 -->
|
||||
<DataTrigger Binding="{Binding Alignment}" Value="Left">
|
||||
<Setter TargetName="leftAvatar" Property="Visibility" Value="Visible"/>
|
||||
<Setter TargetName="rightAvatar" Property="Visibility" Value="Collapsed"/>
|
||||
</DataTrigger>
|
||||
<!-- 右对齐消息:显示右侧头像 -->
|
||||
<DataTrigger Binding="{Binding Alignment}" Value="Right">
|
||||
<Setter TargetName="leftAvatar" Property="Visibility" Value="Collapsed"/>
|
||||
<Setter TargetName="rightAvatar" Property="Visibility" Value="Visible"/>
|
||||
</DataTrigger>
|
||||
</DataTemplate.Triggers>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</ScrollViewer>
|
||||
|
||||
<Grid Grid.Row="2" Background="{DynamicResource MaterialDesign.Brush.Primary.Foreground}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBox x:Name="txtMessage" Grid.Column="0"
|
||||
materialDesign:HintAssist.Hint="输入消息..."
|
||||
AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
|
||||
TextWrapping="Wrap" MinHeight="60" MaxHeight="120" Margin="5"/>
|
||||
|
||||
<Button x:Name="btnSend" Grid.Column="1" Content="发送" MinWidth="80"
|
||||
Style="{StaticResource MaterialDesignRaisedButton}"
|
||||
Click="SendMessage_Click"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem>
|
||||
|
@ -1,6 +1,7 @@
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
@ -16,11 +17,11 @@ using System.Security.Policy;
|
||||
using log4net;
|
||||
using log4net.Config;
|
||||
using System.Text.Json;
|
||||
using chatclient.Data;
|
||||
using chatapi;
|
||||
using System.Diagnostics;
|
||||
using System.Windows.Interop;
|
||||
using ControlzEx.Standard;
|
||||
using System.ComponentModel;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Windows.Threading;
|
||||
using System.Collections.Specialized;
|
||||
|
||||
[assembly: XmlConfigurator(ConfigFile = "config/log4net.config", Watch = true)]
|
||||
namespace chatclient
|
||||
@ -37,7 +38,7 @@ namespace chatclient
|
||||
public static Socket? Client;
|
||||
public static readonly HttpClient HttpClient = new HttpClient();
|
||||
public event PropertyChangedEventHandler? PropertyChanged;
|
||||
private string? _Username;
|
||||
private string? _Username;
|
||||
public string? Username
|
||||
{
|
||||
get { return _Username; }
|
||||
@ -47,10 +48,6 @@ namespace chatclient
|
||||
Update("Username");
|
||||
}
|
||||
}
|
||||
// 消息列表
|
||||
public ObservableCollection<ChatMessage> Messages { get; } = new ObservableCollection<ChatMessage>();
|
||||
private ItemsControl MessageList => messageList;
|
||||
private ScrollViewer MessageScroller => messageScroller;
|
||||
private void Update(string UpdateName)
|
||||
{
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(UpdateName));
|
||||
@ -75,16 +72,8 @@ namespace chatclient
|
||||
Login.Show();
|
||||
Thread th = new Thread(Receive);
|
||||
th.Start();
|
||||
MessageList.ItemsSource = Messages;
|
||||
((INotifyCollectionChanged)MessageList.Items).CollectionChanged += (s, e) =>
|
||||
{
|
||||
// 确保有足够的时间让UI更新
|
||||
Dispatcher.BeginInvoke(new Action(() =>
|
||||
{
|
||||
MessageScroller.ScrollToEnd();
|
||||
}), DispatcherPriority.ContextIdle);
|
||||
};
|
||||
}
|
||||
|
||||
static void Receive()
|
||||
{
|
||||
byte[] buffer = new byte[1024];
|
||||
@ -112,6 +101,7 @@ namespace chatclient
|
||||
Client?.Close();
|
||||
}
|
||||
}
|
||||
|
||||
static void response(string msg)
|
||||
{
|
||||
log.Info($"收到服务器消息: {msg}");
|
||||
@ -139,61 +129,26 @@ namespace chatclient
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
else if (LoginResponse != null)
|
||||
{
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
var loginWindow = Application.Current.Windows.OfType<LoginWindow>().FirstOrDefault();
|
||||
if (loginWindow != null)
|
||||
{
|
||||
loginWindow.LoginMsg = LoginResponse != null ? LoginResponse.message : "服务器返回错误";
|
||||
}
|
||||
});
|
||||
log.Warn($"登录失败: {LoginResponse.message}\nMsg:{msg}");
|
||||
var loginWindow = Application.Current.Windows.OfType<LoginWindow>().FirstOrDefault();
|
||||
loginWindow!.LoginMsg = LoginResponse.message;
|
||||
}
|
||||
}
|
||||
else if (Type.type == "login_0" && LoginResponse != null)
|
||||
else if (Type.type == "login_0")
|
||||
{
|
||||
log.Warn($"登录失败: {LoginResponse.message}\nMsg:{msg}");
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
if (LoginResponse != null)
|
||||
{
|
||||
var loginWindow = Application.Current.Windows.OfType<LoginWindow>().FirstOrDefault();
|
||||
if (loginWindow != null)
|
||||
{
|
||||
loginWindow.LoginMsg = "用户名或密码错误";
|
||||
}
|
||||
});
|
||||
}
|
||||
else if (Type.type == "chat")
|
||||
{
|
||||
var chat = JsonSerializer.Deserialize<ChatRegisterData>(msg);
|
||||
if (chat != null)
|
||||
{
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
// 处理聊天消息
|
||||
var chatmessage = new ChatMessage
|
||||
{
|
||||
Sender = chat.user ?? "未知用户",
|
||||
Type = MessageType.Text,
|
||||
Image = new BitmapImage(new Uri(chat.image ?? "pack://application:,,,/resource/user.png", UriKind.Absolute)),
|
||||
Content = chat.message ?? "无内容",
|
||||
Timestamp = chat.timestamp,
|
||||
Alignment = HorizontalAlignment.Left,
|
||||
SenderColor = new SolidColorBrush(Colors.Black)
|
||||
};
|
||||
var mainWindow = Application.Current.Windows.OfType<MainWindow>().FirstOrDefault();
|
||||
mainWindow?.Messages.Add(chatmessage);
|
||||
});
|
||||
loginWindow!.LoginMsg = LoginResponse.message;
|
||||
}
|
||||
else
|
||||
{
|
||||
log.Error("反序列化聊天数据时返回了 null");
|
||||
var loginWindow = Application.Current.Windows.OfType<LoginWindow>().FirstOrDefault();
|
||||
loginWindow!.LoginMsg = "服务器返回错误";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
log.Error($"未知的消息类型: {Type.type},请检查服务器响应格式");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (JsonException ex)
|
||||
@ -205,68 +160,5 @@ namespace chatclient
|
||||
log.Error("处理响应时发生错误", ex);
|
||||
}
|
||||
}
|
||||
private void SendMessage_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
SendMessage();
|
||||
}
|
||||
private void SendMessage()
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(txtMessage.Text))
|
||||
return;
|
||||
|
||||
// 获取当前选中的联系人
|
||||
//var contact = cmbContacts.SelectedItem as Contact;
|
||||
// 判断是否为群组,若是则收件人设为“所有人”,否则为联系人显示名
|
||||
//string recipient = contact?.IsGroup == true ? "所有人" : contact?.DisplayName;
|
||||
|
||||
// 创建新消息
|
||||
var newMessage = new ChatMessage
|
||||
{
|
||||
Sender = "我",
|
||||
Type = MessageType.Text,
|
||||
Image = new BitmapImage(new Uri("pack://application:,,,/resource/user.png", UriKind.Absolute)), // 默认头像
|
||||
Content = txtMessage.Text,
|
||||
Timestamp = DateTime.Now,
|
||||
Alignment = HorizontalAlignment.Right, // 自己发送的消息靠右
|
||||
SenderColor = new SolidColorBrush(Colors.Blue)
|
||||
};
|
||||
var newChatMessage = new ChatData
|
||||
{
|
||||
type = "chat",
|
||||
message = newMessage.Content
|
||||
};
|
||||
string ChatJsonData = JsonSerializer.Serialize(newChatMessage);
|
||||
byte[] dataBytes = Encoding.UTF8.GetBytes(ChatJsonData);
|
||||
log.Info($"向服务器聊天信息(长度:{dataBytes.Length})");
|
||||
if (Client != null)
|
||||
{
|
||||
if (Client.Connected)
|
||||
{
|
||||
Client.Send(dataBytes);
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
log.Info("未连接服务器,尝试连接");
|
||||
Client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
|
||||
Client.Connect(IPAddress.Parse(Server.ServerIP), Server.ServerPort);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
log.Error(ex);
|
||||
Client.Close();
|
||||
}
|
||||
//finally
|
||||
//{
|
||||
//
|
||||
//}
|
||||
}
|
||||
}
|
||||
// 添加到消息列表
|
||||
Messages.Add(newMessage);
|
||||
// 清空输入框
|
||||
txtMessage.Clear();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,6 +1,5 @@
|
||||
using System.Security.RightsManagement;
|
||||
|
||||
namespace chatclient.Data
|
||||
|
||||
namespace chatapi
|
||||
{
|
||||
internal class Server
|
||||
{
|
||||
@ -34,16 +33,4 @@ namespace chatclient.Data
|
||||
{
|
||||
public string? type { get; set; }
|
||||
}
|
||||
internal class ChatRegisterData
|
||||
{
|
||||
public string? user { get; set; } = "Unnamed";
|
||||
public string? message { get; set; } = null;
|
||||
public string? image { get; set; } = null;
|
||||
public DateTime timestamp { get; set; } = DateTime.Now;
|
||||
}
|
||||
internal class ChatData
|
||||
{
|
||||
public required string type { get; set; } = "chat";
|
||||
public required string message { get; set; } = "message";
|
||||
}
|
||||
}
|
@ -6,23 +6,9 @@
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<UseWPF>true</UseWPF>
|
||||
<ApplicationIcon>resource\chat.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<DebugType>full</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<DebugType>full</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="resource\chat.ico" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
|
||||
<PackageReference Include="log4net" Version="3.1.0" />
|
||||
<PackageReference Include="MaterialDesignThemes" Version="5.2.1" />
|
||||
<PackageReference Include="MaterialDesignThemes.MahApps" Version="5.2.1" />
|
||||
@ -30,7 +16,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Resource Include="resource\user.png" />
|
||||
<Resource Include="user.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 87 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Loading…
x
Reference in New Issue
Block a user