Avans/huehuehue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
kennyboy55
2015-12-03 12:00:17 +01:00
parent 0e0edae19c eb6d794806
commit 1334c23fea
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HueUWP/APIHandler.cs
+9 -14
View File
@@ -73,25 +73,20 @@ namespace HueUWP
try {
var json = await nwh.AllLights();
JObject o = JObject.Parse(json);
Debug.WriteLine(o.ToString());
foreach(var i in o)
{
var light = o["" + i.Key];
var state = light["state"];
alllights.Add(new Light() { api = this,ID = Int32.Parse( i.Key), Brightness = (int)state["bri"], IsOn = ((string)state["on"]).ToLower() == "true" ? true : false, Hue = (int)state["hue"], Saturation = (int)state["sat"], Name = (string)light["name"], Type = (string)light["type"] });
//Debug.WriteLine("Added light number " + i + " " + state["on"]);
if ((String)light["type"] != "Dimmable light")
{
alllights.Add(new Light() { api = this, ID = Int32.Parse(i.Key), Brightness = (int)state["bri"], SaturationEnabled = true, HueEnabled = true, IsOn = ((string)state["on"]).ToLower() == "true" ? true : false, Hue = (int)state["hue"], Saturation = (int)state["sat"], Name = (string)light["name"], Type = (string)light["type"] });
}
else
{
alllights.Add(new Light() { api = this, ID = Int32.Parse(i.Key), Brightness = (int)state["bri"], SaturationEnabled = false,HueEnabled = false,IsOn = ((string)state["on"]).ToLower() == "true" ? true : false, Hue =0, Saturation = 0, Name = (string)light["name"], Type = (string)light["type"] });
}//Debug.WriteLine("Added light number " + i + " " + state["on"]);
}
//lightlist = lightlist.OrderBy(q => q.Name).ToList();
//lightlist.Sort(
// delegate (Light p1, Light p2)
// {
// return p1.Name.CompareTo(p2.Name);
// }
// );
//lightlist.ForEach(q => alllights.Add(q));
return "success";
}
catch(Exception e)