Merge pull request #14249 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '18efcac0f2a2091ff305b275c88024b14a3ce7e2':
  REPORT-111995 【NewUI】文件-选项和帮助面板翻新
  REPORT-125224 fix:补充设计器启动计时器关闭

designer-base/src/main/java/com/fr/design/carton/latency/DesignerLatencyMetric.java

@@ -9,10 +9,10 @@ import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
 import com.fr.general.CloudCenter;
+import com.fr.general.GeneralUtils;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
-import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
@@ -81,7 +81,7 @@ public class DesignerLatencyMetric {
             this.scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("LatencyMetricWorker"));
             this.scheduler.scheduleWithFixedDelay(this::collectAndSubmit, 60, 60, TimeUnit.MINUTES);
             // 注册设计器工作目录切换事件监听
-            EventDispatcher.listen(WorkspaceEvent.AfterSwitch, new Listener<Workspace>() {
+            EventDispatcher.listen(WorkspaceEvent.BeforeSwitch, new Listener<Workspace>() {
                 @Override
                 public void on(Event event, Workspace param) {
                     collectAndSubmit();
@@ -162,14 +162,12 @@ public class DesignerLatencyMetric {
         info.put(APPID, MarketConfig.getInstance().getCloudOperationMaintenanceId());
         info.put(USERID, MarketConfig.getInstance().getBbsUid());
         info.put(DESIGNER_ID, DesignerEnvManager.getEnvManager().getUUID());
-        info.put(DESIGNER_VERSION, ProductConstants.DESIGNER_VERSION);
+        info.put(DESIGNER_VERSION, GeneralUtils.getVersion());
         info.put(DESIGN_METHOD, WorkContext.getCurrent().isLocal() ? LOCAL : REMOTE);
         info.put(OPERANDS_NUM, LATENCY_CONTAINER.values().stream().mapToInt(AtomicInteger::get).sum());
         for (Map.Entry<LatencyLevel, AtomicInteger> entry : LATENCY_CONTAINER.entrySet()) {
-            if (!LatencyLevel.UNDEFINE.equals(entry.getKey())) {
             info.put(entry.getKey().getMark(), entry.getValue().get());
         }
-        }
         return info;
     }
 

designer-base/src/main/java/com/fr/design/carton/latency/LatencyLevel.java

@@ -24,9 +24,7 @@ public enum LatencyLevel {
     // 非常严重卡顿
     EXTREME(2000, 3000, "waitNum7"),
     // 极度卡顿
-    CRITICAL(3000, Long.MAX_VALUE, "waitNum8"),
-    // 未知场景
-    UNDEFINE(-1, -1, "unknown");
+    CRITICAL(3000, Long.MAX_VALUE, "waitNum8");
 
     final long start;
     final long end;
@@ -62,6 +60,6 @@ public enum LatencyLevel {
                 return level;
             }
         }
-        return UNDEFINE;
+        return CRITICAL;
     }
 }

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

@@ -161,7 +161,7 @@ public class MainDesigner extends BaseDesigner {
             ServerTray.init();
         }
         FineLoggerFactory.getLogger().info("Designer started.Time used {} ms", DesignerStartupContext.getRecorder().getTime(TimeUnit.MILLISECONDS));
-
+        DesignerStartupContext.getRecorder().stop();
         SwitchForSwingChecker.initThreadMonitoring();
         DesignerLatencyMetric.getInstance().start();
     }