From 45fa0ad66159097854b84ae02bf78dd649cfc2e2 Mon Sep 17 00:00:00 2001
From: Eason <291028775@qq.com>
Date: Sat, 18 Mar 2023 01:16:10 +0800
Subject: [PATCH] fix: ios sift bugs

---
 src/main/docker/Dockerfile                           |  4 ++--
 .../sonic/agent/tests/handlers/IOSStepHandler.java   | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 7c6fbf6c..57ef951f 100755
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,8 +1,8 @@
-FROM sonicorg/sonic-agent-linux-base:v1.0.1
+FROM sonicorg/sonic-agent-linux-base:v1.0.2
 
 ADD /mini /root/mini
 ADD /plugins /root/plugins
 ADD /src/main/docker/config /root/config
 ADD /target/sonic-agent-linux-x86_64.jar /root
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-ENTRYPOINT ["/root/jdk-15.0.2+7/bin/java","-server","-Dfile.encoding=utf-8","-XX:-UseGCOverheadLimit","-XX:+DisableExplicitGC","-XX:SurvivorRatio=1","-XX:LargePageSizeInBytes=128M","-XX:SoftRefLRUPolicyMSPerMB=0","-Djava.security.egd=file:/dev/./urandom","--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED","-jar","sonic-agent-linux-x86_64.jar"]
+ENTRYPOINT ["/root/jdk-17+20/bin/java","-server","-Dfile.encoding=utf-8","-XX:-UseGCOverheadLimit","-XX:+DisableExplicitGC","-XX:SurvivorRatio=1","-XX:LargePageSizeInBytes=128M","-XX:SoftRefLRUPolicyMSPerMB=0","-Djava.security.egd=file:/dev/./urandom","--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED","-jar","sonic-agent-linux-x86_64.jar"]
diff --git a/src/main/java/org/cloud/sonic/agent/tests/handlers/IOSStepHandler.java b/src/main/java/org/cloud/sonic/agent/tests/handlers/IOSStepHandler.java
index 613d0d3a..0f76af32 100755
--- a/src/main/java/org/cloud/sonic/agent/tests/handlers/IOSStepHandler.java
+++ b/src/main/java/org/cloud/sonic/agent/tests/handlers/IOSStepHandler.java
@@ -756,7 +756,17 @@ public void clickByImg(HandleContext handleContext, String des, String pathValue
         }
         if (findResult != null) {
             try {
-                iosDriver.tap(findResult.getX(), findResult.getY());
+                String[] size = SibTool.getSize(udId).split("x");
+                WindowSize windowSize = iosDriver.getWindowSize();
+                int width;
+                int ori = SibTool.getOrientation(udId);
+                if (ori == 1 || ori == 2) {
+                    width = windowSize.getWidth();
+                } else {
+                    width = windowSize.getHeight();
+                }
+                iosDriver.tap(findResult.getX() / (Integer.parseInt(size[0]) / width),
+                        findResult.getY() / (Integer.parseInt(size[0]) / width));
             } catch (Exception e) {
                 log.sendStepLog(StepType.ERROR, "点击" + des + "失败！", "");
                 handleContext.setE(e);