|
|
|
@ -110,28 +110,29 @@ namespace ButcherFactory.Login |
|
|
|
const string puKey = "c756e02cedb42a33f78091a466411bde8447d854"; |
|
|
|
|
|
|
|
void Login_Loaded(object sender, RoutedEventArgs e) |
|
|
|
{ |
|
|
|
if (!File.Exists("ButcherFactory.AutoUpdate.exe")) |
|
|
|
return; |
|
|
|
var versionInfo = new ClientVersion(); |
|
|
|
if (File.Exists("ClientVersion.xml")) |
|
|
|
{ |
|
|
|
versionInfo = XmlUtil.DeserializeFromFile<ClientVersion>("ClientVersion.xml"); |
|
|
|
versionLbl.Text = versionInfo.Version; |
|
|
|
} |
|
|
|
if (string.IsNullOrEmpty(versionInfo.ServerUrl)) |
|
|
|
versionInfo.ServerUrl = serUri; |
|
|
|
{ |
|
|
|
versionLbl.Text = BO.Utils.AppContext.Version; |
|
|
|
//if (!File.Exists("ButcherFactory.AutoUpdate.exe"))
|
|
|
|
// return;
|
|
|
|
//var versionInfo = new ClientVersion();
|
|
|
|
//if (File.Exists("ClientVersion.xml"))
|
|
|
|
//{
|
|
|
|
// versionInfo = XmlUtil.DeserializeFromFile<ClientVersion>("ClientVersion.xml");
|
|
|
|
// versionLbl.Text = versionInfo.Version;
|
|
|
|
//}
|
|
|
|
//if (string.IsNullOrEmpty(versionInfo.ServerUrl))
|
|
|
|
// versionInfo.ServerUrl = serUri;
|
|
|
|
|
|
|
|
HttpWebRequest req = (HttpWebRequest)WebRequest.Create(versionInfo.ServerUrl); |
|
|
|
req.Timeout = 5000; |
|
|
|
HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); |
|
|
|
if (resp.StatusCode != HttpStatusCode.OK) |
|
|
|
return; |
|
|
|
//HttpWebRequest req = (HttpWebRequest)WebRequest.Create(versionInfo.ServerUrl);
|
|
|
|
//req.Timeout = 5000;
|
|
|
|
//HttpWebResponse resp = (HttpWebResponse)req.GetResponse();
|
|
|
|
//if (resp.StatusCode != HttpStatusCode.OK)
|
|
|
|
// return;
|
|
|
|
|
|
|
|
var down = new System.Net.WebClient(); |
|
|
|
var serverVersion = XmlUtil.XmlDeserializeObject<ClientVersion>(down.DownloadString(versionInfo.ServerUrl)); |
|
|
|
if (versionInfo.Version != serverVersion.Version) |
|
|
|
updateImg.Visibility = Visibility.Visible; |
|
|
|
//var down = new System.Net.WebClient();
|
|
|
|
//var serverVersion = XmlUtil.XmlDeserializeObject<ClientVersion>(down.DownloadString(versionInfo.ServerUrl));
|
|
|
|
//if (versionInfo.Version != serverVersion.Version)
|
|
|
|
// updateImg.Visibility = Visibility.Visible;
|
|
|
|
} |
|
|
|
|
|
|
|
private void UpdateBtn_Click(object sender, MouseButtonEventArgs e) |
|
|
|
|