fix(Android): 修复多个页面同时打开时，只能有一个页面响应热重载的问题

bbssyyuui · bbssyyuui · commit 6f97df6c09fc · 2022-07-31T11:05:31.000+08:00
diff --git a/android/hummer-dev-tools/src/main/java/com/didi/hummer/devtools/HummerDevTools.java b/android/hummer-dev-tools/src/main/java/com/didi/hummer/devtools/HummerDevTools.java
@@ -34,8 +34,8 @@ public interface IParameterInjector {
         void injectParameter(StringBuilder builder);
     }
 
-    public interface IRefreshCallback {
-        void onRefresh();
+    public interface IHotReloadCallback {
+        void onHotReload();
     }
 
     private HummerContext hmContext;
@@ -56,8 +56,8 @@ public HummerDevTools(HummerContext context) {
     public HummerDevTools(HummerContext context, DevToolsConfig config) {
         hmContext = context;
         entrance = new DevToolsEntrance(context);
-        wsManager = new WebSocketManager();
-        logManager = new HummerLogManager(wsManager);
+        wsManager = WebSocketManager.getInstance();
+        logManager = new HummerLogManager();
         hmContext.registerInvoker(new HummerInvokerWrapper(logManager));
         entrance.setLogManager(logManager);
         netManager = new HummerNetManager();
@@ -69,28 +69,28 @@ public HummerDevTools(HummerContext context, DevToolsConfig config) {
         }
     }
 
-    public void release() {
-        wsManager.close();
+    public void release(HummerContext hmContext) {
+        wsManager.release(hmContext.getPageUrl());
     }
 
     /**
      * 初始化连接
      */
-    public void initConnection(HummerContext context, String url, IRefreshCallback callback) {
+    public void initConnection(HummerContext context, String url, IHotReloadCallback callback) {
         connectWebSocket(url, callback);
         initRefreshView(context, callback);
     }
 
     /**
-     * 与CLI建立WebSocket连接，用于热更新和日志输出
+     * 与CLI建立WebSocket连接，用于热重载和日志输出
      */
-    private void connectWebSocket(String url, IRefreshCallback callback) {
+    private void connectWebSocket(String url, IHotReloadCallback callback) {
         wsManager.connect(url, msg -> {
             msg = getUrlFromWS(msg);
             if (url != null && url.equalsIgnoreCase(msg)) {
-                // 热更新
+                // 热重载
                 if (callback != null) {
-                    callback.onRefresh();
+                    callback.onHotReload();
                 }
             }
         });
@@ -99,11 +99,11 @@ private void connectWebSocket(String url, IRefreshCallback callback) {
     /**
      * 初始化刷新按钮
      */
-    private void initRefreshView(HummerContext context, IRefreshCallback callback) {
+    private void initRefreshView(HummerContext context, IHotReloadCallback callback) {
         FloatLayout floatLayout = new FloatLayout(context);
         floatLayout.setOnClickListener(v -> {
             if (callback != null) {
-                callback.onRefresh();
+                callback.onHotReload();
             }
         });
         ViewCompat.setElevation(floatLayout, 9000);
diff --git a/android/hummer-dev-tools/src/main/java/com/didi/hummer/devtools/manager/HummerLogManager.java b/android/hummer-dev-tools/src/main/java/com/didi/hummer/devtools/manager/HummerLogManager.java
@@ -19,14 +19,9 @@ public interface ILogListener {
         void onLogAdd(LogBean log);
     }
 
-    private WebSocketManager wsManager;
     private List<LogBean> logs = new ArrayList<>();
     private ILogListener mListener;
 
-    public HummerLogManager(WebSocketManager manager) {
-        wsManager = manager;
-    }
-
     public void registerListener(ILogListener listener) {
         mListener = listener;
     }
@@ -57,6 +52,6 @@ public void addLog(int level, String msg) {
      */
     public void sendLog2Cli(LogBean bean) {
         WSMsg<LogBean> wsMsg = new WSMsg<>(WSMsg.TYPE_LOG, bean);
-        wsManager.sendMsg(HMGsonUtil.toJson(wsMsg));
+        WebSocketManager.getInstance().sendMsg(HMGsonUtil.toJson(wsMsg));
     }
 }
diff --git a/android/hummer-dev-tools/src/main/java/com/didi/hummer/devtools/ws/WebSocketManager.java b/android/hummer-dev-tools/src/main/java/com/didi/hummer/devtools/ws/WebSocketManager.java
@@ -5,6 +5,9 @@
 import android.os.Looper;
 import android.text.TextUtils;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -24,32 +27,53 @@ public interface WSMsgListener {
 
     private static final int RECONNECT_DELAY_MS = 2000;
 
+    private static volatile WebSocketManager instance = null;
     private static OkHttpClient client;
     private WebSocket webSocket;
     private String mWsUrl;
     private Handler mHandler;
     private boolean mClosed;
     private boolean mIsReconnectWaiting;
+    private Map<String, WSMsgListener> wsMsgListeners = new HashMap<>();
+
+    public static WebSocketManager getInstance() {
+        if (instance == null) {
+            synchronized (WebSocketManager.class) {
+                if (instance == null) {
+                    instance = new WebSocketManager();
+                }
+            }
+        }
+        return instance;
+    }
 
-    public WebSocketManager() {
+    private WebSocketManager() {
         mHandler = new Handler(Looper.getMainLooper());
         if (client == null) {
             client = new OkHttpClient();
         }
     }
 
     public void connect(String url, WSMsgListener listener) {
+        if (!wsMsgListeners.containsKey(url)) {
+            wsMsgListeners.put(url, listener);
+        }
+
+        if (webSocket != null) {
+            return;
+        }
+
         mWsUrl = toWSUrl(url);
-        doConnect(mWsUrl, listener);
+        doConnect();
     }
 
-    private void doConnect(String url, WSMsgListener listener) {
-        if (TextUtils.isEmpty(url)) {
+    private void doConnect() {
+        if (TextUtils.isEmpty(mWsUrl)) {
             return;
         }
 
         okhttp3.Request request = new Request.Builder()
-                .url(url)
+                .url(mWsUrl)
                 .build();
 
         client.newWebSocket(request, new WebSocketListener() {
@@ -61,37 +85,40 @@ public void onOpen(okhttp3.WebSocket webSocket, Response response) {
             @Override
             public void onClosed(okhttp3.WebSocket webSocket, int code, String reason) {
                 if (!mClosed) {
-                    reconnect(listener);
+                    reconnect();
                 }
             }
 
             @Override
             public void onFailure(okhttp3.WebSocket webSocket, Throwable t, Response response) {
                 t.printStackTrace();
                 if (!mClosed) {
-                    reconnect(listener);
+                    reconnect();
                 }
             }
 
             @Override
             public void onMessage(okhttp3.WebSocket webSocket, String text) {
                 mHandler.post(() -> {
-                    if (listener != null) {
-                        listener.onMsgReceived(text);
+                    for (String url : wsMsgListeners.keySet()) {
+                        WSMsgListener l = wsMsgListeners.get(url);
+                        if (l != null) {
+                            l.onMsgReceived(text);
+                        }
                     }
                 });
             }
         });
     }
 
-    private void reconnect(WSMsgListener listener) {
+    private void reconnect() {
         if (mClosed || mIsReconnectWaiting) {
             return;
         }
         mIsReconnectWaiting = true;
         mHandler.postDelayed(() -> {
             if (!mClosed) {
-                doConnect(mWsUrl, listener);
+                doConnect();
             }
             mIsReconnectWaiting = false;
         }, RECONNECT_DELAY_MS);
@@ -103,7 +130,12 @@ public void sendMsg(String msg) {
         }
     }
 
-    public void close() {
+    public void release(String url) {
+//        close();
+        wsMsgListeners.remove(url);
+    }
+
+    private void close() {
         mClosed = true;
         if (webSocket != null) {
             try {
diff --git a/android/hummer-sdk/src/main/java/com/didi/hummer/context/HummerContext.java b/android/hummer-sdk/src/main/java/com/didi/hummer/context/HummerContext.java
@@ -188,11 +188,11 @@ public boolean onBack() {
     }
 
     /**
-     * 用于调式的时候刷新用
+     * 用于调式时的热重载
      *
      * @return
      */
-    public void onRefresh(String url) {
+    public void onHotReload(String url) {
         stop();
         pause();
         destroy();
diff --git a/android/hummer/src/main/java/com/didi/hummer/HummerRender.java b/android/hummer/src/main/java/com/didi/hummer/HummerRender.java
@@ -124,7 +124,7 @@ public void onDestroy() {
         if (DebugUtil.isDebuggable()) {
             HummerDebugger.release(hmContext);
             if (devTools != null) {
-                devTools.release();
+                devTools.release(hmContext);
             }
         }
     }
@@ -215,7 +215,7 @@ public void renderWithUrl(String url) {
             // 调试插件
             HummerDebugger.init(hmContext, url);
 
-            // 热更新
+            // 热重载
             if (devTools != null) {
                 devTools.initConnection(hmContext, url, () -> {
                     requestJsBundle(url, true);
@@ -226,8 +226,7 @@ public void renderWithUrl(String url) {
         requestJsBundle(url, false);
     }
 
-    private void requestJsBundle(String url, boolean isRefresh) {
-        long startTime = System.currentTimeMillis();
+    private void requestJsBundle(String url, boolean isHotReload) {
         NetworkUtil.httpGet(url, (HttpCallback<String>) response -> {
             if (isDestroyed.get()) {
                 if (renderCallback != null) {
@@ -253,13 +252,13 @@ private void requestJsBundle(String url, boolean isRefresh) {
             perfInfo.jsFetchTimeCost = (System.currentTimeMillis() - startTime);
 
             // 如果是刷新流程，那么在执行JS之前，需要先模拟走一遍生命周期，来做相关的清理工作
-            if (DebugUtil.isDebuggable() && isRefresh) {
-                hmContext.onRefresh(url);
+            if (DebugUtil.isDebuggable() && isHotReload) {
+                hmContext.onHotReload(url);
             }
 
             render(response.data, url);
 
-            if (DebugUtil.isDebuggable() && isRefresh) {
+            if (DebugUtil.isDebuggable() && isHotReload) {
                 Toast.makeText(hmContext, "页面已刷新", Toast.LENGTH_SHORT).show();
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,9 @@ public interface ILogListener {`
`19`	`19`	`void onLogAdd(LogBean log);`
`20`	`20`	`}`
`21`	`21`
`22`		`- private WebSocketManager wsManager;`
`23`	`22`	`private List<LogBean> logs = new ArrayList<>();`
`24`	`23`	`private ILogListener mListener;`
`25`	`24`
`26`		`- public HummerLogManager(WebSocketManager manager) {`
`27`		`- wsManager = manager;`
`28`		`- }`
`29`		`-`
`30`	`25`	`public void registerListener(ILogListener listener) {`
`31`	`26`	`mListener = listener;`
`32`	`27`	`}`
`@@ -57,6 +52,6 @@ public void addLog(int level, String msg) {`
`57`	`52`	`*/`
`58`	`53`	`public void sendLog2Cli(LogBean bean) {`
`59`	`54`	`WSMsg<LogBean> wsMsg = new WSMsg<>(WSMsg.TYPE_LOG, bean);`
`60`		`- wsManager.sendMsg(HMGsonUtil.toJson(wsMsg));`
	`55`	`+ WebSocketManager.getInstance().sendMsg(HMGsonUtil.toJson(wsMsg));`
`61`	`56`	`}`
`62`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,11 +188,11 @@ public boolean onBack() {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`/**`
`191`		`- * 用于调式的时候刷新用`
	`191`	`+ * 用于调式时的热重载`
`192`	`192`	`*`
`193`	`193`	`* @return`
`194`	`194`	`*/`
`195`		`- public void onRefresh(String url) {`
	`195`	`+ public void onHotReload(String url) {`
`196`	`196`	`stop();`
`197`	`197`	`pause();`
`198`	`198`	`destroy();`