Skip to content

Commit 2f5fb2f

Browse files
author
xuxiaoyan
committed
优化跨平台性。
1 parent ff3a35b commit 2f5fb2f

2 files changed

Lines changed: 14 additions & 5 deletions

File tree

src/main/java/com/xwintop/xJavaFxTool/services/debugTools/SwitchHostsToolService.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.xwintop.xJavaFxTool.services.debugTools;
22

3+
import com.sun.jna.Platform;
34
import com.xwintop.xJavaFxTool.controller.debugTools.SwitchHostsToolController;
45
import com.xwintop.xcore.util.SystemInfoUtil;
56
import com.xwintop.xcore.util.javafx.TooltipUtil;
@@ -33,16 +34,22 @@ public class SwitchHostsToolService {
3334
private String localHost2String = "# 方案二\n";
3435

3536
public void reloadSystemHosts() throws Exception {
36-
String fileName = SystemInfoUtil.getHostsFilePath();
37-
String systemHostString = FileUtils.readFileToString(new File(fileName),"utf-8");
37+
String fileName = null;
38+
if (Platform.isWindows()) {
39+
fileName = "C://WINDOWS//system32//drivers//etc//hosts";
40+
} else {
41+
fileName = "/etc/hosts";
42+
}
43+
// String fileName = SystemInfoUtil.getHostsFilePath();
44+
String systemHostString = FileUtils.readFileToString(new File(fileName), "utf-8");
3845
switchHostsToolController.getHostTextArea().setText(systemHostString);
3946

4047
}
4148

4249
public void editAction() throws Exception {
4350
String fileName = SystemInfoUtil.getHostsFilePath();
4451
String systemHostString = switchHostsToolController.getHostTextArea().getText();
45-
FileUtils.writeByteArrayToFile(new File(fileName),systemHostString.getBytes());
52+
FileUtils.writeByteArrayToFile(new File(fileName), systemHostString.getBytes());
4653
TooltipUtil.showToast("保存配置成功");
4754
}
4855

src/main/java/com/xwintop/xJavaFxTool/services/javaFxTools/ShowSystemInfoService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@ public void run() {
134134
if (series[ii * 2 + 1].getData().size() > 60) {
135135
series[ii * 2 + 1].getData().remove(0);
136136
}
137-
series[ii * 2 + 0].getData().add(new XYChart.Data(xValue, diskStores[ii].getReadBytes() * 1000 / diskStores[ii].getTransferTime()));
138-
series[ii * 2 + 1].getData().add(new XYChart.Data(xValue, diskStores[ii].getWriteBytes() * 1000 / diskStores[ii].getTransferTime()));
137+
if(diskStores[ii].getTransferTime() > 0){
138+
series[ii * 2 + 0].getData().add(new XYChart.Data(xValue, diskStores[ii].getReadBytes() * 1000 / diskStores[ii].getTransferTime()));
139+
series[ii * 2 + 1].getData().add(new XYChart.Data(xValue, diskStores[ii].getWriteBytes() * 1000 / diskStores[ii].getTransferTime()));
140+
}
139141
});
140142
}
141143
} catch (Exception e) {

0 commit comments

Comments
 (0)