yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

规范自动驾驶命名

Browse Source 
Signed-off-by: 董宏宇 <martindhy@gmail.com>
This commit is contained in:
董宏宇
2021-10-13 15:01:01 +08:00
parent 78daacaae7
commit ef0c6da1d8
19 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt
View File

@@ -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.AdasControlCommandParameter
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters
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.IMoGoAutoPilotProvider
import com.mogo.eagle.core.utilcode.util.GsonUtils
@@ -18,9 +18,13 @@ import com.zhidao.support.adas.high.AdasManager
class MoGoAutoPilotProvider : IMoGoAutoPilotProvider {
override fun init(context: Context) {}
override fun connectAutoPilot() {}
override fun startAutoPilot(result: RemoteControlAutoPilotParameters) {
override fun startAutoPilot(result: AutoPilotControlParameters) {
if (AdasManager.getInstance().isSocketConnect) {
val parameter = AdasControlCommandParameter(TAG, result)
val parameter =
AutoPilotControlCmdParameter(
TAG,
result
)
AdasManager.getInstance().aiCloudToAdasData(GsonUtils.toJson(parameter))
} else {
LogUtils.eTag(TAG, "车机与工控机链接失败，无法开启自动驾驶")

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.autopilot.AdasOCHData
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo
import com.mogo.eagle.core.data.constants.MoGoConfig
import com.mogo.eagle.core.data.obu.ObuStatusInfo
@@ -100,7 +100,7 @@ class DebugSettingView @JvmOverloads constructor(
/**
* 自动驾驶相关回调
*/
override fun onAutoPilotArriveAtStation(data: AdasOCHData?) {
override fun onAutoPilotArriveAtStation(data: AutoPilotStationInfo?) {
}

16
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
View File

@@ -5,17 +5,14 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.data.autopilot.AdasOCHData
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters
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
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.module.common.MogoApisHandler
import com.mogo.service.adas.IMogoAdasOCHCallback
import com.mogo.utils.logger.Logger
import kotlinx.android.synthetic.main.view_autopilot_status.view.*
import java.util.*
/**
* @author xiaoyuzhou
@@ -70,10 +67,11 @@ class AutoPilotStatusView @JvmOverloads constructor(
// startAutoPilot();
}
private fun startAutoPilot() {
val currentAutopilot = RemoteControlAutoPilotParameters()
val currentAutopilot =
AutoPilotControlParameters()
currentAutopilot.isSpeakVoice = false
currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409);
currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199730,116.735687);
currentAutopilot.startLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409);
currentAutopilot.endLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.199730,116.735687);
currentAutopilot.vehicleType = 10
MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot)
}
@@ -105,7 +103,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
}
}
override fun onArriveAt(data: AdasOCHData?) {
override fun onArriveAt(data: AutoPilotStationInfo?) {
}