Browse Source

Merge pull request #976 in BA/design from ~KERRY/design:9.0 to 9.0

* commit 'abb205975df3543e4b752802b5dc5742c5d2cc4b':
  REPORT-2354 点击用户名会弹出资源下载bug
master
superman 7 years ago
parent
commit
735251db28
  1. 4
      designer_base/src/com/fr/design/extra/PluginOperateUtils.java
  2. 2
      designer_base/src/com/fr/design/extra/WebViewDlgHelper.java

4
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");
}
}

2
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() {

Loading…
Cancel
Save