diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java index 236dc08dd4..79b073f95a 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java @@ -1,5 +1,7 @@ package com.mogo.och.bus.presenter; +import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_STOPPED; + import android.content.Context; import android.location.Location; import android.os.Handler; @@ -14,7 +16,6 @@ import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; @@ -56,7 +57,6 @@ import io.reactivex.exceptions.UndeliverableException; import io.reactivex.functions.Consumer; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.schedulers.Schedulers; -import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_STOPPED; /** * @author congtaowang @@ -273,10 +273,6 @@ public class OchBusOrderModel { }; // 自车定位 private IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() { - @Override - public void onCarLocationChanged(MogoLatLng latLng) { - - } @Override public void onCarLocationChanged2( Location location ) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java index 3f18527f57..197161ba04 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java @@ -18,7 +18,6 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -31,11 +30,6 @@ import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; -import com.mogo.och.taxi.passenger.callback.IOCHTaxiAutopilotPlanningCallback; -import com.mogo.och.taxi.passenger.constant.OCHTaxiConst; -import com.mogo.och.taxi.passenger.constant.OrderStatusEnum; -import com.mogo.och.taxi.passenger.constant.OrderTypeEnum; -import com.mogo.och.taxi.passenger.network.OCHTaxiServiceCallback; import com.mogo.och.taxi.passenger.bean.DriverServiceDataRespBean; import com.mogo.och.taxi.passenger.bean.DriverStatusQueryRespBean; import com.mogo.och.taxi.passenger.bean.OrderGrabRespBean; @@ -46,9 +40,14 @@ import com.mogo.och.taxi.passenger.bean.OrdersInServiceQueryRespBean; import com.mogo.och.taxi.passenger.bean.OrdersListQueryRespBean; import com.mogo.och.taxi.passenger.bean.OrdersNewBookingQueryRespBean; import com.mogo.och.taxi.passenger.callback.IOCHTaxiADASStatusCallback; +import com.mogo.och.taxi.passenger.callback.IOCHTaxiAutopilotPlanningCallback; import com.mogo.och.taxi.passenger.callback.IOCHTaxiCarStatusCallback; import com.mogo.och.taxi.passenger.callback.IOCHTaxiControllerStatusCallback; import com.mogo.och.taxi.passenger.callback.IOCHTaxiOrderStatusCallback; +import com.mogo.och.taxi.passenger.constant.OCHTaxiConst; +import com.mogo.och.taxi.passenger.constant.OrderStatusEnum; +import com.mogo.och.taxi.passenger.constant.OrderTypeEnum; +import com.mogo.och.taxi.passenger.network.OCHTaxiServiceCallback; import com.mogo.och.taxi.passenger.network.OCHTaxiServiceManagerNew; import com.mogo.och.taxi.passenger.utils.OrderUtil; import com.mogo.och.taxi.passenger.utils.PinYinUtil; @@ -856,10 +855,6 @@ public class MogoOCHTaxiModelNew { // 自车定位 private IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() { - @Override - public void onCarLocationChanged(MogoLatLng latLng) { - - } @Override public void onCarLocationChanged2( Location location ) { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java index 58d22abc4a..76cb5313d4 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java @@ -19,7 +19,6 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -32,11 +31,6 @@ import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; -import com.mogo.och.taxi.callback.IOCHTaxiAutopilotPlanningCallback; -import com.mogo.och.taxi.constant.OCHTaxiConst; -import com.mogo.och.taxi.constant.OrderStatusEnum; -import com.mogo.och.taxi.constant.OrderTypeEnum; -import com.mogo.och.taxi.network.OCHTaxiServiceCallback; import com.mogo.och.taxi.bean.DriverServiceDataRespBean; import com.mogo.och.taxi.bean.DriverStatusQueryRespBean; import com.mogo.och.taxi.bean.OrderGrabRespBean; @@ -47,9 +41,14 @@ import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean; import com.mogo.och.taxi.bean.OrdersListQueryRespBean; import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean; import com.mogo.och.taxi.callback.IOCHTaxiADASStatusCallback; +import com.mogo.och.taxi.callback.IOCHTaxiAutopilotPlanningCallback; import com.mogo.och.taxi.callback.IOCHTaxiCarStatusCallback; import com.mogo.och.taxi.callback.IOCHTaxiControllerStatusCallback; import com.mogo.och.taxi.callback.IOCHTaxiOrderStatusCallback; +import com.mogo.och.taxi.constant.OCHTaxiConst; +import com.mogo.och.taxi.constant.OrderStatusEnum; +import com.mogo.och.taxi.constant.OrderTypeEnum; +import com.mogo.och.taxi.network.OCHTaxiServiceCallback; import com.mogo.och.taxi.network.OCHTaxiServiceManagerNew; import com.mogo.och.taxi.utils.OrderUtil; import com.mogo.och.taxi.utils.PinYinUtil; @@ -905,10 +904,6 @@ public class MogoOCHTaxiModelNew { // 自车定位 private IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() { - @Override - public void onCarLocationChanged(MogoLatLng latLng) { - - } @Override public void onCarLocationChanged2( Location location ) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index 8cc8c6376c..5be0c6cfe7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -8,7 +8,6 @@ import android.view.Gravity import android.widget.FrameLayout import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.Logger @@ -99,10 +98,6 @@ class SpeedPanelView @JvmOverloads constructor( } - override fun onCarLocationChanged(latLng: MogoLatLng?) { - - } - override fun onCarLocationChanged2(latLng: Location) { mLatLng = latLng } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt index 2a0363a2e1..32e291577c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt @@ -203,10 +203,6 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, ) } - override fun onCarLocationChanged(latLng: MogoLatLng?) { - - } - override fun onCarLocationChanged2(latLng: Location?) { latLng?.let { mLocation = it diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java index 3e2a45ccc3..ae9e1df56d 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java @@ -1,9 +1,7 @@ package com.mogo.eagle.core.function.v2x.speedlimit; -import android.content.Context; import android.location.Location; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.navi.IMogoCarLocationChangedListener2; @@ -58,8 +56,4 @@ public class SpeedLimitDataManager implements IMogoCarLocationChangedListener2 { mLocation = latLng; } - @Override - public void onCarLocationChanged(MogoLatLng latLng) { - - } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt index 3605b0e8fb..a18327a169 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt @@ -4,7 +4,6 @@ import android.content.Context import android.location.Location import android.os.Handler import android.os.Looper -import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.data.trafficlight.RoadIDResult import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail import com.mogo.eagle.core.data.trafficlight.TrafficLightResult @@ -163,10 +162,6 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { ) } - override fun onCarLocationChanged(latLng: MogoLatLng?) { - - } - override fun onCarLocationChanged2(latLng: Location?) { latLng?.let { mLocation = latLng diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java index fc4d7e4cf1..4ce184a68b 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java @@ -1,8 +1,6 @@ package com.mogo.map.navi; -import com.mogo.eagle.core.data.map.MogoLatLng; - /** * @author congtaowang * @since 2020-03-14 @@ -11,5 +9,4 @@ import com.mogo.eagle.core.data.map.MogoLatLng; */ public interface IMogoCarLocationChangedListener { - void onCarLocationChanged( MogoLatLng latLng ); } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java index d7fd6fa425..4bcf9a71b9 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java @@ -90,12 +90,6 @@ public class EventDispatchCenter implements return false; } - - @Override - public void onCarLocationChanged( MogoLatLng latLng ) { - // do nothing. - } - @Override public void onCarLocationChanged2( Location latLng ) { @@ -112,15 +106,6 @@ public class EventDispatchCenter implements } catch ( Exception e ) { e.printStackTrace(); } - } else { - try { - if ( target == null ) { - target = new MogoLatLng( latLng.getLatitude(), latLng.getLongitude() ); - } - listener.onCarLocationChanged( target ); - } catch ( Exception e ) { - e.printStackTrace(); - } } } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java index deb859893a..fb17a9f311 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java @@ -8,11 +8,6 @@ package com.mogo.module.main.constants; */ public class MainConstants { - /** - * 消息：加载卡片模块 - */ - public static final int MSG_LOAD_CARD_MODULES = 5000; - /** * 消息：隐藏地图遮罩（避免地图加载白屏） */ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 1d177c2b28..cd04e72811 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -639,11 +639,6 @@ public class MogoServices implements IMogoMapListener, } } - @Override - public void onCarLocationChanged( MogoLatLng latLng ) { - - } - /** * 刷新数据 */ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java index f4ec46d942..257a6777c4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java @@ -208,10 +208,6 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener