opensource/MooTool
3
0
Fork 0
mirror of https://github.com/rememberber/MooTool.git synced 2026-08-29 02:10:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177 from rememberber/copilot/enhance-time-conversion-feature

Browse Source 
Add timezone selection to time conversion (时间转换增加时区选择)
This commit is contained in:
周波
2026-04-15 10:20:52 +08:00
committed by GitHub
parent 2e0c2c90d7 b87e4c5ef2
commit 3901dda9e7
2 changed files with 201 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/luoboduner/moo/tool/ui/form/func/TimeConvertForm.java
+191 -1
View File
@@ -25,6 +25,7 @@ import javax.swing.text.StyleContext;
import java.awt.*;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
/**
* <pre>
@@ -54,6 +55,9 @@ public class TimeConvertForm {
private JSplitPane splitPane;
private JScrollPane leftScrollPane;
private JButton clockButton;
private JComboBox<String> timezoneComboBox;
private JLabel gmtLabel;
private JPanel timezoneQuickPanel;
private static final Log logger = LogFactory.get();
@@ -61,6 +65,43 @@ public class TimeConvertForm {
public static final String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
/**
* Common timezone IDs for the combo box
*/
private static final String[] COMMON_TIMEZONE_IDS = {
"UTC",
"Asia/Shanghai",
"Asia/Tokyo",
"Asia/Seoul",
"Asia/Singapore",
"Asia/Hong_Kong",
"Asia/Kolkata",
"Asia/Dubai",
"Europe/London",
"Europe/Paris",
"Europe/Berlin",
"Europe/Moscow",
"America/New_York",
"America/Chicago",
"America/Denver",
"America/Los_Angeles",
"Australia/Sydney",
"Pacific/Auckland"
};
/**
* Quick timezone buttons: display label -> timezone ID
*/
private static final String[][] QUICK_TIMEZONE_BUTTONS = {
{"UTC", "UTC"},
{"+8", "Asia/Shanghai"},
{"+9", "Asia/Tokyo"},
{"-5", "America/New_York"},
{"-8", "America/Los_Angeles"},
{"+1", "Europe/Paris"},
{"+3", "Europe/Moscow"},
};
private static TFuncContentMapper funcContentMapper = MybatisUtil.getSqlSession().getMapper(TFuncContentMapper.class);
private TimeConvertForm() {
@@ -74,9 +115,51 @@ public class TimeConvertForm {
return timeConvertForm;
}
/**
* Get the currently selected TimeZone from the combo box.
*/
public TimeZone getSelectedTimeZone() {
if (timezoneComboBox == null || timezoneComboBox.getSelectedItem() == null) {
return TimeZone.getDefault();
}
String selected = (String) timezoneComboBox.getSelectedItem();
// Extract timezone ID from display string like "Asia/Shanghai (GMT+08:00)"
int parenIndex = selected.indexOf(" (");
String tzId = parenIndex > 0 ? selected.substring(0, parenIndex) : selected;
return TimeZone.getTimeZone(tzId);
}
/**
* Format a timezone ID for display: "Asia/Shanghai (GMT+08:00)"
*/
private static String formatTimezoneDisplay(String tzId) {
TimeZone tz = TimeZone.getTimeZone(tzId);
int rawOffset = tz.getRawOffset();
int hours = rawOffset / 3600000;
int minutes = Math.abs((rawOffset % 3600000) / 60000);
return String.format("%s (GMT%+03d:%02d)", tzId, hours, minutes);
}
/**
* Update the gmtLabel to show the selected timezone.
*/
private void updateGmtLabel() {
TimeZone tz = getSelectedTimeZone();
int rawOffset = tz.getRawOffset();
int hours = rawOffset / 3600000;
int minutes = Math.abs((rawOffset % 3600000) / 60000);
String offsetStr = String.format("GMT%+03d:%02d", hours, minutes);
if (gmtLabel != null) {
gmtLabel.setText("时间(" + offsetStr + ")");
}
}
public static void init() {
timeConvertForm = getInstance();
// Initialize timezone combo box
initTimezoneComponents();
ThreadUtil.execute(() -> {
while (true) {
timeConvertForm.getCurrentTimestampLabel().setText(String.valueOf(System.currentTimeMillis() / 1000));
@@ -89,7 +172,8 @@ public class TimeConvertForm {
timeConvertForm.getTimestampTextField().setText(String.valueOf(System.currentTimeMillis()));
}
if ("".equals(timeConvertForm.getGmtTextField().getText())) {
timeConvertForm.getGmtTextField().setText(DateFormatUtils.format(new Date(), TIME_FORMAT));
TimeZone tz = timeConvertForm.getSelectedTimeZone();
timeConvertForm.getGmtTextField().setText(DateFormatUtils.format(new Date(), TIME_FORMAT, tz));
}
Style.emphaticIndicatorFont(timeConvertForm.getCurrentGmtLabel());
@@ -120,6 +204,112 @@ public class TimeConvertForm {
TimeConvertListener.addListeners();
}
/**
* Initialize timezone selection components and add them to the UI.
*/
private static void initTimezoneComponents() {
// Create timezone combo box with common timezones
timeConvertForm.timezoneComboBox = new JComboBox<>();
for (String tzId : COMMON_TIMEZONE_IDS) {
timeConvertForm.timezoneComboBox.addItem(formatTimezoneDisplay(tzId));
}
// Set default selection to system default timezone
String systemTzId = TimeZone.getDefault().getID();
String systemDisplay = formatTimezoneDisplay(systemTzId);
boolean found = false;
for (int i = 0; i < timeConvertForm.timezoneComboBox.getItemCount(); i++) {
if (timeConvertForm.timezoneComboBox.getItemAt(i).equals(systemDisplay)) {
timeConvertForm.timezoneComboBox.setSelectedIndex(i);
found = true;
break;
}
}
if (!found) {
// Add system timezone if not in the common list
timeConvertForm.timezoneComboBox.insertItemAt(systemDisplay, 0);
timeConvertForm.timezoneComboBox.setSelectedIndex(0);
}
// Create quick timezone buttons panel
timeConvertForm.timezoneQuickPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
JLabel tzLabel = new JLabel("时区:");
timeConvertForm.timezoneQuickPanel.add(tzLabel);
timeConvertForm.timezoneQuickPanel.add(timeConvertForm.timezoneComboBox);
for (String[] btnDef : QUICK_TIMEZONE_BUTTONS) {
JButton btn = new JButton(btnDef[0]);
btn.setMargin(new Insets(2, 6, 2, 6));
String tzId = btnDef[1];
btn.setToolTipText(formatTimezoneDisplay(tzId));
btn.addActionListener(e -> {
String display = formatTimezoneDisplay(tzId);
for (int i = 0; i < timeConvertForm.timezoneComboBox.getItemCount(); i++) {
if (timeConvertForm.timezoneComboBox.getItemAt(i).equals(display)) {
timeConvertForm.timezoneComboBox.setSelectedIndex(i);
return;
}
}
// If not found, add and select
timeConvertForm.timezoneComboBox.addItem(display);
timeConvertForm.timezoneComboBox.setSelectedItem(display);
});
timeConvertForm.timezoneQuickPanel.add(btn);
}
// Listen for timezone changes to update label
timeConvertForm.timezoneComboBox.addActionListener(e -> {
timeConvertForm.updateGmtLabel();
});
// Add timezone panel to panel5 (the conversion panel, parent of gmtTextField)
Container gmtParent = timeConvertForm.getGmtTextField().getParent();
if (gmtParent instanceof JPanel) {
JPanel panel5 = (JPanel) gmtParent;
LayoutManager lm = panel5.getLayout();
if (lm instanceof GridLayoutManager) {
// Store all existing components and their constraints
Component[] components = panel5.getComponents();
GridLayoutManager glm = (GridLayoutManager) lm;
GridConstraints[] storedConstraints = new GridConstraints[components.length];
for (int i = 0; i < components.length; i++) {
storedConstraints[i] = glm.getConstraintsForComponent(components[i]);
}
// Rebuild panel5 with 4 rows (was 3 rows x 3 cols)
panel5.removeAll();
panel5.setLayout(new GridLayoutManager(4, 3, new Insets(10, 10, 10, 10), -1, -1));
// Re-add existing components with their original constraints
for (int i = 0; i < components.length; i++) {
panel5.add(components[i], storedConstraints[i]);
}
// Add timezone panel at row 3, spanning all 3 columns
panel5.add(timeConvertForm.timezoneQuickPanel,
new GridConstraints(3, 0, 1, 3,
GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL,
GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
GridConstraints.SIZEPOLICY_FIXED,
null, null, null, 0, false));
}
// Find and store reference to the "本地时间" label for dynamic updates
for (Component comp : panel5.getComponents()) {
if (comp instanceof JLabel) {
JLabel label = (JLabel) comp;
if (label.getText() != null && label.getText().contains("本地时间")) {
timeConvertForm.gmtLabel = label;
break;
}
}
}
}
// Update the label to show current timezone
timeConvertForm.updateGmtLabel();
}
public static int saveContent() {
timeConvertForm = getInstance();
String timeHisText = timeConvertForm.getTimeHisTextArea().getText();
src/main/java/com/luoboduner/moo/tool/ui/listener/func/TimeConvertListener.java
+10 -5
View File
@@ -10,12 +10,13 @@ import com.luoboduner.moo.tool.util.AlertUtil;
import com.luoboduner.moo.tool.util.ConsoleUtil;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import javax.swing.*;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
/**
* <pre>
@@ -141,7 +142,10 @@ public class TimeConvertListener {
try {
String localTime = timeConvertForm.getGmtTextField().getText();
String unit = (String) timeConvertForm.getUnitComboBox().getSelectedItem();
Date date = DateUtils.parseDate(localTime, TimeConvertForm.TIME_FORMAT);
TimeZone tz = timeConvertForm.getSelectedTimeZone();
SimpleDateFormat sdf = new SimpleDateFormat(TimeConvertForm.TIME_FORMAT);
sdf.setTimeZone(tz);
Date date = sdf.parse(localTime);
long timeStamp = date.getTime();
if ("秒(s)".equals(unit)) {
timeStamp = timeStamp / 1000;
@@ -149,7 +153,7 @@ public class TimeConvertListener {
timeConvertForm.getTimestampTextField().setText(String.valueOf(timeStamp));
timeConvertForm.getTimestampTextField().grabFocus();
output("本地时间: " + localTime + " --> 时间戳: " + timeStamp);
output("时间(" + tz.getID() + "): " + localTime + " --> 时间戳: " + timeStamp);
} catch (Exception ex) {
ex.printStackTrace();
logger.error(ExceptionUtils.getStackTrace(ex));
@@ -170,11 +174,12 @@ public class TimeConvertListener {
if ("秒(s)".equals(unit)) {
timeStamp = timeStamp * 1000;
}
String localTime = DateFormatUtils.format(new Date(timeStamp), TimeConvertForm.TIME_FORMAT);
TimeZone tz = timeConvertForm.getSelectedTimeZone();
String localTime = DateFormatUtils.format(new Date(timeStamp), TimeConvertForm.TIME_FORMAT, tz);
timeConvertForm.getGmtTextField().setText(localTime);
timeConvertForm.getGmtTextField().grabFocus();
output("时间戳: " + timeStamp + " --> 本地时间: " + localTime);
output("时间戳: " + timeStamp + " --> 时间(" + tz.getID() + "): " + localTime);
} catch (Exception ex) {
ex.printStackTrace();
logger.error(ExceptionUtils.getStackTrace(ex));