From b43d208668abb021aef43ccd83d96ce0fd3fb442 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Mon, 5 Sep 2016 14:28:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BE=9D=E8=B5=96=E7=9A=84?= =?UTF-8?q?=E9=80=9A=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginHelper.java | 16 +- .../DownLoadDependenceUI.java | 232 +++++++++++++++++ .../DownLoadDependenceUtils.java | 32 +++ .../image/background.png | Bin .../extra/pre4plugin/PreDependenceUtils.java | 238 ------------------ 5 files changed, 273 insertions(+), 245 deletions(-) create mode 100644 designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java create mode 100644 designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUtils.java rename designer_base/src/com/fr/design/extra/{pre4plugin => plugindependence}/image/background.png (100%) delete mode 100644 designer_base/src/com/fr/design/extra/pre4plugin/PreDependenceUtils.java diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index 2ae59e84a..631bc984b 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -3,13 +3,14 @@ package com.fr.design.extra; import com.fr.base.Env; import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; -import com.fr.design.extra.pre4plugin.PreDependenceUtils; +import com.fr.design.extra.plugindependence.DownLoadDependenceUtils; import com.fr.general.*; import com.fr.general.http.HttpClient; import com.fr.plugin.Plugin; import com.fr.plugin.PluginLoader; import com.fr.plugin.PluginManagerHelper; -import com.fr.plugin.PluginPreDependence; +import com.fr.plugin.dependence.PluginDependence; +import com.fr.plugin.dependence.PluginDependenceUnit; import com.fr.stable.ArrayUtils; import com.fr.stable.EncodeConstants; import com.fr.stable.StableUtils; @@ -122,13 +123,14 @@ public class PluginHelper { return plugin; } - //将所有未配置好的依赖环境准备好 + //将所有未配置好的资源文件依赖准备好 private static void checkDependenceEnv(Plugin plugin) { - List list = plugin.getPreDependenceList(); + PluginDependence dependence = plugin.getDependence(); + List list = dependence.getDependPlugins(); for (int i = 0;list != null && i < list.size(); i++){ - PluginPreDependence preDependence = list.get(i); - if (!preDependence.checkEnv()){ - PreDependenceUtils.preDependenceOnline(preDependence.getDependenceID(), preDependence.getDir()); + PluginDependenceUnit preDependence = list.get(i); + if (!preDependence.checkFileEnv()){ + DownLoadDependenceUtils.preDependenceOnline(preDependence.getDependenceID(), preDependence.getFileDir()); } } } diff --git a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java new file mode 100644 index 000000000..701bf9bbd --- /dev/null +++ b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUI.java @@ -0,0 +1,232 @@ +package com.fr.design.extra.plugindependence; + +import com.fr.design.extra.PluginConstants; +import com.fr.design.extra.PluginHelper; +import com.fr.design.mainframe.DesignerContext; +import com.fr.general.IOUtils; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.general.http.HttpClient; +import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.net.HttpURLConnection; + +/** + * Created by hufan on 2016/9/5. + */ +public class DownLoadDependenceUI implements ActionListener { + //进度显示界面 + private JDialog frame = null; + //进度条 + private JProgressBar progressbar; + //进度信息 + private JLabel label; + //进度条更新时钟 + private Timer timer; + //是否继续下载 + private boolean flag = true; + + // 定义加载窗口大小 + private final int LOAD_WIDTH = 455; + private final int LOAD_HEIGHT = 295; + + //安装环境相关信息 + private String ID; + private String dir; + //安装结果 + private boolean result = false; + //链接服务器的客户端 + private HttpClient httpClient; + //已读文件字节数 + private int totalBytesRead = 0; + //文件总长度 + private int totalSize = 0; + + public DownLoadDependenceUI(String ID, String dir) { + this.ID = ID; + this.dir = dir; + this.totalSize = getFileLength(); + init(); + } + + private void init(){ + // 创建标签,并在标签上放置一张图片 + BufferedImage image = IOUtils.readImage("/com/fr/design/extra/plugindependence/image/background.png"); + ImageIcon imageIcon = new ImageIcon(image); + label = new JLabel(imageIcon); + label.setBounds(0, 0, LOAD_WIDTH, LOAD_HEIGHT - 15); + + progressbar = new JProgressBar(); + // 显示当前进度值信息 + progressbar.setStringPainted(true); + // 设置进度条边框不显示 + progressbar.setBorderPainted(false); + // 设置进度条的前景色 + progressbar.setForeground(new Color(0x38aef5)); + // 设置进度条的背景色 + progressbar.setBackground(new Color(188, 190, 194)); + progressbar.setBounds(0, LOAD_HEIGHT - 15, LOAD_WIDTH, 15); + progressbar.setMinimum(0); + progressbar.setMaximum(totalSize); + progressbar.setValue(0); + + timer = new Timer(100, this); + + frame = new JDialog(DesignerContext.getDesignerFrame(), true); + frame.setTitle("在线安装" + ID); + frame.setSize(LOAD_WIDTH, LOAD_HEIGHT); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + frame.setLocation(screenSize.width/2-LOAD_WIDTH/2,screenSize.height/2-LOAD_HEIGHT/2); + frame.setResizable(false); + // 设置布局为空 + frame.setLayout(new BorderLayout(0,0)); + frame.getContentPane().add(label, BorderLayout.CENTER); + frame.getContentPane().add(progressbar, BorderLayout.SOUTH); + + frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + frame.addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + //取消下载 + flag = false; + frame.dispose(); + } + }); + } + + + //是否可以连接服务器 + private boolean connectToServer(){ + httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(ID)); + return httpClient.getResponseCode() == HttpURLConnection.HTTP_OK; + } + + //获取依赖文件大小 + private int getFileLength(){ + HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(ID)); + if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { + return httpClient.getContentLength(); + } + return -1; + } + + //安装 + private boolean install() { + //开始时钟 + timer.start(); + //开始下载 + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + installPhantomJsOnline(); + } + }); + thread.start(); + + frame.setVisible(true); + //等待下载线程处理结束 + try { + thread.join(); + } catch (InterruptedException e) { + e.printStackTrace(); + return false; + } + //停止时钟 + timer.stop(); + return result; + } + + private String downloadPluginPhantomJSFile() throws Exception { + httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(ID)); + if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { + InputStream reader = httpClient.getResponseStream(); + String temp = StableUtils.pathJoin(PluginHelper.DOWNLOAD_PATH, PluginHelper.TEMP_FILE); + StableUtils.makesureFileExist(new File(temp)); + FileOutputStream writer = new FileOutputStream(temp); + byte[] buffer = new byte[PluginConstants.BYTES_NUM]; + int bytesRead = 0; + totalBytesRead = 0; + + while ((bytesRead = reader.read(buffer)) > 0 && flag) { + writer.write(buffer, 0, bytesRead); + buffer = new byte[PluginConstants.BYTES_NUM]; + totalBytesRead += bytesRead; + } + reader.close(); + writer.flush(); + writer.close(); + + //下载被取消 + if (flag == false){ + result = false; + return StringUtils.EMPTY; + } + return temp; + + } else { + result = false; + throw new com.fr.plugin.PluginVerifyException(Inter.getLocText("FR-Designer-Plugin_Connect_Server_Error")); + } + } + + public void installPhantomJsOnline(){ + try { + String filePath = downloadPluginPhantomJSFile(); + if (!StringUtils.EMPTY.equals(filePath)){ + //安装文件 + installPluginPhantomJsFile(filePath); + result = true; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + //安装已经下载好的文件 + private void installPluginPhantomJsFile(String filePath){ + IOUtils.unzip(new File(filePath), dir); + } + + public void actionPerformed(ActionEvent e) { + if (e.getSource() == timer) { + int value = progressbar.getValue(); + if (value < totalSize) { + progressbar.setValue(totalBytesRead); + } + else { + timer.stop(); + frame.dispose(); + } + } + } + + public boolean preOnline() { + int choose = JOptionPane.showConfirmDialog(null, "新图表需要" + ID + "支持。是否需要安装" + ID + "(" + totalSize/Math.pow(10, 6) + " m)？", "install tooltip", JOptionPane.YES_NO_OPTION); + if (choose == 0){//下载安装 + if (!connectToServer()){ + JOptionPane.showMessageDialog(null, "无法连接远程服务器！！", "警告", JOptionPane.ERROR_MESSAGE); + return false; + } + //安装依赖环境 + if (install()){ + JOptionPane.showMessageDialog(null, "安装成功！！"); + return true; + }else { + JOptionPane.showMessageDialog(null, "安装失败！！", "警告", JOptionPane.ERROR_MESSAGE); + return false; + } + }else {//不安装。无需为用户准备环境 + return true; + } + } +} diff --git a/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUtils.java b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUtils.java new file mode 100644 index 000000000..32163325c --- /dev/null +++ b/designer_base/src/com/fr/design/extra/plugindependence/DownLoadDependenceUtils.java @@ -0,0 +1,32 @@ +package com.fr.design.extra.plugindependence; + +/** + * Created by hufan on 2016/8/31. + */ +import com.fr.design.extra.PluginConstants; +import com.fr.design.extra.PluginHelper; +import com.fr.design.mainframe.DesignerContext; +import com.fr.general.IOUtils; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.general.http.HttpClient; +import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; + +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.image.BufferedImage; +import java.io.*; +import java.net.HttpURLConnection; +import javax.swing.*; + + +public class DownLoadDependenceUtils { + public static boolean preDependenceOnline(String dependenceID, String dir) { + DownLoadDependenceUI ui = new DownLoadDependenceUI(dependenceID, dir); + return ui.preOnline(); + } +} diff --git a/designer_base/src/com/fr/design/extra/pre4plugin/image/background.png b/designer_base/src/com/fr/design/extra/plugindependence/image/background.png similarity index 100% rename from designer_base/src/com/fr/design/extra/pre4plugin/image/background.png rename to designer_base/src/com/fr/design/extra/plugindependence/image/background.png diff --git a/designer_base/src/com/fr/design/extra/pre4plugin/PreDependenceUtils.java b/designer_base/src/com/fr/design/extra/pre4plugin/PreDependenceUtils.java deleted file mode 100644 index 92bea4650..000000000 --- a/designer_base/src/com/fr/design/extra/pre4plugin/PreDependenceUtils.java +++ /dev/null @@ -1,238 +0,0 @@ -package com.fr.design.extra.pre4plugin; - -/** - * Created by hufan on 2016/8/31. - */ -import com.fr.design.extra.PluginConstants; -import com.fr.design.extra.PluginHelper; -import com.fr.design.mainframe.DesignerContext; -import com.fr.general.IOUtils; -import com.fr.general.Inter; -import com.fr.general.SiteCenter; -import com.fr.general.http.HttpClient; -import com.fr.stable.StableUtils; -import com.fr.stable.StringUtils; - -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.image.BufferedImage; -import java.io.*; -import java.net.HttpURLConnection; -import javax.swing.*; - - -public class PreDependenceUtils{ - public static boolean preDependenceOnline(String dependenceID, String dir) { - PreDependenceUI ui = new PreDependenceUI(dependenceID, dir); - return ui.preOnline(); - } - - private static class PreDependenceUI implements ActionListener{ - //进度显示界面 - private JDialog frame = null; - //进度条 - private JProgressBar progressbar; - //进度信息 - private JLabel label; - //进度条更新时钟 - private Timer timer; - //是否继续下载 - private boolean flag = true; - - // 定义加载窗口大小 - private final int LOAD_WIDTH = 455; - private final int LOAD_HEIGHT = 295; - - //安装环境相关信息 - private String ID; - private String dir; - //安装结果 - private boolean result = false; - //链接服务器的客户端 - private HttpClient httpClient; - //已读文件字节数 - private int totalBytesRead = 0; - //文件总长度 - private int totalSize = 0; - - public PreDependenceUI(String ID, String dir) { - this.ID = ID; - this.dir = dir; - this.totalSize = getFileLength(); - init(); - } - - private void init(){ - // 创建标签,并在标签上放置一张图片 - BufferedImage image = IOUtils.readImage("/com/fr/design/extra/pre4plugin/image/background.png"); - ImageIcon imageIcon = new ImageIcon(image); - label = new JLabel(imageIcon); - label.setBounds(0, 0, LOAD_WIDTH, LOAD_HEIGHT - 15); - - progressbar = new JProgressBar(); - // 显示当前进度值信息 - progressbar.setStringPainted(true); - // 设置进度条边框不显示 - progressbar.setBorderPainted(false); - // 设置进度条的前景色 - progressbar.setForeground(new Color(0x38aef5)); - // 设置进度条的背景色 - progressbar.setBackground(new Color(188, 190, 194)); - progressbar.setBounds(0, LOAD_HEIGHT - 15, LOAD_WIDTH, 15); - progressbar.setMinimum(0); - progressbar.setMaximum(totalSize); - progressbar.setValue(0); - - timer = new Timer(100, this); - - frame = new JDialog(DesignerContext.getDesignerFrame(), true); - frame.setTitle("在线安装" + ID); - frame.setSize(LOAD_WIDTH, LOAD_HEIGHT); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - frame.setLocation(screenSize.width/2-LOAD_WIDTH/2,screenSize.height/2-LOAD_HEIGHT/2); - frame.setResizable(false); - // 设置布局为空 - frame.setLayout(new BorderLayout(0,0)); - frame.getContentPane().add(label, BorderLayout.CENTER); - frame.getContentPane().add(progressbar, BorderLayout.SOUTH); - - frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); - frame.addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent e) { - //取消下载 - flag = false; - frame.dispose(); - } - }); - } - - - //是否可以连接服务器 - private boolean connectToServer(){ - httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(ID)); - return httpClient.getResponseCode() == HttpURLConnection.HTTP_OK; - } - - //获取依赖文件大小 - private int getFileLength(){ - HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(ID)); - if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { - return httpClient.getContentLength(); - } - return -1; - } - - //安装 - private boolean install() { - //开始时钟 - timer.start(); - //开始下载 - Thread thread = new Thread(new Runnable() { - @Override - public void run() { - installPhantomJsOnline(); - } - }); - thread.start(); - - frame.setVisible(true); - //等待下载线程处理结束 - try { - thread.join(); - } catch (InterruptedException e) { - e.printStackTrace(); - return false; - } - //停止时钟 - timer.stop(); - return result; - } - - private String downloadPluginPhantomJSFile() throws Exception { - httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(ID)); - if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { - InputStream reader = httpClient.getResponseStream(); - String temp = StableUtils.pathJoin(PluginHelper.DOWNLOAD_PATH, PluginHelper.TEMP_FILE); - StableUtils.makesureFileExist(new File(temp)); - FileOutputStream writer = new FileOutputStream(temp); - byte[] buffer = new byte[PluginConstants.BYTES_NUM]; - int bytesRead = 0; - totalBytesRead = 0; - - while ((bytesRead = reader.read(buffer)) > 0 && flag) { - writer.write(buffer, 0, bytesRead); - buffer = new byte[PluginConstants.BYTES_NUM]; - totalBytesRead += bytesRead; - } - reader.close(); - writer.flush(); - writer.close(); - - //下载被取消 - if (flag == false){ - result = false; - return StringUtils.EMPTY; - } - return temp; - - } else { - result = false; - throw new com.fr.plugin.PluginVerifyException(Inter.getLocText("FR-Designer-Plugin_Connect_Server_Error")); - } - } - - public void installPhantomJsOnline(){ - try { - String filePath = downloadPluginPhantomJSFile(); - if (!StringUtils.EMPTY.equals(filePath)){ - //安装文件 - installPluginPhantomJsFile(filePath); - result = true; - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - //安装已经下载好的文件 - private void installPluginPhantomJsFile(String filePath){ - IOUtils.unzip(new File(filePath), dir); - } - - public void actionPerformed(ActionEvent e) { - if (e.getSource() == timer) { - int value = progressbar.getValue(); - if (value < totalSize) { - progressbar.setValue(totalBytesRead); - } - else { - timer.stop(); - frame.dispose(); - } - } - } - - public boolean preOnline() { - int choose = JOptionPane.showConfirmDialog(null, "新图表需要" + ID + "支持。是否需要安装" + ID + "(" + totalSize/Math.pow(10, 6) + " m)？", "install tooltip", JOptionPane.YES_NO_OPTION); - if (choose == 0){//下载安装 - if (!connectToServer()){ - JOptionPane.showMessageDialog(null, "无法连接远程服务器！！", "警告", JOptionPane.ERROR_MESSAGE); - return false; - } - //安装依赖环境 - if (install()){ - JOptionPane.showMessageDialog(null, "安装成功！！"); - return true; - }else { - JOptionPane.showMessageDialog(null, "安装失败！！", "警告", JOptionPane.ERROR_MESSAGE); - return false; - } - }else {//不安装。无需为用户准备环境 - return true; - } - } - } -}