maier_st/HA.NetDeamon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NotifyServices Nachrichten sind unzuverlässt versendet werden . NotifyServices wird bei den Methoden jetzt übergeben.

Browse Source
This commit is contained in:
maier_st
2023-09-19 18:57:27 +02:00
parent dd6cb90ea6
commit 1898ceb79a
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NetDaemonApps/NetDaemonApps/AreaControl/AreaControl.cs
View File

@@ -101,19 +101,19 @@ namespace NetDaemonApps.AreaControl
}
public virtual void SunDawn()
public virtual void SunDawn(NotifyServices notifyServices)
{
}
public virtual void SunRising()
public virtual void SunRising(NotifyServices notifyServices)
{
}
public virtual void SunDusk()
public virtual void SunDusk(NotifyServices notifyServices)
{
}
public virtual void SunSetting()
public virtual void SunSetting(NotifyServices notifyServices)
{
}
}

8
NetDaemonApps/NetDaemonApps/AreaControl/Areas/Office.cs
View File

@@ -20,7 +20,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Morgendämmerung
/// </summary>
public override void SunDawn()
public override void SunDawn(NotifyServices notifyServices)
{
}
@@ -28,7 +28,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Sonnenaufgang
/// </summary>
public override void SunRising()
public override void SunRising(NotifyServices notifyServices)
{
}
@@ -36,7 +36,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Abenddämmerung
/// </summary>
public override void SunDusk()
public override void SunDusk(NotifyServices notifyServices)
{
}
@@ -44,7 +44,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Sonnenuntergang
/// </summary>
public override void SunSetting()
public override void SunSetting(NotifyServices notifyServices)
{
}

8
NetDaemonApps/NetDaemonApps/AreaControl/Areas/TmpArea.cs
View File

@@ -93,7 +93,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Morgendämmerung
/// </summary>
public override void SunDawn()
public override void SunDawn(NotifyServices notifyServices)
{
notifyServices.Whatsapp("Morgendämmerung");
}
@@ -101,7 +101,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Sonnenaufgang
/// </summary>
public override void SunRising()
public override void SunRising(NotifyServices notifyServices)
{
notifyServices.Whatsapp("Sonnenaufgang");
}
@@ -109,7 +109,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Abenddämmerung
/// </summary>
public override void SunDusk()
public override void SunDusk(NotifyServices notifyServices)
{
notifyServices.Whatsapp("Abenddämmerung");
}
@@ -117,7 +117,7 @@ namespace NetDaemonApps.AreaControl.Areas
/// <summary>
/// Sonnenuntergang
/// </summary>
public override void SunSetting()
public override void SunSetting(NotifyServices notifyServices)
{
notifyServices.Whatsapp("Sonnenuntergang");
}

1
NetDaemonApps/NetDaemonApps/NetDaemonApps.csproj
View File

@@ -46,7 +46,6 @@
<ItemGroup>
<Folder Include="AreaControl\Areas\" />
<Folder Include="Properties\PublishProfiles\" />
</ItemGroup>
<ItemGroup>

24
NetDaemonApps/NetDaemonApps/apps/Scheduler.cs
View File

@@ -21,43 +21,43 @@ namespace NetDaemonApps.apps
AreaCollection = areaCollection;
notifyServices = new NotifyServices(haContext);
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextDawn.State), () => SunDawn()); // Morgendämmerung
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextRising.State), () => SunRising()); // Sonnenaufgang
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextDawn.State), () => SunDawn(notifyServices)); // Morgendämmerung
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextRising.State), () => SunRising(notifyServices)); // Sonnenaufgang
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextDusk.State), () => SunDusk()); // Abenddämmerung
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextSetting.State), () => SunSetting()); // Sonnenuntergang
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextDusk.State), () => SunDusk(notifyServices)); // Abenddämmerung
scheduler.Schedule(DateTime.Parse(entities.Sensor.SunNextSetting.State), () => SunSetting(notifyServices)); // Sonnenuntergang
}
private void SunDawn()
private void SunDawn(NotifyServices notifyServices)
{
foreach (var area in Enum.GetValues(typeof(AreaControlEnum)))
{
AreaCollection.GetArea((AreaControlEnum)area).SunDawn();
AreaCollection.GetArea((AreaControlEnum)area).SunDawn(notifyServices);
}
}
private async void SunRising()
private async void SunRising(NotifyServices notifyServices)
{
foreach (var area in Enum.GetValues(typeof(AreaControlEnum)))
{
AreaCollection.GetArea((AreaControlEnum)area).SunRising();
AreaCollection.GetArea((AreaControlEnum)area).SunRising(notifyServices);
}
}
private void SunDusk()
private void SunDusk(NotifyServices notifyServices)
{
foreach (var area in Enum.GetValues(typeof(AreaControlEnum)))
{
AreaCollection.GetArea((AreaControlEnum)area).SunDusk();
AreaCollection.GetArea((AreaControlEnum)area).SunDusk(notifyServices);
}
}
private void SunSetting()
private void SunSetting(NotifyServices notifyServices)
{
foreach (var area in Enum.GetValues(typeof(AreaControlEnum)))
{
AreaCollection.GetArea((AreaControlEnum)area).SunSetting();
AreaCollection.GetArea((AreaControlEnum)area).SunSetting(notifyServices);
}
}
}

2
NetDaemonApps/NetDaemonApps/program.cs
View File

@@ -12,7 +12,7 @@ using NetDaemonInterface;
try
{
Console.WriteLine("Starting v0.0.0");
Console.WriteLine("Starting v0.1");
await Host.CreateDefaultBuilder(args)
.UseNetDaemonAppSettings()

11
NetDaemonApps/NetDeamonInterface/IAreaControl.cs
View File

@@ -1,4 +1,5 @@
using NetDaemonInterface;
using HomeAssistantGenerated;
using NetDaemonInterface;
namespace NetDaemonInterface;
@@ -17,21 +18,21 @@ public interface IAreaControl
/// <summary>
/// Morgendämmerung
/// </summary>
public void SunDawn();
public void SunDawn(NotifyServices notifyServices);
/// <summary>
/// Sonnenaufgang
/// </summary>
public void SunRising();
public void SunRising(NotifyServices notifyServices);
/// <summary>
/// Abenddämmerung
/// </summary>
public void SunDusk();
public void SunDusk(NotifyServices notifyServices);
/// <summary>
/// Sonnenuntergang
/// </summary>
public void SunSetting();
public void SunSetting(NotifyServices notifyServices);
}