Update min and target android version

cleanup logging
2026-07-26 10:38:54 +00:00 · 2023-11-25 23:31:47 -06:00 · 2023-11-25 23:26:07 -06:00
11 changed files with 123 additions and 150 deletions
@@ -38,7 +38,6 @@ namespace QControlKit
                _log.Debug($"found host {zeroconfHost.IPAddress}:{zeroconfHost.DisplayName}");
                foreach (var service in zeroconfHost.Services)
                {
-                    _log.Debug($"found {service.Key}:{service.Value}");
                    if (service.Key.Equals(QBonjour.TCPService))
                    {

@@ -62,7 +62,6 @@ namespace QControlKit
        public void sendMessage(string address, params object[] args)
        {
            tcpClient.Send(new OscMessage(address, args));
-            _log.Debug($"send message {address} : {args}");
        }

        private void ProcessMessage(object source, MessageEventArgs args)
@@ -70,9 +69,6 @@ namespace QControlKit

            QMessage message = new QMessage(args.Message);

-            Log.Verbose(message.ToString());
-
-
            if (message.IsReply)
            {
                JToken data = message.data;
@@ -115,8 +111,6 @@ namespace QControlKit
                }
                else if (message.IsConnect)
                {
-                    _log.Verbose(message.data.ToString());
-                    _log.Verbose("Status:" + message.status.ToString());
                    if (message.status.ToString().Equals("ok"))
                        OnWorkspaceConnected(message.status.ToString(),message.data.ToString());
                    else
@@ -189,7 +183,7 @@ namespace QControlKit

        protected virtual void OnCueListsUpdated(JToken response)
        {
-            _log.Debug($"Cue Lists Updated");
+            _log.Debug("Cue Lists Updated");
            CueListsUpdated?.Invoke(this, new QCueListsUpdatedArgs { data = response });
        }

@@ -213,19 +207,19 @@ namespace QControlKit

        protected virtual void OnWorkspaceLightDashboardUpdated()
        {
-            _log.Debug($"Workspace Light Dashboard Updated");
+            _log.Debug("Workspace Light Dashboard Updated");
            WorkspaceLightDashboardUpdated?.Invoke(this, new QWorkspaceLightDashboardUpdatedArgs());
        }

        protected virtual void OnQLabPreferencesUpdated(string key)
        {
-            _log.Debug($"QLab Preferences Updated");
+            _log.Debug("QLab Preferences Updated");
            QLabPreferencesUpdated?.Invoke(this, new QQLabPreferencesUpdatedArgs { key = key });
        }

        protected virtual void OnWorkspaceDisconnected()
        {
-            _log.Debug($"Workspace Disconnected");
+            _log.Debug("Workspace Disconnected");
            WorkspaceDisconnected?.Invoke(this, new QWorkspaceDisconnectedArgs());
        }

@@ -6,7 +6,7 @@
    <Authors>Joel Wetzell</Authors>
    <Version>1.0.0-devel</Version>
    <PackOnBuild>true</PackOnBuild>
-    <PackageVersion>0.0.32</PackageVersion>
+    <PackageVersion>0.0.33</PackageVersion>
    <PackageId>QControlKit</PackageId>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <Summary>Unofficial C# port of Figure53's QLabKit.objc</Summary>
@@ -163,7 +163,6 @@ namespace QControlKit

                QCue cue = childCuesUIDMap[aUid];

-                //_log.Debug($"Removing Child Cue From {listName} : {cue.uid} + {cue.listName}");
                childCues.Remove(cue);
                childCuesUIDMap.Remove(aUid);
            }
@@ -640,8 +639,6 @@ namespace QControlKit
        {
            bool cueUpdated = false;

-            _log.Verbose($"updatePropertiesWithDictionary() Called for cue");
-
            //TODO: pretty sure this is done
            JObject dictObj = (JObject)dict;
            List<string> propertiesUpdated = new List<string>();
@@ -650,14 +647,12 @@ namespace QControlKit
                JToken value = obj.Value;
                if (obj.Key.Equals(QOSCKey.Cues))
                {
-                    //_log.Debug($"Cues OSC Key found in update message...updating child cues");
                    if (value.Type != JTokenType.Array)
                        continue;
                    updateChildCuesWithPropertiesArray(value, false);
                }
                else if(obj.Key.Equals(QOSCKey.Children) && IsGroup)
                {
-                    //_log.Debug($"Children OSC Key found in update message for {uid} ...updating child and removing deleted ones.");
                    if (value.Type != JTokenType.Array)
                        continue;
                    updateChildCuesWithPropertiesArray(value, true);
@@ -671,7 +666,6 @@ namespace QControlKit
                    {
                        cueUpdated = true;
                        propertiesUpdated.Add(obj.Key);
-                        //_log.Debug($"cue property {obj.Key} updated with {obj.Value}");
                    }
                }
            }
@@ -1005,7 +999,7 @@ namespace QControlKit
                }
                else
                {
-                    _log.Verbose($"parent cue with id: {parentID} can't be found this could be a problem");
+                    _log.Error($"parent cue with id: {parentID} can't be found this could be a problem");
                }
            }
            CuePropertiesUpdated?.Invoke(this, new QCuePropertiesUpdatedArgs { properties = properties });
@@ -575,7 +575,6 @@ namespace QControlKit

            if (cue.ignoreUpdates)
            {
-                _log.Verbose($"Skipping updatePropertiesWithDictionary for cue: {args.cueID} because of ignoreUpdates setting");
                return;
            }

@@ -26,8 +26,6 @@ namespace SharpOSC
 		private static OscMessage parseMessage(byte[] msg)
 		{
 			int index = 0;
-            //Log.Debug("Raw ASCII DATA: " + System.Text.Encoding.ASCII.GetString(msg));
-            //Log.Debug("Raw UTF-8 DATA: " + System.Text.Encoding.UTF8.GetString(msg));
 			string address = null;
 			char[] types = new char[0];
 			List<object> arguments = new List<object>();
@@ -71,14 +71,9 @@ namespace SharpOSC
            _log.Error(e.Exception.ToString());
        }

-        private void TCPLog(string obj)
-        {
-            _log.Verbose($"{obj}");
-        }
-
        private void ClientDisconneted(object sender, OnClientDisconnectedEventArgs e)
        {
-            _log.Verbose($"client disconnected: {e.Reason}");
+            _log.Information($"client disconnected: {e.Reason}");
            Close();
        }

@@ -108,11 +103,7 @@ namespace SharpOSC
                        {
                            _log.Error("responeMessage is null");
                        }
-
-                        _log.Debug($"OSC Message Received: {responseMessage.Address}");
                        OnMessageReceived(responseMessage);
-                        _log.Debug($"After OnMessageReceived Event");
-
                    }
                    catch (Exception ex)
                    {
@@ -100,7 +100,6 @@ namespace SharpOSC
                        Log.Error(e.ToString());
                        // If there is an error reading the packet, null is sent to the callback
                    }
-                    //Log.Debug("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
                    OscPacketCallback(packet);
 				}
 				else
@@ -151,7 +150,6 @@ namespace SharpOSC
 				{
 					byte[] bytes = queue.Dequeue();
 					var packet = OscPacket.GetPacket(bytes);
-                    //Log.Debug("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
                    return packet;
 				}
 				else
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.jwetzell.qcontrolkitxamdemo">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:label="QControlKitXamDemo.Android"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
@@ -1,113 +1,113 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>QControlKitXamDemo.Droid</RootNamespace>
-    <AssemblyName>QControlKitXamDemo.Android</AssemblyName>
-    <Deterministic>True</Deterministic>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
-    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
-    <AndroidUseAapt2>true</AndroidUseAapt2>
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Serilog.Sinks.Xamarin">
-      <Version>0.2.0.64</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Tabbar.xml" />
-    <AndroidResource Include="Resources\layout\Toolbar.xml" />
-    <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\values\colors.xml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" />
-    <AndroidResource Include="Resources\mipmap-hdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\drawable\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\QControlKit\QControlKit.csproj">
-      <Project>{51cd2579-79c9-49a9-b68d-93cbe878baa1}</Project>
-      <Name>QControlKit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QControlKitXamDemo\QControlKitXamDemo.csproj">
-      <Project>{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}</Project>
-      <Name>QControlKitXamDemo</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidAsset Include="Assets\materialdesignicons-webfont.ttf" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties XamarinHotReloadDebuggerTimeoutExceptionQControlKitXamDemoAndroidHideInfoBar="True" />
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4F7F13C7-85EF-431F-AB03-B2494F0F4C7F}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>QControlKitXamDemo.Droid</RootNamespace>
+    <AssemblyName>QControlKitXamDemo.Android</AssemblyName>
+    <Deterministic>True</Deterministic>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
+    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Serilog.Sinks.Xamarin">
+      <Version>1.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainActivity.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\Tabbar.xml" />
+    <AndroidResource Include="Resources\layout\Toolbar.xml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <AndroidResource Include="Resources\values\colors.xml" />
+    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />
+    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" />
+    <AndroidResource Include="Resources\mipmap-hdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-mdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xhdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xxhdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\drawable\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\QControlKit\QControlKit.csproj">
+      <Project>{51cd2579-79c9-49a9-b68d-93cbe878baa1}</Project>
+      <Name>QControlKit</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\QControlKitXamDemo\QControlKitXamDemo.csproj">
+      <Project>{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}</Project>
+      <Name>QControlKitXamDemo</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\materialdesignicons-webfont.ttf" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties XamarinHotReloadDebuggerTimeoutExceptionQControlKitXamDemoAndroidHideInfoBar="True" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>netstandard2.1</TargetFramework>
@@ -12,8 +12,8 @@

  <ItemGroup>
    <PackageReference Include="Serilog" Version="2.12.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
    <PackageReference Include="Acr.UserDialogs" Version="7.2.0.564" />
  </ItemGroup>
Author	SHA1	Message	Date
jwetzell	ceb18307f6	Update min and target android version	2023-11-25 23:31:47 -06:00
jwetzell	2f5ce281d3	cleanup logging	2023-11-25 23:26:07 -06:00