Merge branch 'dev_robotaxi-d_231129_6.2.2_routing_verify' into dev_robotaxi-d_231201_6.2.2

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
This commit is contained in:
aibingbing
2023-12-04 20:58:15 +08:00
78 changed files with 3987 additions and 80 deletions

View File

@@ -90,8 +90,8 @@ WEBSOCKET_VERSION=1.1.7
applicationId=com.mogo.launcer
applicationName=IntelligentPilot
# RoboBus司机端2.5.1RoboTaxi司机端2.5.1RoboTaxi乘客端1.0.0
versionCode=6001000
versionName=6.1.2
versionCode=6002002
versionName=6.2.2
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10
@@ -163,7 +163,7 @@ TAXI_DRIVER_VERSION=6.2.0
TAXI_PASSENGER_VERSION=5.2.0
# 出租车模式司机端版本号
TAXIUNMANNED_DRIVER_VERSION=6.2.0
TAXIUNMANNED_DRIVER_VERSION=6.2.2
# 出租车模式乘客端端版本号
TAXIUNMANNED_PASSENGER_VERSION=5.2.0