wpf我的信息显示时BUG修复,右侧信息支持屏蔽,v1.7.1

This commit is contained in:
dathlin
2017-10-25 21:35:19 +08:00
parent 3011f43756
commit d086dfbe17
5 changed files with 41 additions and 30 deletions

View File

@@ -277,23 +277,22 @@ namespace ClientsLibrary
ms
);
if(result.IsSuccess)
if (result.IsSuccess)
{
if(IsHandleCreated) Invoke(new Action(() =>
try
{
// 下载完成
Bitmap bitmap = new Bitmap(ms);
pictureBox_UserPortrait.Image = bitmap;
try
if (IsHandleCreated) Invoke(new Action(() =>
{
// 下载完成
Bitmap bitmap = new Bitmap(ms);
pictureBox_UserPortrait.Image = bitmap;
bitmap.Save(fileName);
}
catch
{
}
}));
}));
}
catch
{
// 不知道什么原因
}
}
else
{

View File

@@ -44,7 +44,7 @@ namespace CommonLibrary
**************************************************************************/
SoftBasic.FrameworkVersion = new SystemVersion("1.7.0");
SoftBasic.FrameworkVersion = new SystemVersion("1.7.1");
}

View File

@@ -112,7 +112,11 @@
<materialDesign:PackIcon Kind="Palette" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="窗口显示" x:Name="MenuItem窗口显示" Click="MenuItem窗口显示_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="KeyboardTab" />
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="_关于">
<MenuItem.Icon>
@@ -192,8 +196,8 @@
<!--右侧的账户信息和登录消息-->
<Grid DockPanel.Dock="Right" Width="230">
<Grid>
<Grid DockPanel.Dock="Right">
<Grid Name="MainPageRight" Width="230">
<Grid.RowDefinitions>
<RowDefinition Height="auto"></RowDefinition>
<RowDefinition Height="auto"></RowDefinition>

View File

@@ -28,9 +28,7 @@ namespace 软件系统客户端Wpf
{
/***************************************************************************************
*
@@ -414,6 +412,18 @@ namespace 软件系统客户端Wpf
}
}
private void MenuItem窗口显示_Click(object sender, RoutedEventArgs e)
{
if (MainPageRight.Visibility != Visibility.Collapsed)
{
MainPageRight.Visibility = Visibility.Collapsed;
}
else
{
MainPageRight.Visibility = Visibility.Visible;
}
}
#endregion
#region
@@ -448,10 +458,10 @@ namespace 软件系统客户端Wpf
if (customer == CommonHeadCode.MultiNetHeadCode.)
{
if (IsWindowShow) Dispatcher.Invoke(new Action(() =>
{
FormPopup fpp = new FormPopup(data, System.Drawing.Color.DodgerBlue, 10000);
fpp.Show();
}));
{
FormPopup fpp = new FormPopup(data, System.Drawing.Color.DodgerBlue, 10000);
fpp.Show();
}));
}
else if (customer == CommonHeadCode.MultiNetHeadCode.线)
{
@@ -504,7 +514,7 @@ namespace 软件系统客户端Wpf
TextBlock_ServerTime.Text = UserClient.DateTimeServer.ToString("yyyy-MM-dd HH:mm:ss");
TextBlock_FileCount.Text = json["FileCount"].ToObject<int>().ToString();
UIControls_Chat.AddChatsHistory(sb.ToString());
NetAccount[] accounts = JArray.Parse(json["ClientsOnline"].ToString()).ToObject<NetAccount[]>();
foreach (var m in accounts)
@@ -545,7 +555,7 @@ namespace 软件系统客户端Wpf
Views.Controls.UserClientRenderItem item = null;
foreach (Views.Controls.UserClientRenderItem m in ClientsOnline.Children)
{
if(m?.UniqueId == data)
if (m?.UniqueId == data)
{
item = m;
}
@@ -553,7 +563,7 @@ namespace 软件系统客户端Wpf
if (item != null) ClientsOnline.Children.Remove(item);
}));
}
else if(customer == CommonHeadCode.MultiNetHeadCode.)
else if (customer == CommonHeadCode.MultiNetHeadCode.)
{
UserClient.PortraitManager.UpdateSmallPortraitByName(data);
if (IsWindowShow) Dispatcher.Invoke(new Action(() =>

View File

@@ -42,9 +42,7 @@ using 软件系统服务端模版.BasicSupport;
/********************************************************************************************
*
* 本项目模版不包含 《软件自动更新.exe》
* 如需支持部署环境的自动升级 请联系hsl200909@163.com获取
* 软件自动更新.exe 将绑定IP端口和软件名称后授权销售30元人民币一组永久使用
* 软件自动更新的部署提供长期的技术支持
* 该exe程序来自另一个开源项目HslCommunication
*
********************************************************************************************/