diff --git a/app/productFlavors/f8xx.gradle b/app/productFlavors/f8xx.gradle index d54d8b9a79..1429240524 100644 --- a/app/productFlavors/f8xx.gradle +++ b/app/productFlavors/f8xx.gradle @@ -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' } diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index b4415802eb..cd72bc87d6 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -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' } diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index 51845b4ce7..0e65bd1c47 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -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' } diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index 123f43fb56..4b7b299e78 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -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' } diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index da28df52c4..4d92c20f68 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -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' } diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle index 36bb397436..b69be39466 100644 --- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle @@ -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' } diff --git a/app/productFlavors/fochbus.gradle b/app/productFlavors/fochbus.gradle index 31c4a38bd4..16feafdae4 100644 --- a/app/productFlavors/fochbus.gradle +++ b/app/productFlavors/fochbus.gradle @@ -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' } diff --git a/app/productFlavors/fochtaxi.gradle b/app/productFlavors/fochtaxi.gradle index 5c6f6f94b5..fa21f03205 100644 --- a/app/productFlavors/fochtaxi.gradle +++ b/app/productFlavors/fochtaxi.gradle @@ -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' } diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index eda2b829c1..46fb18b8dc 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -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); } } diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index d5daff1c71..fc67de4c1f 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -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) 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 5b97241065..7a428474e1 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 @@ -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) } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index 1c2480f200..86c1e88797 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -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系统 diff --git a/gradle.properties b/gradle.properties index ca2455e054..0867e40c63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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