Merge pull request #1549 in BA/design from ~YAOH.WU/a_design_0811:feature/9.0 to feature/9.0

* commit '84cdbd3da281b27076eebaec17cc56694435e0aa':
  使用公共方法拷贝文件
  REPORT-5856 插件管理插件新分类

designer_base/src/com/fr/design/extra/PluginOperateUtils.java

@@ -122,7 +122,7 @@ public class PluginOperateUtils {
         return resultArray.toString();
     }
 
-    public static void dealParams(StringBuilder url, String category, String seller, String fee) {
+    public static void dealParams(StringBuilder url, String category, String seller, String fee, String scope) {
         if (StringUtils.isNotBlank(category)) {
             url.append("cid=").append(category.split("-")[1]);
         } else {
@@ -152,6 +152,18 @@ public class PluginOperateUtils {
                     url.append("&fee=").append(StringUtils.EMPTY);
             }
         }
+        if (StringUtils.isNotBlank(scope)) {
+            switch (scope.split("-")[1]) {
+                case "universal":
+                    url.append("&scope=").append(1);
+                    break;
+                case "program":
+                    url.append("&scope=").append(2);
+                    break;
+                default:
+                    url.append("&scope=").append(StringUtils.EMPTY);
+            }
+        }
     }
 
     public static void getLoginInfo(JSCallback jsCallback, UILabel uiLabel) {

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

@@ -339,10 +339,26 @@ public class PluginWebBridge {
      * @param callback 回调函数
      */
     public void getPluginFromStore(String category, String seller, String fee, final JSObject callback) {
-        Task<Void> task = new PluginTask<>(webEngine, callback, new GetPluginFromStoreExecutor(category, seller, fee));
+        Task<Void> task = new PluginTask<>(webEngine, callback, new GetPluginFromStoreExecutor(category, seller, fee, ""));
         threadPoolExecutor.submit(task);
     }
 
+    /**
+     * 根据条件获取在线插件
+     *
+     * @param info     插件信息
+     * @param callback 回调函数
+     */
+    public void getPluginFromStoreNew(String info, final JSObject callback) {
+        try {
+            Task<Void> task = new PluginTask<>(webEngine, callback, new GetPluginFromStoreExecutor(new JSONObject(info)));
+            threadPoolExecutor.submit(task);
+        } catch (JSONException e) {
+            FRLogger.getLogger().error(e.getMessage());
+        }
+    }
+
+
     public void getPluginPrefix(final JSObject callback) {
         Task<Void> task = new PluginTask<>(webEngine, callback, new GetPluginPrefixExecutor());
         threadPoolExecutor.submit(task);

designer_base/src/com/fr/design/extra/WebViewDlgHelper.java

@@ -5,6 +5,7 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.CommonIOUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
@@ -22,9 +23,7 @@ import javax.swing.SwingWorker;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.net.HttpURLConnection;
 import java.util.concurrent.ExecutionException;
@@ -94,27 +93,17 @@ public class WebViewDlgHelper {
     public static void checkAndCopyMainFile(String indexPath, String mainJsPath) {
         File file = new File(indexPath);
         if (!file.exists()) {
-            copyMainFile(indexPath, mainJsPath);
+            copyMainFile(mainJsPath);
         }
     }
 
     /**
      * 將script文件夹中的plugin.html文件复制到webreport下
      */
-    public static void copyMainFile(String indexPath, String mainJsPath) {
+    private static void copyMainFile(String mainJsPath) {
         try {
-            File mainJsFile = new File(mainJsPath);
-            int byteread = 0;
-            if (mainJsFile.exists()) {
-                InputStream inStream = new FileInputStream(mainJsPath);
-                FileOutputStream fs = new FileOutputStream(indexPath);
-                byte[] buffer = new byte[BYTES_NUM];
-                while ((byteread = inStream.read(buffer)) != -1) {
-                    fs.write(buffer, 0, byteread);
-                }
-                inStream.close();
-            }
-        } catch (Exception e) {
+            CommonIOUtils.copy(new File(mainJsPath), new File(installHome));
+        } catch (IOException e) {
             FRContext.getLogger().error(e.getMessage());
         }
     }
@@ -131,6 +120,7 @@ public class WebViewDlgHelper {
 
     /**
      * 以关键词打开设计器商店显示搜索结果
+     *
      * @param keyword
      * @param data
      */
@@ -240,7 +230,7 @@ public class WebViewDlgHelper {
                     if (get()) {
                         String relativePath = "/scripts/plugin.html";
                         IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome);
-                        copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"), StableUtils.pathJoin(installHome, relativePath));
+                        copyMainFile(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);

designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java

@@ -20,11 +20,20 @@ public class GetPluginFromStoreExecutor implements Executor {
     private String category;
     private String seller;
     private String fee;
+    private String scope;
 
-    public GetPluginFromStoreExecutor(String category, String seller, String fee) {
+    public GetPluginFromStoreExecutor(JSONObject info) {
+        this.category = info.optString("category");
+        this.fee = info.optString("fee");
+        this.seller = info.optString("seller");
+        this.scope = info.optString("scope");
+    }
+
+    public GetPluginFromStoreExecutor(String category, String seller, String fee, String scope) {
         this.category = category;
         this.seller = seller;
         this.fee = fee;
+        this.scope = scope;
     }
 
     @Override
@@ -44,7 +53,7 @@ public class GetPluginFromStoreExecutor implements Executor {
                     @Override
                     public void run(Process<String> process) {
                         String plistUrl = SiteCenter.getInstance().acquireUrlByKind("shop.plugin.plist") + "?";
-                        boolean getRecommend = StringUtils.isEmpty(category) && StringUtils.isEmpty(seller) && StringUtils.isEmpty(fee);
+                        boolean getRecommend = StringUtils.isEmpty(category) && StringUtils.isEmpty(seller) && StringUtils.isEmpty(fee) && StringUtils.isEmpty(scope);
                         if (getRecommend) {
                             result = PluginOperateUtils.getRecommendPlugins();
                             return;
@@ -53,7 +62,7 @@ public class GetPluginFromStoreExecutor implements Executor {
                         if (StringUtils.isNotBlank(plistUrl)) {
                             StringBuilder url = new StringBuilder();
                             url.append(plistUrl);
-                            PluginOperateUtils.dealParams(url, category, seller, fee);
+                            PluginOperateUtils.dealParams(url, category, seller, fee, scope);
                             try {
                                 HttpClient httpClient = new HttpClient(url.toString());
                                 httpClient.asGet();
@@ -66,7 +75,7 @@ public class GetPluginFromStoreExecutor implements Executor {
                                 FRLogger.getLogger().error(e.getMessage());
                             }
                         } else {
-                             result = PluginConstants.CONNECTION_404;
+                            result = PluginConstants.CONNECTION_404;
                         }
                     }
                 }