Browse Source

代码合并

syh 5 năm trước cách đây
mục cha
commit
c715b8dd85

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

@@ -152,11 +152,11 @@ public class AppiumUtil {
                     break;
                 case "com.yxcorp.gifshow.HomeActivity":
 
-                    WebElement loginText = getElementById(androidDriver, "com.smile.gifmaker:id/login_text");
-                    WebElement leftText = getElementById(androidDriver, "com.smile.gifmaker:id/left_text");
-                    WebElement phoneLoginBtn = getElementById(androidDriver, "com.smile.gifmaker:id/phone_login_view");
-                    WebElement leftBtn = getElementById(androidDriver, "com.smile.gifmaker:id/left_btn");
-                    WebElement closeBtn = getElementById(androidDriver, "com.smile.gifmaker:id/close_btn");
+                    WebElement loginText = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/login_text");
+                    WebElement leftText = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/left_text");
+                    WebElement phoneLoginBtn = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/phone_login_view");
+                    WebElement leftBtn = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/left_btn");
+                    WebElement closeBtn = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/close_btn");
                     if (closeBtn != null) {
                         closeBtn.click();
                         break;
@@ -190,7 +190,7 @@ public class AppiumUtil {
                     }
                     break;
                 case "com.yxcorp.gifshow.profile.activity.MyProfileActivity":
-                    WebElement loadingTitle = getElementById(androidDriver, "com.smile.gifmaker:id/loading_title");
+                    WebElement loadingTitle = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/loading_title");
                     if (loadingTitle != null) {
                         System.out.println(loadingTitle.getText());
                     }
@@ -211,8 +211,6 @@ public class AppiumUtil {
                     WebElement loginTitleTv = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/login_title_tv");
                     WebElement loginNameEt = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/login_name_et");
                     WebElement nextView = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/next_view");
-//                    WebElement forgetPsdBtn = getElementById(androidDriver,"com.smile.gifmaker:id/forget_psd_btn");
-
                     if (loginTitleTv != null) {
                         System.out.println(loginTitleTv.getText());
                         if (loginTitleTv.getText().equals("输入密码")) {