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

UserInterface/UserInterface.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />

hass-workstation-service/Communication/InterProcesCommunication/InterProcessApi.cs

@@ -128,6 +128,9 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
                 case AvailableSensors.NamedWindowSensor:
                     sensorToCreate = new NamedWindowSensor(this._publisher, model.WindowName, model.Name, (int)model.UpdateInterval);
                     break;
+                case AvailableSensors.IdleTimeSensor:
+                    sensorToCreate = new IdleTimeSensor(this._publisher,(int)model.UpdateInterval, model.Name);
+                    break;
                 default:
                     Log.Logger.Error("Unknown sensortype");
                     break;

hass-workstation-service/Communication/InterProcesCommunication/ServiceContractModels.cs

@@ -39,7 +39,8 @@ namespace hass_workstation_service.Communication.InterProcesCommunication.Models
         WebcamActiveSensor,
         MicrophoneActiveSensor,
         ActiveWindowSensor,
-        NamedWindowSensor
+        NamedWindowSensor,
+        IdleTimeSensor
     }
 
     public enum WebcamDetectionMode

hass-workstation-service/Data/ConfigurationService.cs

@@ -91,6 +91,8 @@ namespace hass_workstation_service.Data
                     case "NamedWindowSensor":
                         sensor = new NamedWindowSensor(publisher, configuredSensor.WindowName, configuredSensor.Name, configuredSensor.UpdateInterval, configuredSensor.Id);
                         break;
+                    case "IdleTimeSensor":
+                        sensor = new IdleTimeSensor(publisher, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id);
                     case "WebcamActiveSensor":
                         sensor = new WebcamActiveSensor(publisher, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.DetectionMode, configuredSensor.Id);
                         break;

hass-workstation-service/Data/ConfiguredMqttBroker.cs

@@ -5,8 +5,30 @@ namespace hass_workstation_service.Data
 {
     public class ConfiguredMqttBroker
     {
+        private string username;
+        private string password;
         public string Host { get; set; }
-        public string Username { get; set; }
+
-        public string Password { get; set; }
+        public string Username
+        {
+            get
+            {
+                if (username != null) return username;
+                
+                return "";
+            }
+            set => username = value;
+        }
+
+        public string Password
+        {
+            get
+            {
+                if (password != null) return password;
+                
+                return "";
+            }
+            set => password = value;
+        }
     }
 }

hass-workstation-service/Domain/Sensors/IdleTimeSensor.cs

@@ -0,0 +1,76 @@
+using hass_workstation_service.Communication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using HWND = System.IntPtr;
+
+namespace hass_workstation_service.Domain.Sensors
+{
+    public class IdleTimeSensor : AbstractSensor
+    {
+        
+        public IdleTimeSensor(MqttPublisher publisher, int? updateInterval = 10, string name = "IdleTime", Guid id = default) : base(publisher, name ?? "IdleTime", updateInterval ?? 10, id)
+        {
+        
+
+        }
+
+        public override AutoDiscoveryConfigModel GetAutoDiscoveryConfig()
+        {
+            return this._autoDiscoveryConfigModel ?? SetAutoDiscoveryConfigModel(new AutoDiscoveryConfigModel()
+            {
+                Name = this.Name,
+                Unique_id = this.Id.ToString(),
+                Device = this.Publisher.DeviceConfigModel,
+                State_topic = $"homeassistant/sensor/{this.Name}/state",
+                Icon = "mdi:window-maximize",
+            });
+        }
+
+        public override string GetState()
+        {
+
+            return GetLastInputTime().ToString();
+        }
+
+
+        
+
+        static int GetLastInputTime()
+        {
+            int idleTime = 0;
+            LASTINPUTINFO lastInputInfo = new LASTINPUTINFO();
+            lastInputInfo.cbSize = Marshal.SizeOf(lastInputInfo);
+            lastInputInfo.dwTime = 0;
+
+            int envTicks = Environment.TickCount;
+
+            if (GetLastInputInfo(ref lastInputInfo))
+            {
+                int lastInputTick = Convert.ToInt32(lastInputInfo.dwTime);
+
+                idleTime = envTicks - lastInputTick;
+            }
+
+            return ((idleTime > 0) ? (idleTime / 1000) : idleTime);
+        }
+
+
+
+        [DllImport("User32.dll")]
+        private static extern bool GetLastInputInfo(ref LASTINPUTINFO plii);
+
+        [StructLayout(LayoutKind.Sequential)]
+        struct LASTINPUTINFO
+        {
+            public static readonly int SizeOf = Marshal.SizeOf(typeof(LASTINPUTINFO));
+
+            [MarshalAs(UnmanagedType.U4)]
+            public int cbSize;
+            [MarshalAs(UnmanagedType.U4)]
+            public UInt32 dwTime;
+        }
+    }
+}

hass-workstation-service/hass-workstation-service.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Worker">
+<Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <UserSecretsId>dotnet-hass_workstation_service-C65C2EBE-1977-4C24-AC6B-6921877E1390</UserSecretsId>
     <RootNamespace>hass_workstation_service</RootNamespace>
     <OutputType>WinExe</OutputType>
@@ -28,12 +28,6 @@
     <None Remove="UserInterface.pdb" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="UserInterface.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="appsettings.json">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>