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

[Change]

Browse Source 
兼容小巴车192.168.8.102工控机连接
升级地图版本2.0.5.1 修改某些路段车道线闪烁问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-02-22 16:38:27 +08:00
parent a7ad1f77c8
commit c501223cb8
13 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/productFlavors/f8xx.gradle
View File

@@ -28,6 +28,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "192.168.1.102"
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

2
app/productFlavors/fPadLenovo.gradle
View File

@@ -28,6 +28,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x02"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

2
app/productFlavors/fPadLenovoOchBus.gradle
View File

@@ -30,6 +30,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

2
app/productFlavors/fPadLenovoOchBusPassenger.gradle
View File

@@ -28,6 +28,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机0｜乘客1
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x01"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

2
app/productFlavors/fPadLenovoOchTaxi.gradle
View File

@@ -31,6 +31,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

2
app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
View File

@@ -30,6 +30,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机0｜乘客1
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x01"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

2
app/productFlavors/fochbus.gradle
View File

@@ -28,6 +28,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

2
app/productFlavors/fochtaxi.gradle
View File

@@ -28,6 +28,8 @@ project.android.productFlavors {
// 构建的应用身份类型，司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
}

7
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -70,13 +70,14 @@ public class MogoApplication extends MainMoGoApplication {
FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER;
// 演示模式,上一次勾选的数据
FunctionBuildConfig.isDemoMode = BuildConfig.IS_DEMO_MODE;
// app安装的身份信息
FunctionBuildConfig.appIdentityMode = BuildConfig.APP_IDENTITY_MODE;
// 不同身份对应不同的IP地址
FunctionBuildConfig.adasConnectIP = BuildConfig.ADAS_CONNECT_IP;
// 配置BuglyAppID：MoGoEagleEye
CrashReportConstants.buglyAppID = "ac71228f85";
// 是否是演示（美化）模式，会存在SP中，方便做现场恢复
FunctionBuildConfig.isDemoMode = SharedPrefsMgr.getInstance(this).getBoolean(MoGoConfig.IS_DEMO_MODE, false);
if (DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxi")
|| DebugConfig.getProductFlavor().equals("fPadLenovoOchBus")
@@ -107,7 +108,7 @@ public class MogoApplication extends MainMoGoApplication {
@Override
protected void initConfigWithSP() {
// 演示模式,上一次勾选的数据
// 是否是演示（美化）模式，会存在SP中，方便做现场恢复
FunctionBuildConfig.isDemoMode = SharedPrefsMgr.getInstance(this).getBoolean(MoGoConfig.IS_DEMO_MODE, false);
}
}

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

@@ -51,14 +51,14 @@ class MoGoAutopilotProvider :
0x00 -> // 司机
{
CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this)
AdasManager.getInstance().create(context, "192.168.1.102")
AdasManager.getInstance().create(context, FunctionBuildConfig.adasConnectIP)
}
0x01 -> // 乘客
{
// 乘客端默认接收绘制全局路径+引导线
//FunctionBuildConfig.isDemoMode = true
//FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
AdasManager.getInstance().create(context, "192.168.1.103")
AdasManager.getInstance().create(context, FunctionBuildConfig.adasConnectIP)
}
else -> // 默认采用UDP寻址方式
AdasManager.getInstance().create(context)

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

@@ -234,7 +234,7 @@ class DebugSettingView @JvmOverloads constructor(
// 初始化工控机 IP信息
val autoPilotIpAddress =
SharedPrefsMgr.getInstance(context).getString(MoGoConfig.AUTOPILOT_IP, "192.168.1.102")
SharedPrefsMgr.getInstance(context).getString(MoGoConfig.AUTOPILOT_IP, FunctionBuildConfig.adasConnectIP)
etAutopilotIP.setText(autoPilotIpAddress)
etAutopilotIP.text?.let { etAutopilotIP.setSelection(it.length) }

9
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
View File

@@ -31,6 +31,15 @@ object FunctionBuildConfig {
@JvmField
var appIdentityMode = 0x00
/**
* 配置连接工控机的IP地址
* 小巴车 192.168.8.102
* 出租车 192.168.1.102
*/
@Volatile
@JvmField
var adasConnectIP = "192.168.1.102"
/**
* 自车位置使用哪种外部数据源
* 0 = Android系统

2
gradle.properties
View File

@@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.18
MOGO_LOCATION_VERSION=1.3.18
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.0.5
MAP_SDK_VERSION=2.0.5.1
MAP_SDK_OPERATION_VERSION=1.0.11
# websocket
WEBSOCKET_VERSION=1.1.7