mattuy/stormchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
Haven Mattuy
2018-12-18 20:27:22 +08:00
parent 7c3873c5b5 f3df3b2995
commit f27f629d53
6 changed files with 104 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interact/Client.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Interact
//登录结果处理事件 //登录结果处理事件
public static event LoginDoneHandler OnLoginDone; public static event LoginDoneHandler OnLoginDone;
//获取用户列表结果处理事件 //获取用户列表结果处理事件
private static event GetUserListDoneHandler OnGetUserListDone; public static event GetUserListDoneHandler OnGetUserListDone;
//当前连接状态 //当前连接状态
public static ClientStatus Status public static ClientStatus Status
StormChatWPF/Chat.cs
+37 -16
View File
@@ -11,29 +11,38 @@ namespace StormChatWPF
{ {
class Chat class Chat
{ {
public static List<User> userlist = new List<User>();//联系人集合 public static List<User> ContactsList;//联系人集合
public static Chat chat = new Chat();
private Chat()
internal static void GetUsers(ResultHandler head, User user)
{ {
StormClient.OnLoginDone += HaveLogin;
StormClient.OnGetUserListDone += GetContactsList;
StormClient.OnMessage +=ReciveMessage;
}
}//获取联系人对象
internal static void GetUserList(ResultHead head, User[] users) private User ChatNow;
internal User SetContact
{
get
{
return ChatNow;
}
set
{
ChatNow = value;
}
}//设置当前联系人对象
internal static void GetContactsList(ResultHead head, User[] users)
{ {
if (head.Error != "") if (head.Error != "")
{ {
MessageBox.Show("无法获取联系人列表"); MessageBox.Show("无法获取联系人列表");
} }
else else
ContactsList =new List<User>( users);
return; return;
}//获取用户列表 }//获取联系人列表
internal static void GetUserPhoto(ResultHead head, Image image)
{
if (head.Error != "")
{
MessageBox.Show("无法读取用户图片");
}
}//对用户头像进行赋值
internal void Log(string user,string password) internal void Log(string user,string password)
{ {
if (StormClient.Initialize()) if (StormClient.Initialize())
@@ -55,7 +64,7 @@ namespace StormChatWPF
User.Me = user; User.Me = user;
MainWindow userWindow = new MainWindow(); MainWindow userWindow = new MainWindow();
userWindow.Show(); userWindow.Show();
LogWindow.a.Close(); LogWindow.Instence.Close();
} }
else else
{ {
@@ -63,7 +72,19 @@ namespace StormChatWPF
} }
}); });
}//登录完成 }//登录完成
internal static void ReciveMessage(Message message)
{
LogWindow.Instence.ShowMessage(message);
}//接受到新消息的时候
internal static void SendMessage(string text,User target)
{
// Message msg = new Message(text);
// Action<BaseHead> f = delegate(BaseHead head)
// {
// };
// StormClient.QueueSendMessage(msg, target, f);
// LogWindow.Instence.ShowUserMessage();
}
} }
} }
StormChatWPF/LogWindow.xaml
+5 -5
View File
@@ -6,11 +6,11 @@
xmlns:local="clr-namespace:StormChatWPF" xmlns:local="clr-namespace:StormChatWPF"
mc:Ignorable="d" mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800"> Title="MainWindow" Height="450" Width="800">
<Grid> <Grid Margin="0,0,-0.4,-1">
<Image x:Name="LogImage" HorizontalAlignment="Left" Height="230" Margin="10,10,0,0" VerticalAlignment="Top" Width="774" Source="/RESOURCES/logFormBackground.jpg" Stretch="None"/> <Image x:Name="LogImage" Margin="0,0,0,181" Source="/RESOURCES/logFormBackground.jpg" Stretch="None"/>
<Button x:Name="Login_button" Content="LogIn" HorizontalAlignment="Left" Margin="240,376,0,0" VerticalAlignment="Top" Width="75" RenderTransformOrigin="0.664,1.51" Click="Login_button_Click"/> <Button x:Name="Login_button" Content="LogIn" Margin="361,370,361,32" RenderTransformOrigin="0.664,1.51" Click="Login_button_Click"/>
<TextBox x:Name="AccountBox" HorizontalAlignment="Left" Height="23" Margin="240,290,0,0" TextWrapping="Wrap" Text="201701110203" VerticalAlignment="Top" Width="120" /> <TextBox x:Name="AccountBox" Margin="346,263,340,0" TextWrapping="Wrap" Text="201701110203" Height="15" VerticalAlignment="Top" />
<PasswordBox x:Name="passwordBox" HorizontalAlignment="Left" Margin="240,332,0,0" VerticalAlignment="Top" Width="120" Password="1233211234567"/> <PasswordBox x:Name="passwordBox" Margin="346,311,0,0" Password="1233211234567" RenderTransformOrigin="0.503,0.59" Height="18" VerticalAlignment="Top" HorizontalAlignment="Left" Width="109"/>
</Grid> </Grid>
StormChatWPF/LogWindow.xaml.cs
+9 -7
View File
@@ -21,20 +21,22 @@ namespace StormChatWPF
/// </summary> /// </summary>
public partial class LogWindow : Window public partial class LogWindow : Window
{ {
public static LogWindow a; public static LogWindow Instence;
public LogWindow() public LogWindow()
{ {
InitializeComponent(); InitializeComponent();
StormClient.OnLoginDone += Chat.HaveLogin; Instence = this;
StormClient.OnGetUserListDone += Chat.GetUserList;
StormClient.OnGetUserPhotoDone += Chat.GetUserPhoto;
a = this;
} }
Chat chat = new Chat();
private void Login_button_Click(object sender, RoutedEventArgs e) private void Login_button_Click(object sender, RoutedEventArgs e)
{ {
chat.Log(AccountBox.Text,passwordBox.Password); Chat.chat.Log(AccountBox.Text,passwordBox.Password);
} }
internal void ShowMessage(Message message)
{
}//将收到的消息展现于UI界面
internal void ShowUserMessage()
{
}
} }
} }
StormChatWPF/MainWindow.xaml
+9 -8
View File
@@ -8,14 +8,15 @@
Title="UserWindow" Height="450" Width="800" Title="UserWindow" Height="450" Width="800"
> >
<Grid> <Grid>
<ListView x:Name="UsersList" HorizontalAlignment="Left" Height="346" VerticalAlignment="Top" Width="191" Margin="10,64,0,0" IsEnabled="False"> <ListView x:Name="UsersList" HorizontalAlignment="Left" Width="201" Margin="0,64,0,10" IsEnabled="True" SelectionChanged="UsersList_SelectionChanged">
<ListView.View> <ListView.View>
<GridView> <GridView>
<GridViewColumn/> <GridViewColumn/>
</GridView> </GridView>
</ListView.View> </ListView.View>
</ListView> </ListView>
<TextBox HorizontalAlignment="Left" Height="90" Margin="201,320,0,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="583" />
<Button Content="Button" HorizontalAlignment="Left" Margin="378,262,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
</Grid> </Grid>
</Window> </Window>
StormChatWPF/MainWindow.xaml.cs
+43 -30
View File
@@ -1,28 +1,28 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Documents; using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Shapes; using System.Windows.Shapes;
namespace StormChatWPF namespace StormChatWPF
{ {
/// <summary> /// <summary>
/// UserWindow.xaml 的交互逻辑 /// UserWindow.xaml 的交互逻辑
/// </summary> /// </summary>
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
} }
private void AddUserList() private void AddUserList()
{ {
if (Chat.userlist.Any()) if (Chat.userlist.Any())
@@ -32,8 +32,21 @@ namespace StormChatWPF
UsersList.Items.Add(user); UsersList.Items.Add(user);
} }
} }
}//向联系人列表listview中添加元素 }//向联系人列表listview中添加元素
private void UsersList_Selected(object sender, RoutedEventArgs e)
} {
}
}
private void UsersList_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
}
private void Button_Click(object sender, RoutedEventArgs e)
{
AddUserList();
}
}
}