From a0fc6855cc136ddc32012e5dd4f336bdc0818505 Mon Sep 17 00:00:00 2001 From: Sean Date: Wed, 9 Apr 2025 17:24:27 -0400 Subject: [PATCH] Add SystemInfo to AboutPage --- .../Service/MarketDataServiceClient.cs | 25 +++++++++++++++++++ Navigator/ViewModels/AboutViewModel.cs | 12 +++++++++ Navigator/Views/AboutPage.xaml | 1 + 3 files changed, 38 insertions(+) diff --git a/MarketDataLib/Service/MarketDataServiceClient.cs b/MarketDataLib/Service/MarketDataServiceClient.cs index ad7c29d..d703512 100644 --- a/MarketDataLib/Service/MarketDataServiceClient.cs +++ b/MarketDataLib/Service/MarketDataServiceClient.cs @@ -61,6 +61,7 @@ namespace MarketData.Service { return null==baseUri?"":baseUri.ToString(); } + public bool Ping(String url) { lock(this) @@ -98,6 +99,30 @@ namespace MarketData.Service } } } + + public ServiceResult GetSystemInfo() + { + lock(this) + { + try + { + if(!IsNetworkAvailable())return new ServiceResult(false,"No network."); + StringBuilder sb = new StringBuilder(); + sb.Append("/api/Ping/GetSystemInfo"); + String json = httpClient.GetStringAsync(sb.ToString()).Result; + json=ToConformimgJson(json); + String accessToken = JsonConvert.DeserializeObject(json); + return new ServiceResult(accessToken); + } + catch (Exception exception) + { + exceptions.Add(exception); + Debug.WriteLine(exception.ToString()); + return new ServiceResult(false,exception.ToString()); + } + } + } + private ServiceResult Login(String user, String password) { lock(this) diff --git a/Navigator/ViewModels/AboutViewModel.cs b/Navigator/ViewModels/AboutViewModel.cs index 27a8785..baab752 100644 --- a/Navigator/ViewModels/AboutViewModel.cs +++ b/Navigator/ViewModels/AboutViewModel.cs @@ -119,6 +119,18 @@ namespace Navigator.ViewModels } } + public String SystemInfo + { + get + { + String systemInfo = ""; + ServiceResult serviceResult = MarketDataServiceClient.GetInstance().GetSystemInfo(); + if(serviceResult.Success)systemInfo=(String)serviceResult.ContextSpecificResult; + return "System Info: "+systemInfo; + } + } + + public String ScreenDimensions { get diff --git a/Navigator/Views/AboutPage.xaml b/Navigator/Views/AboutPage.xaml index 8d6de75..4d783e5 100644 --- a/Navigator/Views/AboutPage.xaml +++ b/Navigator/Views/AboutPage.xaml @@ -74,6 +74,7 @@