diff --git a/stormchat-client-csharp/StormChatWPF/Chat.cs b/stormchat-client-csharp/StormChatWPF/Chat.cs
index 743bdd4..7c36c87 100644
--- a/stormchat-client-csharp/StormChatWPF/Chat.cs
+++ b/stormchat-client-csharp/StormChatWPF/Chat.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Interact;
 using System.Drawing;
 using System.Windows;
+using System.IO;
 
 namespace StormChatWPF
 {
@@ -17,7 +18,8 @@ namespace StormChatWPF
         {
             StormClient.OnLoginDone += OnHaveLogin;
             StormClient.OnGetUserListDone += OnGetContactsList;
-            StormClient.OnMessage +=OnMessage;
+            StormClient.OnMessage +=OnMessage;//事件挂接
+            User.DefaultPhoto = new MemoryStream(File.ReadAllBytes(@"../../UI/Resources/默认头像.png"));
         }
         internal static User CurrentContact { get; set; }//设置当前联系人对象
         /// <summary>
@@ -38,7 +40,7 @@ namespace StormChatWPF
                     mainWindow.Show();
                     LogWindow.Instence.Close();
                 });
-        }
+        }//获取联系人列表完成
         private  void OnHaveLogin(ResultHead head, User user)
         {
                     if (head.Error == "")
@@ -48,6 +50,11 @@ namespace StormChatWPF
                     }
                     else
                     {
+                App.Current.Dispatcher.Invoke(
+                    (Action)delegate ()
+                    {
+                        LogWindow.Instence.Login_button.IsEnabled = true;
+                    });
                         MessageBox.Show("请核对账号密码！");
                     }
         }//登录完成
@@ -74,11 +81,21 @@ namespace StormChatWPF
             {
                 if (!StormClient.QueueLogin(user, password))
                 {
+                    App.Current.Dispatcher.Invoke(
+                    (Action)delegate ()
+                    {
+                        LogWindow.Instence.Login_button.IsEnabled = true;
+                    }); 
                     MessageBox.Show("登录失败");
                 }
             }
             else
             {
+                App.Current.Dispatcher.Invoke(
+                    (Action)delegate ()
+                    {
+                        LogWindow.Instence.Login_button.IsEnabled = true;
+                    });
                 MessageBox.Show("连接服务器失败！");
             }
         }//登录
diff --git a/stormchat-client-csharp/StormChatWPF/LogWindow.xaml.cs b/stormchat-client-csharp/StormChatWPF/LogWindow.xaml.cs
index 63c1f06..9f2c305 100644
--- a/stormchat-client-csharp/StormChatWPF/LogWindow.xaml.cs
+++ b/stormchat-client-csharp/StormChatWPF/LogWindow.xaml.cs
@@ -29,9 +29,8 @@ namespace StormChatWPF
         }
         private void Login_button_Click(object sender, RoutedEventArgs e)
         {
+            Login_button.IsEnabled = false;
             Chat.Log(AccountBox.Text,passwordBox.Password);
         }
-       
-
     }
 }
diff --git a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml
index dffa90a..72d33dc 100644
--- a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml
+++ b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml
@@ -1,32 +1,32 @@
-<Window x:Class="StormChatWPF.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:local="clr-namespace:StormChatWPF"
-        mc:Ignorable="d"
-        Title="StormChat" Height="450" Width="800"
-		WindowStartupLocation="CenterScreen">
-	<Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="60*"/>
-			<RowDefinition Height="300*"/>
-			<RowDefinition Height="90*"/>
-		</Grid.RowDefinitions>
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="200*"/>
-			<ColumnDefinition Width="200*"/>
-			<ColumnDefinition Width="200*"/>
-			<ColumnDefinition Width="200*"/>
-		</Grid.ColumnDefinitions>
-		<ListView x:Name="UsersList" Margin="0,0,0,0" IsEnabled="True" SelectionChanged="UsersList_SelectionChanged" Grid.Row="1" Grid.RowSpan="2"/>
-		<TextBox x:Name="InputBox" Margin="0,0,0,0" TextWrapping="Wrap" Text="" Grid.Row="2" Grid.ColumnSpan="3" Grid.Column="1" />
-		<Button Content="Send" HorizontalAlignment="Right" Margin="0,0,0,0" VerticalAlignment="Bottom" Width="75" Click="Button_Click" Height="20" Grid.Row="2" Grid.Column="3"/>
-		<ScrollViewer Grid.ColumnSpan="3" Grid.Column="1" Margin="0,0,0,0" Grid.Row="1" >
-			<ScrollViewer.Content>
-				<StackPanel x:Name="OutBox" Margin="0,0,0,0" Grid.ColumnSpan="3" Grid.Column="1" Grid.Row="1" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
-			</ScrollViewer.Content>
+<Window x:Class="StormChatWPF.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:local="clr-namespace:StormChatWPF"
+        mc:Ignorable="d"
+        Title="StormChat" Height="450" Width="800"
+		WindowStartupLocation="CenterScreen">
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="60*"/>
+			<RowDefinition Height="300*"/>
+			<RowDefinition Height="90*"/>
+		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="200*"/>
+			<ColumnDefinition Width="200*"/>
+			<ColumnDefinition Width="200*"/>
+			<ColumnDefinition Width="200*"/>
+		</Grid.ColumnDefinitions>
+		<ListView x:Name="UsersList" Margin="0,0,0,0" IsEnabled="True" SelectionChanged="UsersList_SelectionChanged" Grid.Row="1" Grid.RowSpan="2"/>
+		<TextBox x:Name="InputBox" Margin="0,0,0,0" TextWrapping="Wrap" Text="" Grid.Row="2" Grid.ColumnSpan="3" Grid.Column="1" />
+		<Button Content="Send" HorizontalAlignment="Right" Margin="0,0,0,0" VerticalAlignment="Bottom" Width="75" Click="Button_Click" Height="20" Grid.Row="2" Grid.Column="3"/>
+		<ScrollViewer Grid.ColumnSpan="3" Grid.Column="1" Margin="0,0,0,0" Grid.Row="1" >
+			<ScrollViewer.Content>
+				<StackPanel x:Name="OutBox" Margin="0,0,0,0" Grid.ColumnSpan="3" Grid.Column="1" Grid.Row="1" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
+			</ScrollViewer.Content>
 		</ScrollViewer>
-		<Button x:Name="button" Content="Button" Grid.Column="2" HorizontalAlignment="Left" Margin="73,31,0,0" Grid.Row="2" VerticalAlignment="Top" Width="75" Click="button_Click_1"/>
-	</Grid>
-</Window>
+		<Button x:Name="button" Content="Button" Grid.Column="2" HorizontalAlignment="Left" Margin="73,31,0,0" Grid.Row="2" VerticalAlignment="Top" Width="75" Click="button_Click_1"/>
+	</Grid>
+</Window>
diff --git a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs
index ecca4cf..976de23 100644
--- a/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs
+++ b/stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Interact;
+using StormChatWPF.UI;
 using System;
 using System.Linq;
 using System.Windows;
@@ -58,7 +59,7 @@ namespace StormChatWPF
                 App.Current.Dispatcher.Invoke(
                 (Action)delegate()
                 {
-                    OutBox.Children.Add(new ChatBubble(message,HorizontalAlignment.Left));
+                    OutBox.Children.Add(new StormChatWPF.UI.ChatBubble(message,HorizontalAlignment.Left));
                 });
             }//接受到的的消息
             else
@@ -66,7 +67,7 @@ namespace StormChatWPF
                 App.Current.Dispatcher.Invoke(
                     (Action)delegate()
                 {
-                    OutBox.Children.Add(new ChatBubble(message, HorizontalAlignment.Right));
+                    OutBox.Children.Add(new StormChatWPF.UI.ChatBubble(message, HorizontalAlignment.Right));
                 });
             }//发送的的消息
         }//将消息展现于UI界面
@@ -75,8 +76,7 @@ namespace StormChatWPF
         {
             App.Current.Dispatcher.Invoke(
                 (Action)delegate ()
-                {
-                    OutBox.Children.Add(new HeadPicture());
+                {
                 });
         }
     }
diff --git a/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj b/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj
index 34ad918..c954828 100644
--- a/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj
+++ b/stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj
@@ -66,7 +66,9 @@
     </Compile>
     <Compile Include="ScrollViewer.cs" />
     <Compile Include="UI\ChatBubble.cs" />
-    <Compile Include="UI\HeadPicture.cs" />
+    <Compile Include="UI\Contacts.xaml.cs">
+      <DependentUpon>Contacts.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UI\UserInfo.cs" />
     <Compile Include="Window1.xaml.cs">
       <DependentUpon>Window1.xaml</DependentUpon>
@@ -87,6 +89,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI\Contacts.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Window1.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -129,5 +135,8 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="UI\Resources\默认头像.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/stormchat-client-csharp/StormChatWPF/UI/ChatBubble.cs b/stormchat-client-csharp/StormChatWPF/UI/ChatBubble.cs
index 1b14f59..d49d01e 100644
--- a/stormchat-client-csharp/StormChatWPF/UI/ChatBubble.cs
+++ b/stormchat-client-csharp/StormChatWPF/UI/ChatBubble.cs
@@ -5,7 +5,7 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace StormChatWPF
+namespace StormChatWPF.UI
 {
     /// <summary>
     /// 聊天气泡
diff --git a/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml b/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml
new file mode 100644
index 0000000..afa8829
--- /dev/null
+++ b/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="StormChatWPF.UI.Contacts"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:StormChatWPF.UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="40" d:DesignWidth="120">
+    <Grid>
+		<WrapPanel HorizontalAlignment="Left" Height="40" VerticalAlignment="Stretch" Width="120">
+			<Image x:Name="HeadPicture" HorizontalAlignment="Left" Height="40"  Width="40"/>
+			<Label x:Name="text" Content="Label" Height="40" Width="80"/>
+		</WrapPanel>
+		
+
+	</Grid>
+</UserControl>
diff --git a/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml.cs b/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml.cs
new file mode 100644
index 0000000..484a195
--- /dev/null
+++ b/stormchat-client-csharp/StormChatWPF/UI/Contacts.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace StormChatWPF.UI
+{
+    /// <summary>
+    /// Contacts.xaml 的交互逻辑
+    /// </summary>
+    public partial class Contacts : UserControl
+    {
+        public Contacts()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/stormchat-client-csharp/StormChatWPF/UI/HeadPicture.cs b/stormchat-client-csharp/StormChatWPF/UI/HeadPicture.cs
deleted file mode 100644
index 9108459..0000000
--- a/stormchat-client-csharp/StormChatWPF/UI/HeadPicture.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using System.Media;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.IO;
-
-namespace StormChatWPF
-{
-    class HeadPicture : Image
-    {
-        public HeadPicture(/*Stream imgstream*/)
-        {
-
-            FileStream fileStream = new FileStream(@"C:\Users\Administrator\Desktop\闪电.png", FileMode.Open);
-            
-            Source = new BitmapImage()
-            {
-                StreamSource = fileStream
-            };
-            //border.Content = this;
-        }
-        private Label border = new Label()
-        {
-            
-        };
-    }
-}
diff --git a/stormchat-client-csharp/StormChatWPF/UI/Resources/默认头像.png b/stormchat-client-csharp/StormChatWPF/UI/Resources/默认头像.png
new file mode 100644
index 0000000..2b7d4ab
Binary files /dev/null and b/stormchat-client-csharp/StormChatWPF/UI/Resources/默认头像.png differ
diff --git a/stormchat-client-csharp/StormChatWPF/UI/UserInfo.cs b/stormchat-client-csharp/StormChatWPF/UI/UserInfo.cs
index e9b8cd0..454015b 100644
--- a/stormchat-client-csharp/StormChatWPF/UI/UserInfo.cs
+++ b/stormchat-client-csharp/StormChatWPF/UI/UserInfo.cs
@@ -1,30 +1,20 @@
 using Interact;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows;
+using System.Windows.Media.Imaging;
+using System.IO;
 
-namespace StormChatWPF
+namespace StormChatWPF.UI
 {
-    class UserInfo:Label
+    internal class UserInfo : Contacts
     {
         public UserInfo(User user)
-            {
-                
-                
-            }
-        private Image headpicture = new Image
         {
-            HorizontalAlignment = HorizontalAlignment.Left
-        };
-        private TextBlock UserNmae=new TextBlock
-        {
-            FontFamily = new FontFamily("Comic Sans MS"),
-            HorizontalAlignment = HorizontalAlignment.Right,
-            VerticalAlignment=VerticalAlignment.Top
-        };
+            image.BeginInit();
+            image.StreamSource = user.Photo;
+            User.DefaultPhoto.Seek(0, SeekOrigin.Begin);
+            image.EndInit();
+            HeadPicture.Source = image;
+            text.Content = user.NickName;
+        }
+        BitmapImage image = new BitmapImage();
     }
 }
diff --git a/stormchat-client-csharp/StormChatWPF/Window1.xaml b/stormchat-client-csharp/StormChatWPF/Window1.xaml
index 8d96747..d8cbabf 100644
--- a/stormchat-client-csharp/StormChatWPF/Window1.xaml
+++ b/stormchat-client-csharp/StormChatWPF/Window1.xaml
@@ -7,13 +7,11 @@
         mc:Ignorable="d"
         Title="Window1" Height="300" Width="300">
 	<Grid>
-		<Label x:Name="label" HorizontalAlignment="Left" Margin="76,101,0,0" VerticalAlignment="Top" Width="86" Height="41">
-			<Image x:Name="image" Height="31" Width="36" Source="UI/Resources/闪电.png" Margin="0,0,0,0" HorizontalAlignment="Left" RenderTransformOrigin="0.553,0.5" VerticalAlignment="Center">
-				<Image.OpacityMask>
-					<ImageBrush ImageSource="UI/Resources/聊天气泡.png"/>
-				</Image.OpacityMask>
-			</Image>
-		</Label>
+		<StackPanel HorizontalAlignment="Left" Margin="187,0,0,10.4" Width="100">
+			<Image x:Name="image" Height="46" Source="UI/Resources/聊天气泡.png" Margin="0,0,10,0"/>
+
+		</StackPanel>
+		<Button x:Name="button" Content="Button" HorizontalAlignment="Left" Margin="90,108,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
 
 	</Grid>
 </Window>
diff --git a/stormchat-client-csharp/StormChatWPF/Window1.xaml.cs b/stormchat-client-csharp/StormChatWPF/Window1.xaml.cs
index 6451bfd..8bcf603 100644
--- a/stormchat-client-csharp/StormChatWPF/Window1.xaml.cs
+++ b/stormchat-client-csharp/StormChatWPF/Window1.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Windows;
@@ -22,5 +23,14 @@ namespace StormChatWPF
         {
             InitializeComponent();
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            image.Source = new BitmapImage()
+            {
+                StreamSource = new FileStream(@"C:\Users\10568\Source\Repos\stormchat\stormchat-client-csharp\StormChatWPF\UI\Resources\闪电.png", FileMode.Open)
+
+            };
+        }
     }
 }