diff --git a/app/AnimeMatrix/AniMatrix.cs b/app/AnimeMatrix/AniMatrix.cs index ea511ebb..b2c61936 100644 --- a/app/AnimeMatrix/AniMatrix.cs +++ b/app/AnimeMatrix/AniMatrix.cs @@ -10,23 +10,23 @@ namespace GHelper.AnimeMatrix public class AniMatrix { - static System.Timers.Timer matrixTimer = default!; - static AnimeMatrixDevice mat; + System.Timers.Timer matrixTimer = default!; + AnimeMatrixDevice mat; - static double[] AudioValues; - static WasapiCapture AudioDevice; + double[] AudioValues; + WasapiCapture AudioDevice; - public static bool IsValid => mat != null; + public bool IsValid => mat != null; - private static long lastPresent; - private static List maxes = new List(); + private long lastPresent; + private List maxes = new List(); public AniMatrix() { try { mat = new AnimeMatrixDevice(); - Task.Run(mat.WakeUp); + //Task.Run(mat.WakeUp); matrixTimer = new System.Timers.Timer(100); matrixTimer.Elapsed += MatrixTimer_Elapsed; } @@ -78,8 +78,7 @@ namespace GHelper.AnimeMatrix SetMatrixPicture(AppConfig.getConfigString("matrix_picture")); break; case 3: - StartMatrixTimer(1000); - Logger.WriteLine("Matrix Clock"); + SetMatrixClock(); break; case 4: SetMatrixAudio(); @@ -95,21 +94,21 @@ namespace GHelper.AnimeMatrix } } - private static void StartMatrixTimer(int interval = 100) + private void StartMatrixTimer(int interval = 100) { matrixTimer.Interval = interval; - matrixTimer.Enabled = true; + matrixTimer.Start(); } - private static void StopMatrixTimer() + private void StopMatrixTimer() { - matrixTimer.Enabled = false; + matrixTimer.Stop(); } - private static void MatrixTimer_Elapsed(object? sender, ElapsedEventArgs e) + private void MatrixTimer_Elapsed(object? sender, ElapsedEventArgs e) { - if (!IsValid) return; + //if (!IsValid) return; switch (AppConfig.getConfig("matrix_running")) { @@ -123,6 +122,14 @@ namespace GHelper.AnimeMatrix } + + public void SetMatrixClock() + { + mat.SetBuiltInAnimation(false); + StartMatrixTimer(1000); + Logger.WriteLine("Matrix Clock"); + } + public void Dispose() { StopMatrixAudio(); diff --git a/app/Program.cs b/app/Program.cs index f74dfb01..4f2b5200 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -44,7 +44,7 @@ namespace GHelper Thread.CurrentThread.CurrentUICulture = CultureInfo.CurrentUICulture; Debug.WriteLine(CultureInfo.CurrentUICulture); - //Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture("uk"); + //Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture("zh"); CheckProcesses(); @@ -65,7 +65,7 @@ namespace GHelper } Logger.WriteLine("------------"); - Logger.WriteLine("App launched: " + AppConfig.GetModel() + " :" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + CultureInfo.CurrentUICulture + (IsUserAdministrator() ? "A" : "")); + Logger.WriteLine("App launched: " + AppConfig.GetModel() + " :" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + CultureInfo.CurrentUICulture + (IsUserAdministrator() ? "." : "")); Application.EnableVisualStyles(); diff --git a/app/Settings.cs b/app/Settings.cs index 06500bf6..751c300e 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -721,7 +721,7 @@ namespace GHelper matrix = new AniMatrix(); - if (!AniMatrix.IsValid) + if (!matrix.IsValid) { panelMatrix.Visible = false; return;