From f3973fc6fe09ef060b73f933ff111785acf36fa8 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Thu, 18 Apr 2019 22:15:12 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-442=20=E6=8F=90=E4=BE=9B=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BD=BF=E7=94=A8=E9=87=8D=E6=9E=84=E8=BF=87=E7=9A=84?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E5=99=A8=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=EF=BC=88=E5=9F=BA=E4=BA=8EFineUI=E5=92=8CTypeScript=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/upm/UpmBridge.java | 14 +++++++++++++-
 .../src/main/java/com/fr/design/upm/UpmPane.java   |  9 ---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
index 73e4d2f1a..8984e4191 100644
--- a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
@@ -2,6 +2,7 @@ package com.fr.design.upm;
 
 import com.fr.base.passport.FinePassportManager;
 import com.fr.config.MarketConfig;
+import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader;
 import com.fr.design.bridge.exec.JSBridge;
 import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.extra.PluginOperateUtils;
@@ -12,6 +13,7 @@ import com.fr.design.extra.exe.GetPluginFromStoreExecutor;
 import com.fr.design.extra.exe.PluginLoginExecutor;
 import com.fr.design.extra.exe.ReadUpdateOnlineExecutor;
 import com.fr.design.extra.exe.SearchOnlineExecutor;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.upm.event.CertificateEvent;
 import com.fr.design.upm.event.DownloadEvent;
 import com.fr.design.upm.exec.UpmBrowserExecutor;
@@ -59,10 +61,20 @@ public class UpmBridge {
     }
 
     public void startDownload() {
-        // do something.....
+        try {
+            UpmResourceLoader.INSTANCE.download();
+            UpmResourceLoader.INSTANCE.install();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
         EventDispatcher.fire(DownloadEvent.FINISH, "start");
     }
 
+    @JSBridge
+    public String i18nText(String key) {
+        return Toolkit.i18nText(key);
+    }
+
     @JSBridge
     public void closeWindow() {
         UpmFinder.closeWindow();
diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmPane.java b/designer-base/src/main/java/com/fr/design/upm/UpmPane.java
index 1021f6175..ec0b542f4 100644
--- a/designer-base/src/main/java/com/fr/design/upm/UpmPane.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmPane.java
@@ -1,25 +1,16 @@
 package com.fr.design.upm;
 
-import com.fr.base.TemplateUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.ui.ModernUIPane;
 import com.fr.design.upm.event.DownloadEvent;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
-import com.fr.general.GeneralContext;
-import com.fr.general.IOUtils;
-import com.fr.stable.StringUtils;
 import com.teamdev.jxbrowser.chromium.JSValue;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
 
 import java.awt.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author richie