From 58527580d8b0989184e71bbe601aeb066f16f9a7 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 5 Jul 2017 19:35:44 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-2354=20=E7=82=B9=E5=87=BB=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E4=BC=9A=E5=BC=B9=E5=87=BA=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=B8=8B=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/extra/PluginOperateUtils.java | 4 +++- designer_base/src/com/fr/design/extra/WebViewDlgHelper.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java index 5cba0622b8..12ddee3936 100644 --- a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java @@ -34,11 +34,13 @@ public class PluginOperateUtils { public static void installPluginOnline(final PluginMarker pluginMarker, JSCallback jsCallback) { //下载插件 if (!BBSPluginLogin.getInstance().hasLogin()) { - LoginCheckContext.fireLoginCheckListener(); + UserLoginContext.fireLoginContextListener(); } if (BBSPluginLogin.getInstance().hasLogin()) { PluginTask pluginTask = PluginTask.installTask(pluginMarker); PluginControllerHelper.installOnline(pluginMarker, new InstallOnlineCallback(pluginTask, jsCallback)); + }else{ + jsCallback.execute("success"); } } diff --git a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java index d00d0b870f..f43faaecfb 100644 --- a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java @@ -33,7 +33,7 @@ public class WebViewDlgHelper { private static final String SHOP_SCRIPTS = "shop_scripts"; private static final int VERSION_8 = 8; // 调试时,使用installHome = ClassLoader.getSystemResource("").getPath()代替下面 - private static String installHome = StableUtils.getInstallHome(); + private static String installHome = FRContext.getCurrentEnv().getWebReportPath(); private static final int BYTES_NUM = 1024; public static void createPluginDialog() {