From 7c08d48401956a6d6cd6a3f179b3f10022bc723e Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 28 Feb 2024 17:57:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-114494=20fix:=E3=80=90FR=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E3=80=91=E5=90=AF=E5=8A=A8=E9=A1=B5logo?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/start/SplashContext.java          | 3 ++-
 .../src/main/java/com/fr/start/common/SplashPane.java      | 3 ++-
 .../java/com/fr/start/common/SplashPane4WinAndJDK11.java   | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/SplashContext.java b/designer-realize/src/main/java/com/fr/start/SplashContext.java
index 172e9b7cd..6d2895503 100644
--- a/designer-realize/src/main/java/com/fr/start/SplashContext.java
+++ b/designer-realize/src/main/java/com/fr/start/SplashContext.java
@@ -1,6 +1,7 @@
 package com.fr.start;
 
 import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.DesignerLaunchStatus;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.bbs.BBSConstants;
@@ -186,6 +187,6 @@ public class SplashContext {
     }
 
     private static String getSplashPath() {
-        return I18nImage.getImagePath(SPLASH_IMAGE_PATH);
+        return I18nImage.getImagePath(SPLASH_IMAGE_PATH, DesignerEnvManager.getEnvManager().getLanguage());
     }
 }
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java
index a6c6c92bc..535ace2d2 100644
--- a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java
+++ b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java
@@ -3,6 +3,7 @@ package com.fr.start.common;
 import com.bulenkov.iconloader.IconLoader;
 import com.bulenkov.iconloader.util.JBUI;
 import com.fr.base.GraphHelper;
+import com.fr.design.DesignerEnvManager;
 import com.fr.general.locale.image.I18nImage;
 import com.fr.stable.GraphDrawHelper;
 import com.fr.stable.GraphicsConfig;
@@ -59,7 +60,7 @@ public class SplashPane extends JPanel {
     }
 
     private static String getSplashPath() {
-        return I18nImage.getImagePath(SPLASH_PATH);
+        return I18nImage.getImagePath(SPLASH_PATH, DesignerEnvManager.getEnvManager().getLanguage());
     }
 
     private NotNullLazyValue<Font> fontValue = new NotNullLazyValue<Font>() {
diff --git a/designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java b/designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java
index 45aa33471..4d692067a 100644
--- a/designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java
+++ b/designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java
@@ -2,6 +2,7 @@ package com.fr.start.common;
 
 import com.bulenkov.iconloader.IconLoader;
 import com.fr.base.BaseUtils;
+import com.fr.design.DesignerEnvManager;
 import com.fr.general.IOUtils;
 import com.fr.general.locale.image.I18nImage;
 
@@ -11,6 +12,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
+import java.util.Locale;
 
 /**
  * @author Yvan
@@ -43,8 +45,9 @@ public class SplashPane4WinAndJDK11 extends SplashPane{
     }
 
     private String getSplashPath4WinAndJdk11() {
-        String path = I18nImage.getImagePath(SPLASH_PATH);
-        String pathOfDouble = I18nImage.getImagePath(DOUBLE_SPLASH_PATH);
+        Locale locale = DesignerEnvManager.getEnvManager().getLanguage();
+        String path = I18nImage.getImagePath(SPLASH_PATH, locale);
+        String pathOfDouble = I18nImage.getImagePath(DOUBLE_SPLASH_PATH, locale);
         // 为图片加上"@2x"
         // 某些定制jar里面没有两倍图，判断一下，如果文件不存在，就返回一倍图的path
         if (IOUtils.readResource(pathOfDouble) != null) {