From 0a7ace0ca737ea741a27a07aefd315fc6340c730 Mon Sep 17 00:00:00 2001 From: dathlin Date: Wed, 11 Oct 2017 22:12:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=8Cv1.6.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LogsSupport/FormLogView.Designer.cs | 1 - ClientsLibrary/LogsSupport/FormLogView.cs | 28 ++++++----- .../SoftUpdateSupport/FormUpdateRemote.cs | 35 ++++++++++--- .../Views/{ => Controls}/Palette.xaml | 2 +- .../Views/{ => Controls}/Palette.xaml.cs | 2 +- .../Views/Controls/UserClientRenderItem.xaml.cs | 43 ++++++++++++---- .../Views/{ => Controls}/UserFileRenderItem.xaml | 2 +- .../Views/{ => Controls}/UserFileRenderItem.xaml.cs | 2 +- .../Views/{ => UIControls}/UserChat.xaml | 0 .../Views/{ => UIControls}/UserChat.xaml.cs | 50 +++++++++++++------ .../Views/{ => UIControls}/UserFileRender.xaml | 0 .../Views/{ => UIControls}/UserFileRender.xaml.cs | 1 + .../Views/{ => UIControls}/UserHome.xaml | 0 .../Views/{ => UIControls}/UserHome.xaml.cs | 0 .../Views/{ => UIControls}/UserPaletteSelector.xaml | 3 +- .../{ => UIControls}/UserPaletteSelector.xaml.cs | 0 软件系统客户端Wpf/软件系统客户端Wpf.csproj | 24 ++++----- 17 files changed, 130 insertions(+), 63 deletions(-) rename 软件系统客户端Wpf/Views/{ => Controls}/Palette.xaml (96%) rename 软件系统客户端Wpf/Views/{ => Controls}/Palette.xaml.cs (92%) rename 软件系统客户端Wpf/Views/{ => Controls}/UserFileRenderItem.xaml (97%) rename 软件系统客户端Wpf/Views/{ => Controls}/UserFileRenderItem.xaml.cs (99%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserChat.xaml (100%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserChat.xaml.cs (87%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserFileRender.xaml (100%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserFileRender.xaml.cs (99%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserHome.xaml (100%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserHome.xaml.cs (100%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserPaletteSelector.xaml (97%) rename 软件系统客户端Wpf/Views/{ => UIControls}/UserPaletteSelector.xaml.cs (100%) diff --git a/ClientsLibrary/LogsSupport/FormLogView.Designer.cs b/ClientsLibrary/LogsSupport/FormLogView.Designer.cs index 3a81d3b..09fb4a0 100644 --- a/ClientsLibrary/LogsSupport/FormLogView.Designer.cs +++ b/ClientsLibrary/LogsSupport/FormLogView.Designer.cs @@ -320,7 +320,6 @@ this.Controls.Add(this.userButton1); this.Controls.Add(this.userButton_login); this.Name = "FormLogView"; - this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "日志查看器"; this.Load += new System.EventHandler(this.FormLogView_Load); diff --git a/ClientsLibrary/LogsSupport/FormLogView.cs b/ClientsLibrary/LogsSupport/FormLogView.cs index 860689f..b2b495a 100644 --- a/ClientsLibrary/LogsSupport/FormLogView.cs +++ b/ClientsLibrary/LogsSupport/FormLogView.cs @@ -14,6 +14,8 @@ namespace ClientsLibrary { public partial class FormLogView : Form { + #region Constructor + public FormLogView() { InitializeComponent(); @@ -23,13 +25,26 @@ namespace ClientsLibrary net_simplify_client = UserClient.Net_simplify_client; } + #endregion + + #region Window Load + private void FormLogView_Load(object sender, EventArgs e) { } + #endregion + + #region Private Member + private NetSimplifyClient net_simplify_client = null; + #endregion + + #region Button Click + + private void ReadFromServer(int head_code) { OperateResultString result = net_simplify_client.ReadFromServer(head_code); @@ -129,19 +144,8 @@ namespace ClientsLibrary { ClearFromServer(CommonHeadCode.SimplifyHeadCode.客户端日志清空); } - //private void userButton17_Click(object sender, EventArgs e) - //{ - // ReadFromServer(CommonHeadCode.SimplifyHeadCode.头像日志查看); - //} - //private void userButton16_Click(object sender, EventArgs e) - //{ - // ClearFromServer(CommonHeadCode.SimplifyHeadCode.头像日志清空); - //} + #endregion - private void logNetAnalysisControl1_Load(object sender, EventArgs e) - { - - } } } diff --git a/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs b/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs index a96b44d..a56a700 100644 --- a/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs +++ b/ClientsLibrary/SoftUpdateSupport/FormUpdateRemote.cs @@ -14,17 +14,20 @@ using ClientsLibrary.FileSupport; namespace ClientsLibrary { - //===================================================================================== - // - // 用途： 本窗口用于实现对本系统的客户端进行全面的远程更新的操作。 - // 第一步： 先将新版本的所有客户端传送到服务器端进行覆盖。 - // 第二步： 再将版本号传送到服务器进行更新，这样所有的客户端登录后就会自动更新新的版本了 - // - //===================================================================================== + /************************************************************************************************ + * + * 用途： 本窗口用于实现对本系统的客户端进行全面的远程更新的操作。 + * 第一步： 先将新版本的所有客户端传送到服务器端进行覆盖。 + * 第二步： 再将版本号传送到服务器进行更新，这样所有的客户端登录后就会自动更新新的版本了 + * + **************************************************************************************************/ public partial class FormUpdateRemote : Form { + #region Constructor + + public FormUpdateRemote() { InitializeComponent(); @@ -32,6 +35,11 @@ namespace ClientsLibrary Icon = UserClient.GetFormWindowIcon(); } + #endregion + + #region Select File And Upload + + private void userButton_file_Click(object sender, EventArgs e) { using (OpenFileDialog ofd = new OpenFileDialog()) @@ -53,6 +61,12 @@ namespace ClientsLibrary } } + + #endregion + + #region Update Version + + private void userButton_version_Click(object sender, EventArgs e) { OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新版本, textBox1.Text); @@ -66,9 +80,16 @@ namespace ClientsLibrary } } + + #endregion + + #region Form Load + private void FormUpdateRemote_Load(object sender, EventArgs e) { textBox1.Text = UserClient.CurrentVersion.ToString(); } + + #endregion } } diff --git a/软件系统客户端Wpf/Views/Palette.xaml b/软件系统客户端Wpf/Views/Controls/Palette.xaml similarity index 96% rename from 软件系统客户端Wpf/Views/Palette.xaml rename to 软件系统客户端Wpf/Views/Controls/Palette.xaml index 5b3b205..40a277a 100644 --- a/软件系统客户端Wpf/Views/Palette.xaml +++ b/软件系统客户端Wpf/Views/Controls/Palette.xaml @@ -1,4 +1,4 @@ - /// Palette.xaml 的交互逻辑 diff --git a/软件系统客户端Wpf/Views/Controls/UserClientRenderItem.xaml.cs b/软件系统客户端Wpf/Views/Controls/UserClientRenderItem.xaml.cs index 36d2e81..83dc67f 100644 --- a/软件系统客户端Wpf/Views/Controls/UserClientRenderItem.xaml.cs +++ b/软件系统客户端Wpf/Views/Controls/UserClientRenderItem.xaml.cs @@ -23,12 +23,20 @@ namespace 软件系统客户端Wpf.Views.Controls /// public partial class UserClientRenderItem : UserControl { + #region Constructor + public UserClientRenderItem() { InitializeComponent(); } + #endregion + #region Public Property + + /// + /// 当前会话的唯一ID + /// public string UniqueId { get @@ -37,6 +45,9 @@ namespace 软件系统客户端Wpf.Views.Controls } } + #endregion + + #region Show Client Information public void SetClientRender(NetAccount account) { @@ -47,17 +58,18 @@ namespace 软件系统客户端Wpf.Views.Controls Factory.Text = $"({account.Factory})"; Roles.Children.Clear(); - if(account.Roles?.Length>0) + + if (account.Roles?.Length > 0) { - foreach(var m in account.Roles) + foreach (var m in account.Roles) { - TextBlock block = new TextBlock(); - block.Background = Brushes.LightSkyBlue; - block.Foreground = Brushes.Blue; - block.Margin = new Thickness(0, 0, 4, 0); - - block.Text = m; - + TextBlock block = new TextBlock + { + Background = Brushes.LightSkyBlue, + Foreground = Brushes.Blue, + Margin = new Thickness(0, 0, 4, 0), + Text = m + }; Roles.Children.Add(block); } } @@ -66,11 +78,14 @@ namespace 软件系统客户端Wpf.Views.Controls Roles.Children.Add(new TextBlock()); } + // 启动线程池去显示头像 System.Threading.ThreadPool.QueueUserWorkItem(new System.Threading.WaitCallback(ThreadPoolLoadPortrait), account); - } } + #endregion + + #region Update Portrait public void UpdatePortrait(string userName) { @@ -79,6 +94,7 @@ namespace 软件系统客户端Wpf.Views.Controls System.Threading.ThreadPool.QueueUserWorkItem(new System.Threading.WaitCallback(ThreadPoolLoadPortrait), netAccount); } } + private void ThreadPoolLoadPortrait(object obj) { // 向服务器请求小头像 @@ -102,12 +118,17 @@ namespace 软件系统客户端Wpf.Views.Controls } catch (Exception ex) { - MessageBox.Show(ex.Message); + UserClient.LogNet?.WriteException("Thread Download Portrait Failed", ex); } } } + #endregion + + #region Pricvate Member private NetAccount netAccount = null; + + #endregion } } diff --git a/软件系统客户端Wpf/Views/UserFileRenderItem.xaml b/软件系统客户端Wpf/Views/Controls/UserFileRenderItem.xaml similarity index 97% rename from 软件系统客户端Wpf/Views/UserFileRenderItem.xaml rename to 软件系统客户端Wpf/Views/Controls/UserFileRenderItem.xaml index 042aa7c..777063b 100644 --- a/软件系统客户端Wpf/Views/UserFileRenderItem.xaml +++ b/软件系统客户端Wpf/Views/Controls/UserFileRenderItem.xaml @@ -1,4 +1,4 @@ - /// UserFileRenderItem.xaml 的交互逻辑 diff --git a/软件系统客户端Wpf/Views/UserChat.xaml b/软件系统客户端Wpf/Views/UIControls/UserChat.xaml similarity index 100% rename from 软件系统客户端Wpf/Views/UserChat.xaml rename to 软件系统客户端Wpf/Views/UIControls/UserChat.xaml diff --git a/软件系统客户端Wpf/Views/UserChat.xaml.cs b/软件系统客户端Wpf/Views/UIControls/UserChat.xaml.cs similarity index 87% rename from 软件系统客户端Wpf/Views/UserChat.xaml.cs rename to 软件系统客户端Wpf/Views/UIControls/UserChat.xaml.cs index 50c74d3..f6800c3 100644 --- a/软件系统客户端Wpf/Views/UserChat.xaml.cs +++ b/软件系统客户端Wpf/Views/UIControls/UserChat.xaml.cs @@ -21,14 +21,18 @@ namespace 软件系统客户端Wpf.Views /// public partial class UserChat : UserControl { + #region Constructor + public UserChat(Action send) { InitializeComponent(); SendString = send; } + #endregion + + #region Add Chat Show - private Action SendString = null; public void DealwithReceive(string str) { @@ -41,6 +45,7 @@ namespace 软件系统客户端Wpf.Views } ScrollToDown(); } + /// /// 新增聊天的历史记录 /// @@ -62,11 +67,31 @@ namespace 软件系统客户端Wpf.Views ScrollToDown(); } + + #endregion + + #region Chat Focus Scroll + + public void InputFocus() { //textBox1.Focus(); } + /// + /// 光标滚动到最底端 + /// + public void ScrollToDown() + { + TextBox_ChatHistory.ScrollToEnd(); + } + + + #endregion + + #region Text Send + + private void Button_Click(object sender, RoutedEventArgs e) { if (!string.IsNullOrEmpty(TextBox_Send.Text)) @@ -76,27 +101,22 @@ namespace 软件系统客户端Wpf.Views } } + private void TextBox_KeyDown(object sender, KeyEventArgs e) { - //按下Enter键后进行发送数据到服务器 - if (!string.IsNullOrEmpty(TextBox_Send.Text)) + if (e.Key == Key.Enter) { - if (e.Key == Key.Enter) - { - SendString?.Invoke(TextBox_Send.Text); - TextBox_Send.Text = ""; - } + Button_Click(sender, new RoutedEventArgs()); } } + #endregion + + #region Private Member - /// - /// 光标滚动到最底端 - /// - public void ScrollToDown() - { - TextBox_ChatHistory.ScrollToEnd(); - } + private Action SendString = null; + + #endregion } } diff --git a/软件系统客户端Wpf/Views/UserFileRender.xaml b/软件系统客户端Wpf/Views/UIControls/UserFileRender.xaml similarity index 100% rename from 软件系统客户端Wpf/Views/UserFileRender.xaml rename to 软件系统客户端Wpf/Views/UIControls/UserFileRender.xaml diff --git a/软件系统客户端Wpf/Views/UserFileRender.xaml.cs b/软件系统客户端Wpf/Views/UIControls/UserFileRender.xaml.cs similarity index 99% rename from 软件系统客户端Wpf/Views/UserFileRender.xaml.cs rename to 软件系统客户端Wpf/Views/UIControls/UserFileRender.xaml.cs index 0b48372..35abe81 100644 --- a/软件系统客户端Wpf/Views/UserFileRender.xaml.cs +++ b/软件系统客户端Wpf/Views/UIControls/UserFileRender.xaml.cs @@ -18,6 +18,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using 软件系统客户端Wpf.Views.Controls; namespace 软件系统客户端Wpf.Views { diff --git a/软件系统客户端Wpf/Views/UserHome.xaml b/软件系统客户端Wpf/Views/UIControls/UserHome.xaml similarity index 100% rename from 软件系统客户端Wpf/Views/UserHome.xaml rename to 软件系统客户端Wpf/Views/UIControls/UserHome.xaml diff --git a/软件系统客户端Wpf/Views/UserHome.xaml.cs b/软件系统客户端Wpf/Views/UIControls/UserHome.xaml.cs similarity index 100% rename from 软件系统客户端Wpf/Views/UserHome.xaml.cs rename to 软件系统客户端Wpf/Views/UIControls/UserHome.xaml.cs diff --git a/软件系统客户端Wpf/Views/UserPaletteSelector.xaml b/软件系统客户端Wpf/Views/UIControls/UserPaletteSelector.xaml similarity index 97% rename from 软件系统客户端Wpf/Views/UserPaletteSelector.xaml rename to 软件系统客户端Wpf/Views/UIControls/UserPaletteSelector.xaml index 321ca8a..61356db 100644 --- a/软件系统客户端Wpf/Views/UserPaletteSelector.xaml +++ b/软件系统客户端Wpf/Views/UIControls/UserPaletteSelector.xaml @@ -6,6 +6,7 @@ xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors" xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf" xmlns:local="clr-namespace:软件系统客户端Wpf.Views" + xmlns:local1="clr-namespace:软件系统客户端Wpf.Views.Controls" mc:Ignorable="d" d:DesignHeight="700" d:DesignWidth="400" Loaded="UserControl_Loaded"> @@ -84,7 +85,7 @@ - + 这是你当前的主题配色，可以在app.xaml中进行配置和初始化， 也可以在运行的时候进行更改。 diff --git a/软件系统客户端Wpf/Views/UserPaletteSelector.xaml.cs b/软件系统客户端Wpf/Views/UIControls/UserPaletteSelector.xaml.cs similarity index 100% rename from 软件系统客户端Wpf/Views/UserPaletteSelector.xaml.cs rename to 软件系统客户端Wpf/Views/UIControls/UserPaletteSelector.xaml.cs diff --git a/软件系统客户端Wpf/软件系统客户端Wpf.csproj b/软件系统客户端Wpf/软件系统客户端Wpf.csproj index 1301d8c..fbd331c 100644 --- a/软件系统客户端Wpf/软件系统客户端Wpf.csproj +++ b/软件系统客户端Wpf/软件系统客户端Wpf.csproj @@ -78,23 +78,23 @@ UserClientRenderItem.xaml - + Palette.xaml - + UserChat.xaml - + UserFileRender.xaml - + UserFileRenderItem.xaml - + UserHome.xaml - + UserPaletteSelector.xaml @@ -120,27 +120,27 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile