floraachy
/
MooInfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from rememberber/dev 

Dev
This commit is contained in:
周波 2022-02-22 21:52:28 +08:00 committed by GitHub
parent b659a095f8 6d04ac1cda
commit 01813997a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@ -18,20 +18,19 @@
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<logback.version>1.2.7</logback.version> <logback.version>1.2.10</logback.version>
<forms_rt.version>7.0.3</forms_rt.version> <forms_rt.version>7.0.3</forms_rt.version>
<AppleJavaExtensions.version>1.4</AppleJavaExtensions.version>
<lombok.version>1.18.22</lombok.version> <lombok.version>1.18.22</lombok.version>
<junit-jupiter-api.version>5.8.1</junit-jupiter-api.version> <junit-jupiter-api.version>5.8.2</junit-jupiter-api.version>
<commons-lang3.version>3.12.0</commons-lang3.version> <commons-lang3.version>3.12.0</commons-lang3.version>
<guava.version>31.0.1-jre</guava.version> <guava.version>31.0.1-jre</guava.version>
<okhttp.version>4.9.3</okhttp.version> <okhttp.version>4.9.3</okhttp.version>
<flatlaf.version>2.0.1</flatlaf.version> <flatlaf.version>2.0.1</flatlaf.version>
<flatlaf-extras.version>2.0.1</flatlaf-extras.version> <flatlaf-extras.version>2.0.1</flatlaf-extras.version>
<flatlaf-intellij-themes.version>2.0.1</flatlaf-intellij-themes.version> <flatlaf-intellij-themes.version>2.0.1</flatlaf-intellij-themes.version>
<hutool-all.version>5.7.16</hutool-all.version> <hutool-all.version>5.7.21</hutool-all.version>
<fastjson.version>1.2.78</fastjson.version> <fastjson.version>1.2.79</fastjson.version>
<oshi-core.version>6.1.2</oshi-core.version> <oshi-core.version>6.1.3</oshi-core.version>
<jfreechart.version>1.5.3</jfreechart.version> <jfreechart.version>1.5.3</jfreechart.version>
</properties> </properties>
@ -56,12 +55,6 @@
<version>${forms_rt.version}</version> <version>${forms_rt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.apple</groupId>
<artifactId>AppleJavaExtensions</artifactId>
<version>${AppleJavaExtensions.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>

6
src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java
View File

@ -297,6 +297,7 @@ public class CpuForm {
CentralProcessor processor = App.si.getHardware().getProcessor(); CentralProcessor processor = App.si.getHardware().getProcessor();
long[] currentFreq = processor.getCurrentFreq(); long[] currentFreq = processor.getCurrentFreq();
BigDecimal totalFreq = BigDecimal.ZERO;
for (int i = 0; i < currentFreq.length; i++) { for (int i = 0; i < currentFreq.length; i++) {
@ -305,9 +306,10 @@ public class CpuForm {
String freqStr = divide + " GHz"; String freqStr = divide + " GHz";
textField.setText(freqStr); textField.setText(freqStr);
// TODO to fix totalFreq = divide.add(totalFreq);
cpuForm.getFreqLabel().setText(freqStr);
} }
cpuForm.getFreqLabel().setText(String.valueOf(totalFreq.divide(new BigDecimal(currentFreq.length), 2, RoundingMode.HALF_UP)));
} }