Browse Source

使用sitecenter

master
vito 9 years ago
parent
commit
e832e8f771
  1. 7
      designer_base/src/com/fr/design/extra/PluginManagerPane.java
  2. 3
      designer_base/src/com/fr/design/extra/PluginWebBridge.java
  3. 2
      designer_base/src/com/fr/design/extra/PluginWebPane.java

7
designer_base/src/com/fr/design/extra/PluginManagerPane.java

@ -5,6 +5,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.general.GeneralUtils;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.stable.StableUtils;
@ -34,10 +35,10 @@ public class PluginManagerPane extends BasicPane {
String installHome;
if (StableUtils.isDebug()) {
URL url = ClassLoader.getSystemResource("");
installHome = url.getPath() + "scripts";
installHome = url.getPath();
} else {
installHome = StableUtils.getInstallHome() + File.separator + "scripts";
File file = new File(installHome);
installHome = StableUtils.getInstallHome();
File file = new File(StableUtils.pathJoin(installHome, "scripts"));
if (!file.exists()) {
int rv = JOptionPane.showConfirmDialog(
null,

3
designer_base/src/com/fr/design/extra/PluginWebBridge.java

@ -6,6 +6,7 @@ import com.fr.design.dialog.UIDialog;
import com.fr.design.extra.exe.*;
import com.fr.general.FRLogger;
import com.fr.general.Inter;
import com.fr.general.SiteCenter;
import com.fr.plugin.Plugin;
import com.fr.plugin.PluginLoader;
import com.fr.stable.ArrayUtils;
@ -33,7 +34,7 @@ public class PluginWebBridge {
private UIDialog uiDialog;
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 final String PLUGIN_SHOP = SiteCenter.getInstance().acquireUrlByKind("plugin.plist");
public static PluginWebBridge getHelper() {
if (helper != null) {

2
designer_base/src/com/fr/design/extra/PluginWebPane.java

@ -29,7 +29,7 @@ public class PluginWebPane extends JFXPanel {
PluginWebPane.this.setScene(scene);
WebView webView = new WebView();
webEngine = webView.getEngine();
webEngine.load("file:///" + installHome + "/store/web/index.html");
webEngine.load("file:///" + installHome + "/scripts/store/web/index.html");
webEngine.setOnAlert(new EventHandler<WebEvent<String>>() {
@Override
public void handle(WebEvent<String> event) {

Loading…
Cancel
Save