better

Author: jiangyitao

src/main/java/com/daxiang/action/MobileAction.java

@@ -172,16 +172,18 @@ public WebElement swipeInContainerToFindElement(WebElement container, String fin
 
     /**
      * 1007.弹窗 允许/接受/...
+     * // todo 转移到BaseAction
      */
     public boolean acceptAlert() {
-        return mobileDevice.acceptAlert();
+        return device.acceptAlert();
     }
 
     /**
      * 1008.异步accept alert
      *
      * @param timeoutInSeconds 超时处理时间
      * @param once             是否只处理一次
+     *                         // todo 转移到BaseAction
      */
     public void asyncAcceptAlert(String timeoutInSeconds, String once) {
         long _timeoutInSeconds = parseLong(timeoutInSeconds);
@@ -206,16 +208,18 @@ public void asyncAcceptAlert(String timeoutInSeconds, String once) {
 
     /**
      * 1009.弹窗 拒绝/取消/...
+     * // todo 转移到BaseAction
      */
     public boolean dismissAlert() {
-        return mobileDevice.dismissAlert();
+        return device.dismissAlert();
     }
 
     /**
      * 1010.异步dismiss alert
      *
      * @param timeoutInSeconds 超时处理时间
      * @param once             是否只处理一次
+     *                         // todo 转移到BaseAction
      */
     public void asyncDismissAlert(String timeoutInSeconds, String once) {
         long _timeoutInSeconds = parseLong(timeoutInSeconds);

src/main/java/com/daxiang/core/Device.java

@@ -146,4 +146,22 @@ public UploadFile screenshotThenUploadToServer() {
             FileUtils.deleteQuietly(screenshotFile);
         }
     }
+
+    public boolean acceptAlert() {
+        try {
+            driver.switchTo().alert().accept();
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public boolean dismissAlert() {
+        try {
+            driver.switchTo().alert().dismiss();
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }

src/main/java/com/daxiang/core/mobile/MobileDevice.java

@@ -41,10 +41,6 @@ public MobileDevice(Mobile mobile, AppiumServer appiumServer) {
 
     public abstract void uninstallApp(String app) throws Exception;
 
-    public abstract boolean acceptAlert();
-
-    public abstract boolean dismissAlert();
-
     public void installApp(File appFile) {
         ((AppiumDriver) driver).installApp(appFile.getAbsolutePath());
     }

src/main/java/com/daxiang/core/mobile/ios/IosDevice.java

@@ -105,26 +105,6 @@ public void uninstallApp(String app) {
         IosUtil.uninstallApp(driver, app);
     }
 
-    @Override
-    public boolean acceptAlert() {
-        try {
-            driver.switchTo().alert().accept();
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean dismissAlert() {
-        try {
-            driver.switchTo().alert().dismiss();
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
     @Override
     public void startRecordingScreen() {
         IOSStartScreenRecordingOptions iosOptions = new IOSStartScreenRecordingOptions();