Merge pull request #7 from opendx/0.8.0

0.8.0
opendx · Nov 23, 2020 · 2ee1f4c · 2ee1f4c
2 parents 844f066 + 7425bbe
commit 2ee1f4c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.daxiang</groupId>
     <artifactId>agent</artifactId>
-    <version>0.7.9</version>
+    <version>0.8.0</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/src/main/java/com/daxiang/core/Device.java b/src/main/java/com/daxiang/core/Device.java
@@ -139,9 +139,13 @@ public File screenshot() {
     }
 
     public UploadFile screenshotThenUploadToServer() {
+        return screenshotThenUploadToServer(FileType.IMG);
+    }
+
+    public UploadFile screenshotThenUploadToServer(Integer fileType) {
         File screenshotFile = screenshot();
         try {
-            return ServerClient.getInstance().uploadFile(screenshotFile, FileType.IMG);
+            return ServerClient.getInstance().uploadFile(screenshotFile, fileType);
         } finally {
             FileUtils.deleteQuietly(screenshotFile);
         }

diff --git a/src/main/java/com/daxiang/model/FileType.java b/src/main/java/com/daxiang/model/FileType.java
@@ -4,6 +4,7 @@
  * Created by jiangyitao.
  */
 public interface FileType {
+    int TMP = -1;
     int IMG = 1;
     int VIDEO = 2;
     int APP = 3;

diff --git a/src/main/java/com/daxiang/service/DeviceService.java b/src/main/java/com/daxiang/service/DeviceService.java
@@ -4,6 +4,7 @@
 import com.daxiang.core.DeviceHolder;
 import com.daxiang.core.mobile.MobileDevice;
 import com.daxiang.exception.AgentException;
+import com.daxiang.model.FileType;
 import com.daxiang.model.UploadFile;
 import io.appium.java_client.AppiumDriver;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +27,7 @@ public Map<String, Object> screenshot(String deviceId) {
             throw new AgentException(deviceId + "未连接");
         }
 
-        UploadFile uploadFile = device.screenshotThenUploadToServer();
+        UploadFile uploadFile = device.screenshotThenUploadToServer(FileType.TMP);
 
         Map<String, Object> res = new HashMap<>();
         res.put("imgUrl", uploadFile.getDownloadUrl());

diff --git a/src/main/java/com/daxiang/utils/UUIDUtil.java b/src/main/java/com/daxiang/utils/UUIDUtil.java
@@ -1,5 +1,6 @@
 package com.daxiang.utils;
 
+import org.apache.commons.io.FilenameUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -16,6 +17,8 @@ public static String getUUID() {
 
     public static String getUUIDFilename(String filename) {
         Assert.hasText(filename, "filename不能为空");
-        return filename.contains(".") ? getUUID() + "." + StringUtils.unqualify(filename) : getUUID();
+        String fileExtension = FilenameUtils.getExtension(filename);
+        String uuid = getUUID();
+        return StringUtils.isEmpty(fileExtension) ? uuid : uuid + "." + fileExtension;
     }
 }