diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java index cf9f317208..444c21166e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java @@ -417,7 +417,7 @@ public abstract class BaseOchBusTabFragment 60 ? "#DB3137" : "#3E77F6")); mouduleArc.setValues(speed); flSpeed.setBackgroundResource(speed > 60 ? R.drawable.bus_yi_biao_pan_bg_speeding : R.drawable.bus_yi_biao_pan_bg_nor); 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-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java index dc6d37d710..e64673e21e 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java @@ -427,7 +427,7 @@ public abstract class BaseOchTaxiTabFragment // 司机 @@ -156,4 +156,17 @@ class MoGoAutopilotProvider : override fun setIPCUpgradeCancel() { AdasManager.getInstance().sendBaseInfo(IPCUpgradeInfo.cancel()); } + + /** + * 演示模式（美化模式） + * isEnable = true 开启 + * isEnable = false 关闭 + */ + override fun setDemoMode(isEnable: Boolean) { + if (isEnable) { + AdasManager.getInstance().enableDemoMode() + } else { + AdasManager.getInstance().disableDemoMode() + } + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 5bc832142d..468b46abf3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -268,9 +268,11 @@ class DebugSettingView @JvmOverloads constructor( // 演示模式,上一次勾选的数据 val isDemoMode = SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false) + CallerAutoPilotManager.setDemoMode(isDemoMode) rbIsDemoMode.isChecked = isDemoMode // 演示模式 rbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked -> + CallerAutoPilotManager.setDemoMode(isChecked) FunctionBuildConfig.isDemoMode = isChecked SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked) } 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/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningListener.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningListener.java deleted file mode 100644 index a65bf3b57e..0000000000 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.eagle.core.function.api.autopilot; - -import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; - -import java.util.ArrayList; - -/** - * 自动驾驶规划路线相关的监听 - */ -public interface IMoGoAutopilotPlanningListener { - - /** - * 工控机引导线数据 - * - * @param trajectoryInfos 引导线数据经纬度 - */ - void onAutopilotTrajectory(ArrayList trajectoryInfos); - - /** - * 2021/6/23 工控机经纬度 绘制时转成高德经纬度 - * - * @param routeList 工控机全局规划路径 - */ - void onAutopilotRotting(AutopilotRouteInfo routeList); - -} diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningListener.kt new file mode 100644 index 0000000000..199045c093 --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotPlanningListener.kt @@ -0,0 +1,24 @@ +package com.mogo.eagle.core.function.api.autopilot + +import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo +import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo +import java.util.ArrayList + +/** + * 自动驾驶规划路线相关的监听 + */ +interface IMoGoAutopilotPlanningListener { + /** + * 工控机引导线数据 + * + * @param trajectoryInfos 引导线数据经纬度 + */ + fun onAutopilotTrajectory(trajectoryInfos: ArrayList) + + /** + * 2021/6/23 工控机经纬度 绘制时转成高德经纬度 + * + * @param routeList 工控机全局规划路径 + */ + fun onAutopilotRotting(routeList: AutopilotRouteInfo?) +} \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt similarity index 59% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.java rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt index dcc9bc9018..34f2103554 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt @@ -1,64 +1,60 @@ -package com.mogo.eagle.core.function.api.autopilot; +package com.mogo.eagle.core.function.api.autopilot -import androidx.annotation.NonNull; - -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; -import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters +import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider /** * @author xiaoyuzhou * @date 2021/9/22 8:27 下午 * 自动驾驶节点 */ -public interface IMoGoAutopilotProvider extends IMoGoFunctionServerProvider { - +interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider { /** * 重新连接自动驾驶域控制器，指定IP地址 * * @param autoPilotIp 指定与控制器IP */ - void resetIpAddress(String autoPilotIp); + fun resetIpAddress(autoPilotIp: String) /** * 开启自动驾驶 * * @param controlParameters 开启自动驾驶的控制参数 */ - void startAutoPilot(AutopilotControlParameters controlParameters); + fun startAutoPilot(controlParameters: AutopilotControlParameters) /** * 发送json数据给 Autopilot 自动驾驶控制器 * 具体的json格式需要与@宋克难 进行沟通 */ - void sendMessageToAutopilot(@NonNull String jsonString); + fun sendMessageToAutopilot(jsonString: String) /** * 结束自动驾驶 */ - void cancelAutoPilot(); + fun cancelAutoPilot() /** * 开启域控制器录制bag包 * * @return true-成功,false-失败 */ - boolean recordPackage(); + fun recordPackage(): Boolean /** * Log 是否显示 * * @param isEnableLog true-打开,false-关闭 */ - void setEnableLog(boolean isEnableLog); + fun setEnableLog(isEnableLog: Boolean) /** * Log 是否写入 * * @param isWriteLog true-打开,false-关闭 */ - void setIsWriteLog(boolean isWriteLog); - - Boolean setAutoPilotSpeed(int speed); + fun setIsWriteLog(isWriteLog: Boolean) + fun setAutoPilotSpeed(speed: Int): Boolean /** * 记录各种失败 @@ -66,25 +62,32 @@ public interface IMoGoAutopilotProvider extends IMoGoFunctionServerProvider { * @param name 文件名字 * @param reason 原因 */ - void recordCause(String key, String name, String id, String reason); + fun recordCause(key: String?, name: String?, id: String?, reason: String?) /** * 关机 */ - void setIPCShutDown(); + fun setIPCShutDown() /** * 重启 */ - void setIPCReboot(); + fun setIPCReboot() /** * 工控机升级确认 */ - void setIPCUpgradeAffirm(); + fun setIPCUpgradeAffirm() /** * 工控机升级取消 */ - void setIPCUpgradeCancel(); -} + fun setIPCUpgradeCancel() + + /** + * 演示模式（美化模式） + * isEnable = true 开启 + * isEnable = false 关闭 + */ + fun setDemoMode(isEnable: Boolean) +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt index 9e5c3210a0..0279c39f2f 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt @@ -15,8 +15,8 @@ object CallerAutoPilotManager { private val providerApi: IMoGoAutopilotProvider? get() = CallerBase.getApiInstance( - IMoGoAutopilotProvider::class.java, - MogoServicePaths.PATH_AUTO_PILOT + IMoGoAutopilotProvider::class.java, + MogoServicePaths.PATH_AUTO_PILOT ) /** @@ -90,15 +90,23 @@ object CallerAutoPilotManager { /** * 设置工控机升级确认 */ - fun setIPCUpgradeAffirm(){ + fun setIPCUpgradeAffirm() { providerApi?.setIPCUpgradeAffirm() } /** * 设置工控机升级取消 */ - fun setIPCUpgradeCancel(){ + fun setIPCUpgradeCancel() { providerApi?.setIPCUpgradeCancel() } + /** + * 演示模式（美化模式） + * isEnable = true 开启 + * isEnable = false 关闭 + */ + fun setDemoMode(isEnable: Boolean) { + providerApi?.setDemoMode(isEnable) + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b071f60893..bc3429ecf3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.18 MOGO_LOCATION_VERSION=1.3.18 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.0.0.23 +MAP_SDK_VERSION=2.0.0.24 # websocket WEBSOCKET_VERSION=1.1.7 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 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