Merge pull request #13413 in DESIGN/design from final/11.0 to release/11.0

* commit 'fd30b296d570632c9205a92224926bf1d7b6c5b2':
  REPORT-111890 升级到release后，延迟启动云端运维模块不会自动开启
  REPORT-111890 升级到release后，延迟启动云端运维模块不会自动开启

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -899,13 +899,18 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada
     }
 
     public boolean isCloudAnalyticsDelay() {
-        return designerPushUpdateConfigManager.isCloudAnalyticsDelay();
+        return designerPushUpdateConfigManager.isCloudAnalyticsDelay() || designerPushUpdateConfigManager.isUseCloudAnalyticsDelayFirst();
     }
 
     public void setCloudAnalyticsDelay(boolean cloudAnalyticsDelay) {
         designerPushUpdateConfigManager.setCloudAnalyticsDelay(cloudAnalyticsDelay);
     }
 
+    public void setUseCloudAnalyticsDelayFirst(boolean useCloudAnalyticsDelayFirst) {
+        designerPushUpdateConfigManager.setUseCloudAnalyticsDelayFirst(useCloudAnalyticsDelayFirst);
+    }
+
+
     /**
      * 设计器登录相关配置
      */

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -1122,7 +1122,10 @@ public class PreferencePane extends BasicPane {
         designerEnvManager.setUseOptimizedUPM4Adapter(optimizedUPMFlag);
         //只有取消掉使用新插件管理器这个选项才需要把useNewPluginFirst置false(意味着用户手动配置了,如果勾选着的话,这个useNewPluginFirst为true就行了)
         designerEnvManager.setUseNewPluginFirst(optimizedUPMFlag);
-        designerEnvManager.setCloudAnalyticsDelay(this.cloudAnalyticsDelayCheckBox.isSelected());
+        boolean cloudDelayFlag = this.cloudAnalyticsDelayCheckBox.isSelected();
+        designerEnvManager.setCloudAnalyticsDelay(cloudDelayFlag);
+        // cloudDelayFlag默认为true,如果用户手动配置过才会是false,则后续的云端运维配置都按照用户意愿来
+        designerEnvManager.setUseCloudAnalyticsDelayFirst(cloudDelayFlag);
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
         vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
         vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());

designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java

@@ -16,6 +16,7 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter {
 
     private boolean autoPushUpdateEnabled = true;  // 是否开启自动推送更新
     private boolean cloudAnalyticsDelay = true;  // 是否云端运维模块延迟启动
+    private boolean useCloudAnalyticsDelayFirst = true; // 默认打开,如果有手动改延迟启动配置则按客户配置的来
     private String lastIgnoredVersion = StringUtils.EMPTY;  // 最近一次跳过的更新版本
 
     private DesignerPushUpdateConfigManager() {
@@ -33,7 +34,8 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter {
         if (reader.isAttr()) {
             this.setAutoPushUpdateEnabled(reader.getAttrAsBoolean("autoPushUpdateEnabled", true));
             this.setLastIgnoredVersion(reader.getAttrAsString("lastIgnoredVersion", StringUtils.EMPTY));
-            this.setCloudAnalyticsDelay(reader.getAttrAsBoolean("cloudAnalyticsDelay", false));
+            this.setCloudAnalyticsDelay(reader.getAttrAsBoolean("cloudAnalyticsDelay", true));
+            this.setUseCloudAnalyticsDelayFirst(reader.getAttrAsBoolean("useCloudAnalyticsDelayFirst", true));
         }
     }
 
@@ -43,6 +45,7 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter {
         writer.attr("autoPushUpdateEnabled", autoPushUpdateEnabled);
         writer.attr("lastIgnoredVersion", lastIgnoredVersion);
         writer.attr("cloudAnalyticsDelay", cloudAnalyticsDelay);
+        writer.attr("useCloudAnalyticsDelayFirst", useCloudAnalyticsDelayFirst);
         writer.end();
     }
 
@@ -69,4 +72,12 @@ public class DesignerPushUpdateConfigManager implements XMLReadable, XMLWriter {
     public void setCloudAnalyticsDelay(boolean cloudAnalyticsDelay) {
         this.cloudAnalyticsDelay = cloudAnalyticsDelay;
     }
+
+    public boolean isUseCloudAnalyticsDelayFirst() {
+        return useCloudAnalyticsDelayFirst;
+    }
+
+    public void setUseCloudAnalyticsDelayFirst(boolean useCloudAnalyticsDelayFirst) {
+        this.useCloudAnalyticsDelayFirst = useCloudAnalyticsDelayFirst;
+    }
 }