==

yhnbgfd · Dec 11, 2024 · cb80e74 · cb80e74
1 parent 74d5b74
commit cb80e74
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/MultiOpenBrowser.Core/Base/Global.cs b/MultiOpenBrowser.Core/Base/Global.cs
@@ -41,6 +41,7 @@ static Global()
             builder.RegisterType<Chrome>().Keyed<WebBrowserBase>(TypeEnum.Chrome);
             builder.RegisterType<MsEdge>().Keyed<WebBrowserBase>(TypeEnum.MsEdge);
             builder.RegisterType<Firefox>().Keyed<WebBrowserBase>(TypeEnum.Firefox);
+            builder.RegisterType<Browser360>().Keyed<WebBrowserBase>(TypeEnum.Browser360);
             builder.RegisterType<CustomizeBrowser>().Keyed<WebBrowserBase>(TypeEnum.Other);
             Container = builder.Build();
         }

diff --git a/MultiOpenBrowser.Core/WebBrowsers/Browser360.cs b/MultiOpenBrowser.Core/WebBrowsers/Browser360.cs
@@ -23,7 +23,7 @@ internal class Browser360(WebEnvironment webEnvironment) : WebBrowserBase(webEnv
             // 360浏览器特有的一些参数
             sb.Append("--360browser ");
             sb.Append("--no-sandbox ");
-            
+
             if (_webEnvironment.WebBrowser.DisableWebSecurity)
             {
                 sb.Append("--disable-web-security ");
@@ -67,4 +67,4 @@ public override StartResult Start(StartOption startOption)
             return StartResult.SuccessResult(process.Id);
         }
     }
-} 
+}
diff --git a/MultiOpenBrowser/App.xaml.cs b/MultiOpenBrowser/App.xaml.cs
@@ -29,21 +29,18 @@ private async void Application_Startup(object sender, StartupEventArgs e)
 
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
-            MessageBox.Show(e.Exception.ToString(), "DispatcherUnhandledException");
+            MessageBox.Show(e.Exception.ToString(), "DispatcherUnhandledException", MessageBoxButton.OK, MessageBoxImage.Error);
             e.Handled = true;
-            //Environment.Exit(1);
         }
 
         private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
         {
-            MessageBox.Show(e.Exception.ToString(), "UnhandledException");
-            //Environment.Exit(1);
+            MessageBox.Show(e.Exception.ToString(), "UnhandledException", MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            MessageBox.Show((e.ExceptionObject as Exception)?.ToString(), "UnobservedTaskException");
-            //Environment.Exit(1);
+            MessageBox.Show((e.ExceptionObject as Exception)?.ToString(), "UnobservedTaskException", MessageBoxButton.OK, MessageBoxImage.Error);
         }
     }
 }
diff --git a/MultiOpenBrowser/Views/UserControls/WebEnvironmentListItemUserControl.xaml.cs b/MultiOpenBrowser/Views/UserControls/WebEnvironmentListItemUserControl.xaml.cs
@@ -48,7 +48,7 @@ private void Button_StartWebEnvironment_Click(object sender, RoutedEventArgs e)
             catch (Exception ex)
             {
                 _logger.Error(ex);
-                MessageBox.Show(Application.Current.MainWindow, ex.Message);
+                MessageBox.Show(Application.Current.MainWindow, ex.Message, "Start WebEnvironment Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -59,7 +59,7 @@ private async void Button_DeleteWebEnvironment_Click(object sender, RoutedEventA
                 return;
             }
 
-            var result = MessageBox.Show(Application.Current.MainWindow, "Delete WebEnvironment ?", "Delete WebEnvironment", MessageBoxButton.OKCancel);
+            var result = MessageBox.Show(Application.Current.MainWindow, "Delete WebEnvironment ?", "Delete WebEnvironment", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
             if (result == MessageBoxResult.Cancel)
             {
                 return;
@@ -88,7 +88,7 @@ private async void Button_DeleteWebEnvironment_Click(object sender, RoutedEventA
             {
                 uow.Rollback();
                 _logger.Error(ex);
-                MessageBox.Show(Application.Current.MainWindow, ex.Message);
+                MessageBox.Show(Application.Current.MainWindow, ex.Message, "Delete WebEnvironment Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             finally
             {
@@ -131,7 +131,7 @@ private void Button_StartWebEnvironmentIncognito_Click(object sender, RoutedEven
             catch (Exception ex)
             {
                 _logger.Error(ex);
-                MessageBox.Show(Application.Current.MainWindow, ex.Message);
+                MessageBox.Show(Application.Current.MainWindow, ex.Message, "Start WebEnvironment Incognito Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -202,7 +202,7 @@ private void MenuItem_CopyStartupCMD_Click(object sender, RoutedEventArgs e)
             catch (Exception ex)
             {
                 _logger.Error(ex);
-                MessageBox.Show(Application.Current.MainWindow, ex.Message);
+                MessageBox.Show(Application.Current.MainWindow, ex.Message, "Copy Startup CMD Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
     }

diff --git a/MultiOpenBrowser/Views/Windows/WebEnvironmentOptionWindow.xaml.cs b/MultiOpenBrowser/Views/Windows/WebEnvironmentOptionWindow.xaml.cs
@@ -77,7 +77,7 @@ private async void Button_Save_Click(object sender, RoutedEventArgs e)
             {
                 uow.Rollback();
                 _logger.Error(ex);
-                MessageBox.Show(Application.Current.MainWindow, ex.Message);
+                MessageBox.Show(Application.Current.MainWindow, ex.Message, "Save WebEnvironment Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }