删除上传和下载进度条

Author: easepan

src/main/java/org/code4everything/qiniu/QiniuApplication.java

@@ -10,7 +10,6 @@
 import javafx.stage.Stage;
 import org.apache.log4j.Logger;
 import org.code4everything.qiniu.constant.QiniuValueConsts;
-import org.code4everything.qiniu.controller.MainController;
 import org.code4everything.qiniu.model.ConfigBean;
 import org.code4everything.qiniu.util.ConfigUtils;
 import org.code4everything.qiniu.util.DialogUtils;
@@ -73,15 +72,11 @@ public void start(Stage stage) {
  stage.setTitle(QiniuValueConsts.MAIN_TITLE);
  // 设置关闭窗口事件
  stage.setOnCloseRequest(event -> {
- // 判断是否有文件在上传下载
- MainController main = MainController.getInstance();
- if (main.downloadProgress.isVisible() || main.uploadProgress.isVisible()) {
- Optional<ButtonType> result = DialogUtils.showConfirmation(QiniuValueConsts.UPLOADING_OR_DOWNLOADING);
- if (result.isPresent() && result.get() != ButtonType.OK) {
- // 取消退出事件
- event.consume();
- return;
- }
+ Optional<ButtonType> result = DialogUtils.showConfirmation(QiniuValueConsts.CONFIRM_EXIT);
+ if (result.isPresent() && result.get() != ButtonType.OK) {
+ // 取消退出事件
+ event.consume();
+ return;
  }
  // 退出程序
  ThreadPool.executor.shutdown();

src/main/java/org/code4everything/qiniu/constant/QiniuValueConsts.java

@@ -81,7 +81,7 @@ public class QiniuValueConsts {
 
  public static final long DATE_SPAN_OF_THIRTY_ONE = 31 * 24 * 60 * 60 * 1000L;
 
- public static final String UPLOADING_OR_DOWNLOADING = "有文件正在上传或下载中，是否确认退出？";
+ public static final String CONFIRM_EXIT = "有文件正在上传或下载中，是否确认退出？";
 
  private QiniuValueConsts() {}
 }

src/main/java/org/code4everything/qiniu/controller/MainController.java

@@ -85,12 +85,6 @@ public class MainController {
  @FXML
  public TextField searchTextField;
 
- @FXML
- public ProgressBar uploadProgress;
-
- @FXML
- public ProgressBar downloadProgress;
-
  @FXML
  public CheckBox folderRecursive;
 
@@ -117,21 +111,6 @@ public class MainController {
  @FXML
  private TableColumn<FileBean, String> timeColumn;
 
- @FXML
- private Hyperlink toCsdnBlog;
-
- @FXML
- private Hyperlink toHexoBlog;
-
- @FXML
- private Hyperlink toGithubSource;
-
- @FXML
- private Hyperlink toIntro;
-
- @FXML
- private Hyperlink toIntro1;
-
  @FXML
  private Label totalSizeLabel;
 
@@ -279,19 +258,21 @@ private void drawChart(boolean isFluxUnitChange, boolean isBandwidthUnitChange)
  // 获取开始日期和结束日期的时间差
  long timeSpan = localEndDate.getTime() - localStartDate.getTime();
  if (Checker.isNotEmpty(domainTextField.getText()) && timeSpan >= 0 && timeSpan <= QiniuValueConsts.DATE_SPAN_OF_THIRTY_ONE) {
- String[] domains = {domainTextField.getText()};
- if (isFluxUnitChange) {
- // 获取流量数据
- String fluxUnit = fluxCountUnit.getValue();
- bucketFluxChart.getData().clear();
- bucketFluxChart.getData().add(service.getBucketFlux(domains, fromDate, toDate, fluxUnit));
- }
- if (isBandwidthUnitChange) {
- // 获取带宽数据
- String bandUnit = bandCountUnit.getValue();
- bucketBandChart.getData().clear();
- bucketBandChart.getData().add(service.getBucketBandwidth(domains, fromDate, toDate, bandUnit));
- }
+ Platform.runLater(() -> {
+ String[] domains = {domainTextField.getText()};
+ if (isFluxUnitChange) {
+ // 获取流量数据
+ String fluxUnit = fluxCountUnit.getValue();
+ bucketFluxChart.getData().clear();
+ bucketFluxChart.getData().add(service.getBucketFlux(domains, fromDate, toDate, fluxUnit));
+ }
+ if (isBandwidthUnitChange) {
+ // 获取带宽数据
+ String bandUnit = bandCountUnit.getValue();
+ bucketBandChart.getData().clear();
+ bucketBandChart.getData().add(service.getBucketBandwidth(domains, fromDate, toDate, bandUnit));
+ }
+ });
  }
  }
 
@@ -582,11 +563,7 @@ public void uploadFile() {
  }
  // 新建一个上传文件的线程
  ThreadPool.executor.submit(() -> {
- Platform.runLater(() -> {
- uploadProgress.setVisible(true);
- uploadProgress.setProgress(0);
- uploadStatusTextArea.insertText(0, QiniuValueConsts.CONFIG_UPLOAD_ENVIRONMENT);
- });
+ Platform.runLater(() -> uploadStatusTextArea.insertText(0, QiniuValueConsts.CONFIG_UPLOAD_ENVIRONMENT));
  String bucket = bucketChoiceCombo.getValue();
  // 默认不指定key的情况下，以文件内容的hash值作为文件名
  String key = Checker.checkNull(filePrefixCombo.getValue());
@@ -648,8 +625,6 @@ public void uploadFile() {
  Platform.runLater(() -> {
  uploadStatusTextArea.deleteText(0, end);
  uploadStatusTextArea.insertText(0, status);
- // 设置上传的进度
- uploadProgress.setProgress(++upProgress / total);
  });
  }
  Platform.runLater(() -> selectedFileTextArea.deleteText(0, path.length() + (paths.length > 1 ? 1 : 0)));
@@ -660,8 +635,6 @@ public void uploadFile() {
  uploadStatusTextArea.positionCaret(0);
  // 清空待上传的文件列表
  selectedFileTextArea.clear();
- // 上传完成时，设置上传进度度不可见
- uploadProgress.setVisible(false);
  });
  mapResourceData();
  // 添加文件前缀到配置文件

src/main/resources/view/Main.fxml

@@ -285,10 +285,10 @@
  <BorderPane.margin>
  <Insets/>
  </BorderPane.margin>
- <ProgressBar fx:id="uploadProgress" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
- minHeight="10.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="10.0" prefWidth="500.0"
- progress="0.0" style="-fx-border-color: transparent;" visible="false" VBox.vgrow="NEVER"/>
  <HBox VBox.vgrow="NEVER">
+ <padding>
+ <Insets top="10" bottom="10"/>
+ </padding>
  <ComboBox fx:id="bucketChoiceCombo" minHeight="-Infinity" minWidth="-Infinity" prefHeight="27.0"
  prefWidth="205.0" promptText="还没有选择存储空间" HBox.hgrow="NEVER">
  <HBox.margin>
@@ -317,9 +317,6 @@
  </HBox.margin>
  </Button>
  </HBox>
- <ProgressBar fx:id="downloadProgress" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
- minHeight="10.0" prefHeight="10.0" prefWidth="500.0" progress="0.0"
- style="-fx-border-color: transparent;" visible="false" VBox.vgrow="NEVER"/>
  </VBox>
  </top>
  </BorderPane>