diff --git a/App.config b/App.config
index b0f1156..f60dcdf 100644
--- a/App.config
+++ b/App.config
@@ -1,42 +1,42 @@
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/Controller/App.cs b/Controller/App.cs
index 21de106..bfd9ca5 100644
--- a/Controller/App.cs
+++ b/Controller/App.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
+//using System;
+//using System.Collections.Generic;
+//using System.Configuration;
+//using System.Data;
+//using System.Linq;
+//using System.Threading.Tasks;
using System.Windows;
namespace Karaoke_Kingpin.Controller
diff --git a/Controller/Index.cs b/Controller/Index.cs
index 270a8b6..034390d 100644
--- a/Controller/Index.cs
+++ b/Controller/Index.cs
@@ -4,29 +4,27 @@ using System.Collections.ObjectModel;
using System.Globalization;
using System.IO;
using System.Linq;
-using System.Runtime.Remoting.Contexts;
+//using System.Runtime.Remoting.Contexts;
using System.Text;
using System.Threading.Tasks;
using System.Data;
using System.Data.SQLite; // 確保添加了這個命名空間
-using System.Data.SqlClient; // 对于SQL Server
+//using System.Data.SqlClient; // 对于SQL Server
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Controls;
+//using System.Windows.Data;
+//using System.Windows.Documents;
+//using System.Windows.Input;
+//using System.Windows.Media;
+//using System.Windows.Media.Imaging;
+//using System.Windows.Shapes;
using System.Net.Sockets;
using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
+//using System.Runtime.InteropServices.ComTypes;
using Microsoft.Win32; // 確保這行代碼存在
-using System.ComponentModel;
-using Pinyin4net;
-using Pinyin4net.Format;
+//using System.ComponentModel;
+//using Pinyin4net;
+//using Pinyin4net.Format;
using Microsoft.International.Converters.PinYinConverter;
using Microsoft.International.Converters.TraditionalChineseToSimplifiedConverter;
using System.Reflection;
@@ -325,7 +323,7 @@ namespace Karaoke_Kingpin.Controller
private void LoadMarqueeItems()
{
MarqueeItems = new ObservableCollection();
- string filePath = "txt/marquee_items.txt";
+ string filePath = "outputfile/txt/marquee_items.txt";
if (File.Exists(filePath))
{
diff --git a/Controller/MainViewModel.cs b/Controller/MainViewModel.cs
index 414d33e..6c5382c 100644
--- a/Controller/MainViewModel.cs
+++ b/Controller/MainViewModel.cs
@@ -1,13 +1,13 @@
-using System;
-using System.Collections.Generic;
+//using System;
+//using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.IO; // 添加這行
-using System.Linq;
+//using System.Linq;
using System.Runtime.CompilerServices;
-using System.Text;
+//using System.Text;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+//using System.Threading.Tasks;
namespace Karaoke_Kingpin.Controller
{
@@ -144,8 +144,8 @@ namespace Karaoke_Kingpin.Controller
ImagesImage = @"outputfile\Imagers\images.jpg";
// Initialize Marquee Items
- Marquee1Items = new ObservableCollection(File.ReadAllLines(@"txt\marquee1_items.txt"));
- Marquee2Items = new ObservableCollection(File.ReadAllLines(@"txt\marquee2_items.txt"));
+ Marquee1Items = new ObservableCollection(File.ReadAllLines(@"outputfile\txt\marquee1_items.txt"));
+ Marquee2Items = new ObservableCollection(File.ReadAllLines(@"outputfile\txt\marquee2_items.txt"));
}
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/Controller/MainWindow.cs b/Controller/MainWindow.cs
index 2061874..7d31694 100644
--- a/Controller/MainWindow.cs
+++ b/Controller/MainWindow.cs
@@ -1,20 +1,20 @@
using System;
-using System.Collections.Generic;
+//using System.Collections.Generic;
using System.Globalization;
-using System.IO;
-using System.Linq;
+//using System.IO;
+//using System.Linq;
using System.Security.Cryptography;
using System.Text;
-using System.Threading.Tasks;
+//using System.Threading.Tasks;
using System.Windows;
-using System.Windows.Controls;
+//using System.Windows.Controls;
using System.Windows.Data;
-using System.Windows.Documents;
+//using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+//using System.Windows.Media.Imaging;
+//using System.Windows.Navigation;
+//using System.Windows.Shapes;
namespace Karaoke_Kingpin.Controller
{
diff --git a/Converters/BitmapToImageSourceConverter.cs b/Converters/BitmapToImageSourceConverter.cs
index a70f1fa..a76125e 100644
--- a/Converters/BitmapToImageSourceConverter.cs
+++ b/Converters/BitmapToImageSourceConverter.cs
@@ -1,11 +1,11 @@
using System;
-using System.Collections.Generic;
+//using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
using System.Windows.Data;
using System.Windows.Media.Imaging;
diff --git a/Converters/ImagePathConverter.cs b/Converters/ImagePathConverter.cs
index a5865ba..f253193 100644
--- a/Converters/ImagePathConverter.cs
+++ b/Converters/ImagePathConverter.cs
@@ -1,9 +1,9 @@
using System;
-using System.Collections.Generic;
+//using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
using System.Windows.Data;
using System.Windows.Media.Imaging;
diff --git a/Converters/PinyinToZhuyinConverter.cs b/Converters/PinyinToZhuyinConverter.cs
index 2e20545..30d2d6e 100644
--- a/Converters/PinyinToZhuyinConverter.cs
+++ b/Converters/PinyinToZhuyinConverter.cs
@@ -1,8 +1,8 @@
-using System;
+//using System;
using System.Collections.Generic;
-using System.Linq;
+//using System.Linq;
using System.Text;
-using System.Threading.Tasks;
+//using System.Threading.Tasks;
namespace Karaoke_Kingpin.Converters
{
diff --git a/ILLink/ILLink.Descriptors.LibraryBuild.xml b/ILLink/ILLink.Descriptors.LibraryBuild.xml
new file mode 100644
index 0000000..a42d7f0
--- /dev/null
+++ b/ILLink/ILLink.Descriptors.LibraryBuild.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/Karaoke Kingpin.csproj b/Karaoke Kingpin.csproj
index e995f76..0e47025 100644
--- a/Karaoke Kingpin.csproj
+++ b/Karaoke Kingpin.csproj
@@ -1,6 +1,6 @@
-
+
Debug
@@ -52,34 +52,43 @@
packages\Microsoft.International.Converters.PinYinConverter.1.0.0\lib\ChnCharInfo.dll
- packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
+ packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll
- packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
+ packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll
-
- packages\EPPlus.7.1.2\lib\net462\EPPlus.dll
+
+ packages\EPPlus.7.7.0\lib\net462\EPPlus.dll
-
- packages\EPPlus.Interfaces.6.1.1\lib\net462\EPPlus.Interfaces.dll
+
+ packages\EPPlus.Interfaces.8.0.0\lib\net462\EPPlus.Interfaces.dll
-
- packages\EPPlus.System.Drawing.6.1.1\lib\net462\EPPlus.System.Drawing.dll
+
+ packages\EPPlus.System.Drawing.8.0.0\lib\net462\EPPlus.System.Drawing.dll
-
- packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll
+
+ packages\ExcelDataReader.3.7.0\lib\net462\ExcelDataReader.dll
-
- packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll
+
+ packages\ExcelDataReader.DataSet.3.7.0\lib\net462\ExcelDataReader.DataSet.dll
packages\ModernUI.WPF.1.0.9\lib\net45\FirstFloor.ModernUI.dll
-
- packages\Microsoft.Data.Sqlite.Core.8.0.4\lib\netstandard2.0\Microsoft.Data.Sqlite.dll
+
+ packages\Microsoft.Bcl.AsyncInterfaces.9.0.3\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
-
- packages\Microsoft.IO.RecyclableMemoryStream.3.0.0\lib\netstandard2.0\Microsoft.IO.RecyclableMemoryStream.dll
+
+ packages\Microsoft.Data.Sqlite.Core.9.0.3\lib\netstandard2.0\Microsoft.Data.Sqlite.dll
+
+
+ packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.3\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+
+ packages\Microsoft.Extensions.Logging.Abstractions.9.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+
+
+ packages\Microsoft.IO.RecyclableMemoryStream.3.0.1\lib\netstandard2.0\Microsoft.IO.RecyclableMemoryStream.dll
packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.AvalonDock.dll
@@ -87,56 +96,57 @@
packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.Toolkit.dll
-
- packages\NStandard.0.63.2\lib\net48\NStandard.dll
+
+ packages\MySqlConnector.2.4.0\lib\net48\MySqlConnector.dll
+
+
+ packages\NStandard.0.90.0\lib\net48\NStandard.dll
packages\pinyin4net.1.0.0\lib\net40\Pinyin4net.dll
-
- packages\SQLitePCLRaw.bundle_e_sqlite3.2.1.8\lib\net461\SQLitePCLRaw.batteries_v2.dll
+
+ packages\SQLitePCLRaw.bundle_e_sqlite3.2.1.11\lib\net461\SQLitePCLRaw.batteries_v2.dll
-
- packages\SQLitePCLRaw.core.2.1.8\lib\netstandard2.0\SQLitePCLRaw.core.dll
+
+ packages\SQLitePCLRaw.core.2.1.11\lib\netstandard2.0\SQLitePCLRaw.core.dll
-
- packages\SQLitePCLRaw.provider.dynamic_cdecl.2.1.8\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
+
+ packages\SQLitePCLRaw.provider.dynamic_cdecl.2.1.11\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
-
- packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
-
packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll
-
- packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net46\System.Data.SQLite.dll
+
+ packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll
-
- packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll
+
+ packages\System.Data.SQLite.EF6.1.0.119.0\lib\net46\System.Data.SQLite.EF6.dll
-
- packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll
+
+ packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll
+
+
+ packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll
+
+ packages\System.Drawing.Common.9.0.3\lib\net462\System.Drawing.Common.dll
+
-
- packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
-
-
- packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
-
-
- packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
-
-
- packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll
+
+ packages\System.Text.Encoding.CodePages.9.0.3\lib\net462\System.Text.Encoding.CodePages.dll
+
+ packages\System.Threading.Tasks.Extensions.4.6.2\lib\net462\System.Threading.Tasks.Extensions.dll
+
+
@@ -151,114 +161,6 @@
-
- packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.dll
-
-
- packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-
-
- packages\Xceed.Wpf.AvalonDock.Themes.FluentDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.AvalonDock.Themes.FluentDesign.dll
-
-
- packages\Xceed.Wpf.AvalonDock.Themes.MaterialDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.AvalonDock.Themes.MaterialDesign.dll
-
-
- packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-
-
- packages\Xceed.Wpf.AvalonDock.Themes.MetroAccent.4.6.24151.1544\lib\net40\Xceed.Wpf.AvalonDock.Themes.MetroAccent.dll
-
-
- packages\Xceed.Wpf.AvalonDock.Themes.Office2007.4.6.24151.1544\lib\net40\Xceed.Wpf.AvalonDock.Themes.Office2007.dll
-
-
- packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-
-
- packages\Xceed.Wpf.AvalonDock.Themes.Windows10.4.6.24151.1544\lib\net40\Xceed.Wpf.AvalonDock.Themes.Windows10.dll
-
-
- packages\Xceed.Wpf.DataGrid.Toolkit.4.6.24151.1544\lib\net40\Xceed.Wpf.DataGrid.dll
-
-
- packages\Xceed.Wpf.DataGrid.Themes.FluentDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.DataGrid.Themes.FluentDesign.dll
-
-
- packages\Xceed.Wpf.DataGrid.Themes.MaterialDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.DataGrid.Themes.MaterialDesign.dll
-
-
- packages\Xceed.Wpf.DataGrid.Themes.Metro.4.6.24151.1544\lib\net40\Xceed.Wpf.DataGrid.Themes.Metro.dll
-
-
- packages\Xceed.Wpf.DataGrid.Themes.Office2007.4.6.24151.1544\lib\net40\Xceed.Wpf.DataGrid.Themes.Office2007.dll
-
-
- packages\Xceed.Wpf.DataGrid.Themes.Windows10.4.6.24151.1544\lib\net40\Xceed.Wpf.DataGrid.Themes.Windows10.dll
-
-
- packages\Xceed.Wpf.ListBox.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.dll
-
-
- packages\Xceed.Wpf.ListBox.Themes.FluentDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.Themes.FluentDesign.dll
-
-
- packages\Xceed.Wpf.ListBox.Themes.LiveExplorer.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.Themes.LiveExplorer.dll
-
-
- packages\Xceed.Wpf.ListBox.Themes.MaterialDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.Themes.MaterialDesign.dll
-
-
- packages\Xceed.Wpf.ListBox.Themes.Metro.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.Themes.Metro.dll
-
-
- packages\Xceed.Wpf.ListBox.Themes.Office2007.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.Themes.Office2007.dll
-
-
- packages\Xceed.Wpf.ListBox.Themes.Windows10.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.Themes.Windows10.dll
-
-
- packages\Xceed.Wpf.ListBox.Themes.WMP11.4.6.24151.1544\lib\net40\Xceed.Wpf.ListBox.Themes.WMP11.dll
-
-
- packages\Xceed.Wpf.Themes.4.6.24151.1544\lib\net40\Xceed.Wpf.Themes.dll
-
-
- packages\Xceed.Wpf.Themes.FluentDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.Themes.FluentDesign.dll
-
-
- packages\Xceed.Wpf.Themes.MaterialDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.Themes.MaterialDesign.dll
-
-
- packages\Xceed.Wpf.Themes.MaterialDesignColors.4.6.24151.1544\lib\net40\Xceed.Wpf.Themes.MaterialDesignColors.dll
-
-
- packages\Xceed.Wpf.Themes.Metro.4.6.24151.1544\lib\net40\Xceed.Wpf.Themes.Metro.dll
-
-
- packages\Xceed.Wpf.Themes.Office2007.4.6.24151.1544\lib\net40\Xceed.Wpf.Themes.Office2007.dll
-
-
- packages\Xceed.Wpf.Themes.Windows10.4.6.24151.1544\lib\net40\Xceed.Wpf.Themes.Windows10.dll
-
-
- packages\Xceed.Wpf.Toolkit.4.6.24151.1544\lib\net40\Xceed.Wpf.Toolkit.dll
-
-
- packages\Xceed.Wpf.Toolkit.Themes.FluentDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.Toolkit.Themes.FluentDesign.dll
-
-
- packages\Xceed.Wpf.Toolkit.Themes.MaterialDesign.4.6.24151.1544\lib\net40\Xceed.Wpf.Toolkit.Themes.MaterialDesign.dll
-
-
- packages\Xceed.Wpf.Toolkit.Themes.Metro.4.6.24151.1544\lib\net40\Xceed.Wpf.Toolkit.Themes.Metro.dll
-
-
- packages\Xceed.Wpf.Toolkit.Themes.Office2007.4.6.24151.1544\lib\net40\Xceed.Wpf.Toolkit.Themes.Office2007.dll
-
-
- packages\Xceed.Wpf.Toolkit.Themes.Windows10.4.6.24151.1544\lib\net40\Xceed.Wpf.Toolkit.Themes.Windows10.dll
-
@@ -276,16 +178,12 @@
Designer
- Views\App.xaml
Code
-
- Views\Index.xaml
-
+
- Views\MainWindow.xaml
Code
@@ -323,15 +221,18 @@
+
+
+
此專案參考這部電腦上所缺少的 NuGet 套件。請啟用 NuGet 套件還原,以下載該套件。如需詳細資訊,請參閱 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的檔案是 {0}。
-
-
-
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/packages.config b/packages.config
index b004c2e..e9b2324 100644
--- a/packages.config
+++ b/packages.config
@@ -2,72 +2,36 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file