From 326bc44a34ec8a3da9a5a8ad2dd422b18b979538 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 21 May 2021 15:34:47 +0800
Subject: [PATCH] change the tomeDelay upload data

---
 .../com/mogo/launcher/MogoApplication.java    |  2 +-
 .../network/bean/MockSocketSendData.java      | 37 +++++++++++++++++++
 .../timedelay/TimeDelayUploadManager.java     | 11 ++++--
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java

diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 2f10de66a7..3459874a0f 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -225,7 +225,7 @@ public class MogoApplication extends AbsMogoApplication {
         // 设置是否是第三APP登录
         clientConfig.setThirdLogin(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
         // 设置是否输出日志
-        clientConfig.setShowDebugLog(false);
+        clientConfig.setShowDebugLog(true);
         // 设置是否是直播推流的主播
         clientConfig.setAnchor(false);
         // 设置从蘑菇AI开放平台获取的APPKey
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java
new file mode 100644
index 0000000000..262b7b2d54
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java
@@ -0,0 +1,37 @@
+package com.mogo.module.service.network.bean;
+
+public class MockSocketSendData {
+    private long systemTime;
+    private String uuid;
+    private long satelliteTime;
+
+    public MockSocketSendData(long systemTime, String uuid, long satelliteTime) {
+        this.systemTime = systemTime;
+        this.uuid = uuid;
+        this.satelliteTime = satelliteTime;
+    }
+
+    public long getSystemTime() {
+        return systemTime;
+    }
+
+    public void setSystemTime(long systemTime) {
+        this.systemTime = systemTime;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public long getSatelliteTime() {
+        return satelliteTime;
+    }
+
+    public void setSatelliteTime(long satelliteTime) {
+        this.satelliteTime = satelliteTime;
+    }
+}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index dc377b0d73..a2ad0b14db 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -9,11 +9,13 @@ import androidx.annotation.RequiresApi;
 
 import com.mogo.commons.data.BaseData;
 import com.mogo.commons.network.SubscribeImpl;
+import com.mogo.commons.network.Utils;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.uploadintime.SnapshotLocationController;
 import com.mogo.module.service.MarkerServiceHandler;
 import com.mogo.module.service.network.TimeDelayApiService;
 import com.mogo.module.service.network.bean.MockSocketReceiverData;
+import com.mogo.module.service.network.bean.MockSocketSendData;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.entity.CloudRoadData;
 import com.mogo.realtime.entity.MogoSnapshotSetData;
@@ -22,6 +24,7 @@ import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
+import com.mogo.utils.network.utils.GsonUtil;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -145,13 +148,13 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
                     .findAny()
                     .orElse(null);
             if (result == null) {
-                Logger.d(TAG,"未找到与之匹配数据");
+                Logger.d(TAG, "未找到与之匹配数据");
                 return;
             }
+            MockSocketSendData mockSocketSendData = new MockSocketSendData(System.currentTimeMillis(), result.getUuid(), result.getSatelliteTime());
             Map<String, Object> map = new HashMap<>();
-            map.put("systemTime", System.currentTimeMillis());
-            map.put("uuid", result.getUuid());
-            map.put("satelliteTime", result.getSatelliteTime());
+            map.put("sn", Utils.getSn());
+            map.put("data", GsonUtil.jsonFromObject(mockSocketSendData));
             timeDelayApiService.uploadDelayData(map)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())