Merge pull request #196 from rememberber/develop

Develop
rememberber · Aug 11, 2019 · 5ce1700 · 5ce1700
2 parents f618fc3 + f8fb82c
commit 5ce1700
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,14 @@
 language: java
 
 before_install:
-- mvn install:install-file -Dfile=./src/main/lib/darcula.jar -DgroupId=com.darcula -DartifactId=darcula-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
-- mvn install:install-file -Dfile=./src/main/lib/beautyeye_lnf.jar -DgroupId=com.beautyeye -DartifactId=beautyeye-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
-- mvn install:install-file -Dfile=./src/main/lib/taobao-sdk-java.jar -DgroupId=com.taobao -DartifactId=top-auto-sdk -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
-- mvn install:install-file -Dfile=./src/main/lib/weblaf-1.29.jar -DgroupId=com.weblaf -DartifactId=weblaf-lnf -Dpackaging=jar -Dversion=1.2.9 -DgeneratePom=true -DcreateChecksum=true
-- mvn install:install-file -Dfile=./src/main/lib/antlr-2.7.4.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=antlr -Dpackaging=jar -Dversion=2.7.4 -DgeneratePom=true -DcreateChecksum=true
-- mvn install:install-file -Dfile=./src/main/lib/chardet-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=chardet -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
-- mvn install:install-file -Dfile=./src/main/lib/cpdetector_1.0.10.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=cpdetector -Dpackaging=jar -Dversion=1.0.10 -DgeneratePom=true -DcreateChecksum=true
-- mvn install:install-file -Dfile=./src/main/lib/jargs-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=jargs -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/darcula.jar -DgroupId=com.darcula -DartifactId=darcula-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/beautyeye_lnf.jar -DgroupId=com.beautyeye -DartifactId=beautyeye-lnf -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/taobao-sdk-java.jar -DgroupId=com.taobao -DartifactId=top-auto-sdk -Dpackaging=jar -Dversion=1.0 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/weblaf-1.29.jar -DgroupId=com.weblaf -DartifactId=weblaf-lnf -Dpackaging=jar -Dversion=1.2.9 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/antlr-2.7.4.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=antlr -Dpackaging=jar -Dversion=2.7.4 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/chardet-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=chardet -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/cpdetector_1.0.10.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=cpdetector -Dpackaging=jar -Dversion=1.0.10 -DgeneratePom=true -DcreateChecksum=true
+- mvn install:install-file -Dfile=/lib/jargs-1.0.jar -DgroupId=net.sourceforge.cpdetector -DartifactId=jargs -Dpackaging=jar -Dversion=1.0.0 -DgeneratePom=true -DcreateChecksum=true
 
 jdk:
   - openjdk8

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/CommonTipsDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/CommonTipsDialog.java
@@ -38,7 +38,7 @@ public CommonTipsDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 0.4, 0.64);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.4, 0.64);
 
         textPane1.addHyperlinkListener(e -> {
             if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) {

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/ExportDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/ExportDialog.java
@@ -46,7 +46,7 @@ public ExportDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 420, 300);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 420, 300);
 
         buttonOK.addActionListener(e -> onOK());
 

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/FontSizeAdjustDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/FontSizeAdjustDialog.java
@@ -35,7 +35,7 @@ public FontSizeAdjustDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 420, 200);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 420, 200);
 
         buttonOK.addActionListener(e -> onOK());
 

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/MailTestDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/MailTestDialog.java
@@ -37,7 +37,7 @@ public MailTestDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 420, 200);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 420, 200);
 
         buttonOK.addActionListener(e -> onOK());
 

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/Spinner.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/Spinner.java
@@ -31,7 +31,7 @@ public Spinner() {
         setContentPane(contentPane);
         setModal(false);
         setUndecorated(true);
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 420, 50);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 420, 50);
     }
 
     public static Spinner getInstance() {

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/SwitchWxAccountDialog.java
@@ -64,7 +64,7 @@ public SwitchWxAccountDialog() {
         setContentPane(contentPane);
         setModal(true);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 0.6, 0.63);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.6, 0.63);
 
         buttonOk.addActionListener(e -> onCancel());
 

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateDialog.java
@@ -46,7 +46,7 @@ public UpdateDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 600, 200);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 600, 200);
 
         buttonOK.addActionListener(e -> onOK());
 

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/UpdateInfoDialog.java
@@ -47,7 +47,7 @@ public UpdateInfoDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 0.4, 0.64);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.4, 0.64);
 
         buttonOK.addActionListener(e -> onOK());
 

diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/WxCpAppDialog.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/WxCpAppDialog.java
@@ -54,7 +54,7 @@ public WxCpAppDialog() {
         setContentPane(contentPane);
         setModal(true);
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 0.5, 0.5);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.5, 0.5);
 
         // 保存按钮事件
         saveButton.addActionListener(e -> {

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MainWindow.java b/src/main/java/com/fangxuele/tool/push/ui/form/MainWindow.java
@@ -37,6 +37,7 @@ public class MainWindow {
     private static GridConstraints gridConstraints = new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, 200), null, 0, false);
 
     public void init() {
+        mainWindow.getMainPanel().updateUI();
         mainWindow.getAboutPanel().add(AboutForm.aboutForm.getAboutPanel(), gridConstraints);
         mainWindow.getUserCasePanel().add(UserCaseForm.userCaseForm.getUserCasePanel(), gridConstraints);
         mainWindow.getSchedulePanel().add(ScheduleForm.scheduleForm.getSchedulePanel(), gridConstraints);
@@ -48,6 +49,7 @@ public void init() {
         mainWindow.getPushPanel().add(PushForm.pushForm.getPushPanel(), gridConstraints);
         mainWindow.getMessageTypePanel().add(MessageTypeForm.messageTypeForm.getMessageTypePanel(), gridConstraints);
         mainWindow.getBoostPanel().add(BoostForm.boostForm.getBoostPanel(), gridConstraints);
+        mainWindow.getMainPanel().updateUI();
     }
 
     {

diff --git a/src/main/java/com/fangxuele/tool/push/ui/frame/HttpResultFrame.java b/src/main/java/com/fangxuele/tool/push/ui/frame/HttpResultFrame.java
@@ -41,7 +41,7 @@ public void init() {
             application.setDockIconImage(UiConsts.IMAGE_ICON_LG);
         }
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 0.6, 0.66);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.6, 0.66);
     }
 
     public static HttpResultFrame getInstance() {

diff --git a/src/main/java/com/fangxuele/tool/push/ui/frame/MainFrame.java b/src/main/java/com/fangxuele/tool/push/ui/frame/MainFrame.java
@@ -52,7 +52,7 @@ public void init() {
             application.setEnabledPreferencesMenu(false);
         }
 
-        ComponentUtil.setPrefersizeAndLocateToCenter(this, 0.8, 0.88);
+        ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.8, 0.88);
     }
 
     /**

diff --git a/src/main/java/com/fangxuele/tool/push/ui/listener/BoostListener.java b/src/main/java/com/fangxuele/tool/push/ui/listener/BoostListener.java
@@ -63,7 +63,7 @@ public static void addListeners() {
             @Override
             public void mousePressed(MouseEvent e) {
                 CommonTipsDialog dialog = new CommonTipsDialog();
-                ComponentUtil.setPrefersizeAndLocateToCenter(dialog, 0.6, 0.7);
+                ComponentUtil.setPreferSizeAndLocateToCenter(dialog, 0.6, 0.7);
                 StringBuilder tipsBuilder = new StringBuilder();
                 tipsBuilder.append("<h1>什么是性能模式？</h1>");
                 tipsBuilder.append("<h2>最大限度利用系统资源，提升性能，实验性地不断优化，以期获得更快速的批量推送效果</h2>");

diff --git a/src/main/java/com/fangxuele/tool/push/util/ComponentUtil.java b/src/main/java/com/fangxuele/tool/push/util/ComponentUtil.java
@@ -24,7 +24,7 @@ public class ComponentUtil {
     /**
      * 设置组件preferSize并定位于屏幕中央
      */
-    public static void setPrefersizeAndLocateToCenter(Component component, int preferWidth, int preferHeight) {
+    public static void setPreferSizeAndLocateToCenter(Component component, int preferWidth, int preferHeight) {
         component.setBounds((screenWidth - preferWidth) / 2, (screenHeight - preferHeight) / 2,
                 preferWidth, preferHeight);
         Dimension preferSize = new Dimension(preferWidth, preferHeight);
@@ -34,9 +34,9 @@ public static void setPrefersizeAndLocateToCenter(Component component, int prefe
     /**
      * 设置组件preferSize并定位于屏幕中央(基于屏幕宽高的百分百)
      */
-    public static void setPrefersizeAndLocateToCenter(Component component, double preferWidthPercent, double preferHeightPercent) {
+    public static void setPreferSizeAndLocateToCenter(Component component, double preferWidthPercent, double preferHeightPercent) {
         int preferWidth = (int) (screenWidth * preferWidthPercent);
         int preferHeight = (int) (screenHeight * preferHeightPercent);
-        setPrefersizeAndLocateToCenter(component, preferWidth, preferHeight);
+        setPreferSizeAndLocateToCenter(component, preferWidth, preferHeight);
     }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/util/ConfigBaseUtil.java b/src/main/java/com/fangxuele/tool/push/util/ConfigBaseUtil.java
@@ -0,0 +1,43 @@
+package com.fangxuele.tool.push.util;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.setting.Setting;
+
+import java.io.File;
+
+/**
+ * <pre>
+ * 配置管理基类
+ * </pre>
+ *
+ * @author <a href="https://github.com/rememberber">RememBerBer</a>
+ * @since 2017/6/14.
+ */
+public class ConfigBaseUtil {
+    /**
+     * 设置文件路径
+     */
+    private String settingFilePath = SystemUtil.configHome + "config" + File.separator + "config.setting";
+
+    Setting setting;
+
+    ConfigBaseUtil() {
+        setting = new Setting(FileUtil.touch(settingFilePath), CharsetUtil.CHARSET_UTF_8, false);
+    }
+
+    public void setProps(String key, String value) {
+        setting.put(key, value);
+    }
+
+    public String getProps(String key) {
+        return setting.get(key);
+    }
+
+    /**
+     * 存盘
+     */
+    public void save() {
+        setting.store(settingFilePath);
+    }
+}
diff --git a/src/main/java/com/fangxuele/tool/push/util/ConfigUtil.java b/src/main/java/com/fangxuele/tool/push/util/ConfigUtil.java
@@ -1,11 +1,5 @@
 package com.fangxuele.tool.push.util;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.setting.Setting;
-
-import java.io.File;
-
 /**
  * <pre>
  * 配置管理
@@ -14,16 +8,18 @@
  * @author <a href="https://github.com/rememberber">RememBerBer</a>
  * @since 2017/6/14.
  */
-public class ConfigUtil {
-    /**
-     * 设置文件路径
-     */
-    private String settingFilePath = SystemUtil.configHome + "config" + File.separator + "config.setting";
-
-    private Setting setting;
+public class ConfigUtil extends ConfigBaseUtil {
 
     private static ConfigUtil configUtil = new ConfigUtil();
 
+    public static ConfigUtil getInstance() {
+        return configUtil;
+    }
+
+    private ConfigUtil() {
+        super();
+    }
+
     private int msgType;
 
     private String msgName;
@@ -185,29 +181,6 @@ public class ConfigUtil {
 
     private int fontSize;
 
-    public static ConfigUtil getInstance() {
-        return configUtil;
-    }
-
-    private ConfigUtil() {
-        setting = new Setting(FileUtil.touch(settingFilePath), CharsetUtil.CHARSET_UTF_8, false);
-    }
-
-    public void setProps(String key, String value) {
-        setting.put(key, value);
-    }
-
-    public String getProps(String key) {
-        return setting.get(key);
-    }
-
-    /**
-     * 存盘
-     */
-    public void save() {
-        setting.store(settingFilePath);
-    }
-
     public int getMsgType() {
         return setting.getInt("msgType", "msg", 13);
     }