Explorar o código

1. 处理获取截图时间错误的问题
2. 尝试忽略退出按钮

LiHaoyu %!s(int64=5) %!d(string=hai) anos
pai
achega
bd15bd123d

+ 10 - 4
src/main/java/net/mooctest/www/android_auto_test/Obversers/ScreenShotThread.java

@@ -49,9 +49,12 @@ public class ScreenShotThread extends Thread {
             try {
                 File screenShotFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE);
                 try {
-                    String path = AddressUtil.getScreenShotFilePath(traceId, udid, DeviceUtil.getDeviceTimeStamp(udid));
+                    String deviceTimestamp = DeviceUtil.getDeviceTimeStamp(udid);
+                    // 解析timestamp防止返回的不是数字
+                    long ignored = Long.parseLong(deviceTimestamp);
+                    String path = AddressUtil.getScreenShotFilePath(traceId, udid, deviceTimestamp);
                     FileUtils.copyFile(screenShotFile, new File(path));
-                } catch (IOException e) {
+                } catch (IOException | NumberFormatException e) {
                     e.printStackTrace();
                 }
                 FileReader fr;
@@ -60,9 +63,12 @@ public class ScreenShotThread extends Thread {
                     if(fr.read() == -1){
                         screenShotFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE);
                         try {
-                            String path = AddressUtil.getScreenShotFilePath(traceId, udid, DeviceUtil.getDeviceTimeStamp(udid));
+                            String deviceTimestamp = DeviceUtil.getDeviceTimeStamp(udid);
+                            // 解析timestamp防止返回的不是数字
+                            long ignored = Long.parseLong(deviceTimestamp);
+                            String path = AddressUtil.getScreenShotFilePath(traceId, udid, deviceTimestamp);
                             FileUtils.copyFile(screenShotFile, new File(path));
-                        } catch (IOException e) {
+                        } catch (IOException | NumberFormatException e) {
                             e.printStackTrace();
                         }
                         if(fr.read() == -1){

+ 1 - 1
src/main/java/net/mooctest/www/android_auto_test/utils/CoverageTest.java

@@ -346,7 +346,7 @@ public class CoverageTest extends Thread{
         try {
             String command = "adb -s " + this.udid + " uninstall " + this.apkInfo.getPackageName();
             if (isFinal){
-                PrintUtil.print("Uninstall to clean the device.", TAG);
+                PrintUtil.print("Uninstall to clean the device.", TAG, udid);
                 command = String.format("adb -s %s shell pm uninstall %s", udid, this.apkInfo.getPackageName());
             }else {
                 checkDeviceOnline();