diff --git a/.idea/misc.xml b/.idea/misc.xml index 6aecfa7..8d040d7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/src/main/java/xyz/wbsite/jmacro/JMainApplication.java b/src/main/java/xyz/wbsite/jmacro/JMainApplication.java index 1318cd8..cdf55a5 100644 --- a/src/main/java/xyz/wbsite/jmacro/JMainApplication.java +++ b/src/main/java/xyz/wbsite/jmacro/JMainApplication.java @@ -30,7 +30,7 @@ public class JMainApplication extends Application { @Override public void start(Stage stage) throws Exception { - stage.setTitle("无限工具"); + stage.setTitle("芝麻糊的自动工具箱"); stage.setMinWidth(400); stage.setMinHeight(300); FXMLLoader mainLoader = FXMLUtil.load("main.fxml"); diff --git a/src/main/java/xyz/wbsite/jmacro/JMainController.java b/src/main/java/xyz/wbsite/jmacro/JMainController.java index 9703787..f318388 100644 --- a/src/main/java/xyz/wbsite/jmacro/JMainController.java +++ b/src/main/java/xyz/wbsite/jmacro/JMainController.java @@ -13,6 +13,7 @@ import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.Node; +import javafx.scene.control.CheckBox; import javafx.scene.control.Button; import javafx.scene.control.RadioButton; import javafx.scene.control.TextArea; @@ -56,6 +57,8 @@ public class JMainController implements Initializable { @FXML private Button stop; @FXML + private CheckBox autoMini; + @FXML private ToggleGroup runMode; @FXML private HBox modeLoop; @@ -86,6 +89,12 @@ public class JMainController implements Initializable { JMainController.instance = this; // 控件初始化 + boolean autoMiniValue = JProp.getInstance().getBool("autoMini", false); + autoMini.setSelected(autoMiniValue); + autoMini.setOnMouseClicked(event -> { + JProp.getInstance().setBool("autoMini", autoMini.isSelected()); + }); + String mode = JProp.getInstance().getString("mode", "loop"); ObservableList toggles = runMode.getToggles(); for (Toggle tog : toggles) { @@ -291,6 +300,11 @@ public class JMainController implements Initializable { return; } Logger.info("服务启动成功"); + + boolean autoMini = JProp.getInstance().getBool("autoMini", false); + if (autoMini) { + JMainApplication.primaryStage.setIconified(true); + } } } } diff --git a/src/main/java/xyz/wbsite/jmacro/JProp.java b/src/main/java/xyz/wbsite/jmacro/JProp.java index 6417b1a..9a7fc29 100644 --- a/src/main/java/xyz/wbsite/jmacro/JProp.java +++ b/src/main/java/xyz/wbsite/jmacro/JProp.java @@ -44,6 +44,10 @@ public class JProp { return this.props.getStr(key, "").split(","); } + public boolean getBool(String key, boolean defaultValue) { + return this.props.getBool(key, defaultValue); + } + public int getInt(String key, int defaultValue) { return this.props.getInt(key, defaultValue); } @@ -70,6 +74,11 @@ public class JProp { this.save(); } + public void setBool(String key, boolean value) { + this.props.setProperty(key, String.valueOf(value)); + this.save(); + } + public void setInt(String key, int value) { this.props.setProperty(key, String.valueOf(value)); this.save(); diff --git a/src/main/java/xyz/wbsite/jtask/TaskImpl.java b/src/main/java/xyz/wbsite/jtask/TaskImpl.java index 50045f3..e9e1b7b 100644 --- a/src/main/java/xyz/wbsite/jtask/TaskImpl.java +++ b/src/main/java/xyz/wbsite/jtask/TaskImpl.java @@ -38,24 +38,24 @@ public class TaskImpl extends JMacro { Logger.info("启动图标坐标：{}", launch.getRect().toString()); Logger.info("移动鼠标"); mouseMove(launch.getCenter()); -// Logger.info("双击我的电脑"); -// mouseLeftDoubleClick(launch); -// Logger.info("等待程序启动中，请稍等..."); -// delay(3 * 1000); -// -// Region windows = findLegend("我的电脑窗口", 0.9); -// if (windows == null) { -// Logger.error("我的电脑启动失败"); -// return; -// } -// Logger.info("定位到我的电脑窗口"); -// Logger.info("移动鼠标"); -// mouseMove(windows.getCenter().offset(100,0)); -// -// Logger.info("等待1秒后自动关闭"); -// delay(1000); -// mouseLeftClick(windows.getCenter().offset(100,0)); -// -// Logger.info("结束任务"); + Logger.info("双击我的电脑"); + mouseLeftDoubleClick(launch); + Logger.info("等待程序启动中，请稍等..."); + delay(3 * 1000); + + Region windows = findLegend("我的电脑窗口", 0.9); + if (windows == null) { + Logger.error("我的电脑启动失败"); + return; + } + Logger.info("定位到我的电脑窗口"); + Logger.info("移动鼠标"); + mouseMove(windows.getCenter().offset(100,0)); + + Logger.info("等待1秒后自动关闭"); + delay(1000); + mouseLeftClick(windows.getCenter().offset(100,0)); + + Logger.info("结束任务"); } } diff --git a/src/main/resources/icon.ico b/src/main/resources/icon.ico index 061bb64..13e7865 100644 Binary files a/src/main/resources/icon.ico and b/src/main/resources/icon.ico differ diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png index adf116c..9ec4f1d 100644 Binary files a/src/main/resources/icon.png and b/src/main/resources/icon.png differ diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml index 4bf75b1..4fc2dc0 100644 --- a/src/main/resources/main.fxml +++ b/src/main/resources/main.fxml @@ -13,7 +13,8 @@ - + + + + + + + + + +