Selaa lähdekoodia

优化截图上传

LiHaoyu 5 vuotta sitten
vanhempi
commit
e68fb7b1a6

+ 15 - 0
src/main/java/net/mooctest/www/android_auto_test/services/Impl/OssServiceImpl.java

@@ -68,6 +68,21 @@ public class OssServiceImpl implements OssService {
     }
 
     @Override
+    public void uploadFilesToTraceDir(File[] files, String traceId) {
+        OSSClient client = new OSSClient(endPoint, accessKeyId, accessKeySecret);
+        for (File file: files){
+            try {
+                String filePath = Consts.TRACE_DATA_PATH + traceId + "/" + file.getName();
+                InputStream is = new FileInputStream(file);
+                client.putObject(bucketName, filePath , is);
+            }catch (FileNotFoundException ignored) {
+
+            }
+        }
+        client.shutdown();
+    }
+
+    @Override
     public String uploadInputStreamToTraceDir(InputStream is, String traceId, String fileName){
             String filePath = Consts.TRACE_DATA_PATH + traceId + "/" + fileName;
             OSSClient client = new OSSClient(endPoint, accessKeyId, accessKeySecret);

+ 2 - 0
src/main/java/net/mooctest/www/android_auto_test/services/OssService.java

@@ -13,5 +13,7 @@ public interface OssService {
 
     String uploadFileToTraceDir(File file, String traceId, String fileName);
 
+    void uploadFilesToTraceDir(File[] files, String traceId);
+
     String uploadInputStreamToTraceDir(InputStream is, String traceId, String fileName);
 }

+ 2 - 4
src/main/java/net/mooctest/www/android_auto_test/utils/TraceDaemon.java

@@ -118,10 +118,8 @@ public class TraceDaemon extends Thread{
                     if (!screenDir.exists()){
                         continue;
                     }
-                    for (File screenShot: screenDir.listFiles()){
-                        System.out.println(screenShot);
-                        ossService.uploadFileToTraceDir(screenShot, traceId, screenShot.getName());
-                    }
+                    System.out.println(String.format("Upload %s files.", udid));
+                    ossService.uploadFilesToTraceDir(screenDir.listFiles(), traceId);
                 }
             }
         }