21- prepare to release, fix small bugs

Author: RocketMaDev

README.md

@@ -21,7 +21,8 @@
 
 ## 注意事项
 
-1. 在程序里看到这份文档时，程序已在程序文件的目录下创建了**导入学生**的表格。 请根据指示在表格中填入名字、拼音（**全部小写，不能有空格**）、是否住校，至少2名学生。 然后关闭窗口，重新打开程序。
+1. 在程序里看到这份文档时，程序已在程序文件的目录下创建了**导入学生**的表格。 请根据指示在表格中填入名字、拼音（**全部小写，不能有空格，每个学生都要有**）、是否住校，至少2名学生。 然后关闭窗口，重新打开程序。
+   程序完全启动后，模板表格可以删除。
 2. **请不要导入原先的表格！已做更改！（删除了第8行）**
 3. 导入导出界面可以用回车代表点击确定
 4. 出现任何bug，请在Github上发issue（或私信）（可通过主界面左下角版权按钮直达）

src/cn/rocket/deksrt/main/Entry.java

@@ -7,11 +7,20 @@
 import cn.rocket.deksrt.util.Student;
 import cn.rocket.deksrt.util.StudentList;
 import cn.rocket.deksrt.util.Util;
+import com.jfoenix.controls.JFXButton;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.paint.Paint;
+import javafx.scene.text.Font;
 import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.ss.usermodel.Cell;
@@ -34,8 +43,14 @@ public class Entry extends Application {
     public void start(Stage primaryStage) throws Exception {
         GlobalVariables.mainS = primaryStage;
 //        File propertiesFile = new File(GlobalVariables.env+"config.properties");
-        if (!importStuInfo())
-            System.out.println("errors:" + scanStuInfo());
+        if (!importStuInfo()) {
+            String errors = scanStuInfo();
+            if (errors == null) {
+                showIntroduction(primaryStage);
+                return;
+            } else
+                System.out.println("errors:" + errors);
+        }
         exportStuInfo();
 
         Parent root = FXMLLoader.load(Objects.requireNonNull(
@@ -45,7 +60,23 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.setResizable(false);
         primaryStage.setScene(new Scene(root));
         primaryStage.show();
+    }
 
+    private void showIntroduction(Stage primaryStage) {
+        JFXButton btn = new JFXButton("关闭");
+        btn.setButtonType(JFXButton.ButtonType.RAISED);
+        btn.setTextFill(Paint.valueOf("white"));
+        btn.setFont(Font.font(25));
+        btn.setOnAction(event -> primaryStage.close());
+        btn.setBackground(new Background(new BackgroundFill(Paint.valueOf("dodgerblue"), null, null)));
+        AnchorPane pane = new AnchorPane();
+        AnchorPane.setTopAnchor(btn, 100.0);
+        AnchorPane.setRightAnchor(btn, 100.0);
+        pane.setPrefSize(970, 700);
+        pane.getChildren().addAll(new ImageView(new Image(GlobalVariables.INTRODUCTION)), btn);
+        primaryStage.setScene(new Scene(pane));
+        primaryStage.initStyle(StageStyle.UNDECORATED);
+        primaryStage.show();
     }
 
     /**
@@ -61,7 +92,7 @@ private String scanStuInfo() throws IOException, InvalidFormatException {
         if (!infoXlsx.exists()) {
             assert in != null;
             Files.copy(in, infoXlsx.toPath());
-            System.exit(99);
+            return null;
         } else {
             OPCPackage opcPackage = OPCPackage.open(infoXlsx);
             XSSFWorkbook wb = new XSSFWorkbook(opcPackage);
@@ -71,19 +102,16 @@ private String scanStuInfo() throws IOException, InvalidFormatException {
             Sheet sheet = wb.getSheetAt(0);
             DataFormatter df = new DataFormatter();
 
-            Student queue;
             String name;
             String pinyin;
             boolean boarding;
             for (int row = 1; row <= 52; row++) {
                 Row r = sheet.getRow(row);
                 if (r == null)
                     continue;
-
                 Cell c0 = r.getCell(0, Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);
                 Cell c1 = r.getCell(1, Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);
                 Cell c2 = r.getCell(2, Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);
-
                 if (c0 != null) {
                     if (c1 == null || !Util.validatePinyin((pinyin = df.formatCellValue(c1)))) {
                         errors.append("B").append(row + 1).append(",");
@@ -108,16 +136,15 @@ private String scanStuInfo() throws IOException, InvalidFormatException {
                 if (!stuIn.add(new Student(name, pinyin.toLowerCase(), boarding)))
                     errors.append(c0.getAddress()).append(",");
             }
-            if (stuIn.size() == 0) {
-                System.err.println("No names in input file!");
+            if (stuIn.size() < 2) {
+                System.err.println("Too less names in input file!");
                 System.exit(100);
             }
             System.out.println("name\tpy\tboarding");
             for (Student student : stuIn)
                 System.out.println(student);
             wb.close();
         }
-
         return errors.length() != 0 ? errors.deleteCharAt(errors.length() - 1).toString() : "";
     }
 
@@ -201,7 +228,6 @@ public static void main(String[] args) {
                 stuInfoFile.delete();
         }
 
-
         launch(args);
     }
 }

src/cn/rocket/deksrt/main/GlobalVariables.java

@@ -25,8 +25,10 @@ class GlobalVariables {
     static final String STUDENT_INFO = ENV + "student.info";
     static final String RESOURCE_PATH = "/cn/rocket/deksrt/resource/";
     static final String STU_INFO_TEMPLATE_P = RESOURCE_PATH + "templateOfStuInfo.xlsx";
-    static final String MAIN_WINDOW_FXML = RESOURCE_PATH + "MainWindow.fxml";
     static final String TABLE_TEMPLATE_P = RESOURCE_PATH + "templateOfTable.xlsx";
+    static final String MAIN_WINDOW_FXML = RESOURCE_PATH + "MainWindow.fxml";
+    static final String FOLDER_ICON = RESOURCE_PATH + "folder.png";
+    static final String INTRODUCTION = RESOURCE_PATH + "introduction.png";
 
     static final String GIVE_UP_LAYOUT_WARNING = "是否放弃当前布局？";
 }

src/cn/rocket/deksrt/main/IEportDialog.java

@@ -8,14 +8,14 @@
 import com.jfoenix.controls.JFXTextField;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.FileChooser;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 
 import java.io.*;
-import java.net.URL;
 
 /**
  * @author Rocket
@@ -38,9 +38,8 @@ public class IEportDialog {
     @FXML
     void initialize() {
         iodTxtF.setText("");
-        URL iconU = IEportDialog.class.getResource("/cn/rocket/deksrt/resource/folder.png");
         iconBtn.setText("");
-        iconBtn.setGraphic(new ImageView(String.valueOf(iconU)));
+        iconBtn.setGraphic(new ImageView(new Image(GlobalVariables.FOLDER_ICON)));
     }
 
     @FXML

src/cn/rocket/deksrt/main/MainWindow.java

@@ -461,6 +461,7 @@ private void updateTable(int x, int y) {
         JFXButton btn = btns[y][x];
         Student stu = students[y][x];
         if (stu == null) {
+            btn.setTextFill(Paint.valueOf("black"));
             btn.setText("");
         } else {
             btn.setText(stu.getName());