diff --git a/Zway-Bot/Moduls/Mqtt.cs b/Zway-Bot/Moduls/Mqtt.cs index e334c65..d815933 100644 --- a/Zway-Bot/Moduls/Mqtt.cs +++ b/Zway-Bot/Moduls/Mqtt.cs @@ -21,12 +21,14 @@ namespace BlubbFish.IoT.Bots.ZwayBot.Moduls { #region Mqtt protected override void Connect() { + Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Moduls.Mqtt.Connect()"); this.mqtt = ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data); this.mqtt.MessageIncomming += this.MqttUpdate; this.mqttConnect = true; } protected override void Disconnect() { + Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Moduls.Mqtt.Disconnect()"); this.mqttConnect = false; if (this.mqtt != null) { this.mqtt.MessageIncomming -= this.MqttUpdate; diff --git a/Zway-Bot/Moduls/Overtaker.cs b/Zway-Bot/Moduls/Overtaker.cs index d9bc629..93dedef 100644 --- a/Zway-Bot/Moduls/Overtaker.cs +++ b/Zway-Bot/Moduls/Overtaker.cs @@ -16,20 +16,25 @@ namespace BlubbFish.IoT.Bots.ZwayBot.Moduls { public Overtaker(ZwayController zway, InIReader settings) : base(zway, settings) { } - protected override void LibraryUpdateHook(String id) { - foreach (KeyValuePair item in this.overtakeritems) { - item.Value.Polling = false; - item.Value.Update -= this.HandleLibUpdate; - } - this.overtakeritems.Clear(); + protected override void AddLibraryUpdateHook(String id) { ACommandClass c = this.library.GetCommandClass(id); if (c != null) { + Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Moduls.Overtaker.LibraryUpdateHook: Add Watcher to " + c.Name + " [" + c.Id + "]"); this.overtakeritems.Add(id, c); c.Polling = true; c.Update += this.HandleLibUpdate; } } + protected override void RemoveLibraryUpdateHooks() { + foreach (KeyValuePair item in this.overtakeritems) { + Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Moduls.Overtaker.LibraryUpdateHook: Remove Watcher to " + item.Value.Name + " [" + item.Value.Id + "]"); + item.Value.Polling = false; + item.Value.Update -= this.HandleLibUpdate; + } + this.overtakeritems.Clear(); + } + protected override void LibUpadteThread(Object state) { try { DeviceUpdateEvent e = state as DeviceUpdateEvent; diff --git a/Zway-Bot/Moduls/Senml.cs b/Zway-Bot/Moduls/Senml.cs index 674dfaf..0c85600 100644 --- a/Zway-Bot/Moduls/Senml.cs +++ b/Zway-Bot/Moduls/Senml.cs @@ -19,6 +19,16 @@ namespace BlubbFish.IoT.Bots.ZwayBot.Moduls { } } + protected override void Connect() { + Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Moduls.Senml.Connect()"); + base.Connect(); + } + + protected override void Disconnect() { + Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Moduls.Senml.Disconnect()"); + base.Disconnect(); + } + #region Events protected override void LibUpadteThread(Object state) { try { diff --git a/Zway-Bot/Properties/AssemblyInfo.cs b/Zway-Bot/Properties/AssemblyInfo.cs index 6f7f4d9..7272925 100644 --- a/Zway-Bot/Properties/AssemblyInfo.cs +++ b/Zway-Bot/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("BlubbFish")] [assembly: AssemblyProduct("Zway-Bot")] -[assembly: AssemblyCopyright("Copyright © 2017 - 29.09.2018")] +[assembly: AssemblyCopyright("Copyright © 2017 - 02.10.2018")] [assembly: AssemblyTrademark("BlubbFish")] [assembly: AssemblyCulture("")] @@ -31,8 +31,8 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.1")] -[assembly: AssemblyFileVersion("1.7.1")] +[assembly: AssemblyVersion("1.7.2")] +[assembly: AssemblyFileVersion("1.7.2")] [assembly: NeutralResourcesLanguage("de-DE")] // “Internet Of Things” icon by By Michael Wohlwend, US, from thenounproject.com. diff --git a/Zway-Bot/bin/Release/Bot-Utils.dll b/Zway-Bot/bin/Release/Bot-Utils.dll index 9c9635f..ebf8e50 100644 Binary files a/Zway-Bot/bin/Release/Bot-Utils.dll and b/Zway-Bot/bin/Release/Bot-Utils.dll differ diff --git a/Zway-Bot/bin/Release/ConnectorDataMqtt.dll b/Zway-Bot/bin/Release/ConnectorDataMqtt.dll index 3c63520..aae9185 100644 Binary files a/Zway-Bot/bin/Release/ConnectorDataMqtt.dll and b/Zway-Bot/bin/Release/ConnectorDataMqtt.dll differ diff --git a/Zway-Bot/bin/Release/Iot-Interfaces.dll b/Zway-Bot/bin/Release/Iot-Interfaces.dll index c182a26..5960256 100644 Binary files a/Zway-Bot/bin/Release/Iot-Interfaces.dll and b/Zway-Bot/bin/Release/Iot-Interfaces.dll differ diff --git a/Zway-Bot/bin/Release/M2Mqtt.dll b/Zway-Bot/bin/Release/M2Mqtt.dll index 9d4ca3f..f3f13a4 100644 Binary files a/Zway-Bot/bin/Release/M2Mqtt.dll and b/Zway-Bot/bin/Release/M2Mqtt.dll differ diff --git a/Zway-Bot/bin/Release/Utils-IoT.dll b/Zway-Bot/bin/Release/Utils-IoT.dll index 382f565..21075e2 100644 Binary files a/Zway-Bot/bin/Release/Utils-IoT.dll and b/Zway-Bot/bin/Release/Utils-IoT.dll differ diff --git a/Zway-Bot/bin/Release/Utils.dll b/Zway-Bot/bin/Release/Utils.dll index e55e051..d588c76 100644 Binary files a/Zway-Bot/bin/Release/Utils.dll and b/Zway-Bot/bin/Release/Utils.dll differ diff --git a/Zway-Bot/bin/Release/Zway-Bot.exe b/Zway-Bot/bin/Release/Zway-Bot.exe index 807db9f..b31d614 100644 Binary files a/Zway-Bot/bin/Release/Zway-Bot.exe and b/Zway-Bot/bin/Release/Zway-Bot.exe differ diff --git a/Zway-Bot/bin/Release/Zway.dll b/Zway-Bot/bin/Release/Zway.dll index 485503b..bbd9769 100644 Binary files a/Zway-Bot/bin/Release/Zway.dll and b/Zway-Bot/bin/Release/Zway.dll differ diff --git a/Zway-Bot/bin/Release/litjson.dll b/Zway-Bot/bin/Release/litjson.dll index f4b6f28..082df79 100644 Binary files a/Zway-Bot/bin/Release/litjson.dll and b/Zway-Bot/bin/Release/litjson.dll differ