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 438fb22daa..20c96b11ef 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 @@ -49,7 +49,10 @@ class MoGoAutopilotProvider : // TODO 临时方案，根据不同的身份标识，连接不同的工控机IP when (FunctionBuildConfig.appIdentityMode) { 0 -> // 司机 + { + CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this) AdasManager.getInstance().create(context, "192.168.1.102") + } 1 -> // 乘客 AdasManager.getInstance().create(context, "192.168.1.103") else -> // 默认采用UDP寻址方式 @@ -62,7 +65,6 @@ class MoGoAutopilotProvider : AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl()) // 同步数据给工控机的服务 AsyncDataToAutopilotServer.INSTANCE.initServer() - CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this) } /** diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 1cc069f33e..b31fee555f 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -15,6 +15,7 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.Utils; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLocation; @@ -155,10 +156,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { clientConfig.setAnchor(false); // 设置从蘑菇AI开放平台获取的APPKey switch (DebugConfig.getCarMachineType()) { - // 自研车机 - case DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE: - clientConfig.setThirdPartyAppKey("wbvpzgar"); - break; // 比亚迪 case DebugConfig.CAR_MACHINE_TYPE_BYD: clientConfig.setThirdPartyAppKey("bydauto"); @@ -167,6 +164,10 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { case DebugConfig.CAR_MACHINE_TYPE_LENOVO: clientConfig.setThirdPartyAppKey("pfieouqg"); break; + // 自研车机 + default: + clientConfig.setThirdPartyAppKey("wbvpzgar"); + break; } // 设置应用服务AppId 长链、鉴权 if (DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE) { @@ -266,26 +267,26 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { } private void startSocketService() { - Logger.d(TAG,"startSocketService"); + Logger.d(TAG, "startSocketService"); IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); // 关闭长链服务 apis.getSocketManagerApi(getApplicationContext()).destroy(); apis.getSocketManagerApi(this).registerLifecycleListener(10020, new IMogoLifecycleListener() { @Override public void onConnectFailure() { - Logger.d(TAG,"socket-onConnectFailure"); + Logger.d(TAG, "socket-onConnectFailure"); DebugConfig.setDownloadSnapshot(false); } @Override public void onConnectSuccess() { - Logger.d(TAG,"socket-onConnectSuccess"); + Logger.d(TAG, "socket-onConnectSuccess"); DebugConfig.setDownloadSnapshot(true); } @Override public void onConnectLost() { - Logger.d(TAG,"socket-onConnectLost"); + Logger.d(TAG, "socket-onConnectLost"); DebugConfig.setDownloadSnapshot(false); } }); @@ -311,7 +312,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule(new MogoModule(MapApiPath.PATH, "CustomMapApiBuilder")); MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY)); - // MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME)); + // MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME)); //mogo deva tools MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_DEVA_TOOLS, "IMoGoDevaToolsProvider")); // 域控制器模块（新） @@ -329,8 +330,22 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // 推送模块 MogoModulePaths.addModule(new MogoModule(PushUIConstants.PATH, "PUSH_UI")); - // 地图数据收集模块 - MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector")); + + /* + * 不同身份加载的特殊模块 + */ + switch (FunctionBuildConfig.appIdentityMode) { + // 司机身份专属模块 + case 0: + // 地图数据收集模块 + MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector")); + break; + case 1: + + break; + default: + break; + } if (!DebugConfig.isLauncher()) { PersistentManager @@ -343,7 +358,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { @Override protected void attachBaseContext(Context base) { super.attachBaseContext(base); - /**如果是主进程**/ + /*如果是主进程**/ if (ProcessUtils.isMainProcess(this)) { AppLaunchTimeUtils.beginTimeCalculate(AppLaunchTimeUtils.COLD_START); }