diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml.cs b/Control/UserControls/PannelCard/RightCardControl.xaml.cs
index aa40048..f02fa77 100644
--- a/Control/UserControls/PannelCard/RightCardControl.xaml.cs
+++ b/Control/UserControls/PannelCard/RightCardControl.xaml.cs
@@ -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;
diff --git a/GeekDesk.csproj b/GeekDesk.csproj
index 40b96b8..88712c6 100644
--- a/GeekDesk.csproj
+++ b/GeekDesk.csproj
@@ -70,6 +70,7 @@
packages\System.Drawing.Common.6.0.0-preview.6.21352.12\lib\net461\System.Drawing.Common.dll
+
diff --git a/Util/HttpUtil.cs b/Util/HttpUtil.cs
index 3112f56..c6cd2d8 100644
--- a/Util/HttpUtil.cs
+++ b/Util/HttpUtil.cs
@@ -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();