From a8fd8f3f46ea2d9ae734733c30338a6a11e7dae2 Mon Sep 17 00:00:00 2001
From: DangHome <shoop0830@gmail.com>
Date: Mon, 3 Jul 2023 01:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=87=E5=AF=AB=E6=AD=BB=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=B4=BB=E8=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMMModel/CMMModel.csproj                      |  27 +++
 CMMModel/Model/SMonitorModel.cs               |  17 ++
 CMMService/CMMService.csproj                  |  32 +++
 ControlMyMonitorManagement.sln                |  14 +-
 .../ControlMyMonitorManagement.csproj         |   2 +-
 DellMonitorControl/ControlPanel.xaml          |  15 +-
 DellMonitorControl/ControlPanel.xaml.cs       |  64 +++++-
 DellMonitorControl/DellMonitorControl.csproj  |  25 ++-
 DellMonitorControl/MainWindow.xaml            |   5 +-
 DellMonitorControl/MainWindow.xaml.cs         |   5 +
 DellMonitorControl/Style/Btn.xaml             |   1 -
 Language/Language.csproj                      |   2 +-
 Library/Base/ObservableRangeCollection.cs     | 119 +++++-----
 Library/Base/PropertyBase.cs                  |  43 ++--
 Library/Config/Config.cs                      |  96 ++++----
 Library/Helpers/ConsoleHelper.cs              | 124 ++++++-----
 Library/Helpers/JsonHelper.cs                 | 205 +++++++++---------
 Library/Helpers/UAC.cs                        |  22 +-
 Library/Library.csproj                        |   5 +-
 Library/Method/AssemblyData.cs                |  78 +++----
 Library/Method/CMMCommand.cs                  | 113 +++++-----
 Library/Method/CMMMgr.cs                      |  36 ++-
 Library/ViewModel/XMonitor.cs                 | 126 +++++------
 Library/ViewModel/XMonitorStatus.cs           |   9 +-
 Tester/CommnadTest.cs                         |  38 ++++
 Tester/Tester.csproj                          |  10 +-
 Tester/UnitTest1.cs                           |  16 --
 27 files changed, 703 insertions(+), 546 deletions(-)
 create mode 100644 CMMModel/CMMModel.csproj
 create mode 100644 CMMModel/Model/SMonitorModel.cs
 create mode 100644 CMMService/CMMService.csproj
 create mode 100644 Tester/CommnadTest.cs
 delete mode 100644 Tester/UnitTest1.cs

diff --git a/CMMModel/CMMModel.csproj b/CMMModel/CMMModel.csproj
new file mode 100644
index 0000000..0cbd1f4
--- /dev/null
+++ b/CMMModel/CMMModel.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-windows</TargetFramework>
+		<AssemblyName>CMM.Model</AssemblyName>
+		<RootNamespace>CMM.Model</RootNamespace>
+		<Product>ControlMyMonitorManagement</Product>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<Company>Dang</Company>
+		<Copyright>Copyright © DangWang $([System.DateTime]::Now.ToString(yyyy))</Copyright>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<Major>1</Major>
+		<Minor>0</Minor>
+		<ProjectStartedDate>$([System.DateTime]::op_Subtraction($([System.DateTime]::get_Now().get_Date()),$([System.DateTime]::new(2017,9,17))).get_TotalDays())</ProjectStartedDate>
+		<DaysSinceProjectStarted>$([System.DateTime]::Now.ToString(Hmm))</DaysSinceProjectStarted>
+		<DateTimeSuffix>$([System.DateTime]::Now.ToString(yyyyMMdd))</DateTimeSuffix>
+		<VersionSuffix>$(Major).$(Minor).$(ProjectStartedDate).$(DaysSinceProjectStarted)</VersionSuffix>
+		<AssemblyVersion Condition=" '$(DateTimeSuffix)' == '' ">0.0.0.1</AssemblyVersion>
+		<AssemblyVersion Condition=" '$(DateTimeSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
+		<Version Condition=" '$(DateTimeSuffix)' == '' ">0.0.0.1</Version>
+		<Version Condition=" '$(DateTimeSuffix)' != '' ">$(DateTimeSuffix)</Version>
+	</PropertyGroup>
+
+</Project>
diff --git a/CMMModel/Model/SMonitorModel.cs b/CMMModel/Model/SMonitorModel.cs
new file mode 100644
index 0000000..e94e8db
--- /dev/null
+++ b/CMMModel/Model/SMonitorModel.cs
@@ -0,0 +1,17 @@
+using System.Text.Json.Serialization;
+
+public class SMonitorModel
+{
+    [JsonPropertyName("VCP Code")]
+    public string? VCPCode { get; set; }
+    [JsonPropertyName("VCP Code Name")]
+    public string? VCPCodeName { get; set; }
+    [JsonPropertyName("Read-Write")]
+    public string? ReadWrite { get; set; }
+    [JsonPropertyName("Current Value")]
+    public string? CurrentValue { get; set; }
+    [JsonPropertyName("Maximum Value")]
+    public string? MaximumValue { get; set; }
+    [JsonPropertyName("Possible Values")]
+    public string? PossibleValues { get; set; }
+}
\ No newline at end of file
diff --git a/CMMService/CMMService.csproj b/CMMService/CMMService.csproj
new file mode 100644
index 0000000..134eab8
--- /dev/null
+++ b/CMMService/CMMService.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0-windows</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<AssemblyName>CMM.Service</AssemblyName>
+		<RootNamespace>CMM.Service</RootNamespace>
+		<Product>ControlMyMonitorManagement</Product>
+		<Nullable>enable</Nullable>
+		<Company>Dang</Company>
+		<Copyright>Copyright © DangWang $([System.DateTime]::Now.ToString(yyyy))</Copyright>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<Major>1</Major>
+		<Minor>0</Minor>
+		<ProjectStartedDate>$([System.DateTime]::op_Subtraction($([System.DateTime]::get_Now().get_Date()),$([System.DateTime]::new(2023,7,2))).get_TotalDays())</ProjectStartedDate>
+		<DaysSinceProjectStarted>$([System.DateTime]::Now.ToString(Hmm))</DaysSinceProjectStarted>
+		<DateTimeSuffix>$([System.DateTime]::Now.ToString(yyyyMMdd))</DateTimeSuffix>
+		<VersionSuffix>$(Major).$(Minor).$(ProjectStartedDate).$(DaysSinceProjectStarted)</VersionSuffix>
+		<AssemblyVersion Condition=" '$(DateTimeSuffix)' == '' ">0.0.0.1</AssemblyVersion>
+		<AssemblyVersion Condition=" '$(DateTimeSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
+		<Version Condition=" '$(DateTimeSuffix)' == '' ">0.0.0.1</Version>
+		<Version Condition=" '$(DateTimeSuffix)' != '' ">$(DateTimeSuffix)</Version>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <Folder Include="Interface\" />
+	  <Folder Include="Service\" />
+	</ItemGroup>
+
+</Project>
diff --git a/ControlMyMonitorManagement.sln b/ControlMyMonitorManagement.sln
index dfd99ed..822f1a8 100644
--- a/ControlMyMonitorManagement.sln
+++ b/ControlMyMonitorManagement.sln
@@ -11,7 +11,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Language", "Language\Langua
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tester", "Tester\Tester.csproj", "{0D34DD73-3282-40EB-8F59-DF190944BF12}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DellMonitorControl", "DellMonitorControl\DellMonitorControl.csproj", "{64E96610-D431-40B9-A00B-55CE195B4B58}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DellMonitorControl", "DellMonitorControl\DellMonitorControl.csproj", "{64E96610-D431-40B9-A00B-55CE195B4B58}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMMService", "CMMService\CMMService.csproj", "{FEA2B019-32BC-4704-939F-1CD26F373F55}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMMModel", "CMMModel\CMMModel.csproj", "{88440737-DB6E-4ACA-B1BC-E40350153F96}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +43,14 @@ Global
 		{64E96610-D431-40B9-A00B-55CE195B4B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64E96610-D431-40B9-A00B-55CE195B4B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64E96610-D431-40B9-A00B-55CE195B4B58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEA2B019-32BC-4704-939F-1CD26F373F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEA2B019-32BC-4704-939F-1CD26F373F55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEA2B019-32BC-4704-939F-1CD26F373F55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEA2B019-32BC-4704-939F-1CD26F373F55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88440737-DB6E-4ACA-B1BC-E40350153F96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88440737-DB6E-4ACA-B1BC-E40350153F96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88440737-DB6E-4ACA-B1BC-E40350153F96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88440737-DB6E-4ACA-B1BC-E40350153F96}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ControlMyMonitorManagement/ControlMyMonitorManagement.csproj b/ControlMyMonitorManagement/ControlMyMonitorManagement.csproj
index 04191ea..3062287 100644
--- a/ControlMyMonitorManagement/ControlMyMonitorManagement.csproj
+++ b/ControlMyMonitorManagement/ControlMyMonitorManagement.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<RootNamespace>CMM.Management</RootNamespace>
 		<UseWPF>true</UseWPF>
 		<Copyright>Copyright © DangWang $([System.DateTime]::Now.ToString(yyyy))</Copyright>
diff --git a/DellMonitorControl/ControlPanel.xaml b/DellMonitorControl/ControlPanel.xaml
index 9f5ac20..6f786ef 100644
--- a/DellMonitorControl/ControlPanel.xaml
+++ b/DellMonitorControl/ControlPanel.xaml
@@ -7,21 +7,8 @@
              mc:Ignorable="d">
     <Grid>
         <Border  Background="{DynamicResource H3}" CornerRadius="10" MouseLeave="Border_MouseLeave"/>
-        <StackPanel>
-            
-            <StackPanel Orientation="Vertical" Margin="10,5,5,0">
-                <TextBlock Text="DELL U3223QE (Center)" Style="{StaticResource TitleStyle}" HorizontalAlignment="Left"/>
-                <Button Tag="BR974P3" Content="Sleep" Click="ToggleButton_Checked" Style="{StaticResource TextButtonStyle}"/>
-            </StackPanel>
-            <StackPanel Orientation="Vertical" Margin="10,5,5,0">
-                <TextBlock Text="DELL U3223QE (Right)" Style="{StaticResource TitleStyle}" HorizontalAlignment="Left"/>
-                <Button Tag="CBBP3P3" Content="Sleep" Click="ToggleButton_Checked" Style="{StaticResource TextButtonStyle}"/>
-            </StackPanel>
-            <StackPanel Orientation="Vertical" Margin="10,5,5,0">
-                <TextBlock Text="DELL UP2716D (Left)" Style="{StaticResource TitleStyle}" HorizontalAlignment="Left"/>
-                <Button Tag="KV97067ICLCL" Content="Sleep" Click="ToggleButton_Checked" Style="{StaticResource TextButtonStyle}"/>
+        <StackPanel Name="sp" Margin="10">
 
-            </StackPanel>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/DellMonitorControl/ControlPanel.xaml.cs b/DellMonitorControl/ControlPanel.xaml.cs
index 413ff3e..9561357 100644
--- a/DellMonitorControl/ControlPanel.xaml.cs
+++ b/DellMonitorControl/ControlPanel.xaml.cs
@@ -1,7 +1,8 @@
 using CMM.Library.Method;
+using CMM.Library.ViewModel;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 
 namespace DellMonitorControl;
@@ -16,25 +17,68 @@ public partial class ControlPanel : UserControl
         InitializeComponent();
     }
 
-    private void Border_MouseLeave(object sender, MouseEventArgs e)
+    public async Task Init()
     {
+        await CMMCommand.ScanMonitor();
+        var monitors = await CMMCommand.ReadMonitorsData();
 
+        foreach (var m in monitors)
+        {
+            var status = await CMMCommand.GetMonPowerStatus(m.SerialNumber);
+            var ctrl = CreatControl(m, status);
+
+            sp.Children.Add(ctrl);
+        }
     }
 
-    private async void ToggleButton_Checked(object sender, RoutedEventArgs e)
+    private StackPanel CreatControl(XMonitor monitorModel, string powerStatus)
     {
-        var toggle = sender as Button;
-        var tag = toggle?.Tag.ToString();
-        var content = toggle?.Content as string;
+        var _sp = new StackPanel();
+
+        _sp.Orientation = Orientation.Vertical;
+        _sp.Margin = new Thickness(10, 5, 5, 0);
+
+        var tb = new TextBlock
+        {
+            Text = monitorModel.MonitorName,
+            HorizontalAlignment = HorizontalAlignment.Left,
+            Style = (Style)FindResource("LableStyle")
+        };
+
+        var btn = new Button
+        {
+            Tag = monitorModel.SerialNumber,
+            Content = powerStatus,
+            Style = (Style)FindResource("TextButtonStyle")
+        };
+
+        btn.Click += async (s, e) => await ToggleButton_Checked(s, e);
+
+        _sp.Children.Add(tb);
+        _sp.Children.Add(btn);
+
+        return _sp;
+    }
+
+    private void Border_MouseLeave(object sender, MouseEventArgs e)
+    {
+        
+    }
+
+    private async Task ToggleButton_Checked(object sender, RoutedEventArgs e)
+    {
+        var btn = sender as Button;
+        var tag = btn?.Tag.ToString();
+        var content = btn?.Content as string;
         if (content == "Sleep")
         { 
-            await CMMCommand.Sleep(tag);
-            toggle!.Content = "PowerOn";
+            await CMMCommand.PowerOn(tag);
         }
         else
         {
-            await CMMCommand.PowerOn(tag);
-            toggle!.Content = "Sleep";
+            await CMMCommand.Sleep(tag);
         }
+        await Task.Delay(1000);
+        btn!.Content = await CMMCommand.GetMonPowerStatus(tag);
     }
 }
diff --git a/DellMonitorControl/DellMonitorControl.csproj b/DellMonitorControl/DellMonitorControl.csproj
index 525a830..ef6ecf3 100644
--- a/DellMonitorControl/DellMonitorControl.csproj
+++ b/DellMonitorControl/DellMonitorControl.csproj
@@ -2,12 +2,27 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<Nullable>enable</Nullable>
 		<AssemblyName>DellMonitorControl</AssemblyName>
 		<RootNamespace>DellMonitorControl</RootNamespace>
-		<Product>DellMonitorControl</Product>
+		<Product>ControlMyMonitorManagement</Product>
 		<UseWPF>true</UseWPF>
+		<Company>Dang</Company>
+		<Copyright>Copyright © DangWang $([System.DateTime]::Now.ToString(yyyy))</Copyright>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<Major>1</Major>
+		<Minor>0</Minor>
+		<ProjectStartedDate>$([System.DateTime]::op_Subtraction($([System.DateTime]::get_Now().get_Date()),$([System.DateTime]::new(2023,7,2))).get_TotalDays())</ProjectStartedDate>
+		<DaysSinceProjectStarted>$([System.DateTime]::Now.ToString(Hmm))</DaysSinceProjectStarted>
+		<DateTimeSuffix>$([System.DateTime]::Now.ToString(yyyyMMdd))</DateTimeSuffix>
+		<VersionSuffix>$(Major).$(Minor).$(ProjectStartedDate).$(DaysSinceProjectStarted)</VersionSuffix>
+		<AssemblyVersion Condition=" '$(DateTimeSuffix)' == '' ">0.0.0.1</AssemblyVersion>
+		<AssemblyVersion Condition=" '$(DateTimeSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
+		<Version Condition=" '$(DateTimeSuffix)' == '' ">0.0.0.1</Version>
+		<Version Condition=" '$(DateTimeSuffix)' != '' ">$(DateTimeSuffix)</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -20,6 +35,12 @@
 
 	<ItemGroup>
 		<PackageReference Include="Hardcodet.Wpf.TaskbarNotification.Net6" Version="1.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/DellMonitorControl/MainWindow.xaml b/DellMonitorControl/MainWindow.xaml
index 8c4b6ec..1a8bf2b 100644
--- a/DellMonitorControl/MainWindow.xaml
+++ b/DellMonitorControl/MainWindow.xaml
@@ -6,15 +6,16 @@
         xmlns:tb="clr-namespace:Hardcodet.Wpf.TaskbarNotification;assembly=Hardcodet.Wpf.TaskbarNotification.Net6"
         xmlns:local="clr-namespace:DellMonitorControl"
         mc:Ignorable="d"
+        Loaded="Window_Loaded"
         Title="MainWindow" Height="450" Width="800">
     
     <Grid>
         <tb:TaskbarIcon x:Name="taskbar"
                         IconSource="/DellLogo.ico"
-                        ToolTipText="調整效能"
+                        ToolTipText="螢幕開關"
                         PopupActivation="LeftOrDoubleClick">
             <tb:TaskbarIcon.TrayPopup>
-                <local:ControlPanel/>
+                <local:ControlPanel x:Name="comtrolPanel"/>
             </tb:TaskbarIcon.TrayPopup>
         </tb:TaskbarIcon>
     </Grid>
diff --git a/DellMonitorControl/MainWindow.xaml.cs b/DellMonitorControl/MainWindow.xaml.cs
index b9034fb..382f3ff 100644
--- a/DellMonitorControl/MainWindow.xaml.cs
+++ b/DellMonitorControl/MainWindow.xaml.cs
@@ -10,6 +10,11 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
+    }
+
+    private async void Window_Loaded(object sender, RoutedEventArgs e)
+    {
         this.Hide();
+        await comtrolPanel.Init();
     }
 }
diff --git a/DellMonitorControl/Style/Btn.xaml b/DellMonitorControl/Style/Btn.xaml
index bc42bc8..fe385a4 100644
--- a/DellMonitorControl/Style/Btn.xaml
+++ b/DellMonitorControl/Style/Btn.xaml
@@ -15,7 +15,6 @@
         </Style.Triggers>
     </Style>
 
-
     <Style x:Key="TextBorderStyle" TargetType="{x:Type Border}">
         <Setter Property="Background" Value="{StaticResource F3}"/>
         <Setter Property="BorderBrush" Value="#C1272C"/>
diff --git a/Language/Language.csproj b/Language/Language.csproj
index df47c0c..9b57b5f 100644
--- a/Language/Language.csproj
+++ b/Language/Language.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<RootNamespace>CMM.Language</RootNamespace>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UseWPF>true</UseWPF>
diff --git a/Library/Base/ObservableRangeCollection.cs b/Library/Base/ObservableRangeCollection.cs
index 406dbf5..98bdc3e 100644
--- a/Library/Base/ObservableRangeCollection.cs
+++ b/Library/Base/ObservableRangeCollection.cs
@@ -1,70 +1,67 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 
-namespace CMM.Library.Base
+namespace CMM.Library.Base;
+
+/// <summary> 
+/// Represents a dynamic data collection that provides notifications when items get added, removed, or when the whole list is refreshed. 
+/// </summary> 
+/// <typeparam name="T"></typeparam> 
+public class ObservableRangeCollection<T> : ObservableCollection<T>
 {
     /// <summary> 
-    /// Represents a dynamic data collection that provides notifications when items get added, removed, or when the whole list is refreshed. 
+    /// Adds the elements of the specified collection to the end of the ObservableCollection(Of T). 
     /// </summary> 
-    /// <typeparam name="T"></typeparam> 
-    public class ObservableRangeCollection<T> : ObservableCollection<T>
+    public void AddRange(IEnumerable<T> collection)
     {
-        /// <summary> 
-        /// Adds the elements of the specified collection to the end of the ObservableCollection(Of T). 
-        /// </summary> 
-        public void AddRange(IEnumerable<T> collection)
-        {
-            if (collection == null) throw new ArgumentNullException("collection");
+        if (collection == null) throw new ArgumentNullException("collection");
 
-            foreach (var i in collection) Items.Add(i);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-        }
-
-        /// <summary> 
-        /// Removes the first occurence of each item in the specified collection from ObservableCollection(Of T). 
-        /// </summary> 
-        public void RemoveRange(IEnumerable<T> collection)
-        {
-            if (collection == null) throw new ArgumentNullException("collection");
-
-            foreach (var i in collection) Items.Remove(i);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-        }
-
-        /// <summary> 
-        /// Clears the current collection and replaces it with the specified item. 
-        /// </summary> 
-        public void Replace(T item)
-        {
-            ReplaceRange(new T[] { item });
-        }
-
-        /// <summary> 
-        /// Clears the current collection and replaces it with the specified collection. 
-        /// </summary> 
-        public void ReplaceRange(IEnumerable<T> collection)
-        {
-            if (collection == null) throw new ArgumentNullException("collection");
-
-            Items.Clear();
-            foreach (var i in collection) Items.Add(i);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-        }
-
-        /// <summary> 
-        /// Initializes a new instance of the System.Collections.ObjectModel.ObservableCollection(Of T) class. 
-        /// </summary> 
-        public ObservableRangeCollection()
-            : base() { }
-
-        /// <summary> 
-        /// Initializes a new instance of the System.Collections.ObjectModel.ObservableCollection(Of T) class that contains elements copied from the specified collection. 
-        /// </summary> 
-        /// <param name="collection">collection: The collection from which the elements are copied.</param> 
-        /// <exception cref="System.ArgumentNullException">The collection parameter cannot be null.</exception> 
-        public ObservableRangeCollection(IEnumerable<T> collection)
-            : base(collection) { }
+        foreach (var i in collection) Items.Add(i);
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
     }
+
+    /// <summary> 
+    /// Removes the first occurence of each item in the specified collection from ObservableCollection(Of T). 
+    /// </summary> 
+    public void RemoveRange(IEnumerable<T> collection)
+    {
+        if (collection == null) throw new ArgumentNullException("collection");
+
+        foreach (var i in collection) Items.Remove(i);
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+    }
+
+    /// <summary> 
+    /// Clears the current collection and replaces it with the specified item. 
+    /// </summary> 
+    public void Replace(T item)
+    {
+        ReplaceRange(new T[] { item });
+    }
+
+    /// <summary> 
+    /// Clears the current collection and replaces it with the specified collection. 
+    /// </summary> 
+    public void ReplaceRange(IEnumerable<T> collection)
+    {
+        if (collection == null) throw new ArgumentNullException("collection");
+
+        Items.Clear();
+        foreach (var i in collection) Items.Add(i);
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+    }
+
+    /// <summary> 
+    /// Initializes a new instance of the System.Collections.ObjectModel.ObservableCollection(Of T) class. 
+    /// </summary> 
+    public ObservableRangeCollection()
+        : base() { }
+
+    /// <summary> 
+    /// Initializes a new instance of the System.Collections.ObjectModel.ObservableCollection(Of T) class that contains elements copied from the specified collection. 
+    /// </summary> 
+    /// <param name="collection">collection: The collection from which the elements are copied.</param> 
+    /// <exception cref="System.ArgumentNullException">The collection parameter cannot be null.</exception> 
+    public ObservableRangeCollection(IEnumerable<T> collection)
+        : base(collection) { }
 }
diff --git a/Library/Base/PropertyBase.cs b/Library/Base/PropertyBase.cs
index b225fe7..e031282 100644
--- a/Library/Base/PropertyBase.cs
+++ b/Library/Base/PropertyBase.cs
@@ -1,31 +1,30 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace CMM.Library.Base
+namespace CMM.Library.Base;
+
+public class PropertyBase : INotifyPropertyChanged
 {
-    public class PropertyBase : INotifyPropertyChanged
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    virtual internal protected void OnPropertyChanged(string propertyName)
     {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        virtual internal protected void OnPropertyChanged(string propertyName)
+        if (this.PropertyChanged != null)
         {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-        protected void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        protected void SetProperty<T>(ref T storage, T value, [CallerMemberName] string propertyName = null)
-        {
-            if (object.Equals(storage, value)) return;
-
-            storage = value;
-            this.OnPropertyChanged(propertyName);
+            this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
         }
     }
+
+    protected void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+    protected void SetProperty<T>(ref T storage, T value, [CallerMemberName] string propertyName = null)
+    {
+        if (object.Equals(storage, value)) return;
+
+        storage = value;
+        this.OnPropertyChanged(propertyName);
+    }
 }
diff --git a/Library/Config/Config.cs b/Library/Config/Config.cs
index e93f2dc..a0d879c 100644
--- a/Library/Config/Config.cs
+++ b/Library/Config/Config.cs
@@ -2,75 +2,69 @@
 using CMM.Library.Base;
 using CMM.Library.Helpers;
 using CMM.Library.Method;
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 using System.Windows;
 
-namespace CMM.Library.Config
+namespace CMM.Library.Config;
+
+public class XConfig : PropertyBase
 {
-    public class XConfig : PropertyBase
+    [JsonIgnore]
+    public string Version { get; private set; }
+
+    public static string ConfigFileName => Path.Combine(AssemblyData.Path, "Config.cfg");
+
+    #region Language
+    [JsonIgnore]
+    public CultureInfo Culture
     {
-        [JsonIgnore]
-        public string Version { get; private set; }
-
-        public static string ConfigFileName => Path.Combine(AssemblyData.Path, "Config.cfg");
-
-        #region Language
-        [JsonIgnore]
-        public CultureInfo Culture
+        get => _Culture;
+        set
         {
-            get => _Culture;
-            set
-            {
-                SetProperty(ref _Culture, value);
-                LoadCultures();
-            }
+            SetProperty(ref _Culture, value);
+            LoadCultures();
         }
-        CultureInfo _Culture;
-        public string Language { get; set; } = null;
-        CulturesHelper CulturesHelper { get; init; } = new();
-        public void LoadCultures()
-        {
-            if (CulturesHelper == null) return;
+    }
+    CultureInfo _Culture;
+    public string Language { get; set; } = null;
+    CulturesHelper CulturesHelper { get; init; } = new();
+    public void LoadCultures()
+    {
+        if (CulturesHelper == null) return;
 
-            CulturesHelper.ChangeCulture(Culture);
-        }
-        #endregion
+        CulturesHelper.ChangeCulture(Culture);
+    }
+    #endregion
 
-        public virtual void Load()
-        {
-            XConfig _base = null;
-            if (new FileInfo(ConfigFileName).Exists)
-            {
-                try
-                {
-                    _base = ConfigFileName.JsonFormFile<XConfig>();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"{Lang.Find("LoadConfigErr")}{ex.Message}", "failed", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-            this.Culture = _base?.Culture ?? new CultureInfo(_base?.Language ?? "en-US", false);
-            this.Version = $"{AssemblyData.AppName} {AssemblyData.AppVersion}";
-        }
-
-        public virtual void Save()
+    public virtual void Load()
+    {
+        XConfig _base = null;
+        if (new FileInfo(ConfigFileName).Exists)
         {
             try
             {
-                this.FileToJson(ConfigFileName);
+                _base = ConfigFileName.JsonFormFile<XConfig>();
             }
             catch (Exception ex)
             {
-                MessageBox.Show($"{Lang.Find("SaveConfigErr")}{ex.Message}", "failed", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show($"{Lang.Find("LoadConfigErr")}{ex.Message}", "failed", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
+        this.Culture = _base?.Culture ?? new CultureInfo(_base?.Language ?? "en-US", false);
+        this.Version = $"{AssemblyData.AppName} {AssemblyData.AppVersion}";
+    }
+
+    public virtual void Save()
+    {
+        try
+        {
+            this.FileToJson(ConfigFileName);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"{Lang.Find("SaveConfigErr")}{ex.Message}", "failed", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
     }
 }
diff --git a/Library/Helpers/ConsoleHelper.cs b/Library/Helpers/ConsoleHelper.cs
index 30d1fa6..f6c50b7 100644
--- a/Library/Helpers/ConsoleHelper.cs
+++ b/Library/Helpers/ConsoleHelper.cs
@@ -1,71 +1,79 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 
-namespace CMM.Library.Helpers
+namespace CMM.Library.Helpers;
+
+internal class ConsoleHelper
 {
-    internal class ConsoleHelper
+    const string cmdFileName = "cmd.exe";
+    private static Process CreatProcess(string fileName) =>
+        new Process()
+        {
+            StartInfo = new ProcessStartInfo
+            {
+                FileName = fileName,
+                UseShellExecute = false,
+                RedirectStandardInput = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                CreateNoWindow = true,
+            }
+        };
+
+    public static async Task<string> ExecuteCommand(string command)
     {
-        const string cmdFileName = "cmd.exe";
-        private static Process CreatProcess(string fileName) =>
-            new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = fileName,
-                    UseShellExecute = false,
-                    RedirectStandardInput = true,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                    CreateNoWindow = true,
-                }
-            };
+        Process p = new Process();
+        p.StartInfo.UseShellExecute = false;
+        p.StartInfo.CreateNoWindow = true;
+        p.StartInfo.RedirectStandardOutput = true;
+        p.StartInfo.FileName = command;
+        p.Start();
+        var output = await p.StandardOutput.ReadToEndAsync();
+        await p.WaitForExitAsync();
 
-        public static async Task<string> CmdCommandAsync(params string[] cmds) =>
-            await CommandAsync(cmdFileName, cmds);
+        return output;
+    }
 
-        public static string CmdCommand(params string[] cmds) =>
-            Command(cmdFileName, cmds);
+    public static async Task<string> CmdCommandAsync(params string[] cmds) =>
+        await CommandAsync(cmdFileName, cmds);
 
-        public static async Task<string> CommandAsync(string fileName, params string[] cmds)
+    public static string CmdCommand(params string[] cmds) =>
+        Command(cmdFileName, cmds);
+
+    public static async Task<string> CommandAsync(string fileName, params string[] cmds)
+    {
+        var p = CreatProcess(fileName);
+        p.Start();
+        foreach (var cmd in cmds)
         {
-            var p = CreatProcess(fileName);
-            p.Start();
-            foreach (var cmd in cmds)
-            {
-                p.StandardInput.WriteLine(cmd);
-            }
-            p.StandardInput.WriteLine("exit");
-            var result = await p.StandardOutput.ReadToEndAsync();
-            var error = await p.StandardError.ReadToEndAsync();
-            if (!string.IsNullOrWhiteSpace(error))
-                result = result + "\r\n<Error Message>:\r\n" + error;
-            await p.WaitForExitAsync();
-            p.Close();
-            Debug.WriteLine(result);
-            return result;
+            p.StandardInput.WriteLine(cmd);
         }
+        p.StandardInput.WriteLine("exit");
+        var result = await p.StandardOutput.ReadToEndAsync();
+        var error = await p.StandardError.ReadToEndAsync();
+        if (!string.IsNullOrWhiteSpace(error))
+            result = result + "\r\n<Error Message>:\r\n" + error;
+        await p.WaitForExitAsync();
+        p.Close();
+        Debug.WriteLine(result);
+        return result;
+    }
 
-        public static string Command(string fileName, params string[] cmds)
+    public static string Command(string fileName, params string[] cmds)
+    {
+        var p = CreatProcess(fileName);
+        p.Start();
+        foreach (var cmd in cmds)
         {
-            var p = CreatProcess(fileName);
-            p.Start();
-            foreach (var cmd in cmds)
-            {
-                p.StandardInput.WriteLine(cmd);
-            }
-            p.StandardInput.WriteLine("exit");
-            var result = p.StandardOutput.ReadToEnd();
-            var error = p.StandardError.ReadToEnd();
-            if (!string.IsNullOrWhiteSpace(error))
-                result = result + "\r\n<Error Message>:\r\n" + error;
-            p.WaitForExit();
-            p.Close();
-            Debug.WriteLine(result);
-            return result;
+            p.StandardInput.WriteLine(cmd);
         }
+        p.StandardInput.WriteLine("exit");
+        var result = p.StandardOutput.ReadToEnd();
+        var error = p.StandardError.ReadToEnd();
+        if (!string.IsNullOrWhiteSpace(error))
+            result = result + "\r\n<Error Message>:\r\n" + error;
+        p.WaitForExit();
+        p.Close();
+        Debug.WriteLine(result);
+        return result;
     }
 }
diff --git a/Library/Helpers/JsonHelper.cs b/Library/Helpers/JsonHelper.cs
index b6b1498..2408705 100644
--- a/Library/Helpers/JsonHelper.cs
+++ b/Library/Helpers/JsonHelper.cs
@@ -1,131 +1,126 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Threading.Tasks;
 
-namespace CMM.Library.Helpers
+namespace CMM.Library.Helpers;
+
+static class JsonSerializerExtensions
 {
-    static class JsonSerializerExtensions
+    public static JsonSerializerOptions defaultSettings = new JsonSerializerOptions()
     {
-        public static JsonSerializerOptions defaultSettings = new JsonSerializerOptions()
+        WriteIndented = true,
+        IgnoreNullValues = true,
+        PropertyNamingPolicy = null,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+    };
+}
+
+public static class JsonHelper
+{
+    /// <summary>
+    /// 複製整個obj全部結構
+    /// </summary>
+    public static T DeepCopy<T>(T RealObject) =>
+        JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(RealObject, JsonSerializerExtensions.defaultSettings));
+
+    public static string JsonFormResource(this string fileName)
+    {
+        var assembly = Assembly.GetExecutingAssembly();
+        var resourceName =
+                    assembly.GetManifestResourceNames().
+                    Where(str => str.Contains(fileName)).FirstOrDefault();
+        if (resourceName == null) return "";
+
+        using (var stream = assembly.GetManifestResourceStream(resourceName))
+        using (var reader = new StreamReader(stream, Encoding.UTF8))
         {
-            WriteIndented = true,
-            IgnoreNullValues = true,
-            PropertyNamingPolicy = null,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-        };
+            return reader.ReadToEnd();
+        }
     }
 
-    internal static class JsonHelper
+    public static T JsonFormResource<T>(this string fileName) =>
+        JsonFormString<T>(JsonFormResource(fileName));
+
+    public static T JsonFormFile<T>(this string fileName) =>
+        JsonFormString<T>(Load(fileName));
+
+    public static T JsonFormString<T>(this string json) =>
+        JsonSerializer.Deserialize<T>(json);
+
+    public static void FileToJson<T>(this T payload, string savePath) =>
+        Save(savePath, payload.ToJson());
+
+    public static string ToJson<T>(this T payload) =>
+        JsonSerializer.Serialize(payload, JsonSerializerExtensions.defaultSettings);
+
+    /// <summary>
+    /// 從Embedded resource讀string
+    /// </summary>
+    /// <param name="aFileName">resource位置，不含副檔名</param>
+    public static string GetResource(this Assembly assembly, string aFileName)
     {
-        /// <summary>
-        /// 複製整個obj全部結構
-        /// </summary>
-        public static T DeepCopy<T>(T RealObject) =>
-            JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(RealObject, JsonSerializerExtensions.defaultSettings));
+        var resourceName = assembly
+            .GetManifestResourceNames()
+            .Where(str => str.Contains(aFileName))
+            .FirstOrDefault();
+        if (resourceName == null) return "";
 
-        public static string JsonFormResource(this string fileName)
+        using (var stream = assembly.GetManifestResourceStream(resourceName))
+        using (var sr = new StreamReader(stream, Encoding.UTF8))
         {
-            var assembly = Assembly.GetExecutingAssembly();
-            var resourceName =
-                        assembly.GetManifestResourceNames().
-                        Where(str => str.Contains(fileName)).FirstOrDefault();
-            if (resourceName == null) return "";
-
-            using (var stream = assembly.GetManifestResourceStream(resourceName))
-            using (var reader = new StreamReader(stream, Encoding.UTF8))
-            {
-                return reader.ReadToEnd();
-            }
+            return sr.ReadToEnd();
         }
+    }
 
-        public static T JsonFormResource<T>(this string fileName) =>
-            JsonFormString<T>(JsonFormResource(fileName));
+    public static string Load(string aFileName) =>
+        Load(new FileInfo(aFileName));
 
-        public static T JsonFormFile<T>(this string fileName) =>
-            JsonFormString<T>(Load(fileName));
-
-        public static T JsonFormString<T>(this string json) =>
-            JsonSerializer.Deserialize<T>(json);
-
-        public static void FileToJson<T>(this T payload, string savePath) =>
-            Save(savePath, payload.ToJson());
-
-        public static string ToJson<T>(this T payload) =>
-            JsonSerializer.Serialize(payload, JsonSerializerExtensions.defaultSettings);
-
-        /// <summary>
-        /// 從Embedded resource讀string
-        /// </summary>
-        /// <param name="aFileName">resource位置，不含副檔名</param>
-        public static string GetResource(this Assembly assembly, string aFileName)
+    public static string Load(FileInfo aFi)
+    {
+        if (aFi.Exists)
         {
-            var resourceName = assembly
-                .GetManifestResourceNames()
-                .Where(str => str.Contains(aFileName))
-                .FirstOrDefault();
-            if (resourceName == null) return "";
-
-            using (var stream = assembly.GetManifestResourceStream(resourceName))
-            using (var sr = new StreamReader(stream, Encoding.UTF8))
-            {
-                return sr.ReadToEnd();
-            }
-        }
-
-        public static string Load(string aFileName) =>
-            Load(new FileInfo(aFileName));
-
-        public static string Load(FileInfo aFi)
-        {
-            if (aFi.Exists)
-            {
-                string _Json = string.Empty;
-
-                try
-                {
-                    var sr = new StreamReader(aFi.FullName);
-                    _Json = sr.ReadToEnd();
-                    sr.Close();
-                }
-                catch (IOException) { throw; }
-                catch (Exception) { throw; }
-
-                return _Json;
-            }
-
-            throw new Exception("開檔失敗。");
-        }
-
-        public static void Save(string filePath, string content) =>
-            Save(new FileInfo(filePath), content);
-
-        public static void Save(FileInfo aFi, string aContent)
-        {
-            if (!aFi.Directory.Exists)
-            {
-                aFi.Directory.Create();
-            }
-
-            if (aFi.Exists)
-            {
-                aFi.Delete();
-            }
-
-            aFi.Refresh();
-            if (aFi.Exists) throw new Exception("寫檔失敗，檔案已存在或已開啟。");
+            string _Json = string.Empty;
 
             try
             {
-                File.WriteAllText(aFi.FullName, aContent);
+                var sr = new StreamReader(aFi.FullName);
+                _Json = sr.ReadToEnd();
+                sr.Close();
             }
             catch (IOException) { throw; }
             catch (Exception) { throw; }
+
+            return _Json;
         }
+
+        throw new Exception("開檔失敗。");
+    }
+
+    public static void Save(string filePath, string content) =>
+        Save(new FileInfo(filePath), content);
+
+    public static void Save(FileInfo aFi, string aContent)
+    {
+        if (!aFi.Directory.Exists)
+        {
+            aFi.Directory.Create();
+        }
+
+        if (aFi.Exists)
+        {
+            aFi.Delete();
+        }
+
+        aFi.Refresh();
+        if (aFi.Exists) throw new Exception("寫檔失敗，檔案已存在或已開啟。");
+
+        try
+        {
+            File.WriteAllText(aFi.FullName, aContent);
+        }
+        catch (IOException) { throw; }
+        catch (Exception) { throw; }
     }
 }
diff --git a/Library/Helpers/UAC.cs b/Library/Helpers/UAC.cs
index a945830..9925d70 100644
--- a/Library/Helpers/UAC.cs
+++ b/Library/Helpers/UAC.cs
@@ -1,18 +1,16 @@
-using System;
-using System.Security.Principal;
+using System.Security.Principal;
 
-namespace CMM.Library.Helpers
+namespace CMM.Library.Helpers;
+
+public class UAC
 {
-    public class UAC
+    public static void Check()
     {
-        public static void Check()
-        {
-            var identity = WindowsIdentity.GetCurrent();
-            var principal = new WindowsPrincipal(identity);
-            if (!principal.IsInRole(WindowsBuiltInRole.Administrator))
-                throw new Exception($"Cannot delete task with your current identity '{identity.Name}' permissions level." +
-                "You likely need to run this application 'as administrator' even if you are using an administrator account.");
+        var identity = WindowsIdentity.GetCurrent();
+        var principal = new WindowsPrincipal(identity);
+        if (!principal.IsInRole(WindowsBuiltInRole.Administrator))
+            throw new Exception($"Cannot delete task with your current identity '{identity.Name}' permissions level." +
+            "You likely need to run this application 'as administrator' even if you are using an administrator account.");
 
-        }
     }
 }
diff --git a/Library/Library.csproj b/Library/Library.csproj
index b03e9e8..8955688 100644
--- a/Library/Library.csproj
+++ b/Library/Library.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<RootNamespace>CMM.Library</RootNamespace>
+		<AssemblyName>CMM.Library</AssemblyName>
 		<Product>ControlMyMonitorManagement</Product>
 		<UseWPF>true</UseWPF>
 		<Company>Dang</Company>
@@ -34,7 +35,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <ProjectReference Include="..\CMMModel\CMMModel.csproj" />
 	  <ProjectReference Include="..\Language\Language.csproj" />
-	  <ProjectReference Include="..\Tester\Tester.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/Library/Method/AssemblyData.cs b/Library/Method/AssemblyData.cs
index 4cc1188..b568756 100644
--- a/Library/Method/AssemblyData.cs
+++ b/Library/Method/AssemblyData.cs
@@ -1,48 +1,42 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 
-namespace CMM.Library.Method
+namespace CMM.Library.Method;
+
+public static class AssemblyData
 {
-    public static class AssemblyData
+    /// <summary>
+    /// 當下Assembly名稱
+    /// </summary>
+    public static string AssemblyName => System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+
+    public static string AppName => AppDomain.CurrentDomain.FriendlyName;
+
+    /// <summary>
+    /// 程式根目錄，無視工作目錄
+    /// </summary>
+    public static string Path => AppDomain.CurrentDomain.BaseDirectory;
+    /// <summary>
+    /// 版本
+    /// </summary>
+    public static string AssemblyVersion => GetAssemblyVersion();
+    public static string AppVersion => GetFileVersion(Process.GetCurrentProcess().MainModule.FileName);
+    /// <summary>
+    /// CCM 輸出
+    /// </summary>
+    public static string smonitors => System.IO.Path.Combine(Path, "smonitors.tmp");
+
+    static string GetAssemblyVersion()
     {
-        /// <summary>
-        /// 當下Assembly名稱
-        /// </summary>
-        public static string AssemblyName => System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+        var fi = System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase.Replace(@"file:///", "");
+        return GetFileVersion(fi);
+    }
 
-        public static string AppName => AppDomain.CurrentDomain.FriendlyName;
-
-        /// <summary>
-        /// 程式根目錄，無視工作目錄
-        /// </summary>
-        public static string Path => AppDomain.CurrentDomain.BaseDirectory;
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public static string AssemblyVersion => GetAssemblyVersion();
-        public static string AppVersion => GetFileVersion(Process.GetCurrentProcess().MainModule.FileName);
-        /// <summary>
-        /// CCM 輸出
-        /// </summary>
-        public static string smonitors => System.IO.Path.Combine(Path, "smonitors.tmp");
-
-        static string GetAssemblyVersion()
-        {
-            var fi = System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase.Replace(@"file:///", "");
-            return GetFileVersion(fi);
-        }
-
-        public static string GetFileVersion(string filePath)
-        {
-            var fvi = FileVersionInfo.GetVersionInfo(filePath);
-            return $"{fvi.FileMajorPart}." +
-                   $"{fvi.FileMinorPart}." +
-                   $"{fvi.FileBuildPart}." +
-                   $"{fvi.FilePrivatePart}";
-        }
+    public static string GetFileVersion(string filePath)
+    {
+        var fvi = FileVersionInfo.GetVersionInfo(filePath);
+        return $"{fvi.FileMajorPart}." +
+               $"{fvi.FileMinorPart}." +
+               $"{fvi.FileBuildPart}." +
+               $"{fvi.FilePrivatePart}";
     }
 }
diff --git a/Library/Method/CMMCommand.cs b/Library/Method/CMMCommand.cs
index f09a2f9..28c8e59 100644
--- a/Library/Method/CMMCommand.cs
+++ b/Library/Method/CMMCommand.cs
@@ -2,6 +2,8 @@
 using CMM.Library.Helpers;
 using CMM.Library.ViewModel;
 using System.IO;
+using System.Net.NetworkInformation;
+using System.Threading;
 
 namespace CMM.Library.Method;
 
@@ -13,7 +15,6 @@ public static class CMMCommand
     static readonly string CMMTmpFolder = Path.Combine(Path.GetTempPath(), $"CMM");
     static readonly string CMMexe       = Path.Combine(CMMTmpFolder, "ControlMyMonitor.exe");
     static readonly string CMMsMonitors = Path.Combine(CMMTmpFolder, "smonitors.tmp");
-    static readonly string CMMcfg       = Path.Combine(CMMTmpFolder, "ControlMyMonitor.cfg");
 
     public static async Task ScanMonitor()
     {
@@ -21,80 +22,92 @@ public static class CMMCommand
         await ConsoleHelper.CmdCommandAsync($"{CMMexe} /smonitors {CMMsMonitors}");
     }
 
-    public static async Task PowerOn(string MonitorSn)
+    public static Task PowerOn(string monitorSN)
     { 
-        await ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {MonitorSn} D6 1");
+        return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} D6 1");
     }
 
-    public static async Task Sleep(string MonitorSn)
+    public static Task Sleep(string monitorSN)
     {
-        await ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {MonitorSn} D6 4");
+        return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} D6 4");
     }
 
-    public static async Task ScanMonitorInterfaces(IEnumerable<XMonitor> monitors)
+    private static async Task<string> GetMonitorValue(string monitorSN)
     {
-        var taskList = new List<Task>();
-        foreach (var mon in monitors)
+        var cmdFileName = Path.Combine(CMMTmpFolder, $"{Guid.NewGuid()}.bat");
+        var cmd = $"{CMMexe} /GetValue {monitorSN} D6\r\n" +
+                  $"echo %errorlevel%";
+        File.WriteAllText(cmdFileName, cmd);
+        var values = await ConsoleHelper.ExecuteCommand(cmdFileName);
+        File.Delete(cmdFileName);
+        return values.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+    }
+
+    public static async Task<string> GetMonPowerStatus(string monitorSN)
+    {
+        var status = await GetMonitorValue(monitorSN);
+
+        return status switch
         {
-            taskList.Add(Task.Run(async () => await
-                ScanMonitorInterfaces($"{CMMTmpFolder}\\{mon.SerialNumber}.tmp", mon)));
-        }
-
-        await Task.WhenAll(taskList.ToArray());
+            "1" => "PowerOn",
+            "4" => "Sleep",
+            "5" => "PowerOff",
+            _ => string.Empty
+        };
     }
 
-    static async Task ScanMonitorInterfaces(string savePath, XMonitor mon)
+    public static async Task ScanMonitorStatus(IEnumerable<XMonitor> monitors)
     {
-        await ConsoleHelper.CmdCommandAsync($"{CMMexe} /scomma {savePath} {mon.MonitorID}");
-        await mon.ReadMonitorStatus(savePath);
+        var taskList = monitors.Select(x =>
+        {
+            return ScanMonitorStatus($"{CMMTmpFolder}\\{x.SerialNumber}.tmp", x);
+        });
+
+        await Task.WhenAll(taskList);
+    }
+
+    static async Task ScanMonitorStatus(string savePath, XMonitor mon)
+    {
+        await ConsoleHelper.CmdCommandAsync($"{CMMexe} /sjson {savePath} {mon.MonitorID}");
+        var monitorModel = JsonHelper.JsonFormFile<IEnumerable<SMonitorModel>>(savePath);
+
+        var status = monitorModel.ReadMonitorStatus();
+
+        mon.Status = new ObservableRangeCollection<XMonitorStatus>(status);
     }
 
     /// <summary>
     /// 取得螢幕狀態
     /// </summary>
-    public static async Task ReadMonitorStatus(this XMonitor @this, string filePath)
+    public static IEnumerable<XMonitorStatus> ReadMonitorStatus(this IEnumerable<SMonitorModel> monitorModel)
     {
-        var statusColle = new ObservableRangeCollection<XMonitorStatus>();
-
-        if (!File.Exists(filePath)) return;
-
-        foreach (var line in await File.ReadAllLinesAsync(filePath))
-        {
-            var sp = line.Split(",");
-            if (sp.Length < 6) continue;
-            
-            statusColle.Add(new XMonitorStatus
+        foreach (var m in monitorModel)
+        {       
+            yield return new XMonitorStatus
             {
-                VCP_Code       = StrTrim(sp[0]),
-                VCPCodeName    = StrTrim(sp[1]),
-                Read_Write     = StrTrim(sp[2]),
-                CurrentValue   = TryGetInt(sp[3]),
-                MaximumValue   = TryGetInt(sp[4]),
-                PossibleValues = TryGetArrStr(sp),
-            });
+                VCP_Code = m.VCPCode,
+                VCPCodeName = m.VCPCodeName,
+                Read_Write = m.ReadWrite,
+                CurrentValue = TryGetInt(m.CurrentValue),
+                MaximumValue = TryGetInt(m.MaximumValue),
+                PossibleValues = TryGetArrStr(m.PossibleValues),
+            };
         }
 
-        @this.Status = statusColle;
-
-        string StrTrim(string str)
+        IEnumerable<int> TryGetArrStr(string str)
         {
-            if (string.IsNullOrEmpty(str)) return null;
-            return str;
-        }
-
-        string TryGetArrStr(string[] strArr)
-        {
-            if (strArr.Length < 7) return null;
-
-            var outStr = string.Join(",", strArr[5..]);
-            outStr = outStr.Substring(1, outStr.Length - 2);
-            return outStr;
+            return str.Split(",", StringSplitOptions.RemoveEmptyEntries)
+                .Select(x => TryGetInt(x))
+                .Where(x => x != null)
+                .Select(x => (int)x)
+                .ToList();
         }
 
         int? TryGetInt(string str)
         {
-            if (int.TryParse(str, out var value)) return value;
-            return null;
+            return int.TryParse(str, out var value)
+                ? value
+                : null;
         }
     }
 
diff --git a/Library/Method/CMMMgr.cs b/Library/Method/CMMMgr.cs
index 09b482d..1586212 100644
--- a/Library/Method/CMMMgr.cs
+++ b/Library/Method/CMMMgr.cs
@@ -1,29 +1,23 @@
 using CMM.Library.Base;
 using CMM.Library.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace CMM.Library.Method
+namespace CMM.Library.Method;
+
+public class CMMMgr : PropertyBase
 {
-    public class CMMMgr : PropertyBase
+    public ObservableRangeCollection<XMonitor> Monitors
     {
-        public ObservableRangeCollection<XMonitor> Monitors
-        {
-            get => _Monitors;
-            set { SetProperty(ref _Monitors, value); }
-        }
-        ObservableRangeCollection<XMonitor> _Monitors = new ();
+        get => _Monitors;
+        set { SetProperty(ref _Monitors, value); }
+    }
+    ObservableRangeCollection<XMonitor> _Monitors = new ();
 
-        public async Task Init()
-        {
-            await CMMCommand.ScanMonitor();
-            var monColle = new ObservableRangeCollection<XMonitor>();
-            monColle.AddRange(await CMMCommand.ReadMonitorsData());
-            Monitors = monColle;
-            await CMMCommand.ScanMonitorInterfaces(monColle);
-        }
+    public async Task Init()
+    {
+        await CMMCommand.ScanMonitor();
+        var monColle = new ObservableRangeCollection<XMonitor>();
+        monColle.AddRange(await CMMCommand.ReadMonitorsData());
+        Monitors = monColle;
+        await CMMCommand.ScanMonitorStatus(monColle);
     }
 }
diff --git a/Library/ViewModel/XMonitor.cs b/Library/ViewModel/XMonitor.cs
index b3e3e35..d0d477d 100644
--- a/Library/ViewModel/XMonitor.cs
+++ b/Library/ViewModel/XMonitor.cs
@@ -1,72 +1,66 @@
 using CMM.Library.Base;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace CMM.Library.ViewModel
+namespace CMM.Library.ViewModel;
+
+public class XMonitor : PropertyBase
 {
-    public class XMonitor : PropertyBase
+    /// <summary>
+    /// 裝置路徑
+    /// </summary>
+    public string MonitorDeviceName
     {
-        /// <summary>
-        /// 裝置路徑
-        /// </summary>
-        public string MonitorDeviceName
-        {
-            get => _MonitorDeviceName;
-            set { SetProperty(ref _MonitorDeviceName, value); }
-        }
-        string _MonitorDeviceName;
-
-        /// <summary>
-        /// 裝置名稱
-        /// </summary>
-        public string MonitorName
-        {
-            get => _MonitorName;
-            set { SetProperty(ref _MonitorName, value); }
-        }
-        string _MonitorName;
-
-        /// <summary>
-        /// 裝置序號
-        /// </summary>
-        public string SerialNumber
-        {
-            get => _SerialNumber;
-            set { SetProperty(ref _SerialNumber, value); }
-        }
-        string _SerialNumber;
-
-        /// <summary>
-        /// 訊號裝置
-        /// </summary>
-        public string AdapterName
-        {
-            get => _AdapterName;
-            set { SetProperty(ref _AdapterName, value); }
-        }
-        string _AdapterName;
-
-        /// <summary>
-        /// 裝置識別碼
-        /// </summary>
-        public string MonitorID
-        {
-            get => _MonitorID;
-            set { SetProperty(ref _MonitorID, value); }
-        }
-        string _MonitorID;
-
-        /// <summary>
-        /// 狀態
-        /// </summary>
-        public ObservableRangeCollection<XMonitorStatus> Status
-        {
-            get => _Status;
-            set { SetProperty(ref _Status, value); }
-        }
-        ObservableRangeCollection<XMonitorStatus> _Status = new();
+        get => _MonitorDeviceName;
+        set { SetProperty(ref _MonitorDeviceName, value); }
     }
+    string _MonitorDeviceName;
+
+    /// <summary>
+    /// 裝置名稱
+    /// </summary>
+    public string MonitorName
+    {
+        get => _MonitorName;
+        set { SetProperty(ref _MonitorName, value); }
+    }
+    string _MonitorName;
+
+    /// <summary>
+    /// 裝置序號
+    /// </summary>
+    public string SerialNumber
+    {
+        get => _SerialNumber;
+        set { SetProperty(ref _SerialNumber, value); }
+    }
+    string _SerialNumber;
+
+    /// <summary>
+    /// 訊號裝置
+    /// </summary>
+    public string AdapterName
+    {
+        get => _AdapterName;
+        set { SetProperty(ref _AdapterName, value); }
+    }
+    string _AdapterName;
+
+    /// <summary>
+    /// 裝置識別碼
+    /// </summary>
+    public string MonitorID
+    {
+        get => _MonitorID;
+        set { SetProperty(ref _MonitorID, value); }
+    }
+    string _MonitorID;
+
+    /// <summary>
+    /// 狀態
+    /// </summary>
+    public ObservableRangeCollection<XMonitorStatus> Status
+    {
+        get => _Status;
+        set { SetProperty(ref _Status, value); }
+    }
+    ObservableRangeCollection<XMonitorStatus> _Status = new();
 }
diff --git a/Library/ViewModel/XMonitorStatus.cs b/Library/ViewModel/XMonitorStatus.cs
index e253639..3c6e27a 100644
--- a/Library/ViewModel/XMonitorStatus.cs
+++ b/Library/ViewModel/XMonitorStatus.cs
@@ -1,9 +1,4 @@
 using CMM.Library.Base;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CMM.Library.ViewModel
 {
@@ -44,11 +39,11 @@ namespace CMM.Library.ViewModel
         }
         int? _MaximumValue;
 
-        public string PossibleValues
+        public IEnumerable<int> PossibleValues
         {
             get => _PossibleValues;
             set { SetProperty(ref _PossibleValues, value); }
         }
-        string _PossibleValues;
+        IEnumerable<int> _PossibleValues;
     }
 }
diff --git a/Tester/CommnadTest.cs b/Tester/CommnadTest.cs
new file mode 100644
index 0000000..6414afe
--- /dev/null
+++ b/Tester/CommnadTest.cs
@@ -0,0 +1,38 @@
+using CMM.Library.Base;
+using CMM.Library.Helpers;
+using CMM.Library.Method;
+using CMM.Library.ViewModel;
+
+namespace CMM.Tester;
+
+public class CommnadTest
+{
+    [SetUp]
+    public void Setup()
+    {
+    }
+
+    [Test]
+    public async Task Test1()
+    {
+        await CMMCommand.ScanMonitor();
+        var monColle = new ObservableRangeCollection<XMonitor>();
+        monColle.AddRange(await CMMCommand.ReadMonitorsData());
+        await CMMCommand.ScanMonitorStatus(monColle);
+    }
+
+    [Test]
+    public void JsonParserTest()
+    {
+        var path = @"C:\Users\shoop\AppData\Local\Temp\CMM\KV97067ICLCL.tmp";
+
+        var monitorModel = JsonHelper.JsonFormFile<IEnumerable<SMonitorModel>>(path);
+
+    }
+
+    [Test]
+    public async Task GetMonPowerStatus()
+    {
+        var status = await CMMCommand.GetMonPowerStatus("CBBP3P3");
+    }
+}
\ No newline at end of file
diff --git a/Tester/Tester.csproj b/Tester/Tester.csproj
index 65e62a8..ce9ba59 100644
--- a/Tester/Tester.csproj
+++ b/Tester/Tester.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<RootNamespace>CMM.Tester</RootNamespace>
 		<Product>ControlMyMonitorManagement</Product>
@@ -18,4 +18,12 @@
 		<PackageReference Include="coverlet.collector" Version="3.1.2" />
 	</ItemGroup>
 
+
+	<ItemGroup>
+		<ProjectReference Include="..\CMMModel\CMMModel.csproj" />
+		<ProjectReference Include="..\CMMService\CMMService.csproj" />
+		<ProjectReference Include="..\Language\Language.csproj" />
+		<ProjectReference Include="..\Library\Library.csproj" />
+	</ItemGroup>
+
 </Project>
diff --git a/Tester/UnitTest1.cs b/Tester/UnitTest1.cs
deleted file mode 100644
index b1800b4..0000000
--- a/Tester/UnitTest1.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace CMM.Tester
-{
-    public class Tests
-    {
-        [SetUp]
-        public void Setup()
-        {
-        }
-
-        [Test]
-        public void Test1()
-        {
-            Assert.Pass();
-        }
-    }
-}
\ No newline at end of file