() {
-
- fun getTrafficLightProvider(): ITrafficLightProvider {
- return getApiInstance(
- ITrafficLightProvider::class.java,
- MogoServicePaths.PATH_TRAFFIC_LIGHT
- )
- }
-
- fun getTrafficLightCurrentState() {
- getTrafficLightProvider().getTrafficLightCurrentState()
- }
-
-}
\ No newline at end of file
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
index c6ab9969de..5285ac617c 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
@@ -69,9 +69,9 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem
@Override
public void init(Context context, String appId, double lat, double lon) {
this.mAppId = appId;
- SocketManager.getInstance().init(context, lat, lon);
SocketManager.getInstance().registerSocketConnCallback(this);
SocketManager.getInstance().registerSocketErrorCallback(TAG, this);
+ SocketManager.getInstance().init(context, lat, lon);
}
@Override
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java
index 36eeae34d5..36ffa13fce 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java
@@ -20,8 +20,10 @@ public class HostConst {
public static final String CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/";
- public static final String HOST_DEV = "https://eagle-qa.zhidaozhixing.com";
- public static final String HOST_RELEASE = "https://eagle-mis.zhidaozhixing.com";
+ public static final String HOST_DEV = "http://eagle-qa.zhidaozhixing.com";
+ public static final String HOST_RELEASE = "http://eagle-mis.zhidaozhixing.com";
+
+ public static final String HOST_EAGLE_QA = "http://eagle-dns-qa.zhidaozhixing.com/";
public static String getHost() {
String host = HOST_RELEASE;
@@ -34,4 +36,10 @@ public class HostConst {
return host;
}
+ public static String getEagleHost(){
+ return HOST_EAGLE_QA;
+ }
+
+
+
}
diff --git a/gradle.properties b/gradle.properties
index ec874f826f..1cad441c1f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4
LOGLIB_VERSION=1.5.10
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.4.3.27
+MOGO_NETWORK_VERSION=1.4.3.32-beta3
# 鉴权
-MOGO_PASSPORT_VERSION=1.4.3.27
+MOGO_PASSPORT_VERSION=1.4.3.32-beta3
# 常链接
-MOGO_SOCKET_VERSION=1.4.3.27
+MOGO_SOCKET_VERSION=1.4.3.32-beta3
# 数据采集
-MOGO_REALTIME_VERSION=1.4.3.27
+MOGO_REALTIME_VERSION=1.4.3.32-beta3
# 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.4.3.27
+MOGO_TANLU_VERSION=1.4.3.32-beta3
# 直播推流
-MOGO_LIVE_VERSION=1.4.3.27
+MOGO_LIVE_VERSION=1.4.3.32-beta3
# 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.4.3.27
+MOGO_TRAFFICLIVE_VERSION=1.4.3.32-beta3
# 定位服务
-MOGO_LOCATION_VERSION=1.4.3.27
+MOGO_LOCATION_VERSION=1.4.3.32-beta3
# 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.4.3.27
+MOGO_TELEMATIC_VERSION=1.4.3.32-beta2
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.9.0.8_gamap_02
@@ -163,4 +163,4 @@ ADAS_DATA_LIB_CHILD_VERSION=.0
# 线程优化版本
-THREAD_OPT_VERSION=3.0.2
+THREAD_OPT_VERSION=4.0.0
diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
index 53291c61ae..e309aab7f8 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
@@ -9,6 +9,7 @@ import chassis.ChassisStatesOuterClass;
import chassis.VehicleStateOuterClass;
import function_state_management.FunctionStates;
import mogo.telematics.pad.MessagePad;
+import mogo.v2x.ObuWarningEvent;
import mogo_msg.MogoReportMsg;
import perception.TrafficLightOuterClass;
import planning.RoboSweeperTaskIndexOuterClass;
@@ -194,6 +195,14 @@ public interface OnAdasListener {
*/
void onPlanningActionMsg(MessagePad.Header header, MessagePad.PlanningActionMsg planningActionMsg);
+ /**
+ * OBU预警事件
+ *
+ * @param header 头
+ * @param obuWarningData 数据
+ */
+ void onObuWarningData(MessagePad.Header header, ObuWarningEvent.ObuWarningData obuWarningData);
+
/**
* 重构后的功能状态
*
diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
index 5c9d79eb3e..92f1d31659 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
@@ -61,6 +61,7 @@ public enum MessageType {
//TODO 透传原始pb文件中不存在以下type。由于Java中无法强转,所以在mogo-adas-data/message_pad.proto中放开注释
TYPE_RECEIVE_PLANNING_DECISION_STATE(MessagePad.MessageType.MsgTypePlanningDecisionState, "Planning决策状态"),
TYPE_RECEIVE_SWEEPER_TASK_INDEX_DATA(MessagePad.MessageType.MsgTypeSweeperTaskIndexData, "清扫车指标数据"),
+ TYPE_RECEIVE_OBU_WARNING_DATA(MessagePad.MessageType.MsgTypeObuWarningData, "OBU预警事件"),
;
diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java
index 58b7e381b4..11ec50a301 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java
@@ -32,6 +32,7 @@ public class MyMessageFactory implements IMyMessageFactory {
private IMsg statusQueryRespMessage;//状态查询应答
private IMsg recordDataConfigRespMessage;//数据采集配置应答
private IMsg planningDecisionStateMessage;//planning决策状态
+ private IMsg obuWarningDataMessage;//工控机透传OBU V2I数据
private IMsg functionStatesMessage;//重构后的功能状态
private IMsg sweeperTaskIndexDataMessage;//清扫车指标数据
private IMsg bagManagerMessage;//Bag管理应答
@@ -158,6 +159,12 @@ public class MyMessageFactory implements IMyMessageFactory {
planningDecisionStateMessage = new PlanningDecisionStateMessage();
}
return planningDecisionStateMessage;
+ } else if (messageType == MessageType.TYPE_RECEIVE_OBU_WARNING_DATA.typeCode) {
+ //OBU预警事件
+ if (obuWarningDataMessage == null) {
+ obuWarningDataMessage = new ObuWarningDataMessage();
+ }
+ return obuWarningDataMessage;
} else if (messageType == MessageType.TYPE_RECEIVE_SWEEPER_TASK_INDEX_DATA.typeCode) {
//清扫车指标数据
if (sweeperTaskIndexDataMessage == null) {
diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java
new file mode 100644
index 0000000000..98075ce004
--- /dev/null
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java
@@ -0,0 +1,31 @@
+package com.zhidao.support.adas.high.msg;
+
+import android.os.SystemClock;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.zhidao.support.adas.high.AdasChannel;
+import com.zhidao.support.adas.high.OnAdasListener;
+import com.zhidao.support.adas.high.common.CupidLogUtils;
+import com.zhidao.support.adas.high.protocol.RawData;
+
+import mogo.v2x.ObuWarningEvent;
+
+
+/**
+ * OBU预警事件
+ */
+public class ObuWarningDataMessage extends MyAbstractMessageHandler {
+
+ @Override
+ public void handlerMsg(RawData raw, OnAdasListener adasListener) throws InvalidProtocolBufferException {
+ ObuWarningEvent.ObuWarningData obuWarningData = ObuWarningEvent.ObuWarningData.parser().parseFrom(raw.originalData.toByteArray(), raw.getOffsetValue(), raw.getPackageLengthValue() - raw.getOffsetValue());
+ AdasChannel.calculateTimeConsumingOnDispatchRaw("OBU预警事件", raw.receiveTime);
+ long nowTime = 0;
+ if (CupidLogUtils.isEnableLog())
+ nowTime = SystemClock.elapsedRealtime();
+ if (adasListener != null) {
+ adasListener.onObuWarningData(raw.getHeader(), obuWarningData);
+ }
+ AdasChannel.calculateTimeConsumingBusiness("OBU预警事件", nowTime);
+ }
+}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoHosListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoHosListenerRegister.java
deleted file mode 100644
index 318321b46a..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoHosListenerRegister.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mogo.map.listener;
-
-import com.mogo.map.marker.IMogoMarkerClickListenerRegister;
-
-/**
- * @author congtaowang
- * @since 2019-12-29
- *
- * 主模块需要注册监听的事件
- */
-public interface IMogoHosListenerRegister extends
- IMogoMapListenerRegister,
- IMogoMarkerClickListenerRegister {
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoHosListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoHosListenerRegister.java
deleted file mode 100644
index 64079055df..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoHosListenerRegister.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mogo.map.listener;
-
-import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.MogoMarkersHandler;
-
-/**
- * @author congtaowang
- * @since 2019-12-29
- *
- * 描述
- */
-public class MogoHosListenerRegister implements IMogoHosListenerRegister {
-
- private static volatile MogoHosListenerRegister sInstance;
-
- private MogoHosListenerRegister() {
- }
-
- public static MogoHosListenerRegister getInstance() {
- if ( sInstance == null ) {
- synchronized ( MogoHosListenerRegister.class ) {
- if ( sInstance == null ) {
- sInstance = new MogoHosListenerRegister();
- }
- }
- }
- return sInstance;
- }
-
- public synchronized void release() {
- sInstance = null;
- }
-
-
- @Override
- public void registerHostMapListener(String tag, IMogoMapListener listener ) {
- MogoMapListenerHandler.Companion.getMogoMapListenerHandler().registerHostMapListener(tag, listener );
- }
-
- @Override
- public void unregisterHostMapListener(String tag) {
- MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(tag);
- }
-
- @Override
- public void registerMarkerClickListener( String tag,IMogoMarkerClickListener listener ) {
- MogoMarkersHandler.Companion.getMogoMarkersHandler().registerMarkerClickListener(tag, listener );
- }
-
- @Override
- public void unregisterMarkerClickListener(String tag) {
- MogoMarkersHandler.Companion.getMogoMarkersHandler().unregisterMarkerClickListener(tag);
- }
-
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java
deleted file mode 100644
index 61310341a2..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.mogo.map.location;
-
-import com.mogo.eagle.core.data.map.MogoLocation;
-
-/**
- * @author congtaowang
- * @since 2019-12-19
- *
- * 定位接口
- */
-public interface IMogoLocationClient extends IMogoLocationListenerRegister {
-
- /**
- * 开始定位
- */
- void start();
-
- /**
- * 开始定位
- *
- * @param interval 默认定位间隔
- */
- void start( long interval );
-
- /**
- * 停止定位
- */
- void stop();
-
- /**
- * 返回上一次有效定位
- *
- * @return
- */
- MogoLocation getLastKnowLocation();
-
- void destroy();
-
- /**
- * 更正最新的位置
- * @param locationToUpdate
- */
- void updateLocation(Object locationToUpdate);
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java
deleted file mode 100644
index 6d6372fba4..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mogo.map.location;
-
-import com.mogo.eagle.core.data.map.MogoLocation;
-
-/**
- * @author congtaowang
- * @since 2019-12-19
- *
- * 定位回调
- */
-public interface IMogoLocationListener {
-
- /**
- * 定位发生改变
- *
- * @param location 新定位点
- */
- void onLocationChanged( MogoLocation location );
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListenerRegister.java
deleted file mode 100644
index 3fd36903af..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListenerRegister.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mogo.map.location;
-
-/**
- * @author congtaowang
- * @since 2019-12-24
- *
- * 地图监听注册管理
- */
-public interface IMogoLocationListenerRegister {
-
- /**
- * 注册定位回调
- *
- * @param listener
- */
- void addLocationListener( IMogoLocationListener listener );
-
- /**
- * 注销定位回调
- *
- * @param listener
- */
- void removeLocationListener( IMogoLocationListener listener );
-}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java
deleted file mode 100644
index 87820f9b83..0000000000
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mogo.map.location;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author congtaowang
- * @since 2019-12-24
- *
- * 地图监听注册管理
- */
-public class MogoLocationListenerRegister implements IMogoLocationListenerRegister {
-
- private static volatile MogoLocationListenerRegister sInstance;
-
- private MogoLocationListenerRegister() {
- }
-
- public static MogoLocationListenerRegister getInstance() {
- if ( sInstance == null ) {
- synchronized ( MogoLocationListenerRegister.class ) {
- if ( sInstance == null ) {
- sInstance = new MogoLocationListenerRegister();
- }
- }
- }
- return sInstance;
- }
-
- public synchronized void release() {
- sInstance = null;
- }
-
- private final Set< IMogoLocationListener > sListeners = new HashSet<>( 10 );
-
- /**
- * 注册定位回调
- *
- * @param listener
- */
- @Override
- public void addLocationListener( IMogoLocationListener listener ) {
- if ( listener == null ) {
- return;
- }
- synchronized ( sListeners ) {
- sListeners.add( listener );
- }
- }
-
- /**
- * 注销定位回调
- *
- * @param listener
- */
- @Override
- public void removeLocationListener( IMogoLocationListener listener ) {
- if ( listener == null ) {
- return;
- }
- synchronized ( sListeners ) {
- sListeners.remove( listener );
- }
- }
-
- public Set< IMogoLocationListener > getListeners() {
- return sListeners;
- }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
index 73b81ebdd7..681c4241e8 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
@@ -38,7 +38,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
@@ -981,7 +980,6 @@ public class AMapViewWrapper implements IMogoMapView,
bean.setLat(lat);
// 使用外部定位数据修改自车位置
mMapView.getLocationClient().updateRTKAutoPilotLocation(bean);
- CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getContext()).updateLocation(bean);
CallerMapDataCollectorManager.INSTANCE.setIsInit();
}
@@ -1121,7 +1119,6 @@ public class AMapViewWrapper implements IMogoMapView,
locationClient.updateLocation(lonLatPoint);//更新新自动驾驶RTK相关数据
- CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getContext()).updateLocation(lonLatPoint);
CallerMapDataCollectorManager.INSTANCE.setIsInit();
}
}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java
index 0da12910e2..d745f286fb 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java
@@ -1,10 +1,6 @@
package com.mogo.map;
-import android.content.Context;
-
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.map.location.ALocationClient;
-import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.uicontroller.AMapUIController;
import com.mogo.map.uicontroller.IMogoMapUIController;
@@ -32,17 +28,10 @@ public class CustomMapApiBuilder {
return sApiBuilder;
}
- public IMogoLocationClient getLocationClient(Context context) {
- return new ALocationClient(context);
- }
-
public IMogoMapUIController getMapUIController() {
return AMapUIController.getInstance();
}
- public static IMogoLocationClient getLocationClientDelegate(Context context) {
- return getApiBuilder().getLocationClient(context);
- }
public static IMogoMapUIController getMapUIControllerDelegate() {
return getApiBuilder().getMapUIController();
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java
deleted file mode 100644
index 5d9fbc2d9a..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.mogo.map;
-
-import android.content.Context;
-
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.map.location.IMogoLocationClient;
-import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocationListenerRegister;
-
-/**
- * @author congtaowang
- * @since 2019-12-19
- *
- */
-public class MogoLocationClient implements IMogoLocationClient {
-
- private static volatile MogoLocationClient sInstance;
-
- public MogoLocationClient( Context context ) {
- mDelegate = CustomMapApiBuilder.getLocationClientDelegate( context );
- }
-
- public static MogoLocationClient getInstance( Context context ) {
- if ( sInstance == null ) {
- synchronized ( MogoLocationClient.class ) {
- if ( sInstance == null ) {
- sInstance = new MogoLocationClient( context );
- }
- }
- }
- return sInstance;
- }
-
- private IMogoLocationClient mDelegate;
-
- @Override
- public void start() {
- if ( mDelegate != null ) {
- mDelegate.start();
- }
- }
-
- @Override
- public void start( long interval ) {
- if ( mDelegate != null ) {
- mDelegate.start( interval );
- }
- }
-
- @Override
- public void stop() {
- if ( mDelegate != null ) {
- mDelegate.stop();
- }
- }
-
- @Override
- public void addLocationListener( IMogoLocationListener listener ) {
- MogoLocationListenerRegister.getInstance().addLocationListener( listener );
- }
-
- @Override
- public void removeLocationListener( IMogoLocationListener listener ) {
- MogoLocationListenerRegister.getInstance().removeLocationListener( listener );
- }
-
- @Override
- public MogoLocation getLastKnowLocation() {
- if ( mDelegate != null ) {
- return mDelegate.getLastKnowLocation();
- }
- return null;
- }
-
- @Override
- public void destroy() {
- if ( mDelegate != null ) {
- mDelegate.destroy();
- }
- }
-
- @Override
- public void updateLocation(Object locationToUpdate) {
- if (mDelegate != null) {
- mDelegate.updateLocation(locationToUpdate);
- }
- }
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java
index c6566e6446..36f6f29fe3 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java
@@ -10,7 +10,6 @@ import android.widget.FrameLayout;
import androidx.annotation.Nullable;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.map.uicontroller.AMapUIController;
import com.zhidaoauto.map.sdk.open.view.MapAutoView;
import mogo.telematics.pad.MessagePad;
@@ -90,7 +89,7 @@ public class MogoMapView extends MogoBaseMapView implements ILifeCycle {
}
public void setExtraGPSData(MessagePad.GnssInfo gnssInfo) {
- AMapUIController.getInstance().setExtraGPSData(gnssInfo);
+ getMap().getUIController().setExtraGPSData(gnssInfo);
}
}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/RoadCacheWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/RoadCacheWrapper.java
deleted file mode 100644
index 4f3a9c2497..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/RoadCacheWrapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.mogo.map;
-
-import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
-
-import java.util.List;
-
-/**
- * 道路数据缓存
- *
- * @author tongchenfei
- */
-public class RoadCacheWrapper {
- private List road;
- private double lastDistanceDiff;
- private int roadLength = -1;
-
- private float laneWidth = -1;
-
- public RoadCacheWrapper(List road) {
- setRoad(road);
- }
-
- public List getRoad() {
- return road;
- }
-
- public void setRoad(List road) {
- this.road = road;
- if(road!=null) {
- roadLength = road.size();
- }
- }
-
- public double getLastDistanceDiff() {
- return lastDistanceDiff;
- }
-
- public void setLastDistanceDiff(double lastDistanceDiff) {
- this.lastDistanceDiff = lastDistanceDiff;
- }
-
- public double getLastLat(){
- if (roadLength != -1) {
- return road.get(roadLength - 1).getLatitude();
- }
- return 0;
- }
-
- public double getLastLon(){
- if (roadLength != -1) {
- return road.get(roadLength - 1).getLongitude();
- }
- return 0;
- }
-
- public float getLaneWidth() {
- return laneWidth;
- }
-
- public void setLaneWidth(float laneWidth) {
- this.laneWidth = laneWidth;
- }
-
- public boolean inCache(double lon, double lat) {
- if (roadLength > 0) {
- LonLatPoint start = road.get(0);
- LonLatPoint end = road.get(roadLength - 1);
- boolean latInRoad = false;
- boolean lonInRoad = false;
- if (start.getLatitude() > end.getLatitude()) {
- latInRoad = lat <= start.getLatitude() && lat >= end.getLatitude();
- }else{
- latInRoad = lat >= start.getLatitude() && lat <= end.getLatitude();
- }
-
- if (start.getLongitude() > end.getLongitude()) {
- lonInRoad = lon <= start.getLongitude() && lon >= end.getLongitude();
- }else{
- lonInRoad = lon >= start.getLongitude() && lon <= end.getLongitude();
- }
-
- return latInRoad && lonInRoad;
- }
- return false;
- }
-
-}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/location/ALocationClient.java b/libraries/mogo-map/src/main/java/com/mogo/map/location/ALocationClient.java
deleted file mode 100644
index 7fdaf67ec1..0000000000
--- a/libraries/mogo-map/src/main/java/com/mogo/map/location/ALocationClient.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.mogo.map.location;
-
-import android.content.Context;
-import android.os.Trace;
-
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.map.utils.ObjectUtils;
-import com.zhidaoauto.map.sdk.open.location.LocationClient;
-import com.zhidaoauto.map.sdk.open.location.LocationListener;
-import com.zhidaoauto.map.sdk.open.location.RTKAutopilotLocationBean;
-import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author congtaowang
- * @since 2019-12-19
- *
- * 自研定位
- */
-public class ALocationClient implements IMogoLocationClient {
-
- private static final String TAG = "ALocationClient";
-
- private MogoLocation mLastLocation;
- private final LocationListener mListener = new InternalLocationListener();
-
- private boolean mIsDestroyed = false;
-
- public ALocationClient( Context context ) {
- mClient = new LocationClient( context );
- mClient.registerListener( mListener );
- mLastLocation = ObjectUtils.fromLocation( mClient.getLastKnownMogoLocation() );
- if ( mLastLocation == null ) {
- mLastLocation = new MogoLocation();
- }
- }
-
- private LocationClient mClient;
-
- @Override
- public void start() {
- start( 2_000L );
- }
-
- @Override
- public void start( long interval ) {
- if ( mIsDestroyed ) {
- destroyWarming();
- return;
- }
- if ( mClient != null ) {
- mClient.start();
- }
- }
-
- @Override
- public void stop() {
- if ( mIsDestroyed ) {
- destroyWarming();
- return;
- }
- if ( mClient != null && mClient.isAGpsStarted() ) {
- mClient.stop();
- }
- }
-
- @Override
- public void addLocationListener( IMogoLocationListener listener ) {
- // do not impl.
- }
-
- @Override
- public void removeLocationListener( IMogoLocationListener listener ) {
- // do not impl.
- }
-
- @Override
- public MogoLocation getLastKnowLocation() {
- if ( mIsDestroyed ) {
- destroyWarming();
- return null;
- }
- return mLastLocation;
- }
-
- @Override
- public synchronized void destroy() {
- mIsDestroyed = true;
- if ( mClient != null ) {
- mClient.unRegisterListener( mListener );
- mClient.destory();
- }
- mClient = null;
- mLastLocation = null;
- }
-
- private class InternalLocationListener implements LocationListener {
-
- @Override
- public void onLocationChanged( @NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location ) {
- if ( mIsDestroyed ) {
- destroyWarming();
- return;
- }
- if ( location == null ||
- location.getLat() == 0.0D ||
- location.getLon() == 0.0D ) {
- return;
- }
- Trace.beginSection( "timer.onLocationChanged" );
- mLastLocation = ObjectUtils.fromLocation( location );
- UiThreadHandler.post(() -> CallerMapLocationListenerManager.INSTANCE.invokeMapLocationChangeListener(mLastLocation, 0, false));
-
- Set< IMogoLocationListener > listeners = MogoLocationListenerRegister.getInstance().getListeners();
- synchronized ( listeners ) {
- Iterator< IMogoLocationListener > listenerIterator = listeners.iterator();
- while ( listenerIterator.hasNext() ) {
- listenerIterator.next().onLocationChanged( mLastLocation.clone() );
- }
- }
- Trace.endSection();
- }
- }
-
- private void destroyWarming() {
- CallerLogger.INSTANCE.w( TAG, "location client has destroyed." );
- }
-
- @Override
- public void updateLocation(Object locationToUpdate) {
- if (locationToUpdate == null) {
- return;
- }
- if (locationToUpdate instanceof MogoLocation) {
- return;
- }
-// if (locationToUpdate instanceof RTKAutopilotLocationBean) {
-// RTKAutopilotLocationBean current = (RTKAutopilotLocationBean) locationToUpdate;
-// if (mClient != null) {
-// mClient.updateRTKAutoPilotLocation(current);
-// }
-// }
- if (locationToUpdate instanceof com.zhidaoauto.map.sdk.open.query.LonLatPoint) {
- LonLatPoint current = (LonLatPoint) locationToUpdate;
- if (mClient != null) {
- mClient.updateLocation(current);
- }
- }
- }
-}