From 4ec1c438799b6379b177fa95858e029b4a26500c Mon Sep 17 00:00:00 2001
From: Kaniu Tayou <1056879522@qq.com>
Date: Tue, 18 Dec 2018 19:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=96=B0=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Interact/Client.cs              |  2 +-
 Interact/User.cs                |  2 +-
 StormChatWPF/Chat.cs            | 43 ++++++++-----------
 StormChatWPF/LogWindow.xaml     | 10 ++---
 StormChatWPF/LogWindow.xaml.cs  | 10 +++--
 StormChatWPF/MainWindow.xaml    |  5 ++-
 StormChatWPF/MainWindow.xaml.cs | 73 +++++++++++++++++++--------------
 7 files changed, 78 insertions(+), 67 deletions(-)

diff --git a/Interact/Client.cs b/Interact/Client.cs
index 79a10f0..708986c 100644
--- a/Interact/Client.cs
+++ b/Interact/Client.cs
@@ -38,7 +38,7 @@ namespace Interact
 		//登录结果处理事件
 		public static event LoginDoneHandler OnLoginDone;
 		//获取用户列表结果处理事件
-		private static event GetUserListDoneHandler OnGetUserListDone;
+		public static event GetUserListDoneHandler OnGetUserListDone;
 		
 		//当前连接状态
 		public static ClientStatus Status
diff --git a/Interact/User.cs b/Interact/User.cs
index 0a94d81..692e66e 100644
--- a/Interact/User.cs
+++ b/Interact/User.cs
@@ -11,7 +11,7 @@ namespace Interact
 	public class User
 	{
 		public static User Me;	//当前用户
-
+        public static string Password;//用户的密码
 		public string Name;     //用户名
 		public string NickName; //昵称
 		public string Motto;	//个性签名
diff --git a/StormChatWPF/Chat.cs b/StormChatWPF/Chat.cs
index 6377be9..f328679 100644
--- a/StormChatWPF/Chat.cs
+++ b/StormChatWPF/Chat.cs
@@ -11,13 +11,9 @@ namespace StormChatWPF
 {
     class Chat
     {
-        public static List<User> userlist = new List<User>();//联系人集合
-
+        public static User[] userlist;//联系人集合
+        public static User ChatNow = new User();//当前聊天对象
         
-        internal static void GetUsers(ResultHandler head, User user)
-        {
-
-        }//获取联系人对象
         internal static void GetUserList(ResultHead head, User[] users)
         {
             if (head.Error != "")
@@ -25,27 +21,24 @@ namespace StormChatWPF
                 MessageBox.Show("无法获取联系人列表");
             }
             else
-                return;
-        }//获取用户列表
-        internal static void GetUserPhoto(ResultHead head, Image image)
-        {
-            if (head.Error != "")
-            {
-                MessageBox.Show("无法读取用户图片");
-            }   
-        }//对用户头像进行赋值
+                userlist = users;
+        }//获取联系人用户列表       
         internal void Log(string user,string password)
         {
-            if (StormClient.Initialize())
-            {
-                StormClient.QueueLogin(user,password);
-            }
-            else
-            {
-                MessageBox.Show("连接服务器失败！");
+            if (StormClient.Initialize())
+            {
+                StormClient.QueueLogin(user,password);
+            }
+            else
+            {
+                MessageBox.Show("连接服务器失败！");
             }
         }//登录
-        internal  static void HaveLogin(ResultHead head, User user)
+        internal static void Reconnect(Exception e)
+        {
+            StormClient.Initialize();
+        }//尝试重连接一次，如果失败，则关闭mainwindow，打开登录窗口
+        internal  static void HaveLogin(ResultHead head, User user)
         {
             App.Current.Dispatcher.Invoke(
                 (Action)delegate ()
@@ -55,13 +48,13 @@ namespace StormChatWPF
                         User.Me = user;
                         MainWindow userWindow = new MainWindow();
                         userWindow.Show();
-                        LogWindow.a.Close();
+                        LogWindow.entry.Close();
                     }
                     else
                     {
                         MessageBox.Show("登录失败！");
                     }
-                });
+                });
         }//登录完成
 
 
diff --git a/StormChatWPF/LogWindow.xaml b/StormChatWPF/LogWindow.xaml
index 0e46e9f..efe8c9a 100644
--- a/StormChatWPF/LogWindow.xaml
+++ b/StormChatWPF/LogWindow.xaml
@@ -6,11 +6,11 @@
         xmlns:local="clr-namespace:StormChatWPF"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
-	<Grid>
-		<Image x:Name="LogImage" HorizontalAlignment="Left" Height="230" Margin="10,10,0,0" VerticalAlignment="Top" Width="774" 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"/>
-		<TextBox x:Name="AccountBox" HorizontalAlignment="Left" Height="23" Margin="240,290,0,0" TextWrapping="Wrap" Text="201701110203" VerticalAlignment="Top" Width="120" />
-		<PasswordBox x:Name="passwordBox" HorizontalAlignment="Left" Margin="240,332,0,0" VerticalAlignment="Top" Width="120" Password="1233211234567"/>
+	<Grid Margin="0,0,-0.4,-1">
+		<Image x:Name="LogImage" Margin="0,0,0,181" Source="/RESOURCES/logFormBackground.jpg" Stretch="None"/>
+		<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" Margin="346,263,340,0" TextWrapping="Wrap" Text="201701110203" Height="15" VerticalAlignment="Top" />
+		<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>
diff --git a/StormChatWPF/LogWindow.xaml.cs b/StormChatWPF/LogWindow.xaml.cs
index 2775cfa..166f091 100644
--- a/StormChatWPF/LogWindow.xaml.cs
+++ b/StormChatWPF/LogWindow.xaml.cs
@@ -21,14 +21,14 @@ namespace StormChatWPF
     /// </summary>
     public partial class LogWindow : Window
     {
-        public static LogWindow a;
+        public static LogWindow entry;
         public LogWindow()
         {
             InitializeComponent();
             StormClient.OnLoginDone += Chat.HaveLogin;
             StormClient.OnGetUserListDone += Chat.GetUserList;
-            StormClient.OnGetUserPhotoDone += Chat.GetUserPhoto;
-            a = this;
+            StormClient.OnDisconnect += Chat.Reconnect;
+            entry = this;
         }
         Chat chat = new Chat();
         private void Login_button_Click(object sender, RoutedEventArgs e)
@@ -36,5 +36,9 @@ namespace StormChatWPF
             chat.Log(AccountBox.Text,passwordBox.Password);
         }
 
+        private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/StormChatWPF/MainWindow.xaml b/StormChatWPF/MainWindow.xaml
index f6a31f3..7f41ef2 100644
--- a/StormChatWPF/MainWindow.xaml
+++ b/StormChatWPF/MainWindow.xaml
@@ -9,13 +9,14 @@
 		
 		>
 	<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>
 				<GridView>
 					<GridViewColumn/>
 				</GridView>
 			</ListView.View>
 		</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>
 </Window>
diff --git a/StormChatWPF/MainWindow.xaml.cs b/StormChatWPF/MainWindow.xaml.cs
index 59f1481..052fe07 100644
--- a/StormChatWPF/MainWindow.xaml.cs
+++ b/StormChatWPF/MainWindow.xaml.cs
@@ -1,28 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace StormChatWPF
-{
-    /// <summary>
-    /// UserWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace StormChatWPF
+{
+    /// <summary>
+    /// UserWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
         private void AddUserList()
         {
             if (Chat.userlist.Any())
@@ -32,8 +32,21 @@ namespace StormChatWPF
                     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();
+        }
+    }
+}