diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AbstractDebuggerService.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AbstractDebuggerService.java index 87c5d9d..edf1f69 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AbstractDebuggerService.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AbstractDebuggerService.java @@ -50,12 +50,12 @@ public abstract class AbstractDebuggerService implements DebuggerService { @Override public boolean removeApp(String deviceId, String appPackage) { - return false; + return deviceHandleHelper.removeApp(deviceId,appPackage); } @Override - public boolean installApp(String deviceId, String appPath, String appPackage) { - return false; + public boolean installApp(String deviceId, String appPath) { + return deviceHandleHelper.installApp(deviceId,appPath); } @Override @@ -94,7 +94,7 @@ public abstract class AbstractDebuggerService implements DebuggerService { @Override public boolean activeApp(String deviceId, String appPackage) { - return false; + return deviceHandleHelper.activateApp(deviceId,appPackage); } protected String regularSub(String xml, String reg, String target) { diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java index 041dc30..ac63293 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java @@ -27,6 +27,7 @@ import net.northking.cctp.upperComputer.exception.ParamMistakeException; import net.northking.cctp.upperComputer.service.thread.AndroidDeviceAllInfoThread; import net.northking.cctp.upperComputer.service.thread.AndroidDeviceInfoByPackageThread; import net.northking.cctp.upperComputer.utils.HttpUtils; +import net.northking.cctp.upperComputer.utils.deviceHepler.android.AndroidDeviceHelper; import net.northking.cctp.upperComputer.webSocket.entity.CatchParam; import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.WebElement; @@ -88,6 +89,10 @@ public class AndroidDebuggerServiceImpl extends AbstractDebuggerService { @Value("${appium.server.contextPath:/wd/hub}") private String appiumContextPath; + public AndroidDebuggerServiceImpl() { + this.deviceHandleHelper = new AndroidDeviceHelper(); + } + @Autowired @Override public void setMobileProperty(MobileProperty mobileProperty) { diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/DebuggerService.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/DebuggerService.java index 36aca77..dd3fb17 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/DebuggerService.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/DebuggerService.java @@ -38,6 +38,8 @@ public interface DebuggerService { boolean removeApp(String deviceId, String appPackage); + boolean installApp(String deviceId, String appPath); + boolean installApp(String deviceId, String appPath, String appPackage); String execShellWaitResult(String shell ,String dir, Map envMap,boolean isWaitOrNot); diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/IosDebuggerServiceImpl.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/IosDebuggerServiceImpl.java index ffc2deb..252ca5d 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/IosDebuggerServiceImpl.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/IosDebuggerServiceImpl.java @@ -276,10 +276,6 @@ public class IosDebuggerServiceImpl extends AbstractDebuggerService { return deviceHandleHelper.isAppInstalled(deviceId, appPackage); } - @Override - public boolean removeApp(String deviceId, String appPackage) { - return deviceHandleHelper.removeApp(deviceId, appPackage); - } /**