From 515b15cba46c7e5926f2a6d8c3fa83ba13586542 Mon Sep 17 00:00:00 2001
From: dathlin <hsl200909@163.com>
Date: Fri, 14 Jul 2017 12:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A4=A7=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=89=A9=E4=B8=8B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=8A=E8=81=8A=E5=A4=A9=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainWindow.xaml"                          | 66 +++++++++----------
 .../MainWindow.xaml.cs"                       |  6 +-
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git "a/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml" "b/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml"
index 0d34094..4a7cdcd 100644
--- "a/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml"
+++ "b/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml"
@@ -155,9 +155,15 @@
                 </Border>
             </Grid>
 
-            <Grid DockPanel.Dock="Right" Width="auto" MinWidth="220">
-                <StackPanel>
-                    <GroupBox Grid.Column="0" Grid.Row="0" Header="账户信息" Margin="2,0,0,0">
+            <Grid DockPanel.Dock="Right" Width="230">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"></RowDefinition>
+                        <RowDefinition Height="auto"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    
+                    <GroupBox Header="账户信息" Margin="2,0,0,0" Grid.Row="0">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="auto"></RowDefinition>
@@ -208,40 +214,30 @@
                         </Grid>
                     </GroupBox>
 
-                    <GroupBox Grid.Column="0" Grid.Row="0" Header="系统信息" Margin="2,5,0,0">
-                        <StackPanel>
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="auto"></RowDefinition>
-                                    <RowDefinition Height="auto"></RowDefinition>
-                                    <RowDefinition Height="auto"></RowDefinition>
-                                    <RowDefinition Height="auto"></RowDefinition>
-                                    <RowDefinition Height="auto"></RowDefinition>
-                                    <RowDefinition Height="auto"></RowDefinition>
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="auto"></ColumnDefinition>
-                                    <ColumnDefinition Width="*"></ColumnDefinition>
-                                    <ColumnDefinition Width="auto"></ColumnDefinition>
-                                </Grid.ColumnDefinitions>
+                    <GroupBox Header="公告" Margin="2,5,0,0" Grid.Row="1">
+                        <Grid Height="100">
+                            <TextBlock Foreground="DodgerBlue" x:Name="TextBlock_Announcement" TextWrapping="Wrap"></TextBlock>
+                        </Grid>
+                    </GroupBox>
 
-                                <TextBlock Grid.Row="0" Grid.Column="0">权限等级：</TextBlock>
-                                <TextBlock Grid.Row="1" Grid.Column="0">所属分厂：</TextBlock>
-                                <TextBlock Grid.Row="2" Grid.Column="0">注册时间：</TextBlock>
-                                <TextBlock Grid.Row="3" Grid.Column="0">登录频次：</TextBlock>
-                                <TextBlock Grid.Row="4" Grid.Column="0">最近登录：</TextBlock>
-                                <TextBlock Grid.Row="5" Grid.Column="0">上次登录IP：</TextBlock>
-
-                                <TextBlock Grid.Row="0" Grid.Column="1"></TextBlock>
-                                <TextBlock Grid.Row="1" Grid.Column="1"></TextBlock>
-                                <TextBlock Grid.Row="2" Grid.Column="1"></TextBlock>
-                                <TextBlock Grid.Row="3" Grid.Column="1"></TextBlock>
-                                <TextBlock Grid.Row="4" Grid.Column="1"></TextBlock>
-                                <TextBlock Grid.Row="5" Grid.Column="1"></TextBlock>
-                            </Grid>
-                        </StackPanel>
+                    <GroupBox Header="系统信息" Margin="2,5,0,0" Grid.Row="2">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="auto"></RowDefinition>
+                                <RowDefinition Height="auto"></RowDefinition>
+                                <RowDefinition Height="*"></RowDefinition>
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock Grid.Row="0" Grid.Column="0">共享文件：</TextBlock>
+                            <TextBlock Grid.Row="1" Grid.Column="0">在线信息：</TextBlock>
+                            <ListBox Grid.Row="2" Grid.ColumnSpan="2" x:Name="ListBox_Onlines" FontSize="10.5"></ListBox>
+                        </Grid>
                     </GroupBox>
-                </StackPanel>
+                </Grid>
             </Grid>
 
             <Grid>
diff --git "a/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml.cs" "b/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml.cs"
index 1ddc287..eb84937 100644
--- "a/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml.cs"
+++ "b/\350\275\257\344\273\266\347\263\273\347\273\237\345\256\242\346\210\267\347\253\257Wpf/MainWindow.xaml.cs"
@@ -152,7 +152,7 @@ namespace 软件系统客户端Wpf
             net_socket_client.AcceptByte += Net_socket_client_AcceptByte;
             net_socket_client.AcceptString += Net_socket_client_AcceptString;
 
-            //label_Announcement.Text = UserClient.Announcement;
+            TextBlock_Announcement.Text = UserClient.Announcement;
 
             TextBlock_Version.Text = UserClient.CurrentVersion.ToString();
 
@@ -381,7 +381,7 @@ namespace 软件系统客户端Wpf
             {
                 if (IsWindowShow) Dispatcher.Invoke(new Action(() =>
                 {
-                    //listBox1.DataSource = data.Split('#');
+                    ListBox_Onlines.ItemsSource = data.Split('#');
                 }));
             }
             else if (customer == CommonHeadCode.MultiNetHeadCode.关闭客户端)
@@ -397,7 +397,7 @@ namespace 软件系统客户端Wpf
                 if (IsWindowShow) Dispatcher.Invoke(new Action(() =>
                 {
                     UserClient.Announcement = data;
-                    //label_Announcement.Text = data;
+                    TextBlock_Announcement.Text = data;
                     FormPopup fpp = new FormPopup(data, System.Drawing.Color.DodgerBlue, 10000);
                     fpp.Show();
                 }));
-- 
GitLab