diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index f6f4fa0..fd149ca 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -11,7 +11,7 @@ Library qController.Droid qController.Droid - v10.0 + v12.0 True Resources\Resource.designer.cs Resource @@ -541,14 +541,10 @@ - - - - @@ -563,8 +559,6 @@ - - @@ -583,7 +577,6 @@ - @@ -596,15 +589,22 @@ - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 58c257f..47a1279 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Build Android and iOS](https://github.com/jwetzell/qController/workflows/Build%20Android%20and%20iOS/badge.svg) ![App Store](https://img.shields.io/itunes/v/1350276173?label=iOS&logo=apple) -![Play Store](http://img.shields.io/static/v1?label=Android&message=v1.1.2&color=blue&logo=android) +![Play Store](http://img.shields.io/static/v1?label=Android&message=v1.6.3&color=blue&logo=android) # qControl Simple Android and iOS application for controlling Figure 53's QLab - [Play Store](https://play.google.com/store/apps/details?id=com.jwetzell.qlabcontroller) diff --git a/iOS/packages.config b/iOS/packages.config index 5f61f7a..ffd6743 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -76,8 +76,8 @@ - - + + \ No newline at end of file diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index 48081a5..476fa28 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -1,6 +1,6 @@  - + Debug @@ -126,16 +126,16 @@ ..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.Essentials.1.7.0\lib\xamarinios10\Xamarin.Essentials.dll + ..\packages\Xamarin.Essentials.1.7.1\lib\xamarinios10\Xamarin.Essentials.dll ..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll @@ -148,7 +148,7 @@ ..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll - ..\packages\Xamarin.Forms.5.0.0.2291\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\packages\Xamarin.Forms.5.0.0.2337\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll @@ -232,5 +232,5 @@ - + \ No newline at end of file diff --git a/qController.Standard/Classes/Communication/QFinder.cs b/qController.Standard/Classes/Communication/QFinder.cs index 3a8e0e4..0a8c53a 100644 --- a/qController.Standard/Classes/Communication/QFinder.cs +++ b/qController.Standard/Classes/Communication/QFinder.cs @@ -16,7 +16,7 @@ namespace qController.Communication public async void SearchForWorkspaces() { Log.Debug("QFINDER - Scanning Started"); - IReadOnlyList results = await ZeroconfResolver.ResolveAsync("_qlab._udp.local."); + IReadOnlyList results = await ZeroconfResolver.ResolveAsync("_qlab._tcp.local."); Log.Debug("QFINDER - Scanning Done"); } } diff --git a/qController.Standard/Classes/Settings/QStorage.cs b/qController.Standard/Classes/Settings/QStorage.cs index 3191a03..192ac49 100644 --- a/qController.Standard/Classes/Settings/QStorage.cs +++ b/qController.Standard/Classes/Settings/QStorage.cs @@ -55,7 +55,7 @@ namespace qController public static bool Contains(string name, string address){ foreach (var item in qInstances) { - //Log.Debug("Item name: " + item.name + " Found Name: " + name); + Log.Information("Item name: " + item.name + " Found Name: " + name); if (item.address == address) { return true; diff --git a/qController.Standard/Pages/qConnectionPage.xaml.cs b/qController.Standard/Pages/qConnectionPage.xaml.cs index 07c4802..f1e214b 100644 --- a/qController.Standard/Pages/qConnectionPage.xaml.cs +++ b/qController.Standard/Pages/qConnectionPage.xaml.cs @@ -89,7 +89,7 @@ namespace qController App.showToast("Scanning for Instances..."); Log.Debug("QCONNECTIONPAGE - Begin Scanning"); - IReadOnlyList results = await ZeroconfResolver.ResolveAsync("_qlab._udp.local.",TimeSpan.FromSeconds(3)); + IReadOnlyList results = await ZeroconfResolver.ResolveAsync("_qlab._tcp.local.",TimeSpan.FromSeconds(3)); if(results != null){ foreach (var result in results) { diff --git a/qController.Standard/qController.csproj b/qController.Standard/qController.csproj index c56d385..c8991af 100644 --- a/qController.Standard/qController.csproj +++ b/qController.Standard/qController.csproj @@ -64,10 +64,10 @@ - + - +