From 248cbbcefeb983e76d1ab894276f51a393f7a88c Mon Sep 17 00:00:00 2001 From: vito Date: Wed, 11 Oct 2017 16:05:12 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4992=20=E6=8F=92=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=84=9A=E6=9C=ACindex.html=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/LoginWebPane.java | 2 +- .../src/com/fr/design/extra/QQLoginWebPane.java | 2 +- .../src/com/fr/design/extra/WebViewDlgHelper.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/LoginWebPane.java b/designer_base/src/com/fr/design/extra/LoginWebPane.java index ee0a3275aa..a5138544c6 100644 --- a/designer_base/src/com/fr/design/extra/LoginWebPane.java +++ b/designer_base/src/com/fr/design/extra/LoginWebPane.java @@ -27,7 +27,7 @@ public class LoginWebPane extends JFXPanel { LoginWebPane.this.setScene(scene); WebView webView = new WebView(); WebEngine webEngine = webView.getEngine(); - webEngine.load("file:///" + installHome + "/scripts/qqLogin/web/login.html"); + webEngine.load("file:///" + installHome + "/scripts/login.html"); webEngine.setOnAlert(new EventHandler>() { @Override public void handle(WebEvent event) { diff --git a/designer_base/src/com/fr/design/extra/QQLoginWebPane.java b/designer_base/src/com/fr/design/extra/QQLoginWebPane.java index 096f9bb258..82648531c4 100644 --- a/designer_base/src/com/fr/design/extra/QQLoginWebPane.java +++ b/designer_base/src/com/fr/design/extra/QQLoginWebPane.java @@ -62,7 +62,7 @@ public class QQLoginWebPane extends JFXPanel { QQLoginWebPane.this.setScene(scene); final WebView webView = new WebView(); webEngine = webView.getEngine(); - url = "file:///" + installHome + "/scripts/qqLogin/web/qqLogin.html"; + url = "file:///" + installHome + "/scripts/qqLogin.html"; webEngine.load(url); final Stage primaryStage = new Stage(); diff --git a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java index 43e1dbae5e..cef4c2d964 100644 --- a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java @@ -37,7 +37,7 @@ public class WebViewDlgHelper { public static void createPluginDialog() { if (StableUtils.getMajorJavaVersion() >= VERSION_8) { - String relativePath = "/scripts/store/web/index.html"; + String relativePath = "/scripts/plugin.html"; String mainJsPath = StableUtils.pathJoin(installHome, relativePath); File file = new File(mainJsPath); if (!file.exists()) { @@ -52,7 +52,7 @@ public class WebViewDlgHelper { downloadShopScripts(SHOP_SCRIPTS); } } else { - String indexPath = "index.html"; + String indexPath = "plugin.html"; String mainIndexPath = StableUtils.pathJoin(installHome, indexPath); checkAndCopyMainFile(mainIndexPath, mainJsPath); showPluginDlg(mainIndexPath); @@ -73,7 +73,7 @@ public class WebViewDlgHelper { } /** - * 检查script文件夹中的index.html文件 + * 检查script文件夹中的plugin.html文件 * */ public static void checkAndCopyMainFile(String indexPath, String mainJsPath){ @@ -84,7 +84,7 @@ public class WebViewDlgHelper { } /** - * 將script文件夹中的index.html文件复制到webreport下 + * 將script文件夹中的plugin.html文件复制到webreport下 * */ public static void copyMainFile(String indexPath, String mainJsPath){ @@ -191,9 +191,9 @@ public class WebViewDlgHelper { try { if (get()) { - String relativePath = "/scripts/store/web/index.html"; + String relativePath = "/scripts/plugin.html"; IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome); - copyMainFile(StableUtils.pathJoin(installHome, "index.html"), StableUtils.pathJoin(installHome, relativePath)); + copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"), StableUtils.pathJoin(installHome, relativePath)); // TODO: 2017/4/17 删除之前存放在安装目录下的script PluginStoreConstants.refreshProps(); // 下载完刷新一下版本号等 JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE);