From 63ba9cb369743318df5e5c6fdd0d2d2061f60327 Mon Sep 17 00:00:00 2001
From: zhaojunxia <zhaojunxia@kaihong.com>
Date: Wed, 19 Oct 2022 10:04:38 +0800
Subject: [PATCH] add numberType for napi_Intellij_plugin

Signed-off-by: zhaojunxia <zhaojunxia@kaihong.com>
---
 .../src/com/sk/dialog/GenerateDialogPane.form | 46 +++++++++++++++++--
 .../src/com/sk/dialog/GenerateDialogPane.java | 26 +++++++++--
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.form b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.form
index 0893f9fa..38db3ee1 100644
--- a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.form
+++ b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.form
@@ -17,12 +17,12 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="800" height="400"/>
+      <xy x="36" y="54" width="812" height="426"/>
     </constraints>
     <properties>
-      <maximumSize width="800" height="300"/>
-      <minimumSize width="800" height="300"/>
-      <preferredSize width="800" height="300"/>
+      <maximumSize width="800" height="350"/>
+      <minimumSize width="800" height="350"/>
+      <preferredSize width="800" height="350"/>
     </properties>
     <border type="none"/>
     <children>
@@ -177,6 +177,44 @@
                       </component>
                     </children>
                   </grid>
+                  <grid id="73bbe" layout-manager="FlowLayout" hgap="-1" vgap="-1" flow-align="0">
+                    <constraints/>
+                    <properties>
+                      <maximumSize width="800" height="30"/>
+                      <minimumSize width="100" height="30"/>
+                      <preferredSize width="750" height="30"/>
+                    </properties>
+                    <border type="none"/>
+                    <children>
+                      <component id="5c95f" class="javax.swing.JLabel">
+                        <constraints/>
+                        <properties>
+                          <maximumSize width="97" height="17"/>
+                          <minimumSize width="97" height="17"/>
+                          <preferredSize width="97" height="17"/>
+                          <text value="number参数类型:"/>
+                        </properties>
+                      </component>
+                      <component id="8af61" class="javax.swing.JComboBox" binding="comboBox">
+                        <constraints/>
+                        <properties>
+                          <maximumSize width="200" height="30"/>
+                          <minimumSize width="200" height="30"/>
+                          <model>
+                            <item value="uint32_t"/>
+                            <item value="int"/>
+                            <item value="float"/>
+                            <item value="double"/>
+                            <item value="char"/>
+                            <item value="wchar_t"/>
+                            <item value="bool"/>
+                            <item value="void"/>
+                          </model>
+                          <preferredSize width="200" height="30"/>
+                        </properties>
+                      </component>
+                    </children>
+                  </grid>
                   <grid id="87aa3" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints/>
diff --git a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java
index a45373bd..731a7026 100644
--- a/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java
+++ b/napi_IntelliJ_plugin/src/com/sk/dialog/GenerateDialogPane.java
@@ -28,13 +28,15 @@ import com.sk.utils.GenNotification;
 import org.apache.http.util.TextUtils;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.JButton;
-import javax.swing.JComponent;
+
 import javax.swing.JDialog;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
+import javax.swing.JRadioButton;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
@@ -78,11 +80,13 @@ public class GenerateDialogPane extends JDialog {
     private JButton buttonSelectScriptPath;
     private JButton buttonSelectH;
     private JButton buttonSelectOutPath;
+    private JComboBox comboBox;
     private boolean generateSuccess = true;
     private String sErrorMessage = "";
     private String interFileOrDir;
     private String genOutDir;
     private String scriptOutDir;
+    private String numberType;
     private int selectedIndex;
 
     /**
@@ -201,6 +205,7 @@ public class GenerateDialogPane extends JDialog {
         interFileOrDir = textFieldInterPath.getText();
         genOutDir = textFieldGenPath.getText();
         scriptOutDir = textFieldScriptPath.getText();
+        numberType = comboBox.getSelectedItem().toString();
         copyFileToLocalPath("header_parser");
         String command;
         command = genCommand();
@@ -240,10 +245,23 @@ public class GenerateDialogPane extends JDialog {
         File file = new File(tmpDirFile);
         String command = file.toString();
         String inArgs = genInArgs();
-        command += inArgs + " -o " + genOutDir + " -i " + radioButton.isSelected();
+        command += inArgs + " -o " + genOutDir + " -i " + radioButton.isSelected() + " -n " + genNumbertypeArgs();
         return command;
     }
 
+    /**
+     * 生成 -n 输入参数。
+     *
+     * @return 生成后的值-n的值
+     */
+    private String genNumbertypeArgs() {
+        String type = "uint32_t";
+        if (numberType != "") {
+            type = numberType;
+        }
+        return type;
+    }
+
     /**
      * 拷贝文件到本地临时目录
      *
-- 
Gitee