Merge branch 'dev7.0-blowing' of…

Merge branch 'dev7.0-blowing' of http://private.flyautomation.net:82/panruising/thick_public into dev7.0-blowing

MultiLayout/FlyLayoutManager.cs

@@ -136,7 +136,7 @@ namespace MultiLayout
         {
             //加载全部 ui module
             UIModules.AddRange(uiContainer.ResolveAll<IUiModule2>());
-            await Task.Delay(10);
+            //await Task.Delay(10);
             lp.Progress += 10;
 
 
@@ -224,7 +224,7 @@ namespace MultiLayout
             foreach (var tabitem in gageTabItem.Items)
                 tabitem.Graphs.RemoveAll(gc => !gageTabItem.Components.Any(c => c.ID == gc.ID));
             
-            await Task.Delay(10);
+            //await Task.Delay(10);
             lp.Progress += 10;
 
             //创建页面
@@ -234,15 +234,15 @@ namespace MultiLayout
 
             //初始化每个区
             InitializeComponent_graph(gageTabItem, ucMainGage.tabControl_graph);
-            await Task.Delay(10);
+            //await Task.Delay(10);
             lp.Progress += 10;
 
             InitializeComponent_dynarea(gageTabItem, ucMainGage.stackpanel_dynarea);
-            await Task.Delay(10);
+            //await Task.Delay(10);
             lp.Progress += 10;
 
             InitializeComponent_menu(gageTabItem, ucMainGage.stackpanel_menu);
-            await Task.Delay(10);
+            //await Task.Delay(10);
             lp.Progress += 10;
 
             return ucMainGage;
@@ -282,7 +282,7 @@ namespace MultiLayout
                 gageTabItem.DynAreaItems.RemoveAll(id => !gageTabItem.Components.Any(c => c.ID == id));
                 foreach (var tabitem in gageTabItem.Items)
                     tabitem.Graphs.RemoveAll(gc => !gageTabItem.Components.Any(c => c.ID == gc.ID));
-                await Task.Delay(10);
+                //await Task.Delay(10);
                 lp.Progress += 10;
 
                 //创建页面
@@ -294,13 +294,13 @@ namespace MultiLayout
                 gageTabItem.TabControl = ucMainGage.tabControl_graph;
                 //初始化每个区
                 InitializeComponent_graph(gageTabItem, ucMainGage.tabControl_graph);
-                await Task.Delay(10);
+                //await Task.Delay(10);
                 lp.Progress += 10;
                 InitializeComponent_dynarea(gageTabItem, ucMainGage.stackpanel_dynarea);
-                await Task.Delay(10);
+                //await Task.Delay(10);
                 lp.Progress += 10;
                 InitializeComponent_menu(gageTabItem, ucMainGage.stackpanel_menu);
-                await Task.Delay(10);
+                //await Task.Delay(10);
                 lp.Progress += 10;
 
                 tabControl_gage.Items.Add(tabItem);
@@ -322,7 +322,7 @@ namespace MultiLayout
                 {
                     onInit.OnInit();
                     lp.Progress += 1;
-                    await Task.Delay(2);
+                    //await Task.Delay(2);
                 }
             }
         }
@@ -335,7 +335,7 @@ namespace MultiLayout
                 {
                     onInit.OnInit();
                     lp.Progress += 1;
-                    await Task.Delay(2);
+                    //await Task.Delay(2);
                 }
             }
         }