diff --git a/app/script/roleFlavors/driverpassenger.gradle b/app/script/roleFlavors/driverpassenger.gradle index 3b18ac2bb6..6498a96254 100644 --- a/app/script/roleFlavors/driverpassenger.gradle +++ b/app/script/roleFlavors/driverpassenger.gradle @@ -1,6 +1,7 @@ project.android.productFlavors { bailing { dimension "role" + applicationId "com.mogo.launcher.rk.passenger" externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -9,11 +10,11 @@ project.android.productFlavors { } manifestPlaceholders = [ - CHANNEL_VALUE_BODY : "Driver", + CHANNEL_VALUE_BODY : "Passenger", ] // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" } } \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 4da5d68d98..4565479a84 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -63,7 +63,7 @@ object ConfigStartUp { // 这里影响当前Activity的身份信息,多进程,主进程为司机端,:passenger 进程为乘客端 // TODO emArrow isMultiDisplay暂时不启用,仅测试3588,在B2 2024车预研 if (DebugConfig.isMultiDisplay()) { - if(ProcessUtils.getCurrentProcessName().contains(":passenger")){ + if(ProcessUtils.getCurrentProcessName().contains("passenger")){ FunctionBuildConfig.appIdentityMode = "Product_Passenger_${BuildConfig.APP_IDENTITY_MODE_TAIL}" }else{ FunctionBuildConfig.appIdentityMode = "Product_Driver_${BuildConfig.APP_IDENTITY_MODE_TAIL}" @@ -125,9 +125,6 @@ object ConfigStartUp { //白天模式 FunctionBuildConfig.skinMode = 1 } - if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { - - } val mapParams = MapParams.init() mapParams.setDebugMode(false) diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index aa39533ce7..f0c53e67a8 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -148,17 +148,20 @@ class HttpDnsStartUp : AndroidStartup(), IMoGoCloudListener { } else { clientConfig.serviceAppId = "com.mogo.launcher" } - // 设置AI云平台分配给三方应用的签名密钥,需要从AI云平台申请 + // 设置AI云平台分配给三方应用的签名密钥,需要从AI云平台申请ert // 设置车机设备的唯一标识(这些表识必须是通过后台录入的设备) // TODO 现在这块逻辑因为网约车业务那后台的限制,还没有更换,条件成熟后替换为 DeviceIdUtils.getWidevineIDWithMd5(context) // 这里影响当前Activity的身份信息,多进程先保持与原来一样,主进程为司机端,:passenger 进程为乘客端 - if (ProcessUtils.getCurrentProcessName().contains(":passenger")) { + if (ProcessUtils.getCurrentProcessName().contains("passenger")) { clientConfig.thirdPartyDeviceId = DeviceUtils.getDeviceSN() + "_passenger" + CallerLogger.i("$M_MAIN$TAG", "emArrow passenger sn : ${DeviceUtils.getDeviceSN()} + _passenger") + clientConfig.secretKey = "DLtjkFhV1lEZqLRnUs6OCFS0luP8S0mG" } else { clientConfig.thirdPartyDeviceId = DeviceUtils.getDeviceSN() + //设置长链接的secretKey 通过SHA1和包名找中台服务生成,后续包名分渠道,需要做对应操作 + CallerLogger.i("$M_MAIN$TAG", "emArrow sn : ${DeviceUtils.getDeviceSN()}") + clientConfig.secretKey = "YMj2VFDFxJ3Q4gNoZceJ" } - //设置长链接的secretKey 通过SHA1和包名找中台服务生成,后续包名分渠道,需要做对应操作 - clientConfig.secretKey = "YMj2VFDFxJ3Q4gNoZceJ" // clientConfig.secretKey = "n48AlVufihvMDWgzwHX42yzSgiWaad6v" clientConfig.iHttpCurrentLocation = object : ICurrentLocation { diff --git a/gradle.properties b/gradle.properties index 03867ca71b..7bf116005e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.33 MOGO_TELEMATIC_VERSION=1.4.7.33 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.4.0.6 +MAP_SDK_VERSION=3.4.1.2 MAP_SDK_DATA_VERSION=1.0.0.9 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket diff --git a/libraries/mapmodule/build.gradle b/libraries/mapmodule/build.gradle index 287e5d161b..87fe9afa20 100644 --- a/libraries/mapmodule/build.gradle +++ b/libraries/mapmodule/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation 'com.zhidaoauto.map:net:1.0.1' - implementation "com.zhidaoauto.machine:mapcore:3.4.1.2" + implementation "com.zhidaoauto.machine:mapcore:${MAP_SDK_VERSION}" implementation "com.zhidaoauto.machine:mapdata:${MAP_SDK_DATA_VERSION}" }