代码优化

fis/Managers/BrowserManager.cs

@@ -67,10 +67,6 @@ namespace fis.Managers
 
         public const string NotificationName = "externalNotification";
 
-        public static AvaloniaCefBrowser? MeasureWindowBrowser { get; set; }
-
-        public static AvaloniaCefBrowser? ReportWindowBrowser { get; set; }
-
         /// <summary>
         /// 获取rpc通信的Service
         /// </summary>
@@ -166,9 +162,9 @@ namespace fis.Managers
         /// <param name="methodName"></param>
         /// <param name="targetMethodName"></param>
         /// <param name="arguments"></param>
-        public static void ExecuteJS(string methodName, TargetMethodName targetMethodName, List<string> arguments, bool isMainBrowser = true)
+        public static void ExecuteJS(TargetMethodName targetMethodName, List<string> arguments, bool isMainBrowser = true)
         {
-            string callString = methodName + "(";
+            string callString = NotificationName + "(";
             if (arguments != null)
             {
                 string comma = ", ";

fis/Managers/SecondaryScreenManager.cs

@@ -37,7 +37,6 @@ namespace fis.Managers
                     _window.Closed += Window_Closed;
                     if (!isShowWindow)
                     {
-                        _window.WindowState = WindowState.Minimized;
                         _window.ShowInTaskbar = false;
                         _window.Show();
                         _window.Hide();

fis/Managers/Ultra3DManager.cs

@@ -98,7 +98,7 @@ namespace fis.Managers
                     surfaceFiles
                 };
                 var callString = PlatFormHelper.GetMethodStr(BrowserManager.NotificationName, TargetMethodName.SetSurface, args);               
-                BrowserManager.MeasureWindowBrowser?.ExecuteJavaScript(callString, null, 0);                
+                BrowserManager.SlaveBrowser?.ExecuteJavaScript(callString, null, 0);                
             }
             catch (Exception exception)
             {
@@ -109,7 +109,7 @@ namespace fis.Managers
         private void MDFileReady(string key)
         {
             var callString = PlatFormHelper.GetMethodStr(BrowserManager.NotificationName, TargetMethodName.MdlFileLoaded, new List<string>() { key});
-            BrowserManager.MeasureWindowBrowser?.ExecuteJavaScript(callString, null, 0);
+            BrowserManager.SlaveBrowser?.ExecuteJavaScript(callString, null, 0);
         }
 
         public async void AdjustImage(Bitmap bitmap)
@@ -121,7 +121,7 @@ namespace fis.Managers
                     base64
                 };
                 var callString = PlatFormHelper.GetMethodStr(BrowserManager.NotificationName, TargetMethodName.AdjustPlaneImage, args);
-                BrowserManager.MeasureWindowBrowser?.ExecuteJavaScript(callString, null, 0);
+                BrowserManager.SlaveBrowser?.ExecuteJavaScript(callString, null, 0);
             }
             catch (Exception exception)
             {

fis/PlatformService.cs

@@ -43,7 +43,7 @@ namespace fis
             if (window != null)
             {
                 window.Close();
-                BrowserManager.ExecuteJS(BrowserManager.NotificationName, TargetMethodName.Logout,new List<string>());
+                BrowserManager.ExecuteJS(TargetMethodName.Logout,new List<string>());
             }
         }
 
@@ -139,7 +139,7 @@ namespace fis
             args.Add(templateJson);
             if (window != null) 
             {
-                BrowserManager.ExecuteJS(BrowserManager.NotificationName, TargetMethodName.SaveReportTemplate, args);
+                BrowserManager.ExecuteJS( TargetMethodName.SaveReportTemplate, args);
             }
         }
 

fis/SlaveWindow.axaml.cs

@@ -64,10 +64,6 @@ namespace fis
         internal async Task ChangeContentViewAsync(string host, Dictionary<string, string> keyValuePairs, WindowType windowType)
         {
             TargetMethodName targetMethodName;
-            if (windowType == WindowType.TemplateDesigner) {
-                //_browser.Address = host;
-                //return;
-            }
             _host = host;
             _parameters = keyValuePairs;
             var arguments = new List<string>();
@@ -105,7 +101,7 @@ namespace fis
                     targetMethodName = TargetMethodName.OpenReportEditPage;
                 }
             }
-            BrowserManager.ExecuteJS(BrowserManager.NotificationName, targetMethodName, arguments, false);
+            BrowserManager.ExecuteJS(targetMethodName, arguments, false);
         }
 
         private void SlaveWindow_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
@@ -204,15 +200,7 @@ namespace fis
             {
                 Icon = new WindowIcon(resourceStream);
             }
-            if (_windowType == WindowType.Measure)
-            {
-                BrowserManager.MeasureWindowBrowser = _browser;
-            }
-            if (_windowType == WindowType.ReportEdit)
-            {
-                BrowserManager.ReportWindowBrowser = _browser;
-            }
-
+       
         }
     }
 }

fis/Utilities/FisBrowserScriptObject.cs

@@ -63,7 +63,7 @@ namespace fis.Utilities
             args.Add(name);
             args.Add(useObject);
             args.Add(templateJson);
-            BrowserManager.ExecuteJS(BrowserManager.NotificationName, TargetMethodName.SaveReportTemplate, args);
+            BrowserManager.ExecuteJS( TargetMethodName.SaveReportTemplate, args);
         }
 
         /// <summary>
@@ -349,7 +349,7 @@ namespace fis.Utilities
         public void RefershReports() 
         {
             CloseWindow();
-            BrowserManager.ExecuteJS(BrowserManager.NotificationName, TargetMethodName.RefershReports, new List<string>());
+            BrowserManager.ExecuteJS(TargetMethodName.RefershReports, new List<string>());
         }
 
         public int Age { get; set; }