升级ADAS版本,控制台输出adas版本信息

开始重构ADAS的相关内容 Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-14 14:51:05 +08:00
parent 8f9bcb9098
commit b1bb68d57b
22 changed files with 196 additions and 123 deletions
--- a/core/function-impl/mogo-core-function-autopilot/build.gradle
+++ b/core/function-impl/mogo-core-function-autopilot/build.gradle
@@ -51,7 +51,7 @@ dependencies {

    kapt rootProject.ext.dependencies.aroutercompiler

-    implementation "com.zhidao.support.adas:high:1.2.0.2"
+    implementation rootProject.ext.dependencies.adasHigh

    if (Boolean.valueOf(RELEASE)) {

--- 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
@@ -16,8 +16,20 @@ import com.zhidao.support.adas.high.AdasManager
 */
@Route(path = MogoServicePaths.PATH_AUTO_PILOT)
 class MoGoAutoPilotProvider : IMoGoAutoPilotProvider {
-    override fun init(context: Context) {}
-    override fun connectAutoPilot() {}
+
+    override fun init(context: Context) {
+        // 初始化ADAS 域控制器
+        AdasManager.getInstance().create(context)
+
+    }
+
+
+    override fun connectAutoPilot() {
+
+
+    }
+
+
    override fun startAutoPilot(result: AutoPilotControlParameters) {
        if (AdasManager.getInstance().isSocketConnect) {
            val parameter =
@@ -49,6 +61,11 @@ class MoGoAutoPilotProvider : IMoGoAutoPilotProvider {
        return 0
    }

+
+    override fun recordPackage(): Boolean {
+        return AdasManager.getInstance().recordPackage()
+    }
+
    companion object {
        private const val TAG = "MogoAutoPilotProvider"
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -14,7 +14,6 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat
 import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
 import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
-import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView
 import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView
 import com.mogo.module.common.enums.EventTypeEnum
 import com.mogo.utils.logger.Logger
@@ -29,48 +28,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
    MoGoWarningContract.View {

    var mWarningFloat: WarningFloat.Builder? = null
-    var mDebugSettingViewFloat: WarningFloat.Builder? = null

    override fun initViews() {
-        autopilotStatus.setOnLongClickListener {
-            activity?.let {
-                val debugSettingView = DebugSettingView(it)

-                if (mDebugSettingViewFloat != null) {
-                    WarningFloat.dismiss(mDebugSettingViewFloat!!.config.floatTag, false)
-                    mDebugSettingViewFloat = null
-                } else {
-                    mDebugSettingViewFloat = WarningFloat.with(it)
-                        .setTag("DebugSettingView")
-                        .setLayout(debugSettingView)
-                        .setSidePattern(SidePattern.RIGHT)
-                        .setGravity(Gravity.RIGHT, offsetY = 70)
-                        .setImmersionStatusBar(true)
-                        .setAnimator(object : DefaultAnimator() {
-                            override fun enterAnim(
-                                view: View,
-                                params: WindowManager.LayoutParams,
-                                windowManager: WindowManager,
-                                sidePattern: SidePattern
-                            ): Animator? =
-                                super.enterAnim(view, params, windowManager, sidePattern)?.apply {
-                                    interpolator = OvershootInterpolator()
-                                }
-
-                            override fun exitAnim(
-                                view: View,
-                                params: WindowManager.LayoutParams,
-                                windowManager: WindowManager,
-                                sidePattern: SidePattern
-                            ): Animator? =
-                                super.exitAnim(view, params, windowManager, sidePattern)
-                                    ?.setDuration(200)
-                        })
-                        .show()
-                }
-            }
-            false
-        }
    }

    override fun getLayoutId(): Int {
--- 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
@@ -13,6 +13,7 @@ import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotStatusListener
 import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.obu.CallerOBUManager
 import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
@@ -92,6 +93,11 @@ class DebugSettingView @JvmOverloads constructor(
                ToastUtils.showShort("请输入正确的IP地址")
            }
        }
+
+        // 域控制器
+        btnRecordPackage.setOnClickListener {
+            CallerAutoPilotManager.recordPackage()
+        }
    }

    /**
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
@@ -1,22 +1,27 @@
 package com.mogo.eagle.core.function.hmi.ui.widget

+import android.animation.Animator
 import android.content.Context
-import android.content.Intent
 import android.graphics.Color
 import android.location.Location
 import android.util.AttributeSet
 import android.util.Log
 import android.view.Gravity
 import android.view.View
+import android.view.WindowManager
+import android.view.animation.OvershootInterpolator
 import android.widget.FrameLayout
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.commons.debug.DebugConfig
-import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.data.map.MogoLatLng
-import com.mogo.map.navi.IMogoCarLocationChangedListener2
-import com.mogo.module.common.MogoApisHandler
-import com.mogo.service.IMogoServiceApis
 import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.data.map.MogoLatLng
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.hmi.notification.WarningFloat
+import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
+import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
+import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView
+import com.mogo.map.navi.IMogoCarLocationChangedListener2
+import com.mogo.service.IMogoServiceApis
 import com.mogo.service.statusmanager.IMogoStatusChangedListener
 import com.mogo.service.statusmanager.StatusDescriptor

@@ -38,6 +43,7 @@ class SpeedPanelView @JvmOverloads constructor(

    var mContext: Context
    var mSpeedChartView: SpeedChartView
+    var mDebugSettingViewFloat: WarningFloat.Builder? = null

    init {
        setBackgroundResource(R.drawable.yi_biao_pan_bg_nor)
@@ -54,12 +60,45 @@ class SpeedPanelView @JvmOverloads constructor(

        if (DebugConfig.isDebug()) {
            mSpeedChartView.isLongClickable = true
-            mSpeedChartView.setOnLongClickListener { v ->
+            mSpeedChartView.setOnLongClickListener {
                Log.d(TAG, "长按显示状态工具栏")
-                val intent = Intent()
-                intent.putExtra("oper", 52)
-                MogoApisHandler.getInstance().apis.intentManagerApi
-                    .invoke("com.mogo.mock", intent)
+                context.let {
+                    val debugSettingView = DebugSettingView(it)
+
+                    if (mDebugSettingViewFloat != null) {
+                        WarningFloat.dismiss(mDebugSettingViewFloat!!.config.floatTag, false)
+                        mDebugSettingViewFloat = null
+                    } else {
+                        mDebugSettingViewFloat = WarningFloat.with(it)
+                            .setTag("DebugSettingView")
+                            .setLayout(debugSettingView)
+                            .setSidePattern(SidePattern.RIGHT)
+                            .setGravity(Gravity.RIGHT, offsetY = 70)
+                            .setImmersionStatusBar(true)
+                            .setAnimator(object : DefaultAnimator() {
+                                override fun enterAnim(
+                                    view: View,
+                                    params: WindowManager.LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                                ): Animator? =
+                                    super.enterAnim(view, params, windowManager, sidePattern)
+                                        ?.apply {
+                                            interpolator = OvershootInterpolator()
+                                        }
+
+                                override fun exitAnim(
+                                    view: View,
+                                    params: WindowManager.LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                                ): Animator? =
+                                    super.exitAnim(view, params, windowManager, sidePattern)
+                                        ?.setDuration(200)
+                            })
+                            .show()
+                    }
+                }
                true
            }
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -97,6 +97,15 @@
                    android:textSize="@dimen/dp_34"
                    android:textStyle="bold" />

+                <Button
+                    android:id="@+id/btnRecordPackage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:padding="@dimen/dp_5"
+                    android:text="录制Bag包"
+                    android:textSize="@dimen/dp_34" />
+
                <TextView
                    android:id="@+id/tvAutopilotInfo"
                    android:layout_width="match_parent"
--- a/core/function-impl/mogo-core-function-map/build.gradle
+++ b/core/function-impl/mogo-core-function-map/build.gradle
@@ -51,7 +51,7 @@ dependencies {

    kapt rootProject.ext.dependencies.aroutercompiler

-    implementation "com.zhidao.support.adas:high:1.2.0.2"
+    implementation rootProject.ext.dependencies.adasHigh

    if (Boolean.valueOf(RELEASE)) {

--- a/core/function-impl/mogo-core-function-v2x/build.gradle
+++ b/core/function-impl/mogo-core-function-v2x/build.gradle
@@ -51,7 +51,7 @@ dependencies {

    kapt rootProject.ext.dependencies.aroutercompiler

-    implementation "com.zhidao.support.adas:high:1.2.0.2"
+    implementation rootProject.ext.dependencies.adasHigh

    if (Boolean.valueOf(RELEASE)) {