|
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
import com.google.gson.JsonArray;
|
|
import com.google.gson.JsonArray;
|
|
import com.google.gson.JsonObject;
|
|
import com.google.gson.JsonObject;
|
|
import net.mooctest.www.android_auto_test.common.BeanFactory;
|
|
import net.mooctest.www.android_auto_test.common.BeanFactory;
|
|
|
|
+import net.mooctest.www.android_auto_test.common.DataUploadInfo;
|
|
import net.mooctest.www.android_auto_test.common.constant.Consts;
|
|
import net.mooctest.www.android_auto_test.common.constant.Consts;
|
|
import net.mooctest.www.android_auto_test.common.constant.enums.DeviceStatus;
|
|
import net.mooctest.www.android_auto_test.common.constant.enums.DeviceStatus;
|
|
import net.mooctest.www.android_auto_test.common.constant.enums.TraceStatus;
|
|
import net.mooctest.www.android_auto_test.common.constant.enums.TraceStatus;
|
|
@@ -30,6 +31,7 @@ public class TraceDaemon extends Thread{
|
|
private TraceService traceService;
|
|
private TraceService traceService;
|
|
private OssService ossService;
|
|
private OssService ossService;
|
|
private ApkService apkService;
|
|
private ApkService apkService;
|
|
|
|
+ private DataUploadInfo dataUploadInfo;
|
|
|
|
|
|
public static final String TAG = Thread.currentThread() .getStackTrace()[1].getClassName();
|
|
public static final String TAG = Thread.currentThread() .getStackTrace()[1].getClassName();
|
|
|
|
|
|
@@ -51,6 +53,7 @@ public class TraceDaemon extends Thread{
|
|
traceService = (TraceService) BeanFactory.getBean(TraceService.class);
|
|
traceService = (TraceService) BeanFactory.getBean(TraceService.class);
|
|
ossService = (OssService) BeanFactory.getBean(OssService.class);
|
|
ossService = (OssService) BeanFactory.getBean(OssService.class);
|
|
apkService = (ApkService) BeanFactory.getBean(ApkService.class);
|
|
apkService = (ApkService) BeanFactory.getBean(ApkService.class);
|
|
|
|
+ dataUploadInfo = (DataUploadInfo) BeanFactory.getBean(DataUploadInfo.class);
|
|
}
|
|
}
|
|
|
|
|
|
public void setNeedCrowdSourcedAnalysis(boolean i){
|
|
public void setNeedCrowdSourcedAnalysis(boolean i){
|
|
@@ -141,7 +144,7 @@ public class TraceDaemon extends Thread{
|
|
}
|
|
}
|
|
try {
|
|
try {
|
|
PrintUtil.print(String.format("Generate bug report by %s's docker", reportType), TAG);
|
|
PrintUtil.print(String.format("Generate bug report by %s's docker", reportType), TAG);
|
|
- String command = String.format("java -jar tasks/%s.jar %s", reportType, traceId);
|
|
|
|
|
|
+ String command = String.format("java -jar tasks/%s.jar %s %s", reportType, traceId, dataUploadInfo.getDataUrlPrefix());
|
|
String result = OsUtil.runCommand(command);
|
|
String result = OsUtil.runCommand(command);
|
|
PrintUtil.print(result, TAG);
|
|
PrintUtil.print(result, TAG);
|
|
|
|
|