REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化

designer-base/src/main/java/com/fr/design/mainframe/toast/DesignerToastMsgUtil.java

@@ -31,13 +31,6 @@ public class DesignerToastMsgUtil {
 
     }
 
-    public static ToastMsgDialog createPromptDialog(String text) {
-        return createDialog(PROMPT_ICON, toastPane(text), DesignerContext.getDesignerFrame());
-    }
-
-    public static ToastMsgDialog createPromptDialog(JPanel contentPane) {
-        return createDialog(PROMPT_ICON, contentPane, DesignerContext.getDesignerFrame());
-    }
 
     public static void toastPrompt(JPanel contendPane) {
         toastPane(PROMPT_ICON, contendPane, DesignerContext.getDesignerFrame());
@@ -76,11 +69,6 @@ public class DesignerToastMsgUtil {
     }
 
     private static void toastPane(Icon icon, JPanel contendPane, Window parent) {
-        ToastMsgDialog dialog = createDialog(icon, contendPane, parent);
-        dialog.setVisible(true);
-    }
-
-    private static ToastMsgDialog createDialog(Icon icon, JPanel contendPane, Window parent) {
         JPanel pane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         UILabel uiLabel = new UILabel(icon);
         uiLabel.setVerticalAlignment(SwingConstants.TOP);
@@ -95,7 +83,7 @@ public class DesignerToastMsgUtil {
         } else {
             dialog = new ToastMsgDialog((Frame) parent, pane);
         }
-        return dialog;
+        dialog.setVisible(true);
     }
 
 

designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java

@@ -24,7 +24,6 @@ public class ToastMsgDialog extends UIDialog {
     private ScheduledExecutorService TIMER;
     private int hide_height = 0;
     private JPanel contentPane;
-    private boolean show = false;
 
     public ToastMsgDialog(Frame parent, JPanel panel) {
         super(parent);
@@ -66,7 +65,6 @@ public class ToastMsgDialog extends UIDialog {
 
 
     public void display(JPanel outerJPanel) {
-        show = true;
         outerJPanel.setLocation(0, -hide_height);
         ScheduledExecutorService TIP_TOOL_TIMER = createToastScheduleExecutorService();
         TIP_TOOL_TIMER.scheduleAtFixedRate(new Runnable() {
@@ -100,7 +98,6 @@ public class ToastMsgDialog extends UIDialog {
                             TIP_TOOL_TIMER.shutdown();
                             ToastMsgDialog.this.setVisible(false);
                             ToastMsgDialog.this.dispose();
-                            ToastMsgDialog.this.show = false;
                         }
                         outerJPanel.setLocation(point.x, point.y - 5);
                         Dimension dimension = ToastMsgDialog.this.getSize();
@@ -162,7 +159,5 @@ public class ToastMsgDialog extends UIDialog {
         super.dispose();
     }
 
-    public boolean isShow() {
+
-        return show;
-    }
 }

designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@@ -7,33 +7,20 @@ import com.fr.design.EnvChangeEntrance;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceInfoContext;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.loghandler.DesignerLogger;
-import com.fr.design.mainframe.share.ui.base.MouseClickListener;
-import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
-import com.fr.design.mainframe.toast.ToastMsgDialog;
 import com.fr.design.ui.util.UIUtil;
-import com.fr.design.utils.BrowseUtils;
 import com.fr.event.EventDispatcher;
-import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.RemoteDesignConstants;
 import com.fr.serialization.SerializerHelper;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.third.apache.log4j.spi.LoggingEvent;
-import com.fr.third.org.apache.http.client.config.RequestConfig;
-import com.fr.third.org.apache.http.client.methods.CloseableHttpResponse;
-import com.fr.third.org.apache.http.client.methods.HttpGet;
 import com.fr.third.org.apache.http.conn.ssl.NoopHostnameVerifier;
 import com.fr.third.org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import com.fr.third.org.apache.http.impl.client.CloseableHttpClient;
-import com.fr.third.org.apache.http.impl.client.HttpClients;
 import com.fr.third.org.apache.http.ssl.SSLContexts;
 import com.fr.web.WebSocketConfig;
 import com.fr.web.socketio.WebSocketProtocol;
@@ -42,27 +29,22 @@ import com.fr.workspace.Workspace;
 import com.fr.workspace.base.WorkspaceConstants;
 import com.fr.workspace.connect.WorkspaceConnection;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.server.socket.SocketInfoOperator;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
 
-import javax.net.ssl.SSLContext;
-import javax.swing.BorderFactory;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.event.MouseEvent;
 import java.io.File;
 import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.util.Arrays;
+import javax.net.ssl.SSLContext;
+import javax.swing.*;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
-import java.security.KeyStore;
-import java.util.Arrays;
 import java.util.Timer;
+import java.util.TimerTask;
 
 public class DesignerSocketIO {
 
@@ -72,21 +54,18 @@ public class DesignerSocketIO {
         Disconnecting
     }
 
-    private static final String WEBSOCKET_HELP_DOC = CloudCenter.getInstance().acquireUrlByKind("websocketConnect", "https://help.fanruan.com/finereport/doc-view-2512.html");
     private static final String HTTPS = "https";
     private static final String HTTP = "http";
     private static Socket socket = null;
     private static Status status = Status.Disconnected;
     private static Timer disConnectHintTimer = null;
     private static long disConnectHintTimerDelay = 3000;
-    private static final int TIMEOUT = 5000;
     //维护一个当前工作环境的uri列表
     private static String[] uri;
     //维护一个关于uri列表的计数器
     private static int count;
     // 当前webSocket选择的协议
     private static String currentProtocol;
-    private static ToastMsgDialog dialog = null;
 
 
     public static void close() {
@@ -206,7 +185,6 @@ public class DesignerSocketIO {
     private static final Emitter.Listener failRetry = new Emitter.Listener() {
         @Override
         public void call(Object... args) {
-            showSocketDisconnectToast();
             printLog(args, PrintEventLogImpl.WARN, "failed args: {}");
             status = Status.Disconnecting;
             socket.close();
@@ -245,63 +223,31 @@ public class DesignerSocketIO {
         @Override
         public void call(Object... objects) {
             FineLoggerFactory.getLogger().info("start disConnectHintTimer");
+            disConnectHintTimer = new Timer();
+            disConnectHintTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    try {
                         /*
                          * todo 远程心跳断开不一定 socket 断开 和远程紧密相关的业务都绑定在心跳上，切换成心跳断开之后进行提醒，
                          * socket 只用推日志和通知配置变更
                          */
                         printLog(objects, PrintEventLogImpl.ERROR, "disConnected args: {}");
                         if (status != Status.Disconnecting) {
-                dealWithSocketDisconnect();
+                            showConnectionLostDialog();
                         }
                         status = Status.Disconnected;
+                    } finally {
+                        disConnectHintTimer.cancel();
+                        disConnectHintTimer = null;
                     }
-    };
-
-    private static void dealWithSocketDisconnect() {
-        if (checkRPCConnect()) {
-            showSocketDisconnectToast();
-        } else {
-            showRPCDisconnectDialog();
                 }
+            }, disConnectHintTimerDelay);
         }
+    };
 
-    private static void showSocketDisconnectToast() {
+    private static void showConnectionLostDialog() {
         try {
-            UIUtil.invokeLaterIfNeeded(new Runnable() {
-                @Override
-                public void run() {
-                    if (dialog == null) {
-                        dialog = DesignerToastMsgUtil.createPromptDialog(createDialogContent());
-                    }
-
-                    if (!dialog.isShow()) {
-                        dialog.setVisible(true);
-                    }
-                }
-            });
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-    }
-
-    private static JPanel createDialogContent() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_WebSocket_Lost_Tip")), BorderLayout.WEST);
-        UILabel hyperLinkLabel = new UILabel(Toolkit.i18nText("Fine-Design_WebSocket_Lost_Tip_HyperLink_Text"));
-        hyperLinkLabel.addMouseListener(new MouseClickListener() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                BrowseUtils.browser(WEBSOCKET_HELP_DOC);
-            }
-        });
-        hyperLinkLabel.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 0));
-        hyperLinkLabel.setForeground(Color.BLUE);
-        hyperLinkLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        jPanel.add(hyperLinkLabel, BorderLayout.CENTER);
-        return jPanel;
-    }
-
-    private static void showRPCDisconnectDialog() {
             UIUtil.invokeLaterIfNeeded(new Runnable() {
                 @Override
                 public void run() {
@@ -314,25 +260,9 @@ public class DesignerSocketIO {
                     EnvChangeEntrance.getInstance().chooseEnv();
                 }
             });
-    }
-
-    private static boolean checkRPCConnect() {
-        CloseableHttpClient httpclient = HttpClients.createDefault();
-        WorkspaceConnectionInfo info = getConnectionInfo();
-        HttpGet httpGet = new HttpGet(StableUtils.pathJoin(info.getUrl(), WorkspaceConstants.CONTROLLER_PREFIX, WorkspaceConstants.VT));
-        RequestConfig requestConfig = RequestConfig
-                .custom()
-                .setConnectTimeout(TIMEOUT)
-                .setConnectionRequestTimeout(TIMEOUT)
-                .build();
-        httpGet.setConfig(requestConfig);
-        try {
-            CloseableHttpResponse response = httpclient.execute(httpGet);
         } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e, e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return false;
         }
-        return true;
     }
 
     //配置变更监听器