Merge pull request #318 in DESIGN/design from ~JU/design:release/10.0 to release/10.0

* commit '1ff55110dc3af9154fd7f5d3b94b4e46a26ed5ff':
  无JIRA任务 预览demo有问题 设置环境和预览demo分开，预览demo不触发第二次切环境
  无JIRA任务 预览demo有问题 设置环境和预览demo分开，预览demo不触发第二次切环境

designer-realize/src/main/java/com/fr/start/EnvSwitcher.java

@@ -1,29 +0,0 @@
-package com.fr.start;
-
-import com.fr.design.DesignerEnvManager;
-import com.fr.design.env.DesignerWorkspaceGenerator;
-import com.fr.design.mainframe.TemplatePane;
-import com.fr.workspace.WorkContext;
-import com.fr.workspace.Workspace;
-
-/**
- * Created by juhaoyu on 2018/1/31.
- * 环境切换器
- */
-public class EnvSwitcher {
-    
-    public void switch2LastEnv() {
-        try {
-    
-            String current = DesignerEnvManager.getEnvManager().getCurEnvName();
-            Workspace workspace = DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getWorkspaceInfo(current));
-            if (workspace == null) {
-                TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner();
-            } else {
-                WorkContext.switchTo(workspace);
-            }
-        } catch (Throwable e) {
-            TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner();
-        }
-    }
-}

designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

@@ -1,11 +1,9 @@
 package com.fr.start.module;
 
 
-import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.event.Event;
 import com.fr.event.Listener;
-import com.fr.general.ComparatorUtils;
 import com.fr.module.Activator;
 import com.fr.record.analyzer.EnableMetrics;
 import com.fr.record.analyzer.Metrics;
@@ -28,30 +26,25 @@ public class DesignerStartup extends Activator {
     @Override
     @Metrics
     public void start() {
+    
         startSub(PreStartActivator.class);
         //启动基础部分
         startSub(BasicActivator.class);
         final String[] args = getModule().upFindSingleton(StartupArgs.class).get();
         final Designer designer = new Designer(args);
-
+    
         startSub(DesignerWorkspaceProvider.class);
         registerEnvListener();
         //启动env
         startSub(EnvBasedModule.class);
-
+        //designer模块启动好后，查看demo
-        if (args != null) {
+        browserDemo();
-            for (String arg : args) {
-                if (ComparatorUtils.equals(arg, "demo")) {
-                    DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
-                    ServerStarter.browserDemoURL();
-                    break;
-                }
-            }
-        }
         ExecutorService service = Executors.newSingleThreadExecutor();
         service.submit(new Runnable() {
+        
             @Override
             public void run() {
+            
                 designer.show(args);
                 DesignerContext.getDesignerFrame().getProgressDialog().dispose();
             }
@@ -60,11 +53,19 @@ public class DesignerStartup extends Activator {
         DesignerContext.getDesignerFrame().setVisible(true);
         //启动画面结束
         SplashContext.getInstance().hide();
-
+    
         DesignerContext.getDesignerFrame().getProgressDialog().setVisible(true);
         startSub(StartFinishActivator.class);
+    
     }
-
+    
+    private void browserDemo() {
+    
+        if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) {
+            ServerStarter.browserDemoURL();
+        }
+    }
+    
     /**
      * 切换环境时，重新启动所有相关模块
      */

designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

@@ -1,33 +1,46 @@
 package com.fr.start.module;
 
 import com.fr.design.DesignerEnvManager;
-
+import com.fr.design.env.DesignerWorkspaceGenerator;
+import com.fr.design.mainframe.TemplatePane;
+import com.fr.general.ComparatorUtils;
 import com.fr.module.Activator;
-import com.fr.start.EnvSwitcher;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.Workspace;
 
 /**
  * Created by juhaoyu on 2018/1/8.
  * 设计器启动时的环境相关模块activator
  */
 public class DesignerWorkspaceProvider extends Activator {
-
+    
     @Override
     public void start() {
         //检查环境
         DesignerEnvManager.checkNameEnvMap();
-
+        
-        EnvSwitcher switcher = new EnvSwitcher();
+        if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) {
-        //设置好环境即可，具体跟环境有关的模块会自动调用
+            DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
-        switcher.switch2LastEnv();
+        } else {
-        getRoot().setSingleton(EnvSwitcher.class, switcher);
+            try {
+                String current = DesignerEnvManager.getEnvManager().getCurEnvName();
+                Workspace workspace = DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getWorkspaceInfo(current));
+                if (workspace == null) {
+                    TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner();
+                } else {
+                    WorkContext.switchTo(workspace);
+                }
+            } catch (Throwable e) {
+                TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner();
+            }
+        }
     }
-
+    
-
+    
     @Override
     public void stop() {
-        //清空模块
+    
-        getRoot().removeSingleton(EnvSwitcher.class);
     }
-
+    
-
+    
 }

designer-realize/src/main/java/com/fr/start/module/StartupArgs.java

@@ -1,5 +1,7 @@
 package com.fr.start.module;
 
+import com.fr.general.ComparatorUtils;
+
 /**
  * Created by juhaoyu on 2018/1/8.
  * 封装启动参数
@@ -17,5 +19,20 @@ public class StartupArgs {
         
         return args;
     }
+    
+    /**
+     * 是否是产品演示
+     */
+    public boolean isDemo() {
+        
+        if (args != null) {
+            for (String arg : args) {
+                if (ComparatorUtils.equals(arg, "demo")) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }