From a7efa6d3a4f02ec11e6b8083ab70d5ccbe829f9d Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Mon, 29 Aug 2022 21:10:29 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-79026=E3=80=90=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E8=B5=B7=E5=A7=8B=E9=A1=B5=E3=80=91F0028?=
 =?UTF-8?q?=E3=80=81F0022=E9=83=A8=E5=88=86=E5=9C=BA=E6=99=AF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/startup/metric/DesignerStartupModel.java | 5 +++--
 .../module/optimized/DesignerStartupPageActivator.java   | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java b/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java
index 9c0c07315d..5ed94d82eb 100644
--- a/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java
+++ b/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java
@@ -6,7 +6,7 @@ import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.stable.os.AbstractOperatingSystem;
 import com.fr.stable.os.OperatingSystem;
-import com.fr.start.common.DesignerStartupConfig;
+import com.fr.start.common.DesignerStartupContext;
 import com.fr.workspace.WorkContext;
 
 import java.lang.management.ManagementFactory;
@@ -117,7 +117,8 @@ public class DesignerStartupModel {
     
     private void fillMode() {
         
-        this.setMode(DesignerStartupConfig.getInstance().isEnabled() ? 0 : 1);
+        // 这里需要使用 showStartupPage ， 表示是否存在启动页
+        this.setMode(DesignerStartupContext.getInstance().isShowStartupPage() ? 0 : 1);
     }
     
     public void fill() {
diff --git a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
index 568b512938..ccae1a19a6 100644
--- a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
@@ -47,10 +47,17 @@ public class DesignerStartupPageActivator extends Activator {
         if (context.isShowStartupPage()) {
             showDesignerStartupPage(context);
         } else {
-            DesignerStartupPageUtil.enterWorkspace();
+            startNonStartupPage();
         }
     }
     
+    private void startNonStartupPage() {
+    
+        StopWatch recorder = DesignerStartupContext.getRecorder();
+        DesignerStartupPageUtil.enterWorkspace();
+        recordStartupEnd(recorder);
+    }
+    
     private void showDesignerStartupPage(DesignerStartupContext context) {
         
         // 启动页关闭