jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-07 16:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android v1.1.0/iOS v2.1.0

Browse Source
This commit is contained in:
Joel Wetzell
2019-08-04 19:04:49 -05:00
parent 5deb4fd084
commit b3681a2d81
7 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/MainActivity.cs
-2
View File
@@ -29,8 +29,6 @@ namespace qController.Droid
if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
{
ConnectivityManager connMgr = (ConnectivityManager)Application.Context.GetSystemService(Context.ConnectivityService);
connMgr.BindProcessToNetwork(null);
Console.WriteLine(connMgr.GetAllNetworks().Length);
Network[] networks = connMgr.GetAllNetworks();
for (int i = 0; i < networks.Length; i++)
{
Droid/Properties/AndroidManifest.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="26" android:versionName="1.0.9" package="com.jwetzell.qlabcontroller">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="27" android:versionName="1.1.0" package="com.jwetzell.qlabcontroller">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Droid/packages.config
+7 -7
View File
@@ -9,7 +9,7 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid71" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid81" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="monoandroid81" />
<package id="Splat" version="8.0.5" targetFramework="monoandroid81" />
<package id="Splat" version="8.1.1" targetFramework="monoandroid81" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid71" />
@@ -37,11 +37,11 @@
<package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="monoandroid81" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Reactive" version="4.1.5" targetFramework="monoandroid81" />
<package id="System.Reactive.Core" version="4.1.5" targetFramework="monoandroid81" />
<package id="System.Reactive.Interfaces" version="4.1.5" targetFramework="monoandroid81" />
<package id="System.Reactive.Linq" version="4.1.5" targetFramework="monoandroid81" />
<package id="System.Reactive.PlatformServices" version="4.1.5" targetFramework="monoandroid81" />
<package id="System.Reactive" version="4.1.6" targetFramework="monoandroid81" />
<package id="System.Reactive.Core" version="4.1.6" targetFramework="monoandroid81" />
<package id="System.Reactive.Interfaces" version="4.1.6" targetFramework="monoandroid81" />
<package id="System.Reactive.Linq" version="4.1.6" targetFramework="monoandroid81" />
<package id="System.Reactive.PlatformServices" version="4.1.6" targetFramework="monoandroid81" />
<package id="System.Reflection" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid71" />
@@ -90,6 +90,6 @@
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Essentials" version="1.2.0" targetFramework="monoandroid81" />
<package id="Xamarin.Forms" version="4.1.0.581479" targetFramework="monoandroid81" />
<package id="Xamarin.Forms" version="4.1.0.618606" targetFramework="monoandroid81" />
<package id="Zeroconf" version="3.0.30" targetFramework="monoandroid81" />
</packages>
Droid/qController.Droid.csproj
+13 -13
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -79,22 +79,22 @@
<HintPath>..\packages\Acr.Settings.9.0.1\lib\monoandroid80\Acr.Settings.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.8.0.5\lib\monoandroid81\Splat.dll</HintPath>
<HintPath>..\packages\Splat.8.1.1\lib\monoandroid81\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive">
<HintPath>..\packages\System.Reactive.4.1.5\lib\netstandard2.0\System.Reactive.dll</HintPath>
<HintPath>..\packages\System.Reactive.4.1.6\lib\netstandard2.0\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\System.Reactive.Core.4.1.5\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
<HintPath>..\packages\System.Reactive.Core.4.1.6\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\System.Reactive.Interfaces.4.1.5\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
<HintPath>..\packages\System.Reactive.Interfaces.4.1.6\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\System.Reactive.Linq.4.1.5\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
<HintPath>..\packages\System.Reactive.Linq.4.1.6\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\System.Reactive.PlatformServices.4.1.5\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
<HintPath>..\packages\System.Reactive.PlatformServices.4.1.6\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Annotations">
<HintPath>..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Annotations.dll</HintPath>
@@ -151,19 +151,19 @@
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\MonoAndroid81\FormsViewGroup.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\MonoAndroid81\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\MonoAndroid81\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\MonoAndroid81\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\MonoAndroid81\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\MonoAndroid81\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="Xamarin.Android.Support.CustomTabs">
@@ -226,5 +226,5 @@
<Import Project="..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid81\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid81\Xamarin.Android.Support.Design.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\build\monoandroid81\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\build\monoandroid81\Xamarin.Android.Support.v7.MediaRouter.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.1\build\monoandroid81\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.1\build\monoandroid81\Xamarin.Android.Support.CustomTabs.targets')" />
<Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.targets')" />
</Project>
iOS/Info.plist
+1 -1
View File
@@ -36,7 +36,7 @@
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>CFBundleShortVersionString</key>
<string>2.0.9</string>
<string>2.1.0</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>ITSAppUsesNonExemptEncryption</key>
iOS/packages.config
+6 -6
View File
@@ -33,11 +33,11 @@
<package id="System.Net.Sockets" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="xamarinios10" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reactive" version="4.1.5" targetFramework="xamarinios10" />
<package id="System.Reactive.Core" version="4.1.5" targetFramework="xamarinios10" />
<package id="System.Reactive.Interfaces" version="4.1.5" targetFramework="xamarinios10" />
<package id="System.Reactive.Linq" version="4.1.5" targetFramework="xamarinios10" />
<package id="System.Reactive.PlatformServices" version="4.1.5" targetFramework="xamarinios10" />
<package id="System.Reactive" version="4.1.6" targetFramework="xamarinios10" />
<package id="System.Reactive.Core" version="4.1.6" targetFramework="xamarinios10" />
<package id="System.Reactive.Interfaces" version="4.1.6" targetFramework="xamarinios10" />
<package id="System.Reactive.Linq" version="4.1.6" targetFramework="xamarinios10" />
<package id="System.Reactive.PlatformServices" version="4.1.6" targetFramework="xamarinios10" />
<package id="System.Reflection" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="xamarinios10" />
@@ -64,6 +64,6 @@
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.2.0" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="4.1.0.581479" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="4.1.0.618606" targetFramework="xamarinios10" />
<package id="Zeroconf" version="3.0.30" targetFramework="xamarinios10" />
</packages>
iOS/qController.iOS.csproj
+11 -11
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -107,31 +107,31 @@
<HintPath>..\packages\Acr.Settings.9.0.1\lib\xamarinios10\Acr.Settings.dll</HintPath>
</Reference>
<Reference Include="System.Reactive">
<HintPath>..\packages\System.Reactive.4.1.5\lib\netstandard2.0\System.Reactive.dll</HintPath>
<HintPath>..\packages\System.Reactive.4.1.6\lib\netstandard2.0\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\System.Reactive.Core.4.1.5\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
<HintPath>..\packages\System.Reactive.Core.4.1.6\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\System.Reactive.Interfaces.4.1.5\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
<HintPath>..\packages\System.Reactive.Interfaces.4.1.6\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\System.Reactive.Linq.4.1.5\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
<HintPath>..\packages\System.Reactive.Linq.4.1.6\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\System.Reactive.PlatformServices.4.1.5\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
<HintPath>..\packages\System.Reactive.PlatformServices.4.1.6\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.1.0.618606\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.2.0\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
@@ -186,5 +186,5 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.targets')" />
</Project>