Merge branch 'feature/10.0' into feature/big-screen

# Conflicts:
#	designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

build.gradle

@@ -28,17 +28,6 @@ dependencies {
     api project(':designer-realize')
 }
 
-configurations.all {
-    resolutionStrategy {
-        force 'com.fr.third:jxbrowser:6.23'
-        force 'com.fr.third:jxbrowser-mac:6.23'
-        force 'com.fr.third:jxbrowser-win64:6.23'
-        force 'com.fr.third:jxbrowser:7.5'
-        force 'com.fr.third:jxbrowser-mac:7.5'
-        force 'com.fr.third:jxbrowser-win64:7.5'
-    }
-}
-
 allprojects {
     apply plugin: 'java'
     apply plugin: 'java-library'
@@ -68,18 +57,12 @@ allprojects {
     }
 
     dependencies {
-        implementation ('com.fr.third:jxbrowser:6.23') {
+        implementation 'com.fr.third:jxbrowser:6.23'
-            force = true
+        implementation 'com.fr.third:jxbrowser-mac:6.23'
-        }
+        implementation 'com.fr.third:jxbrowser-win64:6.23'
-        implementation ('com.fr.third:jxbrowser-mac:6.23') {
+        implementation 'com.fr.third:jxbrowser-v7:7.5'
-            force = true
+        implementation 'com.fr.third:jxbrowser-mac-v7:7.5'
-        }
+        implementation 'com.fr.third:jxbrowser-win64-v7:7.5'
-        implementation ('com.fr.third:jxbrowser-win64:6.23') {
-            force = true
-        }
-        implementation 'com.fr.third:jxbrowser:7.5'
-        implementation 'com.fr.third:jxbrowser-mac:7.5'
-        implementation 'com.fr.third:jxbrowser-win64:7.5'
         implementation 'com.fr.third:jxbrowser-swing:7.5'
         implementation 'com.fr.third.server:servlet-api:3.0'
         implementation 'org.swingexplorer:swexpl:2.0.1'

designer-base/src/main/java/com/fr/design/login/DesignerLoginHelper.java

@@ -68,12 +68,9 @@ public class DesignerLoginHelper {
         if (dialog == null) {
             if (window instanceof Dialog) {
                 dialog = new DesignerLoginShowDialog((Dialog) window, designerLoginPane);
-            } else if (window instanceof Frame) {
-                dialog = new DesignerLoginShowDialog((Frame) window, designerLoginPane);
             } else {
-                return;
+                dialog = new DesignerLoginShowDialog((Frame) window, designerLoginPane);
             }
-
         }
         dialog.setVisible(true);
     }

designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java

@@ -5,6 +5,7 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.event.DesignerOpenedListener;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.os.impl.SupportOSImpl;
+import com.fr.stable.StringUtils;
 import javax.swing.WindowConstants;
 
 /**
@@ -54,7 +55,12 @@ public class DesignerGuideHelper {
      * 激活满一周
      */
     private static boolean isActivatedForOneWeek() {
-        return (System.currentTimeMillis() - DesignerEnvManager.getEnvManager().getDesignerActivatedTime()) > ONE_WEEK;
+        DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
+        String key = manager.getActivationKey();
+        if (StringUtils.isEmpty(key)) {
+            return false;
+        }
+        return (System.currentTimeMillis() - manager.getDesignerActivatedTime()) > ONE_WEEK;
     }
 
     /**

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -57,6 +57,8 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 
+import java.util.concurrent.CopyOnWriteArrayList;
+
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -109,7 +111,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
     private static final Integer TOP_LAYER = 200;
 
-    private List<DesignerOpenedListener> designerOpenedListenerList = new ArrayList<>();
+    private List<DesignerOpenedListener> designerOpenedListenerList = new CopyOnWriteArrayList<>();
 
     private ToolBarMenuDock ad;
 

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

@@ -437,9 +437,10 @@ public class DesignerActivator extends Activator implements Prepare {
                 manager.setDesignerLoginUsername(MarketConfig.getInstance().getBbsUsername());
                 manager.setDesignerLoginAppId(MarketConfig.getInstance().getBbsAppId());
                 manager.setDesignerLoginRefreshToken(MarketConfig.getInstance().getBbsRefreshToken());
-                manager.setCurrentVersionFirstLaunch(false);
+                manager.setDesignerLastLoginTime(System.currentTimeMillis());
                 manager.setLastLoginType(DesignerLoginType.NORMAL_LOGIN);
                 manager.setLastLoginAccount(MarketConfig.getInstance().getBbsUsername());
+                manager.setCurrentVersionFirstLaunch(false);
                 DesignerEnvManager.getEnvManager().saveXMLFile();
             }
         }