Merge remote-tracking branch 'origin/release/10.0' into release/10.0

designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@@ -206,5 +206,21 @@ public class PluginOperateUtils {
         return pluginInfo.toString();
     }
 
+    public static String getSwitchedInfo(PluginTaskResult result) {
+        StringBuilder pluginInfo = new StringBuilder();
+        List<PluginTaskResult> pluginTaskResults = result.asList();
+        for (PluginTaskResult pluginTaskResult : pluginTaskResults) {
+            PluginTask pluginTask = pluginTaskResult.getCurrentTask();
+            if (pluginTask == null) {
+                continue;
+            }
+            PluginMarker pluginMarker = pluginTask.getToMarker();
+            PluginContext pluginContext = PluginManager.getContext(pluginMarker);
+            if (pluginContext != null && pluginContext.getSelfState() == 1) {
+                pluginInfo.append("\n").append(pluginContext.getSwitchedReason());
+            }
+        }
+        return pluginInfo.toString();
+    }
 
 }

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -36,10 +36,12 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
 
     @Override
     public void done(PluginTaskResult result) {
+        String pluginInfo = PluginOperateUtils.getSuccessInfo(result);
         if (result.isSuccess()) {
+            String switchedInfo = PluginOperateUtils.getSwitchedInfo(result);
             jsCallback.execute("success");
-            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success"));
+            FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success"));
+            JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
             int rv = JOptionPane.showOptionDialog(
                     null,

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -35,9 +35,10 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
     protected void allDone(PluginTaskResult result) {
         String pluginInfo = PluginOperateUtils.getSuccessInfo(result);
         if (result.isSuccess()) {
+            String switchedInfo = PluginOperateUtils.getSwitchedInfo(result);
             jsCallback.execute("success");
-            FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success"));
+            FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
-            JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success"));
+            JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo);
         } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
             int rv = JOptionPane.showOptionDialog(
                     null,