双语叫号

src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

@@ -41,8 +41,9 @@ public class DemoStartedService implements IApplicationStartedService {
         log.info("configPath:{}",configPath);
         log.info("host:{}",host);
         log.info("version:{}",version);
-        MainWindow.getInstance().initWindow(configPath,host,version);
         SettingWindow.getInstance().initWindow(configPath,host);
+        MainWindow.getInstance().initWindow(configPath,host,version);
+
 
         log.info("初始化托盘完成！");
 

src/main/java/com/mortals/xhx/tts/UI/SettingWindow.java

@@ -355,28 +355,28 @@ public class SettingWindow {
         jComboBox3.addItem("xy");
         jComboBox3.addItem("yy");
         jComboBox3.addItem("zang");
-        if(speaker == "en"){
+        if(speaker.equals("en")){
             jComboBox3.setSelectedIndex(0);
         }
-        if(speaker == "tb"){
+        if(speaker.equals("tb")){
             jComboBox3.setSelectedIndex(1);
         }
-        if(speaker == "xr"){
+        if(speaker.equals("xr")){
             jComboBox3.setSelectedIndex(2);
         }
-        if(speaker == "xx"){
+        if(speaker.equals("xx")){
             jComboBox3.setSelectedIndex(3);
         }
-        if(speaker == "xy"){
+        if(speaker.equals("xy")){
             jComboBox3.setSelectedIndex(4);
         }
-        if(speaker == "yy"){
+        if(speaker.equals("yy")){
             jComboBox3.setSelectedIndex(5);
         }
-        if(speaker == "zang"){
+        if(speaker.equals("zang")){
             jComboBox3.setSelectedIndex(6);
         }
-        jComboBox2.addItemListener(new ItemListener() {
+        jComboBox3.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
                 if(jComboBox3.getSelectedIndex() == 0){
@@ -408,7 +408,7 @@ public class SettingWindow {
 
 
         //保存本地配置按钮
-        JButton jb1 = new JButton("保存");
+        JButton jb1 = new JButton("保存本地配置");
         jb1.setPreferredSize(new Dimension(460,30));
         jb1.addActionListener(new ActionListener() {
             @Override
@@ -507,7 +507,7 @@ public class SettingWindow {
         frame.add(jPanel7);
 
         //上传站点信息
-        JButton jb2 = new JButton("上传");
+        JButton jb2 = new JButton("上传站点信息");
         jb2.setPreferredSize(new Dimension(460,30));
         jb2.addActionListener(new ActionListener() {
             @Override

src/main/java/com/mortals/xhx/tts/utils/SpliceMp3Util.java

@@ -201,8 +201,10 @@ public class SpliceMp3Util {
      * @throws IOException
      */
     public static String heBingMp3(List<String> pathList) throws IOException {
-//        String luJing= "/tmp/";
-        String luJing= "F:\\\\";
+        String luJing = "/tmp/";
+        if(System.getProperty("os.name").startsWith("Windows")){  //windows电脑测试路径
+            luJing= "F:\\\\";
+        }
         File f=new File(luJing);
         f.mkdirs();
         //生成处理后的文件