Browse Source

合并代码

xuzuoyun 5 years ago
parent
commit
819154e4a9

+ 21 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/AppiumUtil.java

@@ -397,7 +397,7 @@ public class AppiumUtil {
         return isContinue;
     }
 
-    public WebElement getElementById(AndroidDriver androidDriver, String id) {
+    public WebElement getElementByType(AndroidDriver androidDriver, String type, String typeInfo) {
         WebElement element = null;
         if (type.equals(FIND_ELEMENT_TYPE_ID)) {
             element = androidDriver.findElementById(typeInfo);
@@ -568,6 +568,26 @@ public class AppiumUtil {
         }
     }
 
+    public void backToMain(AndroidDriver androidDriver) {
+        WebElement element = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/back_btn");
+        if (null != element) {
+            element.click();
+        }
+    }
+
+    public Boolean checkAdvertiser(AndroidDriver androidDriver, String advertiserName) {
+        WebElement label = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/label");
+        String text = label.getText();
+        if (null != label && null != text && text.startsWith(advertiserName)) {
+            //表示广告筛选成功
+            return true;
+        } else {
+            backToMain(androidDriver);
+            return false;
+        }
+    }
+
+
     private void swipeByType(AndroidDriver androidDriver, String type) {
         if (type.equals(APP_SWIPE_TYPE_UP)) {
             this.swipeToUp(androidDriver);