|
@@ -129,6 +129,7 @@ public class AppiumUtil {
|
|
|
break;
|
|
|
default:
|
|
|
isContinue = false;
|
|
|
+ androidDriver.quit();
|
|
|
System.out.println("当前activity无法处理");
|
|
|
break;
|
|
|
}
|
|
@@ -200,6 +201,7 @@ public class AppiumUtil {
|
|
|
if (kwaiId != null) {
|
|
|
System.out.println(kwaiId.getText());
|
|
|
isContinue = false;
|
|
|
+ androidDriver.quit();
|
|
|
}
|
|
|
break;
|
|
|
case "com.yxcorp.gifshow.activity.BrowseSettingsActivity":
|
|
@@ -382,6 +384,7 @@ public class AppiumUtil {
|
|
|
break;
|
|
|
default:
|
|
|
isContinue = false;
|
|
|
+ androidDriver.quit();
|
|
|
System.out.println("当前activity无法处理");
|
|
|
break;
|
|
|
}
|
|
@@ -397,13 +400,34 @@ public class AppiumUtil {
|
|
|
public WebElement getElementByType(AndroidDriver androidDriver, String type, String typeInfo) {
|
|
|
WebElement element = null;
|
|
|
if (type.equals(FIND_ELEMENT_TYPE_ID)) {
|
|
|
- element = androidDriver.findElementById(typeInfo);
|
|
|
+ try {
|
|
|
+ List<WebElement> elements = androidDriver.findElementsById(typeInfo);
|
|
|
+ if (elements != null && elements.size() > 0) {
|
|
|
+ element = elements.get(0);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ System.out.println("元素ID:" + typeInfo + "不存在");
|
|
|
+ }
|
|
|
}
|
|
|
if (type.equals(FIND_ELEMENT_TYPE_CLASS)) {
|
|
|
- element = androidDriver.findElementByClassName(typeInfo);
|
|
|
+ try {
|
|
|
+ List<WebElement> elements = androidDriver.findElementsByClassName(typeInfo);
|
|
|
+ if (elements != null && elements.size() > 0) {
|
|
|
+ element = elements.get(0);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ System.out.println("元素class:" + typeInfo + "不存在");
|
|
|
+ }
|
|
|
}
|
|
|
if (type.equals(FIND_ELEMENT_TYPE_XPATH)) {
|
|
|
- element = androidDriver.findElementByXPath(typeInfo);
|
|
|
+ try {
|
|
|
+ List<WebElement> elements = androidDriver.findElementsByXPath(typeInfo);
|
|
|
+ if (elements != null && elements.size() > 0) {
|
|
|
+ element = elements.get(0);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ System.out.println("元素xpath:" + typeInfo + "不存在");
|
|
|
+ }
|
|
|
}
|
|
|
return element;
|
|
|
}
|