feat:AndroidDriver中增加tap,longPress,swipe的方法，对齐IOSDriver

src/main/java/org/cloud/sonic/driver/android/AndroidDriver.java

@@ -405,4 +405,54 @@ public byte[] screenshot() throws SonicRespException {
  public void setAppiumSettings(JSONObject settings) throws SonicRespException {
  uiaClient.setAppiumSettings(settings);
  }
+
+ /**
+ * tap position on screen.
+ *
+ * @param x
+ * @param y
+ * @throws SonicRespException
+ */
+ public void tap(int x, int y) throws SonicRespException {
+ uiaClient.tap(x, y);
+ }
+
+ /**
+ * long press position on screen.
+ *
+ * @param x
+ * @param y
+ * @param ms
+ * @throws SonicRespException
+ */
+ public void longPress(double x, double y, double ms) throws SonicRespException {
+ uiaClient.longPress(x, y, ms);
+ }
+
+ /**
+ * swipe position on screen.
+ *
+ * @param fromX
+ * @param fromY
+ * @param toX
+ * @param toY
+ * @throws SonicRespException
+ */
+ public void swipe(int fromX, int fromY, int toX, int toY) throws SonicRespException {
+ this.swipe(fromX, fromY, toX, toY, null);
+ }
+
+ /**
+ * swipe position on screen with target time
+ *
+ * @param fromX
+ * @param fromY
+ * @param toX
+ * @param toY
+ * @param duration
+ * @throws SonicRespException
+ */
+ public void swipe(int fromX, int fromY, int toX, int toY, Integer duration) throws SonicRespException {
+ uiaClient.swipe(fromX, fromY, toX, toY, duration);
+ }
 }

src/main/java/org/cloud/sonic/driver/android/service/UiaClient.java

@@ -82,4 +82,10 @@ public interface UiaClient {
 
  //appium setting handler.
  void setAppiumSettings(JSONObject settings) throws SonicRespException;
+
+ void tap(int x, int y) throws SonicRespException;
+
+ void longPress(double x, double y, double ms) throws SonicRespException;
+
+ void swipe(int fromX, int fromY, int toX, int toY, Integer duration) throws SonicRespException;
 }

src/main/java/org/cloud/sonic/driver/android/service/impl/UiaClientImpl.java

@@ -353,4 +353,65 @@ public void setAppiumSettings(JSONObject settings) throws SonicRespException {
  throw new SonicRespException(b.getErr().getMessage());
  }
  }
+
+ @Override
+ public void tap(int x, int y) throws SonicRespException {
+ checkSessionId();
+ JSONObject data = new JSONObject();
+ data.put("x", x);
+ data.put("y", y);
+ BaseResp b = respHandler.getResp(HttpUtil.createPost(remoteUrl + "/session/" + sessionId + "/appium/tap")
+ .body(data.toJSONString()));
+ if (b.getErr() == null) {
+ logger.info("perform tap action %s.", data.toString());
+ } else {
+ logger.error("perform tap action failed.");
+ throw new SonicRespException(b.getErr().getMessage());
+ }
+ }
+
+ @Override
+ public void longPress(double x, double y, double ms) throws SonicRespException {
+ checkSessionId();
+ JSONObject data = new JSONObject();
+ JSONObject touchEventParams = new JSONObject();
+ touchEventParams.put("x", x);
+ touchEventParams.put("y", y);
+ touchEventParams.put("duration", ms);
+ data.put("params", touchEventParams);
+ BaseResp b = respHandler.getResp(HttpUtil.createPost(remoteUrl + "/session/" + sessionId + "/touch/longclick")
+ .body(data.toJSONString()));
+ if (b.getErr() == null) {
+ logger.info("perform longPress action %s.", data.toString());
+ } else {
+ logger.error("perform longPress action failed.");
+ throw new SonicRespException(b.getErr().getMessage());
+ }
+ }
+
+ @Override
+ public void swipe(int fromX, int fromY, int toX, int toY, Integer duration) throws SonicRespException {
+ checkSessionId();
+ JSONObject data = new JSONObject();
+ data.put("startX", fromX);
+ data.put("startY", fromY);
+ data.put("endX", toX);
+ data.put("endY", toY);
+ // steps 参数为uiautomator层定义的单位
+ // example：So for a 100 steps, the swipe will take about 1/2 second to complete.
+ if (duration == null) {
+ data.put("steps", 100);
+ } else {
+ data.put("steps", duration / 5);
+ }
+ BaseResp b = respHandler.getResp(HttpUtil.createPost(remoteUrl + "/session/" + sessionId + "/touch/perform")
+ .body(data.toJSONString()));
+ if (b.getErr() == null) {
+ logger.info("perform swipe action %s.", data.toString());
+ } else {
+ logger.error("perform swipe action failed.");
+ throw new SonicRespException(b.getErr().getMessage());
+ }
+ }
+
 }

src/test/java/org/cloud/sonic/driver/android/AndroidDriverTest.java

@@ -159,4 +159,33 @@ public void testScreenshot() throws IOException, SonicRespException {
  public void testSetAppiumSettings() throws SonicRespException {
  androidDriver.setAppiumSettings(new JSONObject());
  }
+
+ @Test
+ public void testSwipeAction() throws SonicRespException {
+ // 默认滑动操作的完成时间，500毫秒
+ androidDriver.swipe(540, 1710, 540, 200);
+ // 指定滑动操作在1000毫秒内完成
+ androidDriver.swipe(540, 1710, 540, 200, 1000);
+ }
+
+ @Test
+ public void testTapAction() throws SonicRespException {
+ // 替换为任意待测试的元素
+ AndroidElement androidElement = androidDriver.findElement(AndroidSelector.Id,
+ "com.xueqiu.android:id/my_groups_new_title_bar_ding");
+ ElementRect elementRect = androidElement.getRect();
+ androidDriver.tap(elementRect.getX() + elementRect.getWidth() / 2, elementRect.getY() + elementRect.getHeight() / 2);
+ }
+
+ @Test
+ public void testLongPressAction() throws SonicRespException {
+ // 替换为任意待测试的元素
+ AndroidElement androidElement = androidDriver.findElement(AndroidSelector.Id,
+ "com.xueqiu.android:id/my_groups_list_item_stock_name_label");
+ ElementRect elementRect = androidElement.getRect();
+ androidDriver.longPress((double) elementRect.getX() + (double) elementRect.getWidth() / 2,
+ (double) elementRect.getY() + (double) elementRect.getHeight() / 2,
+ 100);
+ }
+
 }