From 1f4f906748dfe1a1e352be2795369c6151e3b4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 18 Oct 2021 19:50:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../com/mogo/och/bus/presenter/OchBusPresenter.java | 8 ++++---- .../java/com/mogo/och/taxi/MogoOCHTaxiModel.java | 8 ++++---- .../src/main/java/com/mogo/och/BaseOchFragment.java | 8 ++++---- .../core/function/autopilot/MoGoAutoPilotProvider.kt | 8 ++++---- .../function/hmi/ui/widget/AutoPilotStatusView.kt | 8 ++++---- ...CmdParameter.java => AutopilotControlCmdPam.java} | 4 ++-- ...ntrolParameters.java => AutopilotControlPam.java} | 2 +- .../api/autopilot/IMoGoAutoPilotProvider.java | 4 ++-- .../service/autopilot/AutoPilotRemoteController.java | 10 +++++----- .../service/dispatch/DispatchAutoPilotManager.java | 12 ++++++------ .../module/service/intent/MockIntentHandler.java | 8 ++++---- .../com/mogo/service/adas/IMogoADASController.java | 4 ++-- .../mogo/service/impl/adas/MogoADASController.java | 8 ++++---- 13 files changed, 46 insertions(+), 46 deletions(-) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/{AutoPilotControlCmdParameter.java => AutopilotControlCmdPam.java} (80%) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/{AutoPilotControlParameters.java => AutopilotControlPam.java} (96%) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java index 3da432fb7f..5d09d9cbba 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java @@ -30,7 +30,7 @@ import com.mogo.och.bus.bean.UpdateSiteStatusRequest; import com.mogo.och.bus.fragment.OchBusFragment; import com.mogo.och.bus.net.IOchBusApiService; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; @@ -307,10 +307,10 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog currentStation.setIsCurrentSite( STATION_STATUS_LEAVING ); nextStation.setIsCurrentSite( STATION_STATUS_ARRIVING ); - AutopilotControlParameters currentAutopilot = new AutopilotControlParameters(); + AutopilotControlPam currentAutopilot = new AutopilotControlPam(); currentAutopilot.isSpeakVoice = !isRestart; - currentAutopilot.startLatLon = new AutopilotControlParameters.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); - currentAutopilot.endLatLon = new AutopilotControlParameters.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); + currentAutopilot.startLatLon = new AutopilotControlPam.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); + currentAutopilot.endLatLon = new AutopilotControlPam.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); currentAutopilot.vehicleType = VEHICLE_TYPE; Logger.d( TAG, "开启自动驾驶====" + currentAutopilot ); MogoApisHandler.getInstance().getApis().getAdasControllerApi().aiCloudToAdasData( currentAutopilot ); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index 16d4174cb6..7978e5bb74 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -15,7 +15,7 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.HostConst; import com.mogo.och.taxi.ui.OCHTaxiUiController; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.cloud.socket.IMogoOnMessageListener; @@ -853,10 +853,10 @@ class MogoOCHTaxiModel { return; } - AutopilotControlParameters parameters = new AutopilotControlParameters(); + AutopilotControlPam parameters = new AutopilotControlPam(); parameters.vehicleType = mCurrentOCHOrder.orderType; - parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLon ); - parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLon ); + parameters.startLatLon = new AutopilotControlPam.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLon ); + parameters.endLatLon = new AutopilotControlPam.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLon ); MogoApisHandler.getInstance() .getApis() .getAdasControllerApi() diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java index f861c7641b..073880eab7 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java @@ -17,7 +17,7 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.view.OnPreventFastClickListener; import com.mogo.och.view.SlidePanelView; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.utils.logger.Logger; /** @@ -135,12 +135,12 @@ public abstract class BaseOchFragment> e findViewById(R.id.btnAutopilotControl).setOnClickListener(view -> { // Logger.d("lianglihui","模拟 站点下发工控"); - AutopilotControlParameters currentAutopilot = new AutopilotControlParameters(); + AutopilotControlPam currentAutopilot = new AutopilotControlPam(); currentAutopilot.isSpeakVoice = true; // 万集东门站 - currentAutopilot.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409); + currentAutopilot.startLatLon = new AutopilotControlPam.AutoPilotLonLat(40.194795425,116.724476409); // 市政府前街18号 - currentAutopilot.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1939540844,116.720067); + currentAutopilot.endLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1939540844,116.720067); // 订单运营类型 （9出租车，10小巴） currentAutopilot.vehicleType = 10; Logger.d(TAG, "模拟 订单站点下发：" + currentAutopilot); diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt index 073f576adf..87c1fdf69e 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt @@ -2,8 +2,8 @@ package com.mogo.eagle.core.function.autopilot import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route -import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdParameter -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters +import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdPam +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider import com.mogo.eagle.core.utilcode.util.GsonUtils @@ -37,10 +37,10 @@ class MoGoAutopilotProvider : } - override fun startAutoPilot(result: AutopilotControlParameters) { + override fun startAutoPilot(result: AutopilotControlPam) { if (AdasManager.getInstance().isSocketConnect) { val parameter = - AutopilotControlCmdParameter( + AutopilotControlCmdPam( TAG, result ) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index f8de47ea75..dfcd3ae0df 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -5,7 +5,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.hmi.R @@ -68,10 +68,10 @@ class AutoPilotStatusView @JvmOverloads constructor( } private fun startAutoPilot() { val currentAutopilot = - AutopilotControlParameters() + AutopilotControlPam() currentAutopilot.isSpeakVoice = false - currentAutopilot.startLatLon = AutopilotControlParameters.AutoPilotLonLat(40.199157289445921,116.73675895051454); - currentAutopilot.endLatLon = AutopilotControlParameters.AutoPilotLonLat(40.199255159538758,116.73274535677977); + currentAutopilot.startLatLon = AutopilotControlPam.AutoPilotLonLat(40.199157289445921,116.73675895051454); + currentAutopilot.endLatLon = AutopilotControlPam.AutoPilotLonLat(40.199255159538758,116.73274535677977); currentAutopilot.vehicleType = 10 MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot) } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdPam.java similarity index 80% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdPam.java index 09a900acef..eed52cd442 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdPam.java @@ -8,12 +8,12 @@ package com.mogo.eagle.core.data.autopilot; * 域控制器 控制指令发送 * */ -public class AutopilotControlCmdParameter { +public class AutopilotControlCmdPam { public String action; public Object result; - public AutopilotControlCmdParameter(String action, Object result) { + public AutopilotControlCmdPam(String action, Object result) { this.action = action; this.result = result; } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlPam.java similarity index 96% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlPam.java index 36ace6c630..4284fc349a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlPam.java @@ -9,7 +9,7 @@ import java.util.List; * 启动自动驾驶参数 * */ -public class AutopilotControlParameters { +public class AutopilotControlPam { public AutoPilotLonLat startLatLon; public List wayLatLons; 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.java index 033591ddb7..60594e45d3 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.java @@ -1,6 +1,6 @@ package com.mogo.eagle.core.function.api.autopilot; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; /** @@ -21,7 +21,7 @@ public interface IMoGoAutopilotProvider extends IMoGoFunctionServerProvider { * * @param result */ - void startAutoPilot(AutopilotControlParameters result); + void startAutoPilot(AutopilotControlPam result); /** * 结束自动驾驶 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java index 254ccfb2c9..1d82db00fd 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java @@ -2,7 +2,7 @@ package com.mogo.module.service.autopilot; import com.mogo.commons.AbsMogoApplication; import com.mogo.module.common.MogoApisHandler; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.service.cloud.socket.IMogoOnMessageListener; import com.mogo.service.cloud.socket.IMogoSocketManager; import com.mogo.utils.logger.Logger; @@ -23,14 +23,14 @@ class AutoPilotRemoteController { private IMogoSocketManager mMogoSocketManager; - private IMogoOnMessageListener mParametersListener = new IMogoOnMessageListener() { + private IMogoOnMessageListener mParametersListener = new IMogoOnMessageListener() { @Override - public Class target() { - return AutopilotControlParameters.class; + public Class target() { + return AutopilotControlPam.class; } @Override - public void onMsgReceived( AutopilotControlParameters obj ) { + public void onMsgReceived( AutopilotControlPam obj ) { if ( obj == null ) { Logger.e( TAG, "远端控制参数为null", new NullPointerException() ); return; 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 2c85cce12b..9b1f3b06c6 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 @@ -11,7 +11,7 @@ import android.os.Message; import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener; import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager; @@ -137,17 +137,17 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener wayLatLon = new ArrayList<>(); + List wayLatLon = new ArrayList<>(); if (receiverBean!=null && receiverBean.getStopsList()!= null){ for (MogoLatLng mogoLatLng : receiverBean.getStopsList()) { - wayLatLon.add(new AutopilotControlParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon)); + wayLatLon.add(new AutopilotControlPam.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon)); } } currentAutopilot.wayLatLons = wayLatLon; - currentAutopilot.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon()); - currentAutopilot.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon()); + currentAutopilot.startLatLon = new AutopilotControlPam.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon()); + currentAutopilot.endLatLon = new AutopilotControlPam.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon()); currentAutopilot.vehicleType = 10; Logger.d(TAG, "开启自动驾驶====" + currentAutopilot); mApis.getAdasControllerApi().aiCloudToAdasData(currentAutopilot); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 2c489f05ec..4cd018a952 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -18,7 +18,7 @@ import com.mogo.cloud.socket.entity.SocketDownDataHelper; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.traffic.TrafficData; import com.mogo.map.marker.IMogoMarker; @@ -523,10 +523,10 @@ public class MockIntentHandler implements IntentHandler { .onAutopilotArriveLike(intent.getIntExtra("type", 8)); break; case 44:// 控制自动驾驶 - AutopilotControlParameters parameters = new AutopilotControlParameters(); + AutopilotControlPam parameters = new AutopilotControlPam(); parameters.vehicleType = 9; - parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1690522746, 116.567374558); - parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1651999405, 116.567217441); + parameters.startLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1690522746, 116.567374558); + parameters.endLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1651999405, 116.567217441); MogoApisHandler.getInstance() .getApis() .getAdasControllerApi() diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java index 6aff8eef3c..8e2980b8c2 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java @@ -1,7 +1,7 @@ package com.mogo.service.adas; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.eagle.core.data.traffic.TrafficData; import com.mogo.map.uicontroller.EnumMapUI; @@ -57,7 +57,7 @@ public interface IMogoADASController extends IProvider { * * @param result */ - void aiCloudToAdasData(AutopilotControlParameters result); + void aiCloudToAdasData(AutopilotControlPam result); /** * 添加adas数据回调接口 diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index d9252806d5..eb619424bc 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -12,8 +12,8 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdParameter; -import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdPam; +import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; @@ -449,7 +449,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void aiCloudToAdasData(AutopilotControlParameters result) { + public void aiCloudToAdasData(AutopilotControlPam result) { try { syncControlCmdToADAS("aiCloudToStartAutopilot", result); } catch (Exception e) { @@ -462,7 +462,7 @@ public class MogoADASController implements IMogoADASController { * @param result */ private void syncControlCmdToADAS(String action, Object result) { - AutopilotControlCmdParameter parameter = new AutopilotControlCmdParameter(action, result); + AutopilotControlCmdPam parameter = new AutopilotControlCmdPam(action, result); //位置信息 action是aiCloudToStartAutopilot try { adasProvider.sendWsMessage(GsonUtil.jsonFromObject(parameter));