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 0505f0343f..3da432fb7f 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,8 +30,8 @@ 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.AutopilotControlPam; -import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; @@ -307,10 +307,10 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog currentStation.setIsCurrentSite( STATION_STATUS_LEAVING ); nextStation.setIsCurrentSite( STATION_STATUS_ARRIVING ); - AutopilotControlPam currentAutopilot = new AutopilotControlPam(); + AutopilotControlParameters currentAutopilot = new AutopilotControlParameters(); currentAutopilot.isSpeakVoice = !isRestart; - currentAutopilot.startLatLon = new AutopilotControlPam.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); - currentAutopilot.endLatLon = new AutopilotControlPam.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); + currentAutopilot.startLatLon = new AutopilotControlParameters.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); + currentAutopilot.endLatLon = new AutopilotControlParameters.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); currentAutopilot.vehicleType = VEHICLE_TYPE; Logger.d( TAG, "开启自动驾驶====" + currentAutopilot ); MogoApisHandler.getInstance().getApis().getAdasControllerApi().aiCloudToAdasData( currentAutopilot ); @@ -354,7 +354,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog } @Override - public void onArriveAt( AutopilotStationsInfo data ) { + public void onArriveAt( AutopilotStationInfo data ) { if ( currentStationIndex >= stationList.size() - 1 ) { Logger.e( TAG, "到站异常，取消后续操作" ); return; 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 a03caa51e8..16d4174cb6 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,8 +15,8 @@ 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.AutopilotControlPam; -import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.cloud.socket.IMogoOnMessageListener; import com.mogo.service.intent.IMogoIntentListener; @@ -714,7 +714,7 @@ class MogoOCHTaxiModel { */ private class OCHArriveNotifyCallback implements IMogoAdasOCHCallback { @Override - public void onArriveAt( AutopilotStationsInfo data ) { + public void onArriveAt( AutopilotStationInfo data ) { if ( data == null ) { return; } @@ -853,10 +853,10 @@ class MogoOCHTaxiModel { return; } - AutopilotControlPam parameters = new AutopilotControlPam(); + AutopilotControlParameters parameters = new AutopilotControlParameters(); parameters.vehicleType = mCurrentOCHOrder.orderType; - 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 ); + 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 ); MogoApisHandler.getInstance() .getApis() .getAdasControllerApi() diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index 430e3479db..af01af3462 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -26,7 +26,7 @@ import com.mogo.och.taxi.R; import com.mogo.och.view.SlidePanelView; import com.mogo.service.adas.IMogoAdasOCHCallback; import com.mogo.service.adas.IMogoAdasRouteCallBack; -import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; @@ -524,7 +524,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } @Override - public void onArriveAt(AutopilotStationsInfo data) { + public void onArriveAt(AutopilotStationInfo data) { Logger.d( TAG, "行程结束"); MogoApisHandler.getInstance().getApis().getAdasControllerApi().cancelAutopilot(); } 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 073880eab7..f861c7641b 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.AutopilotControlPam; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.utils.logger.Logger; /** @@ -135,12 +135,12 @@ public abstract class BaseOchFragment> e findViewById(R.id.btnAutopilotControl).setOnClickListener(view -> { // Logger.d("lianglihui","模拟 站点下发工控"); - AutopilotControlPam currentAutopilot = new AutopilotControlPam(); + AutopilotControlParameters currentAutopilot = new AutopilotControlParameters(); currentAutopilot.isSpeakVoice = true; // 万集东门站 - currentAutopilot.startLatLon = new AutopilotControlPam.AutoPilotLonLat(40.194795425,116.724476409); + currentAutopilot.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409); // 市政府前街18号 - currentAutopilot.endLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1939540844,116.720067); + currentAutopilot.endLatLon = new AutopilotControlParameters.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/MoGoAutopilotsProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt similarity index 85% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotsProvider.kt rename to core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index e7ab2b0646..073f576adf 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotsProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -2,10 +2,10 @@ 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.AutopilotControlCmdPam -import com.mogo.eagle.core.data.autopilot.AutopilotControlPam +import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdParameter +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsProvider +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.LogUtils import com.zhidao.support.adas.high.AdasManager @@ -16,8 +16,8 @@ import com.zhidao.support.adas.high.AdasManager * 域控制器 */ @Route(path = MogoServicePaths.PATH_AUTO_PILOT) -class MoGoAutopilotsProvider : - IMoGoAutopilotsProvider { +class MoGoAutopilotProvider : + IMoGoAutopilotProvider { private val TAG = "MoGoAutoPilotProvider" override val functionName: String @@ -37,10 +37,10 @@ class MoGoAutopilotsProvider : } - override fun startAutoPilot(result: AutopilotControlPam) { + override fun startAutoPilot(result: AutopilotControlParameters) { if (AdasManager.getInstance().isSocketConnect) { val parameter = - AutopilotControlCmdPam( + AutopilotControlCmdParameter( TAG, result ) 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 e9e9bfdd3d..8bd3e8dd90 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 @@ -11,7 +11,7 @@ import com.mogo.eagle.core.data.autopilot.* import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.obu.ObuStatusInfo import com.mogo.eagle.core.data.traffic.TrafficData -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsStatusListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -38,7 +38,7 @@ class DebugSettingView @JvmOverloads constructor( attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener, - IMoGoAutopilotsStatusListener { + IMoGoAutopilotStatusListener { private val TAG = "DebugSettingView" @@ -107,11 +107,11 @@ class DebugSettingView @JvmOverloads constructor( tvObuInfo.text = GsonUtils.toJson(obuStatusInfo) } - override fun onAutopilotStatusResponse(autoPilotStatussInfo: AutopilotStatussInfo) { - tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatussInfo) + override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { + tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo) } - override fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationsInfo?) { + override fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationInfo?) { } @@ -135,7 +135,7 @@ class DebugSettingView @JvmOverloads constructor( } - override fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) { + override fun onAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) { } 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 5ea0049bc3..f8de47ea75 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,8 +5,8 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.data.autopilot.AutopilotControlPam -import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters +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 import com.mogo.eagle.core.utilcode.util.LogUtils @@ -68,10 +68,10 @@ class AutoPilotStatusView @JvmOverloads constructor( } private fun startAutoPilot() { val currentAutopilot = - AutopilotControlPam() + AutopilotControlParameters() currentAutopilot.isSpeakVoice = false - currentAutopilot.startLatLon = AutopilotControlPam.AutoPilotLonLat(40.199157289445921,116.73675895051454); - currentAutopilot.endLatLon = AutopilotControlPam.AutoPilotLonLat(40.199255159538758,116.73274535677977); + currentAutopilot.startLatLon = AutopilotControlParameters.AutoPilotLonLat(40.199157289445921,116.73675895051454); + currentAutopilot.endLatLon = AutopilotControlParameters.AutoPilotLonLat(40.199255159538758,116.73274535677977); currentAutopilot.vehicleType = 10 MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot) } @@ -103,7 +103,7 @@ class AutoPilotStatusView @JvmOverloads constructor( } } - override fun onArriveAt(data: AutopilotStationsInfo?) { + override fun onArriveAt(data: AutopilotStationInfo?) { } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index efe0099b9e..3b910a2110 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -25,7 +25,7 @@ app:layout_constraintTop_toTopOf="parent" /> * 描述 */ -public class AutopilotWarnMessage { +public class AutoPilotWarnMessage { public String content; public String level; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdPam.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdParameter.java similarity index 80% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdPam.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdParameter.java index eed52cd442..09a900acef 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdPam.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlCmdParameter.java @@ -8,12 +8,12 @@ package com.mogo.eagle.core.data.autopilot; * 域控制器 控制指令发送 * */ -public class AutopilotControlCmdPam { +public class AutopilotControlCmdParameter { public String action; public Object result; - public AutopilotControlCmdPam(String action, Object result) { + public AutopilotControlCmdParameter(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/AutopilotControlPam.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.java similarity index 93% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlPam.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.java index 4284fc349a..c1757319b5 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlPam.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.java @@ -9,7 +9,7 @@ import java.util.List; * 启动自动驾驶参数 * */ -public class AutopilotControlPam { +public class AutopilotControlParameters { public AutoPilotLonLat startLatLon; public List wayLatLons; @@ -44,7 +44,7 @@ public class AutopilotControlPam { @Override public String toString() { - return "RemoteControlAutoPilotParameters{" + + return "AutopilotControlParameters{" + "startLatLon=" + startLatLon + ", wayLatLons=" + wayLatLons + ", endLatLon=" + endLatLon + diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationsInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java similarity index 89% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationsInfo.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java index 2beb7d9bc6..2e803bcd48 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationsInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java @@ -7,13 +7,13 @@ package com.mogo.eagle.core.data.autopilot; * 自动驾驶网约车回调数据 * */ -public class AutopilotStationsInfo { +public class AutopilotStationInfo { private int type; private double lon; private double lat; - public AutopilotStationsInfo(int type, double lon, double lat) { + public AutopilotStationInfo(int type, double lon, double lat) { this.type = type; this.lon = lon; this.lat = lat; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusBean.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatus.java similarity index 97% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusBean.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatus.java index a1e247f532..a60de52967 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusBean.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatus.java @@ -7,7 +7,7 @@ import java.io.Serializable; * @des * @date 2020/7/14 */ -public class AutopilotStatusBean implements Serializable { +public class AutopilotStatus implements Serializable { /** * action : autopilotstate diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatussInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt similarity index 96% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatussInfo.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt index add9a74a4d..276b8f62d8 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatussInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt @@ -9,7 +9,7 @@ import java.io.Serializable * 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); * */ -class AutopilotStatussInfo : Serializable { +class AutopilotStatusInfo : Serializable { /** * 当前链接的IP地址, 默认地址 192.168.1.102 */ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.java similarity index 76% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsProvider.java rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.java index 295e519403..033591ddb7 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsProvider.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.AutopilotControlPam; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; /** @@ -9,7 +9,7 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; * 自动驾驶节点 * */ -public interface IMoGoAutopilotsProvider extends IMoGoFunctionServerProvider { +public interface IMoGoAutopilotProvider extends IMoGoFunctionServerProvider { /** * 连接自动驾驶域控制器 @@ -21,7 +21,7 @@ public interface IMoGoAutopilotsProvider extends IMoGoFunctionServerProvider { * * @param result */ - void startAutoPilot(AutopilotControlPam result); + void startAutoPilot(AutopilotControlParameters result); /** * 结束自动驾驶 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsStatusListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt similarity index 85% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsStatusListener.kt rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt index 77f0f378f5..72d6003666 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotsStatusListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt @@ -8,21 +8,21 @@ import com.mogo.eagle.core.data.traffic.TrafficData * @date 2021/9/22 8:59 下午 * 自动驾驶状态回调监听 */ -interface IMoGoAutopilotsStatusListener { +interface IMoGoAutopilotStatusListener { /** * 自动驾驶状态信息 * - * @param autoPilotStatussInfo 状态信息 + * @param autoPilotStatusInfo 状态信息 */ - fun onAutopilotStatusResponse(autoPilotStatussInfo: AutopilotStatussInfo) + fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) /** * 自动驾驶到站 * * @param autopilotWayArrive 所到车站的简单信息 */ - fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationsInfo?) + fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationInfo?) /** @@ -59,9 +59,9 @@ interface IMoGoAutopilotsStatusListener { /** * 报警信息 * - * @param autopilotWarnMessage 预警信息 + * @param autoPilotWarnMessage 预警信息 */ - fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) + fun onAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) companion object { 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 e53a0d7da4..16c059c7ea 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 @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.call.autopilot import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsProvider +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider import com.mogo.eagle.core.function.call.base.CallerBase /** @@ -10,9 +10,9 @@ import com.mogo.eagle.core.function.call.base.CallerBase * 域控制器管理 */ object CallerAutoPilotManager { - private val providerApi: IMoGoAutopilotsProvider + private val providerApi: IMoGoAutopilotProvider get() = CallerBase.getApiInstance( - IMoGoAutopilotsProvider::class.java, + IMoGoAutopilotProvider::class.java, MogoServicePaths.PATH_AUTO_PILOT ) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index 81441ca782..794ab48920 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.call.autopilot import androidx.annotation.Nullable import com.mogo.eagle.core.data.autopilot.* import com.mogo.eagle.core.data.traffic.TrafficData -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotsStatusListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.utilcode.util.GsonUtils @@ -18,24 +18,24 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { private val TAG = "CallerAutoPilotStatusListenerManager" // 存储最后一次回调的数据，当有新当位置注册了监听将此数据回调过去，防止有些模块注册顺序问题导致无法获取最新状态 - private var mAutopilotStatussInfo: AutopilotStatussInfo = AutopilotStatussInfo() + private var mAutopilotStatusInfo: AutopilotStatusInfo = AutopilotStatusInfo() // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步 - private val M_AUTOPILOTS_STATUS_LISTENERS: HashMap = + private val M_AUTOPILOT_STATUS_LISTENERS: HashMap = HashMap() /** * 查询AutoPilot状态 */ - fun getAutoPilotStatusInfo(): AutopilotStatussInfo { - return mAutopilotStatussInfo + fun getAutoPilotStatusInfo(): AutopilotStatusInfo { + return mAutopilotStatusInfo } /** * 查询AutoPilot状态 */ fun getAutoPilotStatusInfoJsonString(): String { - return GsonUtils.toJson(mAutopilotStatussInfo) + return GsonUtils.toJson(mAutopilotStatusInfo) } /** @@ -45,10 +45,10 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { */ fun addListener( @Nullable tag: String, - @Nullable listener: IMoGoAutopilotsStatusListener + @Nullable listener: IMoGoAutopilotStatusListener ) { - M_AUTOPILOTS_STATUS_LISTENERS[tag] = listener - listener.onAutopilotStatusResponse(mAutopilotStatussInfo) + M_AUTOPILOT_STATUS_LISTENERS[tag] = listener + listener.onAutopilotStatusResponse(mAutopilotStatusInfo) } /** @@ -56,7 +56,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { * @param tag 标记，用来注销监听使用 */ fun removeListener(@Nullable tag: String) { - M_AUTOPILOTS_STATUS_LISTENERS.remove(tag) + M_AUTOPILOT_STATUS_LISTENERS.remove(tag) } /** @@ -64,9 +64,9 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { * @param listener 要删除的监听对象 */ fun removeListener(@Nullable listener: IMoGoObuStatusListener) { - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + M_AUTOPILOT_STATUS_LISTENERS.forEach { if (it.value == listener) { - M_AUTOPILOTS_STATUS_LISTENERS.remove(it.key) + M_AUTOPILOT_STATUS_LISTENERS.remove(it.key) } } } @@ -76,38 +76,38 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { */ @Synchronized fun invokeAutoPilotStatus() { - LogUtils.dTag(TAG, "$mAutopilotStatussInfo") - invokeAutoPilotStatus(mAutopilotStatussInfo) + LogUtils.dTag(TAG, "$mAutopilotStatusInfo") + invokeAutoPilotStatus(mAutopilotStatusInfo) } /** * 自动驾驶状态信息 回调 - * @param autopilotStatussInfo 自动驾驶状态信息 + * @param autopilotStatusInfo 自动驾驶状态信息 */ @Synchronized - fun invokeAutoPilotStatus(autopilotStatussInfo: AutopilotStatussInfo) { - LogUtils.dTag(TAG, "$autopilotStatussInfo") - mAutopilotStatussInfo = autopilotStatussInfo - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + fun invokeAutoPilotStatus(autopilotStatusInfo: AutopilotStatusInfo) { + LogUtils.dTag(TAG, "$autopilotStatusInfo") + mAutopilotStatusInfo = autopilotStatusInfo + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") - listener.onAutopilotStatusResponse(mAutopilotStatussInfo) + listener.onAutopilotStatusResponse(mAutopilotStatusInfo) } } /** * 自动驾驶站点信息 回调 - * @param autopilotStationsInfo 自动驾驶网约车回调数据 + * @param autopilotStationInfo 自动驾驶网约车回调数据 */ @Synchronized - fun invokeArriveAtStation(autopilotStationsInfo: AutopilotStationsInfo) { - LogUtils.dTag(TAG, "$autopilotStationsInfo") - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + fun invokeArriveAtStation(autopilotStationInfo: AutopilotStationInfo) { + LogUtils.dTag(TAG, "$autopilotStationInfo") + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") - listener.onAutopilotArriveAtStation(autopilotStationsInfo) + listener.onAutopilotArriveAtStation(autopilotStationInfo) } } @@ -118,7 +118,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { @Synchronized fun invokeAutopilotCarStateData(autoPilotCarStateInfo: AutopilotCarStateInfo?) { LogUtils.dTag(TAG, "$autoPilotCarStateInfo") - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") @@ -133,7 +133,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { @Synchronized fun invokeAutopilotRoute(routeInfo: AutopilotRouteInfo?) { LogUtils.dTag(TAG, "$routeInfo") - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") @@ -147,7 +147,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { @Synchronized fun invokeAutopilotSNRequest() { LogUtils.dTag(TAG, "") - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") @@ -161,7 +161,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { @Synchronized fun invokeAutopilotGuardian(guardianInfo: AutopilotGuardianStatusInfo?) { LogUtils.dTag(TAG, "$guardianInfo") - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") @@ -175,7 +175,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { @Synchronized fun invokeIdentifyDataUpdate(trafficData: List?) { LogUtils.dTag(TAG, "$trafficData") - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") @@ -187,13 +187,13 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { * 报警信息 回调 */ @Synchronized - fun invokeAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) { - LogUtils.dTag(TAG, "$autopilotWarnMessage") - M_AUTOPILOTS_STATUS_LISTENERS.forEach { + fun invokeAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) { + LogUtils.dTag(TAG, "$autoPilotWarnMessage") + M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") - listener.onAutopilotWarnMessage(autopilotWarnMessage) + listener.onAutopilotWarnMessage(autoPilotWarnMessage) } } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java index 4f562a5f87..7f9c4c80b9 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java @@ -13,7 +13,7 @@ import android.os.Handler; import android.os.Message; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.map.navi.IMogoCarLocationChangedListener2; @@ -130,7 +130,7 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener map = new HashMap<>(); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java index 5a9344d8fc..10ca090421 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java @@ -2,7 +2,7 @@ package com.mogo.module.common.datacenter; import com.mogo.commons.FunctionBuildConfig; import com.mogo.commons.debug.DebugConfig; -import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.module.common.MogoApisHandler; import com.mogo.service.cloud.location.CloudLocationInfo; @@ -94,9 +94,9 @@ public class SnapshotLocationDataCenter { // 使用与渠道配置一样的gps提供者提供的数据 if (gpsProvider == FunctionBuildConfig.gpsProvider) { //测试面板状态同步 - AutopilotStatussInfo autopilotStatussInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); - autopilotStatussInfo.setLocationLat(lat); - autopilotStatussInfo.setLocationLon(lon); + AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); + autopilotStatusInfo.setLocationLat(lat); + autopilotStatusInfo.setLocationLon(lon); CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus(); DebugConfig.setStatusData(DebugConfig.sLon, lon); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java index 5033726c1d..4cd57cb901 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java @@ -15,7 +15,7 @@ import com.mogo.module.extensions.navi.VrModeNavInfoView; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; import com.mogo.service.adas.IMogoAdasWarnMessageCallback; import com.mogo.eagle.core.data.autopilot.MogoADASWarnType; -import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; import com.mogo.utils.logger.Logger; import org.json.JSONArray; @@ -92,7 +92,7 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca } @Override - public void onReceiveData(AutopilotWarnMessage msg) { + public void onReceiveData(AutoPilotWarnMessage msg) { Logger.d(TAG, "收到adas warn message, isVrMode: " + isVrMode + " msg: " + msg); if (!isVrMode) { return; 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 1d82db00fd..254ccfb2c9 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.AutopilotControlPam; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; 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 AutopilotControlPam.class; + public Class target() { + return AutopilotControlParameters.class; } @Override - public void onMsgReceived( AutopilotControlPam obj ) { + public void onMsgReceived( AutopilotControlParameters 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 91a85c9f07..2c85cce12b 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 @@ -10,8 +10,8 @@ import android.os.Handler; import android.os.Message; import com.mogo.cloud.commons.utils.CoordinateUtils; -import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; +import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; 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 AutopilotControlPam.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon)); + wayLatLon.add(new AutopilotControlParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon)); } } currentAutopilot.wayLatLons = wayLatLon; - currentAutopilot.startLatLon = new AutopilotControlPam.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon()); - currentAutopilot.endLatLon = new AutopilotControlPam.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon()); + currentAutopilot.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon()); + currentAutopilot.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon()); currentAutopilot.vehicleType = 10; Logger.d(TAG, "开启自动驾驶====" + currentAutopilot); mApis.getAdasControllerApi().aiCloudToAdasData(currentAutopilot); @@ -191,7 +191,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener map = new HashMap<>(); map.put("sn", sn); map.put("data", GsonUtil.jsonFromObject(reportedRoute)); 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 4cd018a952..2c489f05ec 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.AutopilotControlPam; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; 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:// 控制自动驾驶 - AutopilotControlPam parameters = new AutopilotControlPam(); + AutopilotControlParameters parameters = new AutopilotControlParameters(); parameters.vehicleType = 9; - parameters.startLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1690522746, 116.567374558); - parameters.endLatLon = new AutopilotControlPam.AutoPilotLonLat(40.1651999405, 116.567217441); + parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1690522746, 116.567374558); + parameters.endLatLon = new AutopilotControlParameters.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 8e2980b8c2..6aff8eef3c 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.AutopilotControlPam; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; 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(AutopilotControlPam result); + void aiCloudToAdasData(AutopilotControlParameters result); /** * 添加adas数据回调接口 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java index 99b9a7a5c3..0a16fc0848 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java @@ -1,6 +1,6 @@ package com.mogo.service.adas; -import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; public /** @@ -29,7 +29,7 @@ interface IMogoAdasOCHCallback { * 到站 * @param data 所到车站的简单信息 */ - void onArriveAt( AutopilotStationsInfo data ); + void onArriveAt( AutopilotStationInfo data ); /** * 自动驾驶状态发生改变 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java index b593381b48..1f574d7624 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java @@ -1,6 +1,6 @@ package com.mogo.service.adas; -import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; /** * adas 数据回调接口 @@ -12,5 +12,5 @@ public interface IMogoAdasWarnMessageCallback { * adas 数据回调 * @param msg 具体数据 */ - void onReceiveData( AutopilotWarnMessage msg ); + void onReceiveData( AutoPilotWarnMessage msg ); } \ No newline at end of file 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 e0443d66a8..864ed5e160 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,12 +12,12 @@ 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.AutopilotControlCmdPam; -import com.mogo.eagle.core.data.autopilot.AutopilotControlPam; +import com.mogo.eagle.core.data.autopilot.AutopilotControlCmdParameter; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotStationsInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotStatussInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; +import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.traffic.TrafficData; @@ -261,7 +261,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void onWarnMessage(AutopilotWarnMessage autopilotWarnMessage) { + public void onWarnMessage(AutoPilotWarnMessage autopilotWarnMessage) { if (autopilotWarnMessage == null) { return; } @@ -280,7 +280,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void autopilotArrive(AutopilotStationsInfo autopilotArriveModel) { + public void autopilotArrive(AutopilotStationInfo autopilotArriveModel) { Logger.d(TAG, "autopilotArriveModel " + autopilotArriveModel); if (autopilotArriveModel == null) { Logger.d(TAG, "autopilotArrive autopilotArriveModel is null"); @@ -289,7 +289,7 @@ public class MogoADASController implements IMogoADASController { Logger.d(TAG, "autopilotArrive : " + autopilotArriveModel.toString()); if (!mAdasOCHCallback.isEmpty()) { for (IMogoAdasOCHCallback cb : mAdasOCHCallback) { - cb.onArriveAt(new AutopilotStationsInfo( + cb.onArriveAt(new AutopilotStationInfo( autopilotArriveModel.getType(), autopilotArriveModel.getLon(), autopilotArriveModel.getLat()) @@ -324,7 +324,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void notifyAutopilotState(AutopilotStatussInfo autopilotStatus) { + public void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) { Logger.d(TAG, "notifyAutopilotState: " + GsonUtil.jsonFromObject(autopilotStatus)); DebugConfig.setAutoPilotStatus(autopilotStatus.getState() + ""); @@ -449,7 +449,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void aiCloudToAdasData(AutopilotControlPam result) { + public void aiCloudToAdasData(AutopilotControlParameters 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) { - AutopilotControlCmdPam parameter = new AutopilotControlCmdPam(action, result); + AutopilotControlCmdParameter parameter = new AutopilotControlCmdParameter(action, result); //位置信息 action是aiCloudToStartAutopilot try { adasProvider.sendWsMessage(GsonUtil.jsonFromObject(parameter)); @@ -577,7 +577,7 @@ public class MogoADASController implements IMogoADASController { public void onAutopilotArriveLike(int carType) { if (!mAdasOCHCallback.isEmpty()) { for (IMogoAdasOCHCallback cb : mAdasOCHCallback) { - cb.onArriveAt(new AutopilotStationsInfo( + cb.onArriveAt(new AutopilotStationInfo( carType, 116.09888888, 39.999999) @@ -607,7 +607,7 @@ public class MogoADASController implements IMogoADASController { if (state == -1) { if (!mAdasOCHCallback.isEmpty()) { for (IMogoAdasOCHCallback cb : mAdasOCHCallback) { - cb.onArriveAt(new AutopilotStationsInfo(1, 1d, 1d)); + cb.onArriveAt(new AutopilotStationInfo(1, 1d, 1d)); } } } else {