only: updater wl

This commit is contained in:
rusefillc 2024-08-09 00:24:22 -04:00
parent 7cffc0af6c
commit c797697a8a
4 changed files with 11 additions and 7 deletions

View File

@ -108,6 +108,10 @@ public class ConnectionAndMeta {
new File(localTargetFileName).setLastModified(connectionAndMeta.getLastModified()); new File(localTargetFileName).setLastModified(connectionAndMeta.getLastModified());
} }
public static boolean isDefaultWhitelabel(String whiteLabel) {
return DEFAULT_WHITE_LABEL.equals(whiteLabel);
}
public HttpURLConnection getHttpConnection() { public HttpURLConnection getHttpConnection() {
return httpConnection; return httpConnection;
} }

View File

@ -2,6 +2,7 @@ package com.rusefi;
import com.devexperts.logging.Logging; import com.devexperts.logging.Logging;
import com.rusefi.core.io.BundleUtil; import com.rusefi.core.io.BundleUtil;
import com.rusefi.core.net.ConnectionAndMeta;
import com.rusefi.core.preferences.storage.PersistentConfiguration; import com.rusefi.core.preferences.storage.PersistentConfiguration;
import com.rusefi.core.ui.FrameHelper; import com.rusefi.core.ui.FrameHelper;
import com.rusefi.io.LinkManager; import com.rusefi.io.LinkManager;
@ -214,7 +215,7 @@ public class StartupFrame {
JLabel logo = LogoHelper.createLogoLabel(); JLabel logo = LogoHelper.createLogoLabel();
if (logo != null) if (logo != null)
rightPanel.add(logo); rightPanel.add(logo);
if (UiProperties.isDefaultWhitelabel()) if (ConnectionAndMeta.isDefaultWhitelabel(UiProperties.getWhiteLabel()))
rightPanel.add(LogoHelper.createUrlLabel()); rightPanel.add(LogoHelper.createUrlLabel());
rightPanel.add(new JLabel("Console " + Launcher.CONSOLE_VERSION)); rightPanel.add(new JLabel("Console " + Launcher.CONSOLE_VERSION));

View File

@ -31,10 +31,6 @@ public class UiProperties {
return ConnectionAndMeta.getWhiteLabel(getProperties()); return ConnectionAndMeta.getWhiteLabel(getProperties());
} }
public static boolean isDefaultWhitelabel() {
return ConnectionAndMeta.DEFAULT_WHITE_LABEL.equals(getWhiteLabel());
}
public static String getUpdateHelpUrl() { public static String getUpdateHelpUrl() {
return properties.getProperty("UPDATE_FW_HELP_URL"); return properties.getProperty("UPDATE_FW_HELP_URL");
} }

View File

@ -5,6 +5,7 @@ import com.rusefi.SerialPortScanner;
import com.rusefi.StartupFrame; import com.rusefi.StartupFrame;
import com.rusefi.autodetect.PortDetector; import com.rusefi.autodetect.PortDetector;
import com.rusefi.core.FindFileHelper; import com.rusefi.core.FindFileHelper;
import com.rusefi.core.net.ConnectionAndMeta;
import com.rusefi.core.ui.FrameHelper; import com.rusefi.core.ui.FrameHelper;
import com.rusefi.maintenance.DfuFlasher; import com.rusefi.maintenance.DfuFlasher;
import com.rusefi.maintenance.ProgramSelector; import com.rusefi.maintenance.ProgramSelector;
@ -42,7 +43,8 @@ public class BasicStartupFrame {
} }
public BasicStartupFrame() { public BasicStartupFrame() {
String title = "rusEFI basic console " + Launcher.CONSOLE_VERSION; String whiteLabel = ConnectionAndMeta.getWhiteLabel(ConnectionAndMeta.getProperties());
String title = whiteLabel + " basic console " + Launcher.CONSOLE_VERSION;
frame = FrameHelper.createFrame(title); frame = FrameHelper.createFrame(title);
JPanel panel = new JPanel(new VerticalFlowLayout()); JPanel panel = new JPanel(new VerticalFlowLayout());
if (isWindows()) { if (isWindows()) {
@ -95,6 +97,7 @@ public class BasicStartupFrame {
JLabel logoLabel = LogoHelper.createLogoLabel(); JLabel logoLabel = LogoHelper.createLogoLabel();
if (logoLabel != null) if (logoLabel != null)
panel.add(logoLabel); panel.add(logoLabel);
if (ConnectionAndMeta.isDefaultWhitelabel(whiteLabel))
panel.add(LogoHelper.createUrlLabel()); panel.add(LogoHelper.createUrlLabel());
frame.showFrame(panel, false); frame.showFrame(panel, false);