From 6653fc5ac773eb01be38b23a5f7e3190881ba1c1 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 28 Jan 2021 16:13:04 +0800
Subject: [PATCH] socket change

---
 .../Interface/class-use/RealTimeProvider.html    |  4 ++--
 .../java/com/mogo/cloud/MoGoApplication.java     |  5 +----
 .../com/mogo/cloud/SPIRealTimeTestClass.java     | 10 +++++-----
 .../com/mogo/cloud/socket/SocketManager.java     |  4 ++--
 ...lTimeProvider.java => IRealTimeProvider.java} |  4 +---
 .../spi/RealTimeProviderDelegateManager.java     | 16 ++++++----------
 .../mogo/realtime/spi/RealTimeProviderImp.java   |  6 +++---
 7 files changed, 20 insertions(+), 29 deletions(-)
 rename modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/{RealTimeProvider.java => IRealTimeProvider.java} (77%)

diff --git a/ApiDoc/com/mogo/realtime/Interface/class-use/RealTimeProvider.html b/ApiDoc/com/mogo/realtime/Interface/class-use/RealTimeProvider.html
index cf2a322..4a0e4b8 100644
--- a/ApiDoc/com/mogo/realtime/Interface/class-use/RealTimeProvider.html
+++ b/ApiDoc/com/mogo/realtime/Interface/class-use/RealTimeProvider.html
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="\u63A5\u53E3 com.mogo.realtime.Interface.RealTimeProvider\u7684\u4F7F\u7528 (\u8611\u83C7AI\u4E91\u5E73\u53F0Doc)";
+            parent.document.title="\u63A5\u53E3 com.mogo.realtime.Interface.IRealTimeProvider\u7684\u4F7F\u7528 (\u8611\u83C7AI\u4E91\u5E73\u53F0Doc)";
         }
     }
     catch(err) {
@@ -71,7 +71,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="接口的使用 com.mogo.realtime.Interface.RealTimeProvider" class="title">接口的使用<br>com.mogo.realtime.Interface.RealTimeProvider</h2>
+<h2 title="接口的使用 com.mogo.realtime.Interface.IRealTimeProvider" class="title">接口的使用<br>com.mogo.realtime.Interface.IRealTimeProvider</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
index 17d2762..4a16414 100644
--- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java
+++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
@@ -1,7 +1,5 @@
 package com.mogo.cloud;
 
-import android.app.Application;
-
 import androidx.multidex.MultiDexApplication;
 
 import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
@@ -28,9 +26,8 @@ public class MoGoApplication extends MultiDexApplication {
 
         MoGoAiCloudClientConfig clientConfig = new MoGoAiCloudClientConfig();
         clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_QA);
-        clientConfig.setThirdLogin(true);
+        clientConfig.setThirdLogin(false);
         clientConfig.setShowDebugLog(true);
-        clientConfig.setNeedUploadCoordinatesDurationInTime(true);
         clientConfig.setThirdPartyAppKey("bydauto");
         clientConfig.setThirdPartyDeviceId("bydauto");
         clientConfig.setLoopCheckDelay(15 * 1000);
diff --git a/app/src/main/java/com/mogo/cloud/SPIRealTimeTestClass.java b/app/src/main/java/com/mogo/cloud/SPIRealTimeTestClass.java
index dfbe634..049fc7c 100644
--- a/app/src/main/java/com/mogo/cloud/SPIRealTimeTestClass.java
+++ b/app/src/main/java/com/mogo/cloud/SPIRealTimeTestClass.java
@@ -1,22 +1,22 @@
 package com.mogo.cloud;
 
 import com.elegant.spi.annotations.Service;
-import com.mogo.realtime.Interface.RealTimeProvider;
+import com.mogo.realtime.Interface.IRealTimeProvider;
 import com.mogo.realtime.entity.ADASRecognizedResult;
 import com.mogo.realtime.entity.CloudLocationInfo;
-import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
-import com.zhidao.utils.common.SystemUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+
+
 /**
  * @author liujing
  * @description 描述
  * @since: 2021/1/26
  */
-@Service(value = RealTimeProvider.class)
-class SPIRealTimeTestClass implements RealTimeProvider {
+@Service(value = IRealTimeProvider.class)
+class SPIRealTimeTestClass implements IRealTimeProvider {
 
     @Override
     public List<ADASRecognizedResult> getLastADASRecognizedResult() {
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
index f13fece..8563c9d 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
@@ -119,9 +119,9 @@ public class SocketManager implements IMogoCloudSocketManager, Callback {
 
     @Override
     public void sendMsg(MsgBody body, IMogoCloudSocketMsgAckListener listener) {
-        Logger.d(TAG, "sendMsg.");
+        Logger.d(TAG, "sendMsg  msgId : " + body.getMsgId());
         final byte[] pb = convertToPBBytes(body.getMsgType(), objectToBytes(body.getContent()));
-        SocketClient.getInstance().sendData(mAppId, MogoCommon.Product.mogoBussiness.getNumber(), pb, 1, true, System.currentTimeMillis());
+        SocketClient.getInstance().sendData(mAppId, MogoCommon.Product.mogoBussiness.getNumber(), pb, MogoConnsvr.MsgType.mogoMsgTypeCollectSvrNoRspReq.getNumber(), true, body.getMsgId());
     }
 
     @Override
diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeProvider.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/IRealTimeProvider.java
similarity index 77%
rename from modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeProvider.java
rename to modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/IRealTimeProvider.java
index 9f48137..edeb530 100644
--- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeProvider.java
+++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/IRealTimeProvider.java
@@ -2,15 +2,13 @@ package com.mogo.realtime.Interface;
 
 import com.mogo.realtime.entity.ADASRecognizedResult;
 import com.mogo.realtime.entity.CloudLocationInfo;
-import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
-import com.mogo.realtime.util.MogoLatLng;
 
 import java.util.List;
 
 /**
  * 蘑菇AI云平台实时定位点上报服务接口
  */
-public interface RealTimeProvider {
+public interface IRealTimeProvider {
 
     /**
      * 获取 adas 识别列表，由外部传入
diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
index d831371..acd6e3f 100644
--- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
+++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
@@ -3,14 +3,14 @@ package com.mogo.realtime.spi;
 
 import com.elegant.spi.AbstractDelegateManager;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-import com.mogo.realtime.Interface.RealTimeProvider;
+import com.mogo.realtime.Interface.IRealTimeProvider;
 
 /**
  * 提供RealTime SPI接口实例对象管理类
  */
-class RealTimeProviderDelegateManager extends AbstractDelegateManager<RealTimeProvider> {
+class RealTimeProviderDelegateManager extends AbstractDelegateManager<IRealTimeProvider> {
     private static RealTimeProviderDelegateManager sInstance = null;
-    private RealTimeProvider mRealTimeProvider = null;
+    private IRealTimeProvider mRealTimeProvider = null;
 
     public static RealTimeProviderDelegateManager getInstance() {
         if (sInstance == null) {
@@ -24,15 +24,11 @@ class RealTimeProviderDelegateManager extends AbstractDelegateManager<RealTimePr
     }
 
     public RealTimeProviderDelegateManager() {
-        loadDelegates(MoGoAiCloudClient.getInstance().getContext(), RealTimeProvider.class, new DelegateListener<RealTimeProvider>() {
-            @Override
-            public void onDelegate(String unit, RealTimeProvider p) {
-                mRealTimeProvider = p;
-            }
-        });
+        loadDelegates(MoGoAiCloudClient.getInstance().getContext(), IRealTimeProvider.class, (unit, p)
+                -> mRealTimeProvider = p);
     }
 
-    public RealTimeProvider getRealTimeProvider(){
+    public IRealTimeProvider getRealTimeProvider(){
         return mRealTimeProvider;
     }
 }
diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java
index 878cd79..6c4ca60 100644
--- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java
+++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java
@@ -1,6 +1,6 @@
 package com.mogo.realtime.spi;
 
-import com.mogo.realtime.Interface.RealTimeProvider;
+import com.mogo.realtime.Interface.IRealTimeProvider;
 import com.mogo.realtime.entity.ADASRecognizedResult;
 import com.mogo.realtime.entity.CloudLocationInfo;
 
@@ -9,10 +9,10 @@ import java.util.List;
 /**
  * RealTime Provider SPI 单例对象
  */
-public class RealTimeProviderImp implements RealTimeProvider {
+public class RealTimeProviderImp implements IRealTimeProvider {
 
     private static volatile RealTimeProviderImp sInstance = null;
-    private final RealTimeProvider mDelegate;
+    private final IRealTimeProvider mDelegate;
 
     public static RealTimeProviderImp getInstance() {
         if (sInstance == null) {