1.8.6 修复切换隐蔽模式导致的闪退

showyourlucky · Mar 11, 2021 · a02edd4 · a02edd4
1 parent 2369074
commit a02edd4
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.huage2580'
-version '1.8.5'
+version '1.8.6'
 
 sourceCompatibility = 1.8
 

diff --git a/leeks-1.8.5.zip → leeks-1.8.6.zip b/leeks-1.8.5.zip → leeks-1.8.6.zip
diff --git a/src/main/java/SettingsWindow.form b/src/main/java/SettingsWindow.form
@@ -246,7 +246,7 @@
           <forms/>
         </constraints>
         <properties>
-          <text value="小韭菜 V1.8.5"/>
+          <text value="小韭菜 V1.8.6"/>
         </properties>
       </component>
       <grid id="b17a5" layout-manager="FlowLayout" hgap="30" vgap="5" flow-align="0">

diff --git a/src/main/java/handler/CoinRefreshHandler.java b/src/main/java/handler/CoinRefreshHandler.java
@@ -28,7 +28,11 @@ public abstract class CoinRefreshHandler extends DefaultTableModel {
             instance.setValue(WindowUtils.COIN_TABLE_HEADER_KEY, WindowUtils.COIN_TABLE_HEADER_VALUE);
         }
 
-        columnNames = Objects.requireNonNull(instance.getValue(WindowUtils.COIN_TABLE_HEADER_KEY)).split(",");
+        String[] configStr = Objects.requireNonNull(instance.getValue(WindowUtils.COIN_TABLE_HEADER_KEY)).split(",");
+        columnNames = new String[configStr.length];
+        for (int i = 0; i < configStr.length; i++) {
+            columnNames[i] = WindowUtils.remapPinYin(configStr[i]);
+        }
     }
 
     /**

diff --git a/src/main/java/handler/FundRefreshHandler.java b/src/main/java/handler/FundRefreshHandler.java
@@ -32,8 +32,11 @@ public abstract class FundRefreshHandler extends DefaultTableModel {
         if (instance.getValue(WindowUtils.FUND_TABLE_HEADER_KEY) == null) {
             instance.setValue(WindowUtils.FUND_TABLE_HEADER_KEY, WindowUtils.FUND_TABLE_HEADER_VALUE);
         }
-
-        columnNames = Objects.requireNonNull(instance.getValue(WindowUtils.FUND_TABLE_HEADER_KEY)).split(",");
+        String[] configStr = Objects.requireNonNull(instance.getValue(WindowUtils.FUND_TABLE_HEADER_KEY)).split(",");
+        columnNames = new String[configStr.length];
+        for (int i = 0; i < configStr.length; i++) {
+            columnNames[i] = WindowUtils.remapPinYin(configStr[i]);
+        }
     }
 
 

diff --git a/src/main/java/handler/StockRefreshHandler.java b/src/main/java/handler/StockRefreshHandler.java
@@ -30,7 +30,11 @@ public abstract class StockRefreshHandler extends DefaultTableModel {
             instance.setValue(WindowUtils.STOCK_TABLE_HEADER_KEY, WindowUtils.STOCK_TABLE_HEADER_VALUE);
         }
 
-        columnNames = Objects.requireNonNull(instance.getValue(WindowUtils.STOCK_TABLE_HEADER_KEY)).split(",");
+        String[] configStr = Objects.requireNonNull(instance.getValue(WindowUtils.STOCK_TABLE_HEADER_KEY)).split(",");
+        columnNames = new String[configStr.length];
+        for (int i = 0; i < configStr.length; i++) {
+            columnNames[i] = WindowUtils.remapPinYin(configStr[i]);
+        }
     }
 
     /**

diff --git a/src/main/java/utils/WindowUtils.java b/src/main/java/utils/WindowUtils.java
@@ -1,5 +1,7 @@
 package utils;
 
+import java.util.HashMap;
+
 /**
  * @Created by DAIE
  * @Date 2021/3/8 20:26
@@ -16,6 +18,25 @@ public class WindowUtils {
     public static final String COIN_TABLE_HEADER_KEY = "coin_table_header_key";
     public static final String COIN_TABLE_HEADER_VALUE = "编码,名称,当前价,更新时间";
 
+    private static HashMap<String,String> remapPinYinMap = new HashMap<>();
+
+    static {
+        remapPinYinMap.put(PinYinUtils.toPinYin("编码"),"编码");
+        remapPinYinMap.put(PinYinUtils.toPinYin("基金名称"),"基金名称");
+        remapPinYinMap.put(PinYinUtils.toPinYin("估算净值"),"估算净值");
+        remapPinYinMap.put(PinYinUtils.toPinYin("估算涨跌"),"估算涨跌");
+        remapPinYinMap.put(PinYinUtils.toPinYin("更新时间"),"更新时间");
+        remapPinYinMap.put(PinYinUtils.toPinYin("当日净值"),"当日净值");
+        remapPinYinMap.put(PinYinUtils.toPinYin("股票名称"),"股票名称");
+        remapPinYinMap.put(PinYinUtils.toPinYin("当前价"),"当前价");
+        remapPinYinMap.put(PinYinUtils.toPinYin("涨跌"),"涨跌");
+        remapPinYinMap.put(PinYinUtils.toPinYin("涨跌幅"),"涨跌幅");
+        remapPinYinMap.put(PinYinUtils.toPinYin("最高价"),"最高价");
+        remapPinYinMap.put(PinYinUtils.toPinYin("最低价"),"最低价");
+        remapPinYinMap.put(PinYinUtils.toPinYin("名称"),"名称");
+
+    }
+
 
     /**
      * 通过列名 获取该TABLE的列的数组下标
@@ -30,8 +51,14 @@ public static int getColumnIndexByName(String[] columnNames, String columnName)
                 return i;
             }
         }
+        //考虑拼音编码
+
         return -1;
     }
 
+    public static String remapPinYin(String pinyin){
+        return remapPinYinMap.getOrDefault(pinyin,pinyin);
+    }
+
 
 }