fix(Android): WebSocket回调对齐Web API标准

didi · Sep 13, 2021 · 7309ce8 · 7309ce8
1 parent ff2af5f
commit 7309ce8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/android/hummer-sdk/src/main/java/com/didi/hummer/module/WebSocket.java b/android/hummer-sdk/src/main/java/com/didi/hummer/module/WebSocket.java
@@ -11,6 +11,8 @@
 import com.didi.hummer.utils.UIThreadUtil;
 
 import java.io.EOFException;
+import java.util.HashMap;
+import java.util.Map;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -121,7 +123,11 @@ public void onOpen(okhttp3.WebSocket webSocket, Response response) {
             public void onClosed(okhttp3.WebSocket webSocket, int code, String reason) {
                 UIThreadUtil.runOnUiThread(() -> {
                     if (onclose != null) {
-                        onclose.call(code, reason);
+                        // 包装一层CloseEvent结构体，对齐Web端WebSocket API
+                        Map<String, Object> closeEvent = new HashMap<>();
+                        closeEvent.put("code", code);
+                        closeEvent.put("reason", reason);
+                        onclose.call(closeEvent);
                     }
                 });
             }
@@ -136,7 +142,7 @@ public void onFailure(okhttp3.WebSocket webSocket, Throwable t, Response respons
                         }
                     } else {
                         if (onerror != null) {
-                            onerror.call(t.getMessage());
+                            onerror.call();
                         }
                     }
                 });
@@ -146,7 +152,10 @@ public void onFailure(okhttp3.WebSocket webSocket, Throwable t, Response respons
             public void onMessage(okhttp3.WebSocket webSocket, String text) {
                 UIThreadUtil.runOnUiThread(() -> {
                     if (onmessage != null) {
-                        onmessage.call(text);
+                        // 包装一层MessageEvent结构体，对齐Web端WebSocket API
+                        Map<String, Object> messageEvent = new HashMap<>();
+                        messageEvent.put("data", text);
+                        onmessage.call(messageEvent);
                     }
                 });
             }

diff --git a/examples/hummer/src/Module_WebSocket.js b/examples/hummer/src/Module_WebSocket.js
@@ -39,18 +39,18 @@ class RootView extends View {
             height: 40,
         };
         btn1.addEventListener('tap', e => {
-            this.ws = new WebSocket('ws://x.x.x.x:8000');
+            this.ws = new WebSocket('ws://x.x.x.x:8000/proxy/native');    
             this.ws.onopen = () => {
                 console.log('WebSocket onOpen');
             };
-            this.ws.onmessage = (text) => {
-                console.log('WebSocket onMessage, text = ' + text);
+            this.ws.onmessage = (event) => {
+                console.log('WebSocket onMessage, event.data = ' + event.data);
             };
-            this.ws.onclose = (code, reason) => {
-                console.log('WebSocket onClose, code = ' + code + ', reason = ' + reason);
+            this.ws.onclose = (event) => {
+                console.log('WebSocket onClose, event.code = ' + event.code + ', event.reason = ' + event.reason);
             };
-            this.ws.onerror = (errMsg) => {
-                console.log('WebSocket onError, errMsg = ' + errMsg);
+            this.ws.onerror = () => {
+                console.log('WebSocket onError');
             };
         });