Merge branch 'dev' of https://github.com/Hyrules/WinHue into dev

Hyrules · Jun 13, 2019 · 528806e · 528806e
2 parents a47a267 + 4ca7d84
commit 528806e
Show file tree

Hide file tree

Showing 19 changed files with 107 additions and 40 deletions.
diff --git a/HueLib2Test/Test.csproj b/HueLib2Test/Test.csproj
@@ -71,6 +71,7 @@
       <HintPath>..\packages\Sprache.2.2.1-develop-00025\lib\net45\Sprache.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
     </Reference>

diff --git a/HueLib2Test/UnitTest1.cs b/HueLib2Test/UnitTest1.cs
@@ -31,20 +31,44 @@
 using WinHue3.Functions.Rules;
 using WinHue3.Philips_Hue.BridgeObject;
 using WinHue3.Philips_Hue.HueObjects.Common;
+using System.Net.Http;
 
 namespace WinHueTest
 {
     [TestClass]
     public class WinHueMiscTests
     {
-        private Bridge bridge;
-        private List<IHueObject> listobj;
 
-        [TestInitialize]
-        public void InitTests()
+        [TestMethod]
+        public void HttpGetTest()
         {
-            bridge = new Bridge(IPAddress.Parse("192.168.5.30"), "00:17:88:26:5f:33", "Philips hue", "30jodHoH6BvouvzmGR-Y8nJfa0XTN1j8sz2tstYJ");
-            listobj = bridge.GetAllObjects();
+            HttpClient client = new HttpClient
+            {
+                Timeout = new TimeSpan(0, 0, 0, 3000),
+                BaseAddress = new Uri("http://banane/api/1234567890/")
+            };
+            client.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
+            HttpResponseMessage response;
+            try
+            {
+                response = client.GetAsync("lights").Result;
+                if (response.IsSuccessStatusCode)
+                {
+                    Task<string> task = response.Content.ReadAsStringAsync();
+                    task.RunSynchronously();
+                    string data = task.Result;
+                }
+                else
+                {
+
+                }
+            }
+            catch(WebException ex)
+            {
+                Assert.Fail(ex.Message.ToString());
+            }
+
+
         }
 
 

diff --git a/HueLib2Test/app.config b/HueLib2Test/app.config
@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/WinHue3/App.config b/WinHue3/App.config
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="WinHue3.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="WinHue3.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
+        <assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0"/>
+        <assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
+        <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0"/>
+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
@@ -51,7 +51,7 @@
         <value>75</value>
       </setting>
       <setting name="CPUTemp_ObjectID" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="CPUTemp_ObjectType" serializeAs="String">
         <value>False</value>
@@ -66,7 +66,7 @@
         <value>5</value>
       </setting>
       <setting name="CPUTemp_SensorName" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="CPUTemp_gradientStartColor" serializeAs="String">
         <value>0</value>

diff --git a/WinHue3/Philips Hue/Communication2/Getters.cs b/WinHue3/Philips Hue/Communication2/Getters.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Net.Http;
+using WinHue3.Philips_Hue.HueObjects.LightObject;
+using WinHue3.Philips_Hue.HueObjects.Common;
+using WinHue3.Functions.Application_Settings.Settings;
+
+namespace WinHue3.Philips_Hue.Communication2
+{
+    class Getters
+    {
+        public async Task<string> GetAsync<T>() where T : IHueObject
+        {
+            HttpClient client = new HttpClient();
+            client.Timeout = new TimeSpan(0,0,0,WinHueSettings.settings.Timeout);
+            client.BaseAddress = new Uri("http://mybridge/api/sgsdfgsdfgsdfgsdfg/");
+            client.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
+            HttpResponseMessage response = client.GetAsync("lights").Result;
+
+            if(response.IsSuccessStatusCode)
+            {
+                return await response.Content.ReadAsStringAsync();
+
+            }
+            else
+            {
+                return string.Empty;
+            }
+
+        }
+    }
+}
diff --git a/WinHue3/WinHue3.csproj b/WinHue3/WinHue3.csproj
@@ -100,7 +100,7 @@
       <HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="GongSolutions.WPF.DragDrop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=91f1945125b7a587, processorArchitecture=MSIL">
-      <HintPath>..\packages\gong-wpf-dragdrop.2.0.2\lib\net45\GongSolutions.WPF.DragDrop.dll</HintPath>
+      <HintPath>..\packages\gong-wpf-dragdrop.2.0.3\lib\net45\GongSolutions.WPF.DragDrop.dll</HintPath>
     </Reference>
     <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
@@ -145,6 +145,7 @@
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -355,6 +356,7 @@
     <Compile Include="Philips Hue\BridgeObject\Entertainment API\HueDatagramTransport.cs" />
     <Compile Include="Philips Hue\BridgeObject\Entertainment API\HueDtlsClient.cs" />
     <Compile Include="Philips Hue\BridgeObject\Entertainment API\HueTlsAuthentication.cs" />
+    <Compile Include="Philips Hue\Communication2\Getters.cs" />
     <Compile Include="Philips Hue\HueObjects\GroupObject\Location.cs" />
     <Compile Include="Philips Hue\BridgeObject\Entertainment API\StreamMessage.cs" />
     <Compile Include="Philips Hue\BridgeObject\SearchResult.cs" />
@@ -1049,7 +1051,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_AssemblyInfoFilename="..\..\..\..\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="..\..\..\..\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.None" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>

diff --git a/WinHue3/packages.config b/WinHue3/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="AvalonEdit" version="5.0.4" targetFramework="net451" />
   <package id="BouncyCastle" version="1.8.5" targetFramework="net452" />
-  <package id="gong-wpf-dragdrop" version="2.0.2" targetFramework="net452" />
+  <package id="gong-wpf-dragdrop" version="2.0.3" targetFramework="net452" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net451" />
   <package id="log4net" version="2.0.8" targetFramework="net451" />
   <package id="MQTTnet" version="3.0.2" targetFramework="net452" />

diff --git a/...es/gong-wpf-dragdrop.2.0.2/.signature.p7s → ...es/gong-wpf-dragdrop.2.0.3/.signature.p7s b/...es/gong-wpf-dragdrop.2.0.2/.signature.p7s → ...es/gong-wpf-dragdrop.2.0.3/.signature.p7s
diff --git a/packages/gong-wpf-dragdrop.2.0.2/LICENSE → packages/gong-wpf-dragdrop.2.0.3/LICENSE b/packages/gong-wpf-dragdrop.2.0.2/LICENSE → packages/gong-wpf-dragdrop.2.0.3/LICENSE
diff --git a/.../lib/net45/GongSolutions.WPF.DragDrop.dll → .../lib/net45/GongSolutions.WPF.DragDrop.dll b/.../lib/net45/GongSolutions.WPF.DragDrop.dll → .../lib/net45/GongSolutions.WPF.DragDrop.dll
diff --git a/.../lib/net45/GongSolutions.WPF.DragDrop.xml → .../lib/net45/GongSolutions.WPF.DragDrop.xml b/.../lib/net45/GongSolutions.WPF.DragDrop.xml → .../lib/net45/GongSolutions.WPF.DragDrop.xml
diff --git a/.../lib/net46/GongSolutions.WPF.DragDrop.dll → .../lib/net46/GongSolutions.WPF.DragDrop.dll b/.../lib/net46/GongSolutions.WPF.DragDrop.dll → .../lib/net46/GongSolutions.WPF.DragDrop.dll
diff --git a/.../lib/net46/GongSolutions.WPF.DragDrop.xml → .../lib/net46/GongSolutions.WPF.DragDrop.xml b/.../lib/net46/GongSolutions.WPF.DragDrop.xml → .../lib/net46/GongSolutions.WPF.DragDrop.xml
diff --git a/.../lib/net47/GongSolutions.WPF.DragDrop.dll → .../lib/net47/GongSolutions.WPF.DragDrop.dll b/.../lib/net47/GongSolutions.WPF.DragDrop.dll → .../lib/net47/GongSolutions.WPF.DragDrop.dll
diff --git a/.../lib/net47/GongSolutions.WPF.DragDrop.xml → .../lib/net47/GongSolutions.WPF.DragDrop.xml b/.../lib/net47/GongSolutions.WPF.DragDrop.xml → .../lib/net47/GongSolutions.WPF.DragDrop.xml
diff --git a/...coreapp3.0/GongSolutions.WPF.DragDrop.dll → ...coreapp3.0/GongSolutions.WPF.DragDrop.dll b/...coreapp3.0/GongSolutions.WPF.DragDrop.dll → ...coreapp3.0/GongSolutions.WPF.DragDrop.dll
diff --git a/...coreapp3.0/GongSolutions.WPF.DragDrop.xml → ...coreapp3.0/GongSolutions.WPF.DragDrop.xml b/...coreapp3.0/GongSolutions.WPF.DragDrop.xml → ...coreapp3.0/GongSolutions.WPF.DragDrop.xml
diff --git a/whc/App.config b/whc/App.config
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="whc.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="whc.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
     <userSettings>
         <whc.Properties.Settings>
             <setting name="apikey" serializeAs="String">
-                <value/>
+                <value />
             </setting>
         </whc.Properties.Settings>
     </userSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
+        <assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
+        <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0"/>
+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/whc/whc.csproj b/whc/whc.csproj
@@ -68,6 +68,7 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />