修改adb 路径获取错误

695137400 · Jun 4, 2021 · 5efca5c · 5efca5c
1 parent ee2149a
commit 5efca5c
Show file tree

Hide file tree

Showing 11 changed files with 2,216 additions and 45 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/artifacts/apicloud_intelliJ_plugin.xml b/.idea/artifacts/apicloud_intelliJ_plugin.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/inspectionProfiles/Default.xml b/.idea/inspectionProfiles/Default.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/src/com/apicloud/plugin/Project/ApicloudProjectTemplateGenerator.java b/src/com/apicloud/plugin/Project/ApicloudProjectTemplateGenerator.java
@@ -30,6 +30,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.net.URL;
 import java.util.Properties;
 import java.util.Random;
 
@@ -163,6 +164,10 @@ public ApicloudProjectPeer createPeer() {
      */
     @Override
     public Icon getIcon() {
-        return new ImageIcon(getClass().getResource("/com/apicloud/plugin/icons/apicloud.png"));
+        URL url = getClass().getResource("/com/apicloud/plugin/icons/apicloud.png");
+        ImageIcon icon = new ImageIcon(url);
+        RunProperties.pluginsPath  =  url.getPath().split("!")[0].replace("file:", "").replace("ApicloudPlugins.jar", "");
+        System.out.println( "pluginsPath-->   "+  RunProperties.pluginsPath);
+        return icon;
     }
 }
diff --git a/src/com/apicloud/plugin/ui/createApp/CreateAppFrom.java b/src/com/apicloud/plugin/ui/createApp/CreateAppFrom.java
@@ -4,6 +4,7 @@
 import com.apicloud.plugin.run.WebStorm;
 import com.apicloud.plugin.util.ProjectData;
 import com.apicloud.plugin.util.RunProperties;
+import com.intellij.ide.plugins.cl.PluginClassLoader;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.ui.TextBrowseFolderListener;
@@ -73,17 +74,20 @@ protected void onFileChosen(@NotNull VirtualFile chosenFile) {
                 }
             }
         });
-        Properties properties = System.getProperties();
-        String systemPath = properties.getProperty("idea.plugins.path");
         WebStorm storm = RunProperties.getWebStorm("create");
-        String path = "";
-        if (storm.isMacOS()) {
-            path = systemPath + "/ApicloudPlugins/lib/tools/adb-ios";
-        } else if (storm.isLinux()) {
-            path = systemPath + "/ApicloudPlugins/lib/tools/adb-linux";
-        } else {
-            path = systemPath + "/ApicloudPlugins/lib/tools/adb.exe";
+        String path = null;
+        try {
+            if (storm.isMacOS()) {
+                path = RunProperties.pluginsPath + "/tools/adb-ios";
+            } else if (storm.isLinux()) {
+                path = RunProperties.pluginsPath + "/tools/adb-linux";
+            } else {
+                path = RunProperties.pluginsPath + "/tools/adb.exe";
+            }
+        } catch (Exception e) {
+
         }
+
         textField1.setText(path);
 
         kongPanel.addMouseListener(new MouseAdapter() {

diff --git a/src/com/apicloud/plugin/util/RunProperties.java b/src/com/apicloud/plugin/util/RunProperties.java
@@ -291,4 +291,6 @@ private static void openTcp(String[] devs, WebStorm webStorm, String projectName
         }
     }
 
+
+    public static String pluginsPath;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
+        public static String pluginsPath;
     }