From 28fb7b97d39f5e3d7bcc52e62999640b102daa5f Mon Sep 17 00:00:00 2001 From: rememberber Date: Sun, 20 Feb 2022 18:34:45 +0800 Subject: [PATCH 1/3] optimize the cpu freq --- src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java index 3530087..28fabca 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java @@ -297,6 +297,7 @@ public class CpuForm { CentralProcessor processor = App.si.getHardware().getProcessor(); long[] currentFreq = processor.getCurrentFreq(); + BigDecimal totalFreq = BigDecimal.ZERO; for (int i = 0; i < currentFreq.length; i++) { @@ -305,9 +306,10 @@ public class CpuForm { String freqStr = divide + " GHz"; textField.setText(freqStr); - // TODO to fix - cpuForm.getFreqLabel().setText(freqStr); + totalFreq = divide.add(totalFreq); + } + cpuForm.getFreqLabel().setText(String.valueOf(totalFreq.divide(new BigDecimal(4), 2, RoundingMode.HALF_UP))); } From 571b3d68d3e915a303cf8d9fe2755892967e1b51 Mon Sep 17 00:00:00 2001 From: rememberber Date: Sun, 20 Feb 2022 18:40:27 +0800 Subject: [PATCH 2/3] update maven dependencies --- pom.xml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index f3dbed9..72706cd 100644 --- a/pom.xml +++ b/pom.xml @@ -18,19 +18,18 @@ 1.8 1.8 - 1.2.7 + 1.2.10 7.0.3 - 1.4 1.18.22 - 5.8.1 + 5.8.2 3.12.0 31.0.1-jre 4.9.3 2.0.1 2.0.1 2.0.1 - 5.7.16 - 1.2.78 + 5.7.21 + 1.2.79 6.1.2 1.5.3 @@ -56,12 +55,6 @@ ${forms_rt.version} - - com.apple - AppleJavaExtensions - ${AppleJavaExtensions.version} - - org.projectlombok lombok From 6d04ac1cdab8284bb141c8d4a06bfc499bb74c98 Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Tue, 22 Feb 2022 21:50:01 +0800 Subject: [PATCH 3/3] oshi:update to 6.1.3 --- pom.xml | 2 +- src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 72706cd..e6864f7 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.0.1 5.7.21 1.2.79 - 6.1.2 + 6.1.3 1.5.3 diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java index 28fabca..b680f89 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java @@ -309,7 +309,7 @@ public class CpuForm { totalFreq = divide.add(totalFreq); } - cpuForm.getFreqLabel().setText(String.valueOf(totalFreq.divide(new BigDecimal(4), 2, RoundingMode.HALF_UP))); + cpuForm.getFreqLabel().setText(String.valueOf(totalFreq.divide(new BigDecimal(currentFreq.length), 2, RoundingMode.HALF_UP))); }