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

[6.7.0]

Browse Source 
[fea]
[车模设置、orderId改名为自驾id]
This commit is contained in:
yangyakun
2024-09-29 10:29:15 +08:00
parent b53876df82
commit 484dd8bdc4
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt
View File

@@ -32,6 +32,7 @@ import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.bean.ContraiInfo
import com.mogo.och.data.bean.LineInfo
import kotlin.properties.Delegates
/**
* 订单中
@@ -70,7 +71,15 @@ object LineManager : CallerBase<ILineCallback>() {
var isFirstStartAutopilot = true
private var orderId = ""
/**
* 线路、轨迹、站点 三者确定的id
*/
private var autopilotId: String by Delegates.observable("") { _, oldValue, newValue ->
if (oldValue != newValue) {
CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(newValue)
}
}
// 自车定位
private val mMapLocationListener = object : IMoGoChassisLocationGCJ02Listener {
@@ -84,7 +93,7 @@ object LineManager : CallerBase<ILineCallback>() {
mogoLocation.longitude, mogoLocation.latitude
)
if (distance <= OchCommonConst.ARRIVE_AT_END_STATION_DISTANCE) {
val token = CallerAutoPilotControlManager.sendSsmFuncQueryAutoPilotStation(orderId)
val token = CallerAutoPilotControlManager.sendSsmFuncQueryAutoPilotStation(autopilotId)
OchChainLogManager.writeChainLogAutopilot("到站逻辑","距离站点：$distance 请求token：$token")
}
}
@@ -93,7 +102,7 @@ object LineManager : CallerBase<ILineCallback>() {
fun invokeArrivedStation(orderId: String, arrivedStationFlag: Boolean) {
if (this.orderId==orderId&&arrivedStationFlag){
if (this.autopilotId==orderId&&arrivedStationFlag){
M_LISTENERS.forEach {
it.value.arrivedStationSuccessBySearch()
}
@@ -101,7 +110,7 @@ object LineManager : CallerBase<ILineCallback>() {
}
fun invokeSetIsFirstAutopilot(orderId: String?, firstAutopilotFlag: Boolean, count: Int) {
if (this.orderId==orderId){
if (this.autopilotId==orderId){
if(count>=1){
isFirstStartAutopilot = false
}else{
@@ -252,8 +261,7 @@ object LineManager : CallerBase<ILineCallback>() {
private fun clearAutopilotControlParameters(){
CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null)
TrajectoryAndDistanceManager.setStationPoint(null, null, null)
this.orderId = ""
CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(this.orderId)
this.autopilotId = ""
OchLocationManager.removeGCJ02Listener(TAG)
}
@@ -298,10 +306,9 @@ object LineManager : CallerBase<ILineCallback>() {
parameters?.startLatLon = AutoPilotLonLat(start.lat, start.lon)
parameters?.endLatLon = AutoPilotLonLat(end.lat, end.lon)
parameters?.vehicleType = 10
this.orderId = "${lineInfo.lineId}_${start.siteId}_${end.siteId}"
parameters?.orderId = this.orderId
this.autopilotId = "${lineInfo.lineId}_${start.siteId}_${end.siteId}"
parameters?.orderId = this.autopilotId
parameters?.firstAutopilotFlag = isFirstStartAutopilot
CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(this.orderId)
if (parameters?.autoPilotLine == null) {
parameters?.autoPilotLine = AutoPilotLine(

3
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CommonLoadingView.kt
View File

@@ -59,9 +59,6 @@ class CommonLoadingView @JvmOverloads constructor(
// 设置地图样式
MogoMapListenerHandler.mogoMapListenerHandler.onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR)
val carModel = Carmodel.getCarModelFromServerName(LoginStatusManager.getLoginInfo()?.carModel)
HdMapBuildConfig.currentCarVrIconRes = carModel.rawValue
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(HdMapBuildConfig.currentCarVrIconRes)
UiThreadHandler.postDelayed({ visibility = GONE },2_000,UiThreadHandler.MODE.QUEUE)
}