From 9937cbdf65950d3970d651770a0a11b000fd5f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 18 Oct 2021 20:29:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=84=9F=E7=9F=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- app/productFlavors/fPadLenovo.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index f531a5517e..86cc5b3371 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -36,7 +36,7 @@ project.android.productFlavors { // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // GPS数据提供源： 0-Android系统，1-工控机，2-OBU - buildConfigField 'int', 'GPS_PROVIDER', "1" + buildConfigField 'int', 'GPS_PROVIDER', "2" // 默认进入的地图模式 buildConfigField 'int', 'MAP_STYLE_MODE', "1" } From b585c4fd2e7d3d746eacbe01a0ec320d48717526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 19 Oct 2021 17:34:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20java.lang.NoClassDefFo?= =?UTF-8?q?undError:=20Failed=20resolution=20of:=20Lcom/mogo/eagle/core/fu?= =?UTF-8?q?nction/api/autopilot/IMoGoAutopilotProvider$DefaultImpls;=20=09?= =?UTF-8?q?at=20com.mogo.eagle.core.function.autopilot.MoGoAutopilotProvid?= =?UTF-8?q?er.onDestroy(MoGoAutopilotProvider.kt:19)=20=09at=20com.mogo.mo?= =?UTF-8?q?dule.main.cards.MogoModulesManager.onDestroy(MogoModulesManager?= =?UTF-8?q?.java:320)=20=09at=20com.mogo.module.main.MainActivity.onDestro?= =?UTF-8?q?y(MainActivity.java:416)=20=09at=20com.zhidao.mogo.module.main.?= =?UTF-8?q?launcher.MainLauncherActivity.onDestroy(MainLauncherActivity.ja?= =?UTF-8?q?va:152)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../eagle/core/function/autopilot/MoGoAutopilotProvider.kt | 5 +++-- .../mogo/eagle/core/function/notice/MoGoNoticeProvider.kt | 4 ++++ .../mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt | 6 +++++- .../core/function/api/base/IMoGoFunctionServerProvider.kt | 5 +---- 4 files changed, 13 insertions(+), 7 deletions(-) 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 073f576adf..c053647723 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 @@ -23,20 +23,21 @@ class MoGoAutopilotProvider : override val functionName: String get() = TAG - override fun init(context: Context) { // 初始化ADAS 域控制器 //AdasManager.getInstance().create(context) } + override fun onDestroy() { + + } override fun connectAutoPilot() { } - override fun startAutoPilot(result: AutopilotControlParameters) { if (AdasManager.getInstance().isSocketConnect) { val parameter = diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt index 8f66306f78..28edb711c7 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/MoGoNoticeProvider.kt @@ -14,5 +14,9 @@ class MoGoNoticeProvider : IMoGoNoticeProvider { override val functionName: String get() = TAG + override fun onDestroy() { + + } + override fun init(context: Context) {} } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt index a0b3723917..6a607149fc 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt @@ -3,9 +3,9 @@ package com.mogo.eagle.core.function.obu.mogo import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MoGoConfig +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.utils.storage.SharedPrefsMgr /** @@ -21,6 +21,10 @@ class MoGoObuProvider : IMoGoObuProvider { override val functionName: String get() = TAG + override fun onDestroy() { + + } + override fun init(context: Context) { LogUtils.dTag(TAG, "初始化蘑菇自研OBU……") diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt index 7860e0c27e..2c0938e101 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/base/IMoGoFunctionServerProvider.kt @@ -1,6 +1,5 @@ package com.mogo.eagle.core.function.api.base -import android.util.Log import com.alibaba.android.arouter.facade.template.IProvider /** @@ -19,7 +18,5 @@ interface IMoGoFunctionServerProvider : IProvider { /** * 功能销毁回调 */ - fun onDestroy() { - Log.d("IMoGoFunctionServerProvider", "onDestroy") - } + fun onDestroy() } \ No newline at end of file