From 6e52a6772643db10fd57143b6d429383e4c4b513 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Sat, 13 Feb 2021 14:49:34 -0500 Subject: [PATCH] * packages.config: * packages.config: * qController.iOS.csproj: * qController.Droid.csproj: * qController.csproj: Update QControlKit * QBrowserPage.xaml.cs: * QCueViewModel.cs: * QWorkspacePage.xaml.cs: * QBrowserViewModel.cs: Logging cleanup --- Droid/packages.config | 2 +- Droid/qController.Droid.csproj | 2 +- iOS/packages.config | 2 +- iOS/qController.iOS.csproj | 2 +- qController.Standard/ViewModels/QBrowserViewModel.cs | 5 +++-- qController.Standard/ViewModels/QCueViewModel.cs | 1 - qController.Standard/Views/QBrowserPage.xaml.cs | 1 - qController.Standard/Views/QWorkspacePage.xaml.cs | 7 +++---- qController.Standard/qController.csproj | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Droid/packages.config b/Droid/packages.config index a73f29d..f4faabe 100644 --- a/Droid/packages.config +++ b/Droid/packages.config @@ -9,7 +9,7 @@ - + diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index cce3621..0e1e8d9 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -231,7 +231,7 @@ ..\packages\Zeroconf.3.4.2\lib\netstandard2.0\Zeroconf.dll - ..\packages\QControlKit.0.0.15\lib\netstandard2.0\QControlKit.dll + ..\packages\QControlKit.0.0.17\lib\netstandard2.0\QControlKit.dll ..\packages\Xamarin.AndroidX.MultiDex.2.0.1.6\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll diff --git a/iOS/packages.config b/iOS/packages.config index 90e45a3..5ffeebd 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -8,7 +8,7 @@ - + diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index 70aab46..733aa5d 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -146,7 +146,7 @@ ..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll - ..\packages\QControlKit.0.0.15\lib\netstandard2.0\QControlKit.dll + ..\packages\QControlKit.0.0.17\lib\netstandard2.0\QControlKit.dll diff --git a/qController.Standard/ViewModels/QBrowserViewModel.cs b/qController.Standard/ViewModels/QBrowserViewModel.cs index 9782114..7f630a1 100644 --- a/qController.Standard/ViewModels/QBrowserViewModel.cs +++ b/qController.Standard/ViewModels/QBrowserViewModel.cs @@ -7,6 +7,7 @@ using QControlKit; using QControlKit.Events; using System; using System.Threading.Tasks; +using Serilog; namespace qController.ViewModels { @@ -42,7 +43,7 @@ namespace qController.ViewModels { Device.BeginInvokeOnMainThread(() => { - System.Console.WriteLine($"[QBrowserViewModel] adding server: {args.server.description}"); + Log.Debug($"[QBrowserViewModel] adding server: {args.server.description}"); ServersGrouped.Add(new QServerViewModel(args.server)); }); } @@ -65,7 +66,7 @@ namespace qController.ViewModels { Device.BeginInvokeOnMainThread(() => { - System.Console.WriteLine($"[QBrowserViewModel] removing server: {args.server.description}"); + Log.Debug($"[QBrowserViewModel] removing server: {args.server.description}"); ServersGrouped.Remove(serverToRemove); }); } diff --git a/qController.Standard/ViewModels/QCueViewModel.cs b/qController.Standard/ViewModels/QCueViewModel.cs index a67a5d5..70f9e45 100644 --- a/qController.Standard/ViewModels/QCueViewModel.cs +++ b/qController.Standard/ViewModels/QCueViewModel.cs @@ -46,7 +46,6 @@ namespace qController.ViewModels } else if (property.Equals(QOSCKey.Children)) { - //Log.Debug("children property updated"); if (cue.IsGroup) { OnPropertyChanged("cues"); diff --git a/qController.Standard/Views/QBrowserPage.xaml.cs b/qController.Standard/Views/QBrowserPage.xaml.cs index 122a49e..51c54d8 100644 --- a/qController.Standard/Views/QBrowserPage.xaml.cs +++ b/qController.Standard/Views/QBrowserPage.xaml.cs @@ -68,7 +68,6 @@ namespace qController.Pages { if (resp.Ok) { - Console.WriteLine($"Passcode is null: {resp.Value == null}"); await Navigation.PushAsync(new QWorkspacePage(selectedWorkspace, resp.Value)); } } diff --git a/qController.Standard/Views/QWorkspacePage.xaml.cs b/qController.Standard/Views/QWorkspacePage.xaml.cs index 5a42586..09b8c59 100644 --- a/qController.Standard/Views/QWorkspacePage.xaml.cs +++ b/qController.Standard/Views/QWorkspacePage.xaml.cs @@ -60,8 +60,7 @@ namespace qController private void ConnectedWorkspace_WorkspaceConnectionError(object source, QWorkspaceConnectionErrorArgs connectionErrorArgs) { - System.Console.WriteLine("WorkspaceConnectionError Called"); - if (connectionErrorArgs.status.Equals("badpass")) + if (connectionErrorArgs.status.Equals(QConnectionStatus.BadPass)) { UserDialogs.Instance.Prompt(new PromptConfig { @@ -106,10 +105,10 @@ namespace qController } else { - //Setup and "empty" cue for when no cue is selected + //Setup an "empty" cue for when no cue is selected QCue emptyCue = new QCue(); emptyCue.workspace = connectedWorkspace; - emptyCue.type = "Memo"; + emptyCue.type = QCueType.Memo; emptyCue.listName = "No Cue Selected"; selectedCueFrame.BindingContext = new QCueViewModel(emptyCue, false); diff --git a/qController.Standard/qController.csproj b/qController.Standard/qController.csproj index f7ff12b..954e955 100644 --- a/qController.Standard/qController.csproj +++ b/qController.Standard/qController.csproj @@ -64,7 +64,7 @@ - +