diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle index 294c1c9b8f..6ae4e9b720 100644 --- a/OCH/mogo-och-bus-passenger/build.gradle +++ b/OCH/mogo-och-bus-passenger/build.gradle @@ -54,12 +54,6 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_function_v2x - }else { - implementation project(':foudations:mogo-aicloud-services-sdk') - implementation project(':core:function-impl:mogo-core-function-v2x') - } } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/mogo-och-common-module/build.gradle b/OCH/mogo-och-common-module/build.gradle index 30165c39bd..54bfc93114 100644 --- a/OCH/mogo-och-common-module/build.gradle +++ b/OCH/mogo-och-common-module/build.gradle @@ -60,20 +60,17 @@ dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogoutils api rootProject.ext.dependencies.mogocommons - api rootProject.ext.dependencies.mogo_core_data api rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_function_v2x api rootProject.ext.dependencies.mogo_core_function_hmi + api rootProject.ext.dependencies.mogo_core_function_map }else { api project(":core:mogo-core-utils") api project(":foudations:mogo-commons") - api project(':core:mogo-core-data') api project(':core:mogo-core-function-call') - implementation project(':core:function-impl:mogo-core-function-v2x') api project(':core:function-impl:mogo-core-function-hmi') api project(':core:function-impl:mogo-core-function-map') } - implementation project(':libraries:mogo-adas') + compileOnly project(':libraries:mogo-adas') } \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java index e5b39d9b9d..83332d1bb8 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java @@ -4,12 +4,10 @@ import android.content.Context; import androidx.annotation.Nullable; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatisticsListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager; -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; import com.zhidao.support.adas.high.bean.AutopilotStatistics; diff --git a/OCH/mogo-och-noop/build.gradle b/OCH/mogo-och-noop/build.gradle index 835c4f0715..1b12fcd129 100644 --- a/OCH/mogo-och-noop/build.gradle +++ b/OCH/mogo-och-noop/build.gradle @@ -60,7 +60,6 @@ dependencies { }else { implementation project(":core:mogo-core-utils") implementation project(":foudations:mogo-commons") - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') implementation project(':core:function-impl:mogo-core-function-hmi') } diff --git a/OCH/mogo-och-taxi-passenger/build.gradle b/OCH/mogo-och-taxi-passenger/build.gradle index 529b500e72..6d9432cc53 100644 --- a/OCH/mogo-och-taxi-passenger/build.gradle +++ b/OCH/mogo-och-taxi-passenger/build.gradle @@ -57,11 +57,6 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_function_v2x - }else { - implementation project(':core:function-impl:mogo-core-function-v2x') - } } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/OCH/mogo-och-taxi/build.gradle b/OCH/mogo-och-taxi/build.gradle index 8266377d23..37195198e7 100644 --- a/OCH/mogo-och-taxi/build.gradle +++ b/OCH/mogo-och-taxi/build.gradle @@ -55,11 +55,6 @@ dependencies { implementation project(":OCH:mogo-och-common-module") compileOnly project(":libraries:mogo-map") - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_function_v2x - }else { - implementation project(':core:function-impl:mogo-core-function-v2x') - } } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e70a3c65ef..33ac1066ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -341,21 +341,44 @@ dependencies { implementation rootProject.ext.dependencies.lancetx_runtime implementation rootProject.ext.dependencies.mogocustommap implementation project(':core:function-impl:mogo-core-function-startup') + implementation project(':libraries:map-usbcamera') // // 暂不使用Shizuku-API // implementation rootProject.ext.dependencies.shizuku_provider if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.ttspad implementation rootProject.ext.dependencies.mogo_core_function_hmi + implementation rootProject.ext.dependencies.mogocommons + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_function_map + implementation rootProject.ext.dependencies.mogo_core_function_v2x + implementation rootProject.ext.dependencies.mogo_core_function_datacenter + implementation rootProject.ext.dependencies.mogo_core_function_devatools + implementation rootProject.ext.dependencies.mogo_core_function_chat + implementation rootProject.ext.dependencies.mogo_core_function_biz + implementation rootProject.ext.dependencies.mogo_core_function_call androidTestImplementation rootProject.ext.dependencies.mogo_core_function_call androidTestImplementation rootProject.ext.dependencies.mogo_core_res } else { implementation project(':tts:tts-pad') implementation project(':core:function-impl:mogo-core-function-hmi') + implementation project(':core:function-impl:mogo-core-function-map') + implementation project(':core:function-impl:mogo-core-function-v2x') + implementation project(':core:function-impl:mogo-core-function-datacenter') + implementation project(':core:function-impl:mogo-core-function-devatools') + implementation project(':core:function-impl:mogo-core-function-chat') + implementation project(':core:function-impl:mogo-core-function-biz') + implementation project(':core:mogo-core-function-call') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-res') + implementation project(':foudations:mogo-commons') + androidTestImplementation project(':core:mogo-core-function-call') androidTestImplementation project(':core:mogo-core-res') + } + apply from: "./functions/och.gradle" androidTestImplementation rootProject.ext.dependencies.androidx_test_core diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 83b36492e8..6d32280c78 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -13,7 +13,9 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager +import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager import com.zhjt.mogo_core_function_devatools.binding.BindingCarManager.Companion.bindingCarManager import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter @@ -21,6 +23,8 @@ import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager import com.zhjt.mogo_core_function_devatools.mofang.MoFangManager.Companion.moFangManager import com.zhjt.mogo_core_function_devatools.monitor.MonitorManager +import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb +import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb.Companion.getDb import com.zhjt.mogo_core_function_devatools.report.IPCReportManager.Companion.iPCReportManager import com.zhjt.mogo_core_function_devatools.scene.SceneManager.Companion.sceneManager import com.zhjt.mogo_core_function_devatools.status.StatusManager @@ -55,6 +59,27 @@ class DevaToolsProvider : IDevaToolsProvider { bindingCarManager.init(mContext!!) } + override fun checkMonitorDb() { + mContext?.let { + Thread { + val limitId: Long = 50001 + val file = it.getDatabasePath(MonitorDb.INTERNAL_DB_NAME) + try { + if (file != null && file.exists()) { + val cpuList = getDb(it).monitorDao().getAllCPUById(limitId) + val memList = getDb(it).monitorDao().getAllMemById(limitId) + // 大于5w条清除 + if (cpuList.isNotEmpty() || memList.isNotEmpty()) { + it.deleteDatabase(MonitorDb.INTERNAL_DB_NAME) + } + } + } catch (e: Exception) { + CallerLogger.e(TAG, e.message) + } + }.start() + } + } + override fun startLogCatch() { MogoLogCatchManager.startCatchLog() } @@ -148,6 +173,26 @@ class DevaToolsProvider : IDevaToolsProvider { return EnvChangeManager.getEnvConfig() } + override fun getEnvCityName(): String { + return EnvChangeManager.getCityName() + } + + override fun getEnvNetMode(): String { + return EnvChangeManager.getNetMode() + } + + override fun envConfigReset() { + EnvChangeManager.reset() + } + + override fun envConfigChange(cityCode: String, netMode: Int) { + EnvChangeManager.changeTo(cityCode, netMode) + } + + override fun dockerVersion(dockerVersion: String?) { + BadCaseConfig.dockerVersion = dockerVersion + } + override fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) { bindingCarManager.modifyCarInfo(callBack) } diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index d5bdc3d080..6d4c8edbba 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -78,39 +78,25 @@ dependencies { implementation rootProject.ext.dependencies.koomnative implementation rootProject.ext.dependencies.koomxhook if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - api rootProject.ext.dependencies.mogoaicloudservicesdk - api rootProject.ext.dependencies.mogocommons - api rootProject.ext.dependencies.mogomap - api rootProject.ext.dependencies.crashreportupgrade - api rootProject.ext.dependencies.mogo_core_res - api rootProject.ext.dependencies.mogo_core_data - api rootProject.ext.dependencies.mogo_core_utils - api rootProject.ext.dependencies.mogo_core_network - api rootProject.ext.dependencies.mogo_core_function_map - api rootProject.ext.dependencies.mogo_core_function_v2x - api rootProject.ext.dependencies.mogo_core_function_devatools - api rootProject.ext.dependencies.mogo_core_function_call - - implementation project(':libraries:map-usbcamera') + compileOnly rootProject.ext.dependencies.mogocommons + compileOnly rootProject.ext.dependencies.mogo_core_res + compileOnly rootProject.ext.dependencies.mogo_core_utils + compileOnly rootProject.ext.dependencies.mogo_core_function_map + compileOnly rootProject.ext.dependencies.mogo_core_function_devatools + compileOnly rootProject.ext.dependencies.mogo_core_function_datacenter + compileOnly rootProject.ext.dependencies.mogo_core_function_call + compileOnly project(':libraries:mogo-adas') } else { - api project(':foudations:mogo-aicloud-services-sdk') - api project(':foudations:mogo-commons') api project(':test:crashreport-upgrade') api project(':test:crashreport-apmbyte') - api project(':core:mogo-core-res') - api project(':core:mogo-core-data') - api project(':core:mogo-core-utils') - api project(':core:function-impl:mogo-core-function-map') - api project(':core:function-impl:mogo-core-function-v2x') - api project(':core:function-impl:mogo-core-function-devatools') - api project(':core:function-impl:mogo-core-function-chat') - api project(':core:function-impl:mogo-core-function-datacenter') - api project(':core:function-impl:mogo-core-function-biz') - api project(':core:mogo-core-function-call') - api project(':libraries:mogo-adas') - api project(':libraries:map-usbcamera') + compileOnly project(':core:function-impl:mogo-core-function-datacenter') + compileOnly project(':foudations:mogo-commons') + compileOnly project(':core:mogo-core-res') + compileOnly project(':core:mogo-core-utils') + compileOnly project(':core:mogo-core-function-call') + compileOnly project(':libraries:mogo-adas') } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index d36deb67f5..db43edc926 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -7,18 +7,15 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager -import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgCategory import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.DriverMsgBoxBubbleAdapter import com.mogo.eagle.core.function.msgbox.MsgBoxConfig -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_driver_msg_box_bubble.view.* 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 0a9dc643c1..21d831a626 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 @@ -45,7 +45,6 @@ import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.api.obu.IMoGoObuConnectListener -import com.mogo.eagle.core.function.business.routeoverlay.* import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager @@ -76,7 +75,6 @@ import com.mogo.map.uicontroller.VisualAngleMode.* import com.mogo.support.obu.MogoObuManager import com.mogo.support.obu.constants.MogoObuLogLevel import com.mogo.support.obu.option.MogoObuLog -import com.zhjt.mogo_core_function_devatools.env.* import kotlinx.android.synthetic.main.view_debug_setting.view.* import kotlinx.coroutines.launch import mogo.telematics.pad.MessagePad @@ -931,7 +929,7 @@ internal class DebugSettingView @JvmOverloads constructor( } //切换环境 - tvCurEnv.text = "当前环境:${EnvChangeManager.getCityName()}${EnvChangeManager.getNetMode()}" + tvCurEnv.text = "当前环境:${CallerDevaToolsManager.getEnvCityName()}${CallerDevaToolsManager.getEnvNetMode()}" btChangeEnv.onClick { PopupMenu(context, btChangeEnv).also { p -> p.menuInflater.inflate(R.menu.menu_env_pop, p.menu) @@ -945,19 +943,19 @@ internal class DebugSettingView @JvmOverloads constructor( return@setOnMenuItemClickListener false } R.id.env_reset -> - EnvChangeManager.reset() + CallerDevaToolsManager.envConfigReset() R.id.hy_product -> - EnvChangeManager.changeTo("0734", DebugConfig.NET_MODE_RELEASE) + CallerDevaToolsManager.envConfigChange("0734", DebugConfig.NET_MODE_RELEASE) R.id.hy_qa -> - EnvChangeManager.changeTo("0734", DebugConfig.NET_MODE_QA) + CallerDevaToolsManager.envConfigChange("0734", DebugConfig.NET_MODE_QA) R.id.hy_demo -> - EnvChangeManager.changeTo("0734", DebugConfig.NET_MODE_DEMO) + CallerDevaToolsManager.envConfigChange("0734", DebugConfig.NET_MODE_DEMO) R.id.bj_product -> - EnvChangeManager.changeTo("010", DebugConfig.NET_MODE_RELEASE) + CallerDevaToolsManager.envConfigChange("010", DebugConfig.NET_MODE_RELEASE) R.id.bj_qa -> - EnvChangeManager.changeTo("010", DebugConfig.NET_MODE_QA) + CallerDevaToolsManager.envConfigChange("010", DebugConfig.NET_MODE_QA) R.id.bj_demo -> - EnvChangeManager.changeTo("010", DebugConfig.NET_MODE_DEMO) + CallerDevaToolsManager.envConfigChange("010", DebugConfig.NET_MODE_DEMO) else -> throw AssertionError("invalid item: $item") } @@ -1098,17 +1096,9 @@ internal class DebugSettingView @JvmOverloads constructor( accelerationIsShow = isChecked } - tbRouteDynamicEffect.isChecked = - AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !AppIdentityModeUtils.isBus( - FunctionBuildConfig.appIdentityMode - ) - + tbRouteDynamicEffect.isChecked = HmiBuildConfig.isShowRouteStrategy tbRouteDynamicEffect.setOnCheckedChangeListener { _, isChecked -> - if (isChecked) { - RouteStrategy.enable(true) - } else { - RouteStrategy.enable(false) - } + HmiBuildConfig.isShowRouteStrategy = isChecked } btnThresholdDefine.setOnClickListener { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 91b2aa4cdc..0569eda8fe 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -18,7 +18,6 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.kotlin.currentPadding import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.eagle.core.function.business.routeoverlay.RouteStrategy import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView @@ -64,16 +63,9 @@ internal class SOPSettingView @JvmOverloads constructor( } //引导线动态效果 - tbRouteDynamicEffect.isChecked = - AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !AppIdentityModeUtils.isBus( - FunctionBuildConfig.appIdentityMode - ) + tbRouteDynamicEffect.isChecked = HmiBuildConfig.isShowRouteStrategy tbRouteDynamicEffect.setOnCheckedChangeListener { _, isChecked -> - if (isChecked) { - RouteStrategy.enable(true) - } else { - RouteStrategy.enable(false) - } + HmiBuildConfig.isShowRouteStrategy = isChecked } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt index d96ffd36c6..9ecca9d6e0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt @@ -9,11 +9,11 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import kotlinx.android.synthetic.main.view_version_name.view.* /** @@ -90,7 +90,7 @@ class VersionNameView @JvmOverloads constructor( dockerVersion = autoPilotStatusInfo.dockVersion showCurrentMapVersion() //将工控机版本赋值给BadCase配置常量 - BadCaseConfig.dockerVersion = autoPilotStatusInfo.dockVersion + CallerDevaToolsManager.dockerVersion(autoPilotStatusInfo.dockVersion) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt index 8f73f73bd7..01cd77d9ef 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt @@ -50,14 +50,9 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.map.listener.MogoMapListenerHandler.Companion.mogoMapListenerHandler import com.mogo.map.uicontroller.EnumMapUI -import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb -import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb.Companion.getDb import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD import kotlinx.android.synthetic.main.module_main_activity_main.* -import mogo.telematics.pad.MessagePad -import mogo_msg.MogoReportMsg -import system_master.SystemStatusInfo /** * @author congtaowang @@ -223,7 +218,7 @@ open class MainActivity : MvpActivity(), MainView, // 启动Native内存泄漏监测 startLeakMonitor() } - checkMonitorDb() + CallerDevaToolsManager.checkMonitorDb() } private fun startLeakMonitor() { @@ -255,25 +250,6 @@ open class MainActivity : MvpActivity(), MainView, start() } - private fun checkMonitorDb() { - Thread { - val limitId: Long = 50001 - val file = getDatabasePath(MonitorDb.INTERNAL_DB_NAME) - try { - if (file != null && file.exists()) { - val cpuList = getDb(this).monitorDao().getAllCPUById(limitId) - val memList = getDb(this).monitorDao().getAllMemById(limitId) - // 大于5w条清除 - if (cpuList.isNotEmpty() || memList.isNotEmpty()) { - deleteDatabase(MonitorDb.INTERNAL_DB_NAME) - } - } - } catch (e: Exception) { - e(TAG, e.message) - } - }.start() - } - @ChainLog( linkChainLog = ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK, linkCode = ChainConstant.CHAIN_LINK_LEAK, diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteStrategy.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteStrategy.kt index 9da60d4c24..842b39524f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteStrategy.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteStrategy.kt @@ -1,16 +1,17 @@ package com.mogo.eagle.core.function.business.routeoverlay -import android.animation.* -import android.graphics.* -import android.view.animation.* -import com.mogo.eagle.core.data.config.* -import com.mogo.eagle.core.utilcode.mogo.* +import android.animation.ArgbEvaluator +import android.graphics.Color +import android.view.animation.AccelerateInterpolator +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.function.business.routeoverlay.Colors.Companion.COLOR_BLUE import com.mogo.eagle.core.function.business.routeoverlay.Colors.Companion.COLOR_BLUE_DARK import com.mogo.eagle.core.function.business.routeoverlay.Colors.Companion.COLOR_RED_DARK import com.mogo.eagle.core.function.business.routeoverlay.Colors.Companion.COLOR_TRANSPARENT +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import java.util.* -import kotlin.collections.ArrayList +import kotlin.properties.Delegates interface IStrategy { @@ -22,26 +23,31 @@ class Colors { companion object { val COLOR_BLUE = Color.parseColor("#FF2ABAD9") val COLOR_BLUE_DARK = Color.parseColor("#FF074EFF") - val COLOR_RED_DARK = Color.parseColor("#FFFF5F00") - val COLOR_TRANSPARENT = Color.parseColor("#002ABAD9") + val COLOR_RED_DARK = Color.parseColor("#FFFF5F00") + val COLOR_TRANSPARENT = Color.parseColor("#002ABAD9") } } -sealed class Strategy: IStrategy +sealed class Strategy : IStrategy -class DefaultStrategy(private val colors: List? = null): Strategy() { +class DefaultStrategy(private val colors: List? = null) : Strategy() { override fun getColors(): List = colors ?: listOf(COLOR_BLUE, COLOR_TRANSPARENT) } -class ColorfulStrategy(private val colors: List = emptyList(), var isLightOn: Boolean): Strategy() { +class ColorfulStrategy(private val colors: List = emptyList(), var isLightOn: Boolean) : + Strategy() { override fun getColors(): List = colors } object RouteStrategy { - @Volatile - private var isEnable = !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) + private var isEnable by Delegates.observable(HmiBuildConfig.isShowRouteStrategy) { _, _, newValue -> + if (!newValue) { + strategy = null + colors.clear() + } + } private var strategy: Strategy? = null @@ -57,14 +63,6 @@ object RouteStrategy { private var hasLessThan0 = false - fun enable(enable: Boolean) { - isEnable = enable - if (!enable) { - strategy = null - colors.clear() - } - } - fun start() { if (sorted.isEmpty()) { fill() @@ -89,7 +87,7 @@ object RouteStrategy { } fun check(speed: Double, acc: Double, total: Int) { - if (!isEnable){ + if (!isEnable) { return } if (sorted.isEmpty()) { @@ -112,7 +110,11 @@ object RouteStrategy { } else { if (endEvaluator != null) { val fraction = (index - last) * 1.0f / delta - colors += endEvaluator!!.evaluate(fraction, startColor, COLOR_TRANSPARENT) as Int + colors += endEvaluator!!.evaluate( + fraction, + startColor, + COLOR_TRANSPARENT + ) as Int } } } else { @@ -156,11 +158,14 @@ object RouteStrategy { total = endValue - startValue while (current <= endValue) { val fraction = (current - startValue) / total - val colorValue = evaluator.evaluate(fraction.toFloat(), COLOR_BLUE, COLOR_BLUE_DARK) as Int + val colorValue = + evaluator.evaluate(fraction.toFloat(), COLOR_BLUE, COLOR_BLUE_DARK) as Int sorted[current] = colorValue current += step } } - fun getStrategy(): Strategy = if (isEnable) { (strategy ?: DefaultStrategy()) } else DefaultStrategy() + fun getStrategy(): Strategy = if (isEnable) { + (strategy ?: DefaultStrategy()) + } else DefaultStrategy() } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt index 318111a8de..01d8b51754 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -1,5 +1,7 @@ package com.mogo.eagle.core.data.config +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils + /** * @author xiaoyuzhou * @date 2021/8/24 8:59 下午 @@ -26,6 +28,13 @@ object HmiBuildConfig { @Volatile var isShowSnBindingView = true + /** + * 是否展示 引导线动态效果 + */ + @JvmField + @Volatile + var isShowRouteStrategy = !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) + /** * 是否展示obu的弱势交通 */ diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoFragmentPaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoFragmentPaths.java index 5490f47415..fed9aaf23d 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoFragmentPaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoFragmentPaths.java @@ -15,9 +15,4 @@ public class MoGoFragmentPaths { @Deprecated public static final String PATH_FRAGMENT_SMP = "/smp_ui/"; - /** - * 全览模式地图 Fragment - */ - @Keep - public static final String PATH_FRAGMENT_OVERVIEW = "/overview_ui/"; } diff --git a/core/mogo-core-function-api/build.gradle b/core/mogo-core-function-api/build.gradle index d1e326c4c5..bb7c323f18 100644 --- a/core/mogo-core-function-api/build.gradle +++ b/core/mogo-core-function-api/build.gradle @@ -51,7 +51,7 @@ dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_data - implementation project(path: ':libraries:mogo-adas') + compileOnly project(path: ':libraries:mogo-adas') compileOnly rootProject.ext.dependencies.mogomapapi } else { implementation project(':core:mogo-core-data') diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index 38480a3936..bd6fc6f58b 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -22,6 +22,8 @@ interface IDevaToolsProvider : IProvider { */ fun initBiz() + fun checkMonitorDb() + /** * 开始抓取日志，默认10min */ @@ -160,4 +162,14 @@ interface IDevaToolsProvider : IProvider { fun queryAppUpgrade() fun getEnvConfig(): EnvConfig? + + fun getEnvCityName():String + + fun getEnvNetMode():String + + fun envConfigReset() + + fun envConfigChange(cityCode: String, netMode: Int) + + fun dockerVersion(dockerVersion: String?) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index 6631dd2382..753a80650d 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -28,6 +28,10 @@ object CallerDevaToolsManager { devaToolsProviderApi?.initBiz() } + fun checkMonitorDb(){ + devaToolsProviderApi?.checkMonitorDb() + } + /** * 开始抓取全量日志 */ @@ -177,6 +181,22 @@ object CallerDevaToolsManager { return devaToolsProviderApi?.getEnvConfig() } + fun getEnvCityName():String?{ + return devaToolsProviderApi?.getEnvCityName() + } + + fun getEnvNetMode():String?{ + return devaToolsProviderApi?.getEnvNetMode() + } + + fun envConfigReset(){ + devaToolsProviderApi?.envConfigReset() + } + + fun envConfigChange(cityCode: String, netMode: Int){ + devaToolsProviderApi?.envConfigChange(cityCode, netMode) + } + fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit){ devaToolsProviderApi?.modifyCarInfo(callBack) } @@ -193,6 +213,10 @@ object CallerDevaToolsManager { devaToolsProviderApi?.queryContainers(padSn, dockerVersion) } + fun dockerVersion(dockerVersion: String?){ + devaToolsProviderApi?.dockerVersion(dockerVersion) + } + fun queryAppUpgrade(){ devaToolsProviderApi?.queryAppUpgrade() } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt index 8a30c3b6f3..1b2f35eff9 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt @@ -18,10 +18,6 @@ object CallerSmpManager : CallerBase() { // get() = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP) // .navigation() as IMogoSmallMapProvider -// private val mogoOverViewMapProvider: IMogoSmallMapProvider -// get() = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_OVERVIEW) -// .navigation() as IMogoSmallMapProvider - private val v2xProvider: IV2XEventProvider get() = ARouter.getInstance().build(MogoServicePaths.PATH_V2X_MODULE) .navigation() as IV2XEventProvider @@ -63,11 +59,9 @@ object CallerSmpManager : CallerBase() { if (Thread.currentThread() !== Looper.getMainLooper().thread) { UiThreadHandler.post { v2xProvider.queryWholeRoadEvents() -// mogoOverViewMapProvider.startQueryV2XEvents() } } else { v2xProvider.queryWholeRoadEvents() -// mogoOverViewMapProvider.startQueryV2XEvents() } } diff --git a/modules.txt b/modules.txt index 775878c1c2..c49fc8b512 100644 --- a/modules.txt +++ b/modules.txt @@ -24,3 +24,4 @@ :core:function-impl:mogo-core-function-v2x :core:function-impl:mogo-core-function-chat :core:function-impl:mogo-core-function-devatools +:core:function-impl:mogo-core-function-biz diff --git a/settings.gradle b/settings.gradle index ca6928c12d..db91eb860a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -68,4 +68,3 @@ include ':OCH:mogo-och-taxi-passenger' include ':OCH:mogo-och-noop' include(':OCH:mogo-och-common-module') include ':OCH:mogo-och-sweeper' -include ':mogo-core-function-biz'