admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from Demo-Liu/2.2

Browse Source 
修复 开启窗口动画,启动项目后无法显示主界面bug
This commit is contained in:
Demo-Liu
2021-08-19 14:52:53 +08:00
committed by GitHub
parent c9f19c5084 f11056c469
commit 6ecb55061f
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Control/UserControls/PannelCard/RightCardControl.xaml.cs
View File

@@ -135,12 +135,12 @@ namespace GeekDesk.Control.UserControls.PannelCard
{
if (!MainWindow.hide.IsMargin())
{
MainWindow.mainWindow.Visibility = Visibility.Collapsed;
MainWindow.HideApp();
}
}
else
{
MainWindow.mainWindow.Visibility = Visibility.Collapsed;
MainWindow.HideApp();
}
}
@@ -153,11 +153,11 @@ namespace GeekDesk.Control.UserControls.PannelCard
{
if (!MainWindow.hide.IsMargin())
{
MainWindow.mainWindow.Visibility = Visibility.Collapsed;
MainWindow.HideApp();
}
} else
{
MainWindow.mainWindow.Visibility = Visibility.Collapsed;
MainWindow.HideApp();
}
}
break;

1
GeekDesk.csproj
View File

@@ -70,6 +70,7 @@
<Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Drawing.Common.6.0.0-preview.6.21352.12\lib\net461\System.Drawing.Common.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />

3
Util/HttpUtil.cs
View File

@@ -17,11 +17,12 @@ namespace GeekDesk.Util
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
//创建Web访问对 象
HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(url);
myRequest.ContentType = "text/plain; charset=gbk";
//通过Web访问对象获取响应内容
HttpWebResponse myResponse = (HttpWebResponse)myRequest.GetResponse();
//通过响应内容流创建StreamReader对象，因为StreamReader更高级更快
StreamReader reader = new StreamReader(myResponse.GetResponseStream(), Encoding.UTF8);
StreamReader reader = new StreamReader(myResponse.GetResponseStream(), Encoding.GetEncoding("gbk"));
string returnStr = reader.ReadToEnd();//利用StreamReader就可以从响应内容从头读到尾
reader.Close();
myResponse.Close();