From 406cb13d559d691a2e85309a603cce43d8e779e8 Mon Sep 17 00:00:00 2001 From: YeungHoiChiu <1005935991@qq.com> Date: Tue, 3 Sep 2024 18:52:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=83=E7=B4=A0=E6=8E=A7=E4=BB=B6=E5=89=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sonic/agent/transport/TransportClient.java | 17 +++++++++++++++++ .../sonic/agent/websockets/AndroidWSServer.java | 12 ++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/main/java/org/cloud/sonic/agent/transport/TransportClient.java b/src/main/java/org/cloud/sonic/agent/transport/TransportClient.java index e1a61161..66c62afd 100755 --- a/src/main/java/org/cloud/sonic/agent/transport/TransportClient.java +++ b/src/main/java/org/cloud/sonic/agent/transport/TransportClient.java @@ -306,6 +306,14 @@ public void onMessage(String s) { runIOSStep(jsonObject); } } + case "debugStep" -> { + if (jsonObject.getInteger("pf") == PlatformType.ANDROID) { + debugAndroidStep(jsonObject); + } + if (jsonObject.getInteger("pf") == PlatformType.IOS) { + debugIOSStep(jsonObject); + } + } case "suite" -> { List cases = jsonObject.getJSONArray("cases").toJavaList(JSONObject.class); TestNG tng = new TestNG(); @@ -440,4 +448,13 @@ private void iosRelease(String udId) { DevicesLockMap.unlockAndRemoveByUdId(udId); log.info("ios unlock udId：{}", udId); } + + private void debugAndroidStep(JSONObject jsonObject) { + + } + + private void debugIOSStep(JSONObject jsonObject){ + + } + } diff --git a/src/main/java/org/cloud/sonic/agent/websockets/AndroidWSServer.java b/src/main/java/org/cloud/sonic/agent/websockets/AndroidWSServer.java index 1b96a2f1..94092fd9 100755 --- a/src/main/java/org/cloud/sonic/agent/websockets/AndroidWSServer.java +++ b/src/main/java/org/cloud/sonic/agent/websockets/AndroidWSServer.java @@ -391,6 +391,18 @@ public void onMessage(String message, Session session) { }); } } + case "checkLocation" -> { + JSONObject jsonCheck = new JSONObject(); + jsonCheck.put("msg", "generateStep"); + jsonCheck.put("key", key); + jsonCheck.put("udId", iDevice.getSerialNumber()); + jsonCheck.put("pwd", msg.getString("pwd")); + jsonCheck.put("sessionId", session.getUserProperties().get("id").toString()); + jsonCheck.put("element", msg.getString("element")); + jsonCheck.put("eleType", msg.getString("eleType")); + jsonCheck.put("pf", 1); + TransportWorker.send(jsonCheck); + } } } } From 656c2c9f464a13146234a995af7625062ac5a3ef Mon Sep 17 00:00:00 2001 From: YeungHoiChiu <1005935991@qq.com> Date: Wed, 4 Sep 2024 20:46:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=83=E7=B4=A0=E6=8E=A7=E4=BB=B6=E5=89=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6--=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0ios=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/cloud/sonic/agent/websockets/IOSWSServer.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/cloud/sonic/agent/websockets/IOSWSServer.java b/src/main/java/org/cloud/sonic/agent/websockets/IOSWSServer.java index 4e8f7775..a6e55969 100755 --- a/src/main/java/org/cloud/sonic/agent/websockets/IOSWSServer.java +++ b/src/main/java/org/cloud/sonic/agent/websockets/IOSWSServer.java @@ -475,6 +475,17 @@ public void onMessage(String message, Session session) { } sendText(session, result.toJSONString()); } + case "checkLocation" -> { + JSONObject jsonCheck = new JSONObject(); + jsonCheck.put("msg", "generateStep"); + jsonCheck.put("key", key); + jsonCheck.put("udId", udId); + jsonCheck.put("sessionId", session.getUserProperties().get("id").toString()); + jsonCheck.put("element", msg.getString("element")); + jsonCheck.put("eleType", msg.getString("eleType")); + jsonCheck.put("pf", 2); + TransportWorker.send(jsonCheck); + } } } }