From 5fce4904df7289d4a1fe7b0fd0ba05317d1d35bd Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 31 Jan 2020 09:23:06 -0800 Subject: [PATCH] W10 Toasts --- .../BodyshopUploader.App.wapproj | 116 ++++++++++++++++++ BodyshopUploader.sln | 56 +++++++++ BodyshopUploader/BodyshopUploader.csproj | 4 + BodyshopUploader/ViewModels/MainViewModel.cs | 39 +----- .../ViewModels/MainViewModel.props.cs | 3 + 5 files changed, 180 insertions(+), 38 deletions(-) create mode 100644 BodyshopUploader.App/BodyshopUploader.App.wapproj diff --git a/BodyshopUploader.App/BodyshopUploader.App.wapproj b/BodyshopUploader.App/BodyshopUploader.App.wapproj new file mode 100644 index 0000000..92bd729 --- /dev/null +++ b/BodyshopUploader.App/BodyshopUploader.App.wapproj @@ -0,0 +1,116 @@ + + + + 15.0 + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + AnyCPU + + + Release + AnyCPU + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + + + + 960a536e-23ad-482f-ab18-a96479809cff + 10.0.18362.0 + 10.0.17763.0 + en-US + True + ..\BodyshopUploader\BodyshopUploader.csproj + True + 286119922DB88EA69297C34AE636B20CBC242ACF + SHA256 + True + True + neutral + https://bodyshop.snapt.ca + 0 + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + Designer + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BodyshopUploader.sln b/BodyshopUploader.sln index 2c90e6f..2434a55 100644 --- a/BodyshopUploader.sln +++ b/BodyshopUploader.sln @@ -5,16 +5,72 @@ VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BodyshopUploader", "BodyshopUploader\BodyshopUploader.csproj", "{76B98E9B-A33A-464F-A07B-56E773376543}" EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "BodyshopUploader.App", "BodyshopUploader.App\BodyshopUploader.App.wapproj", "{960A536E-23AD-482F-AB18-A96479809CFF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|ARM.ActiveCfg = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|ARM.Build.0 = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|ARM64.Build.0 = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|x64.ActiveCfg = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|x64.Build.0 = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|x86.ActiveCfg = Debug|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Debug|x86.Build.0 = Debug|Any CPU {76B98E9B-A33A-464F-A07B-56E773376543}.Release|Any CPU.ActiveCfg = Release|Any CPU {76B98E9B-A33A-464F-A07B-56E773376543}.Release|Any CPU.Build.0 = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|ARM.ActiveCfg = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|ARM.Build.0 = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|ARM64.ActiveCfg = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|ARM64.Build.0 = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|x64.ActiveCfg = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|x64.Build.0 = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|x86.ActiveCfg = Release|Any CPU + {76B98E9B-A33A-464F-A07B-56E773376543}.Release|x86.Build.0 = Release|Any CPU + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|ARM.ActiveCfg = Debug|ARM + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|ARM.Build.0 = Debug|ARM + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|ARM.Deploy.0 = Debug|ARM + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|ARM64.Build.0 = Debug|ARM64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|x64.ActiveCfg = Debug|x64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|x64.Build.0 = Debug|x64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|x64.Deploy.0 = Debug|x64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|x86.ActiveCfg = Debug|x86 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|x86.Build.0 = Debug|x86 + {960A536E-23AD-482F-AB18-A96479809CFF}.Debug|x86.Deploy.0 = Debug|x86 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|Any CPU.Build.0 = Release|Any CPU + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|Any CPU.Deploy.0 = Release|Any CPU + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|ARM.ActiveCfg = Release|ARM + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|ARM.Build.0 = Release|ARM + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|ARM.Deploy.0 = Release|ARM + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|ARM64.ActiveCfg = Release|ARM64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|ARM64.Build.0 = Release|ARM64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|ARM64.Deploy.0 = Release|ARM64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|x64.ActiveCfg = Release|x64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|x64.Build.0 = Release|x64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|x64.Deploy.0 = Release|x64 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|x86.ActiveCfg = Release|x86 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|x86.Build.0 = Release|x86 + {960A536E-23AD-482F-AB18-A96479809CFF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BodyshopUploader/BodyshopUploader.csproj b/BodyshopUploader/BodyshopUploader.csproj index 43b530d..764b3f9 100644 --- a/BodyshopUploader/BodyshopUploader.csproj +++ b/BodyshopUploader/BodyshopUploader.csproj @@ -10,6 +10,7 @@ BodyshopUploader BodyshopUploader v4.7.2 + 10.0.18362.0 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -276,6 +277,8 @@ True True + + @@ -317,6 +320,7 @@ + diff --git a/BodyshopUploader/ViewModels/MainViewModel.cs b/BodyshopUploader/ViewModels/MainViewModel.cs index ea68660..154b378 100644 --- a/BodyshopUploader/ViewModels/MainViewModel.cs +++ b/BodyshopUploader/ViewModels/MainViewModel.cs @@ -214,45 +214,8 @@ namespace BodyshopUploader.ViewModels public async Task TestGql() { - //Notification _n = new Notification() - //{ - // Id = 123, - // Title = "This is a title", - // Subtitle = "Subtitle", - // Message = "Somethin" - //}; - //Growler.AddNotification(_n); + notificationService.ShowNotification("abc", 123.45); - var r = new GraphQLRequest - { - Query = @"query MyQuery($key: String!) { - masterdata(where: {key: {_eq: $key}}) { - value - key - } - }", - Variables = new - { - key = Utils.AppMetaData.ShopRegion + "_ciecaopcodes" - } - }; - var data = await Utils.GraphQL.ExecuteQuery(r); - - //var t = Newtonsoft.Json.JsonConvert.DeserializeObject>(data.masterdata[0].value.Value); - Utils.AppMetaData.CiecaOpCodes = JObject.Parse(data.masterdata[0].value.Value); - - try - { - var aa = Utils.AppMetaData.CiecaOpCodes.Property("OP1").Children(); - var cc = Utils.AppMetaData.CiecaOpCodes["OP1"]["desc"].Value; - var ab = Utils.AppMetaData.CiecaOpCodes.Property("OP1.desc"); - - } - catch (Exception EX) - { - logger.Warn("Err"); - } - } } } diff --git a/BodyshopUploader/ViewModels/MainViewModel.props.cs b/BodyshopUploader/ViewModels/MainViewModel.props.cs index c3745a9..56642f0 100644 --- a/BodyshopUploader/ViewModels/MainViewModel.props.cs +++ b/BodyshopUploader/ViewModels/MainViewModel.props.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using BodyshopUploader.Utils.Growls; using BodyshopUploader.Models; +using BodyshopUploader.Utils; namespace BodyshopUploader.ViewModels { @@ -13,6 +14,8 @@ namespace BodyshopUploader.ViewModels { public GrowlNotification Growler; private System.Timers.Timer _updateCheckTimer = new System.Timers.Timer(60 * 1000); + NotificationService notificationService = new NotificationService(); + private ObservableCollection _monitoringPaths = new ObservableCollection(); public ObservableCollection MonitoringPaths