Browse Source

Pull request #9868: REPORT-79026【迭代】【起始页】F0028、F0022部分场景记录异常

Merge in DESIGN/design from ~HARRISON/design:release/11.0 to release/11.0

* commit 'a7efa6d3a4f02ec11e6b8083ab70d5ccbe829f9d':
  REPORT-79026【迭代】【起始页】F0028、F0022部分场景记录异常
newui
Harrison 2 years ago
parent
commit
48a10871fc
  1. 5
      designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java
  2. 9
      designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java

5
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.plugin.manage.PluginManager;
import com.fr.stable.os.AbstractOperatingSystem; import com.fr.stable.os.AbstractOperatingSystem;
import com.fr.stable.os.OperatingSystem; import com.fr.stable.os.OperatingSystem;
import com.fr.start.common.DesignerStartupConfig; import com.fr.start.common.DesignerStartupContext;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
@ -117,7 +117,8 @@ public class DesignerStartupModel {
private void fillMode() { private void fillMode() {
this.setMode(DesignerStartupConfig.getInstance().isEnabled() ? 0 : 1); // 这里需要使用 showStartupPage , 表示是否存在启动页
this.setMode(DesignerStartupContext.getInstance().isShowStartupPage() ? 0 : 1);
} }
public void fill() { public void fill() {

9
designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java

@ -47,8 +47,15 @@ public class DesignerStartupPageActivator extends Activator {
if (context.isShowStartupPage()) { if (context.isShowStartupPage()) {
showDesignerStartupPage(context); showDesignerStartupPage(context);
} else { } else {
DesignerStartupPageUtil.enterWorkspace(); startNonStartupPage();
}
} }
private void startNonStartupPage() {
StopWatch recorder = DesignerStartupContext.getRecorder();
DesignerStartupPageUtil.enterWorkspace();
recordStartupEnd(recorder);
} }
private void showDesignerStartupPage(DesignerStartupContext context) { private void showDesignerStartupPage(DesignerStartupContext context) {

Loading…
Cancel
Save