From cb8e649a275326d78ea279dc9af078d087ec5c3b Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 21 Apr 2016 15:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=20=E6=8D=A2=E6=96=B0=E7=9A=84api=E5=91=BD=E5=90=8D=E4=BB=A5?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E9=87=8D=E8=BD=BD=E9=98=B2=E6=AD=A2js?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=97=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginManagerPane.java | 11 +++++------ .../src/com/fr/design/extra/PluginWebBridge.java | 5 +++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginManagerPane.java b/designer_base/src/com/fr/design/extra/PluginManagerPane.java index 7f2280673..43e9585c3 100644 --- a/designer_base/src/com/fr/design/extra/PluginManagerPane.java +++ b/designer_base/src/com/fr/design/extra/PluginManagerPane.java @@ -32,16 +32,16 @@ public class PluginManagerPane extends BasicPane { setLayout(new BorderLayout()); if (System.getProperty("java.version").startsWith("1.8")) { String installHome; - if(StableUtils.isDebug()){ + if (StableUtils.isDebug()) { URL url = ClassLoader.getSystemResource(""); - installHome = url.getPath() + "scripts"; - }else{ + installHome = url.getPath() + "scripts"; + } else { installHome = StableUtils.getInstallHome() + File.separator + "scripts"; File file = new File(installHome); if (!file.exists()) { int rv = JOptionPane.showConfirmDialog( null, - "您还没有插件商店的资源,是否下载?", + Inter.getLocText("FR-Designer-Plugin_Shop_Need_Install"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE @@ -53,7 +53,6 @@ public class PluginManagerPane extends BasicPane { } PluginWebPane webPane = new PluginWebPane(new File(installHome).getAbsolutePath()); add(webPane, BorderLayout.CENTER); - } else { initTraditionalStore(); } @@ -92,7 +91,7 @@ public class PluginManagerPane extends BasicPane { IOUtils.unzip(new File(StableUtils.pathJoin(PluginHelper.DOWNLOAD_PATH, PluginHelper.TEMP_FILE)), StableUtils.getInstallHome()); int rv = JOptionPane.showOptionDialog( null, - "商店安装完毕,是否立刻启动?", + Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java index 7e4e70e24..947e8bd3a 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java @@ -33,7 +33,7 @@ public class PluginWebBridge { private UIDialog uiDialog; - public static final String PLUGIN_SHOP = "http://192.168.101.20/ShopServer?pg=plist"; + public static final String PLUGIN_SHOP = "http://192.168.101.20/ShopServer?pg=plist";//http://shop.finereport.com/ShopServer?pg=plist(plugin.list) public static PluginWebBridge getHelper() { if (helper != null) { @@ -264,10 +264,11 @@ public class PluginWebBridge { /** * 在本地浏览器里打开url * tips:重载的时候,需要给js调用的方法需要放在前面,否则可能不会被调用(此乃坑) + * 所以最好的是不要重载在js可以访问的接口文件中 * * @param url 要打开的地址 */ - public void openUrlAtLocalWebBrowser(String url) { + public void openShopUrlAtWebBrowser(String url) { openUrlAtLocalWebBrowser(webEngine, url); }