From e168a65f63af1a46150864eb08dbf4c405b96deb Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 19 Nov 2021 16:55:12 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=E5=8E=BB=E9=99=A4=E6=B5=AE=E7=AA=97?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=94=B3=E8=AF=B7=20[Fix]=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3yycp-carDataService--?= =?UTF-8?q?=E3=80=8Byycp-dataService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../core/function/main/MainMoGoApplication.java | 4 +++- .../module/adas/network/IAdasApiService.java | 4 ++-- .../back/BackToLauncherModuleProvider.java | 4 ++++ .../java/com/mogo/module/main/MainActivity.java | 16 ++++++++-------- .../service/ttsConfig/TtsConfigApiService.java | 2 +- 5 files changed, 18 insertions(+), 12 deletions(-) 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 485df7648e..8699e29c9b 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 @@ -1,5 +1,7 @@ package com.mogo.eagle.core.function.main; +import static com.mogo.commons.debug.DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE; + import android.content.Context; import android.content.Intent; import android.os.Process; @@ -262,7 +264,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // 初始化 bugly 日志采集 MogoModulePaths.addBaseModule(new MogoModule(CrashReportConstants.PATH, CrashReportConstants.NAME)); - if (DebugConfig.isLauncher()) { + if (DebugConfig.isLauncher()&&DebugConfig.getCarMachineType() == CAR_MACHINE_TYPE_SELF_INNOVATE) { MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_BACK, MogoServicePaths.PATH_BACK)); } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java index b2e356c978..7a60601a7c 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java @@ -16,12 +16,12 @@ public interface IAdasApiService { //上传自动驾驶状态接口 @Headers({"Content-Type:application/json;charset=UTF-8"}) - @POST("/yycp-carDataService/autonomousDrive/updateAutonomousDriveStatus") + @POST("/yycp-dataService/autonomousDrive/updateAutonomousDriveStatus") Observable updateAutonomousDriveStatus(@Body RequestBody requestBody); //站点上报 用于网约车业务 @Headers({"Content-Type:application/json;charset=UTF-8"}) - @POST("/yycp-carDataService/autonomousDrive/reportSite") + @POST("/yycp-dataService/autonomousDrive/reportSite") Observable updateReportSite(@Body RequestBody requestBody); /** diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java index 2f0bf3dc5a..d3cd39b05e 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java @@ -1,7 +1,9 @@ package com.mogo.module.back; import android.content.Context; +import android.os.Build; import android.os.Bundle; +import android.provider.Settings; import android.view.View; import androidx.annotation.NonNull; @@ -13,6 +15,7 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.module.common.utils.CarSeries; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; +import com.mogo.utils.permissions.PermissionsDialogUtils; /** * @author congtaowang @@ -24,6 +27,7 @@ import com.mogo.service.module.ModuleType; public class BackToLauncherModuleProvider implements IMogoModuleProvider { private static final String TAG = "BackToLauncherModuleProvider"; + private static final int REQUEST_CODE_DIALOG = 100; @Override public Fragment createFragment( Context context, Bundle data ) { diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 4d7ed61433..d5ea9b1db6 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -127,14 +127,14 @@ public class MainActivity extends MvpActivity implement if (CallChatApi.getInstance().getApiProvider() != null) { CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", R.id.module_main_id_message_history_fragment_container, this); } - //申请悬浮窗权限 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - // 检查是否有悬浮窗权限 - if (Settings.canDrawOverlays(this)) { - return; - } - PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG); - } +// //申请悬浮窗权限 +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { +// // 检查是否有悬浮窗权限 +// if (Settings.canDrawOverlays(this)) { +// return; +// } +// PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG); +// } } // 隐藏布局 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java index 4bcd374a0a..78dea27baf 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java @@ -15,6 +15,6 @@ public interface TtsConfigApiService { * 查询语音Tts 的 * */ - @GET("/yycp-carDataService/car/ttsWord/no/getTTSWord/v1") + @GET("/yycp-dataService/car/ttsWord/no/getTTSWord/v1") Observable inquireForTts(); }