From 84cd34bbd427a89d3c657d7ce8ff513b9078d533 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 25 Jan 2021 16:34:55 +0800 Subject: [PATCH] =?UTF-8?q?[re]=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interface/RealTimeApisHandler.java | 35 ------------------- .../realtime/Interface/RealTimeProvider.java | 8 ++--- .../Interface/RealTimeServiceApis.java | 11 ------ .../SimpleLocationCorrectStrategy.java | 6 ++-- .../constant/SnapshotUploadInTime.java | 5 +-- .../mogo/realtime/socket/SocketHandler.java | 6 ++++ 6 files changed, 14 insertions(+), 57 deletions(-) delete mode 100644 modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeApisHandler.java delete mode 100644 modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeServiceApis.java diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeApisHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeApisHandler.java deleted file mode 100644 index 726744e..0000000 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeApisHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mogo.realtime.Interface; - -/** - * @author liujing - * @description 描述 - * @since: 2021/1/21 - */ -public final class RealTimeApisHandler { - private static volatile RealTimeApisHandler sInstance; - private static volatile RealTimeServiceApis sApis; - - public static RealTimeApisHandler getInstance() { - if (sInstance == null) { - synchronized (RealTimeApisHandler.class) { - sInstance = new RealTimeApisHandler(); - } - } - return sInstance; - } - - public void initRealTimeEnvironment() { - //socketeinit locationinit rtkinit - } - - public RealTimeServiceApis getApis() { - if (sApis == null) { - synchronized (this) { -// sApis = new RealTimeServiceApis(); - } - } - return sApis; - } - - -} 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/RealTimeProvider.java index dffb7a5..c0aac9f 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/RealTimeProvider.java @@ -13,7 +13,7 @@ import java.util.List; * @description 描述 * @since: 2021/1/21 */ -public interface RealTimeProvider { +public interface RealTimeProvider { /** * 获取 adas 识别列表 * @@ -22,8 +22,8 @@ public interface RealTimeProvider { List getLastADASRecognizedResult(); /* - * 两个点之间的距离 - * */ + * 两个点之间的距离 + * */ float getDistanceBetweenTwoPoints(); /** @@ -48,5 +48,5 @@ public interface RealTimeProvider { * @param list 消息体 * @param listener 回执监听 */ - public void sendMsg(List list, IMogoCloudSocketOnMessageListener listener); + public void sendMsg(List list, IMogoCloudSocketOnMessageListener listener); } diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeServiceApis.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeServiceApis.java deleted file mode 100644 index eec2e5e..0000000 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeServiceApis.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.mogo.realtime.Interface; - -/** - * @author liujing - * @description 描述 - * @since: 2021/1/21 - */ -public interface RealTimeServiceApis { - RealTimeProvider getRecognizedResultManager(); - -} diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java index d1b8229..9911d8d 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java @@ -2,8 +2,8 @@ package com.mogo.realtime.constant; import android.os.SystemClock; -import com.mogo.realtime.Interface.RealTimeApisHandler; import com.mogo.realtime.entity.CloudLocationInfo; +import com.mogo.realtime.socket.SocketHandler; import com.mogo.realtime.util.MogoLatLng; import com.mogo.utils.logger.Logger; @@ -61,7 +61,7 @@ public class SimpleLocationCorrectStrategy { try { float targetDistance = (float) (lastLocation.getSpeed() * (SystemClock.elapsedRealtime() - anchorTime) / 1000) + TARGET_DISTANCE_DEVIATION; - float distance = RealTimeApisHandler.getInstance().getApis().getRecognizedResultManager().getDistanceBetweenTwoPoints(); + float distance = SocketHandler.getInstance().getRealTimeProvider().getDistanceBetweenTwoPoints(); Logger.d(TAG, "准备计算{ lastInfo: " + lastLocation.print() + " info: " + info.print() + " targetDistance: " + targetDistance + " distance : " + distance + "}"); if (distance <= targetDistance) { @@ -121,7 +121,7 @@ public class SimpleLocationCorrectStrategy { try { float targetDistance = (float) (lastLocation.getSpeed() * (SystemClock.elapsedRealtime() - anchorTime) / 1000) + TARGET_DISTANCE_DEVIATION; - float distance = RealTimeApisHandler.getInstance().getApis().getRecognizedResultManager().getDistanceBetweenTwoPoints(); + float distance = SocketHandler.getInstance().getRealTimeProvider().getDistanceBetweenTwoPoints(); Logger.d(TAG, "异常定位点\n准备计算{ lastInfo: " + lastLocation.print() + " info: " + info.print() + " targetDistance: " + targetDistance + " distance : " + distance + "}"); // 按照上一个点的方向和速度，计算下一个点的位置，下一个点除坐标点外，其余数据与上一个点相同 diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SnapshotUploadInTime.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SnapshotUploadInTime.java index 76dc0ca..2317553 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SnapshotUploadInTime.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SnapshotUploadInTime.java @@ -8,7 +8,6 @@ import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.cloud.socket.MsgBody; import com.mogo.cloud.socket.SocketManager; -import com.mogo.realtime.Interface.RealTimeApisHandler; import com.mogo.realtime.entity.ADASRecognizedResult; import com.mogo.realtime.entity.CloudLocationInfo; import com.mogo.cloud.socket.WebSocketData; @@ -22,8 +21,6 @@ import com.mogo.utils.network.utils.GsonUtil; import java.util.ArrayList; import java.util.List; -import static com.mogo.cloud.socket.WebSocketMsgType.MSG_TYPE_ACK; - /** * @author congtaowang * @since 2020/12/14 @@ -102,7 +99,7 @@ public class SnapshotUploadInTime implements MogoRTKLocation.RTKLocationListener locationResult.sn = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn(); locationResult.coordinates.addAll(cloudLocationInfo); } - List recognizedResults = RealTimeApisHandler.getInstance().getApis().getRecognizedResultManager().getLastADASRecognizedResult();//外显接口返回 + List recognizedResults = SocketHandler.getInstance().getRealTimeProvider().getLastADASRecognizedResult();//外显接口返回 OnePerSecondSendContent content = new OnePerSecondSendContent(); content.self = locationResult; content.adas = recognizedResults; diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java index 0d9127a..4c5c088 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java @@ -6,6 +6,7 @@ import android.os.SystemClock; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.cloud.socket.SocketManager; import com.mogo.cloud.socket.WebSocketData; +import com.mogo.realtime.Interface.RealTimeProvider; import com.mogo.utils.network.utils.GsonUtil; import java.util.List; @@ -22,6 +23,7 @@ public class SocketHandler { private long serverTime = 0; private long receiveMsgTime = 0; private List listenerList; + public RealTimeProvider realTimeProvider; public static SocketHandler getInstance() { if (mInstance == null) { @@ -34,6 +36,10 @@ public class SocketHandler { return mInstance; } + public RealTimeProvider getRealTimeProvider() { + return realTimeProvider; + } + /* * useInner: 是否注册自己内部的监听 * */