[2.13.0-arch-opt] move impl of modules from hmi to app

2023-02-07 22:11:51 +08:00
parent 81a22a63cf
commit 8490801138
23 changed files with 176 additions and 150 deletions
--- 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)
    }
--- 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')
    }
 }

--- 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.*

--- 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 {
--- 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
        }

        /**
--- 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)
    }

 }
--- 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?, MainPresenter?>(), MainView,
            // 启动Native内存泄漏监测
            startLeakMonitor()
        }
-        checkMonitorDb()
+        CallerDevaToolsManager.checkMonitorDb()
    }

    private fun startLeakMonitor() {
@@ -255,25 +250,6 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), 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,
--- 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<Int>? = null): Strategy() {
+class DefaultStrategy(private val colors: List<Int>? = null) : Strategy() {

    override fun getColors(): List<Int> = colors ?: listOf(COLOR_BLUE, COLOR_TRANSPARENT)
 }

-class ColorfulStrategy(private val colors: List<Int> = emptyList(), var isLightOn: Boolean): Strategy() {
+class ColorfulStrategy(private val colors: List<Int> = emptyList(), var isLightOn: Boolean) :
+    Strategy() {
    override fun getColors(): List<Int> = 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()
 }