去除C的依赖项

Author: KaiXin

EyeGuard/BLL/Bll.cs

@@ -1,11 +1,17 @@
-using Microsoft.Win32;
+using EyeGuard.BLL;
+using Microsoft.Win32;
+using NAudio.CoreAudioApi;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
+using System.Linq;
+using System.Media;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
+using WpfScreenHelper;
 
 namespace EyeGuard
 {
@@ -66,7 +72,7 @@ public static string GetFormattingTime(string value)
             int TotalSeconds = Convert.ToInt32(value);
 
             int branch = TotalSeconds / 60;
-            int second= TotalSeconds % 60;
+            int second = TotalSeconds % 60;
             return GetFormattingTime(branch) + ":" + GetFormattingTime(second);
         }
 
@@ -81,7 +87,7 @@ public static double ExecDateDiff(DateTime dateBegin, DateTime dateEnd)
         {
             TimeSpan ts1 = new TimeSpan(dateBegin.Ticks);
             TimeSpan ts2 = new TimeSpan(dateEnd.Ticks);
-            TimeSpan ts3 = ts2- ts1;
+            TimeSpan ts3 = ts2 - ts1;
             //得到相差的分钟数
             return ts3.TotalMinutes;
         }
@@ -159,7 +165,7 @@ public struct RECT
         //桌面窗口句柄 
         private IntPtr desktopHandle;
         //Shell窗口句柄 
-        private IntPtr shellHandle;    
+        private IntPtr shellHandle;
         #endregion
 
 
@@ -233,12 +239,6 @@ public static void BootUp(bool Whether = true)
         }
         #endregion
 
-        [DllImport("PublicTools.dll", EntryPoint = "_GetStateOfTheSound@0")]
-        private static extern int GetStateOfTheSound();
-
-        //_GetInfoOnTheScreen@4
-        [DllImport("PublicTools.dll", EntryPoint = "GetInfoOnTheScreen")]
-        private static extern IntPtr GetInfoOnTheScreen();
 
         /// <summary>
         /// 全部屏幕信息
@@ -251,22 +251,16 @@ public static void BootUp(bool Whether = true)
         /// </summary>
         public static void GetInfoOnTheScreens()
         {
-            string value = Marshal.PtrToStringAnsi(GetInfoOnTheScreen());
-            string[] Displays = value.Split(',');
-
-            for (int i = 0; i < Displays.Length; i++)
+            for (int i = 0; i < Screen.AllScreens.Count(); i++)
             {
-                string[] _value = Displays[i].Split("X");
-                if (_value.Length == 2)
-                {
-                    InfoOnTheScreen infoOnThe = new InfoOnTheScreen();
-                    infoOnThe.Width = Convert.ToInt32(_value[0]);
-                    infoOnThe.Height = Convert.ToInt32(_value[1]);
-                    infoOnThe.Order = i;
-                    InfoOnTheScreens.Add(infoOnThe);
-                }
+                var _value = Screen.AllScreens.ToList()[i];
+                InfoOnTheScreen infoOnThe = new InfoOnTheScreen();
+                infoOnThe.Width = Convert.ToInt32(_value.Bounds.Width);
+                infoOnThe.Height = Convert.ToInt32(_value.Bounds.Height);
+                infoOnThe.Order = i;
+                InfoOnTheScreens.Add(infoOnThe);
             }
-            
+
         }
 
         /// <summary>
@@ -275,11 +269,12 @@ public static void GetInfoOnTheScreens()
         /// <returns></returns>
         public static bool IsAudioPlaying()
         {
-            if (GetStateOfTheSound() == 1)
+            using (var enumerator = new MMDeviceEnumerator())
             {
-                return true;
+                var defaultDevice = enumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+                bool state= defaultDevice.AudioMeterInformation.MasterPeakValue > 0;
+                return state;
             }
-            return false;
         }
     }
 

EyeGuard/Dal.cs

@@ -20,7 +20,7 @@ class Dal
         /// <summary>
         /// 版本号
         /// </summary>
-        public static string Edition = "3.10";
+        public static string Edition = "3.20";
 
 
         /// <summary>

EyeGuard/EyeGuard.csproj

@@ -10,12 +10,11 @@
 
   <ItemGroup>
     <PackageReference Include="HandyControl" Version="3.4.0" />
+    <PackageReference Include="NAudio" Version="2.1.0" />
+    <PackageReference Include="WpfScreenHelper" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="PublicTools.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="PublicTools.lib">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

EyeGuard/EyeGuard.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>E:\开源项目\EyeGuard\core\EyeGuard\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>E:\开源项目\眼睛卫士\EyeGuard\EyeGuard\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
   <ItemGroup>
     <ApplicationDefinition Update="App.xaml">