修复主界面安全模式的问题

更新错误处理逻辑
JamXi233 · Jun 6, 2023 · efbc1ab · efbc1ab
1 parent 146be83
commit efbc1ab
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 4 deletions.
diff --git a/SRTools/App.xaml.cs b/SRTools/App.xaml.cs
@@ -90,7 +90,7 @@ public async void Init()
                     TerminalMode.HideConsole();
                     break;
             }
-            Task.Run(() => getNotify.Get()).Wait();
+            try { Task.Run(() => getNotify.Get()).Wait(); } catch { }
             if (localSettings.Values["Config_TerminalMode"] != null)
             {
                 int Mode = (int)localSettings.Values["Config_TerminalMode"];

diff --git a/SRTools/MainWindow.xaml b/SRTools/MainWindow.xaml
@@ -108,7 +108,7 @@
             </StackPanel>
 
         </Grid>
-        <InfoBar x:Name="infoBar" IsOpen="False" Severity="Error" Title="" Message="" />
+        <InfoBar x:Name="infoBar" IsOpen="False" Severity="Error" Title="" Message="" VerticalAlignment="Bottom" />
     </Grid>
 
 </Window>
diff --git a/SRTools/MainWindow.xaml.cs b/SRTools/MainWindow.xaml.cs
@@ -66,6 +66,7 @@ public MainWindow()
 
         private void InitializeAppData()
         {
+            Windows.ApplicationModel.Core.CoreApplication.UnhandledErrorDetected += OnUnhandledErrorDetected;
             //应用数据检查开始
             ApplicationDataContainer keyContainer = GetOrCreateContainer(KeyPath);
             LocalSettingsData defaultValues = new LocalSettingsData("1", "Null", "Null", "Null");

diff --git a/SRTools/Views/AboutView.xaml b/SRTools/Views/AboutView.xaml
@@ -188,5 +188,6 @@
             </StackPanel>
 
         </Grid>
+        <InfoBar x:Name="infoBar" IsOpen="False" Severity="Error" Title="" Message="" />
     </Grid>
 </Page>
diff --git a/SRTools/Views/AboutView.xaml.cs b/SRTools/Views/AboutView.xaml.cs
@@ -58,6 +58,7 @@ public sealed partial class AboutView : Page
 
         public AboutView()
         {
+            Windows.ApplicationModel.Core.CoreApplication.UnhandledErrorDetected += OnUnhandledErrorDetected;
             InitializeComponent();
             Logging.Write("Switch to AboutView", 0);
             ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
@@ -539,5 +540,19 @@ private void Debug_Panic_Click(object sender, RoutedEventArgs e)
         {
             throw new Exception("异常处理测试");
         }
+
+        private void OnUnhandledErrorDetected(object sender, Windows.ApplicationModel.Core.UnhandledErrorDetectedEventArgs e)
+        {
+            try
+            {
+                e.UnhandledError.Propagate();
+            }
+            catch (Exception ex)
+            {
+                infoBar.IsOpen = true;
+                infoBar.Title = "灾难性错误";
+                infoBar.Message = ex.Message;
+            }
+        }
     }
 }
diff --git a/SRTools/Views/GachaView.xaml b/SRTools/Views/GachaView.xaml
@@ -49,6 +49,6 @@
                 <SymbolIconSource Symbol="Admin" />
             </TeachingTip.IconSource>
         </TeachingTip>
-
+        <InfoBar x:Name="infoBar" IsOpen="False" Severity="Error" Title="" Message="" />
     </Grid>
 </Page>
diff --git a/SRTools/Views/GachaView.xaml.cs b/SRTools/Views/GachaView.xaml.cs
@@ -27,6 +27,7 @@ public sealed partial class GachaView : Page
         ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
         public GachaView()
         {
+            Windows.ApplicationModel.Core.CoreApplication.UnhandledErrorDetected += OnUnhandledErrorDetected;
             var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 
             // 创建定时器，并设置回调函数和时间间隔
@@ -283,6 +284,19 @@ private void NavView_SelectionChanged(NavigationView sender, NavigationViewSelec
             }
         }
 
+        private void OnUnhandledErrorDetected(object sender, Windows.ApplicationModel.Core.UnhandledErrorDetectedEventArgs e)
+        {
+            try
+            {
+                e.UnhandledError.Propagate();
+            }
+            catch (Exception ex)
+            {
+                infoBar.IsOpen = true;
+                infoBar.Title = "灾难性错误";
+                infoBar.Message = ex.Message;
+            }
+        }
 
         private void Window_Closed(object sender, EventArgs e)
         {

diff --git a/SRTools/Views/MainView.xaml.cs b/SRTools/Views/MainView.xaml.cs
@@ -179,6 +179,7 @@ private void OnUnhandledErrorDetected(object sender, Windows.ApplicationModel.Co
             }
             catch (Exception ex)
             {
+                loadRing.Visibility = Visibility.Collapsed;
                 infoBar.IsOpen = true;
                 infoBar.Title = "灾难性错误"; 
                 infoBar.Message = ex.Message;

diff --git a/SRTools/Views/StartGameView.xaml b/SRTools/Views/StartGameView.xaml
@@ -74,7 +74,7 @@
                 <SymbolIconSource Symbol="Help" />
             </TeachingTip.IconSource>
         </TeachingTip>
-
+        <InfoBar x:Name="infoBar" IsOpen="False" Severity="Error" Title="" Message="" />
     </Grid>
 
 </Page>
diff --git a/SRTools/Views/StartGameView.xaml.cs b/SRTools/Views/StartGameView.xaml.cs
@@ -21,6 +21,7 @@ public sealed partial class StartGameView : Page
 
         public StartGameView()
         {
+            Windows.ApplicationModel.Core.CoreApplication.UnhandledErrorDetected += OnUnhandledErrorDetected;
             this.InitializeComponent();
             Logging.Write("Switch to StartGameView",0);
             // 获取UI线程的DispatcherQueue
@@ -234,5 +235,19 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
             dispatcherTimer_Launcher.Stop();
             Logging.Write("Timer Stopped", 0);
         }
+
+        private void OnUnhandledErrorDetected(object sender, Windows.ApplicationModel.Core.UnhandledErrorDetectedEventArgs e)
+        {
+            try
+            {
+                e.UnhandledError.Propagate();
+            }
+            catch (Exception ex)
+            {
+                infoBar.IsOpen = true;
+                infoBar.Title = "灾难性错误";
+                infoBar.Message = ex.Message;
+            }
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,5 +188,6 @@ @@
                 </StackPanel>
             </Grid>
+            <InfoBar x:Name="infoBar" IsOpen="False" Severity="Error" Title="" Message="" />
         </Grid>
     </Page>