Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade

# Conflicts:
#	core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt

@@ -6,13 +6,16 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AdasOCHData
+import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.LogUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.service.adas.IMogoAdasOCHCallback
+import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.view_autopilot_status.view.*
+import java.util.*
 
 /**
  * @author xiaoyuzhou
@@ -20,8 +23,8 @@ import kotlinx.android.synthetic.main.view_autopilot_status.view.*
  * 自动驾驶状态按钮
  */
 class AutoPilotStatusView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet
+        context: Context,
+        attrs: AttributeSet
 ) : ConstraintLayout(context, attrs), View.OnClickListener, IMogoAdasOCHCallback {
 
     private val TAG = "AutopilotStatusView"
@@ -53,7 +56,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
         when (mAutopilotStatus) {
             0 -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常
                 LogUtils.eTag(TAG, "不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
-                ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
+//                ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
                 // TODO 这里临时触发自动驾驶能力,测试功过这里删除
                 CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(true)
             }
@@ -64,6 +67,15 @@ class AutoPilotStatusView @JvmOverloads constructor(
                 CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(false)
             }
         }
+//        startAutoPilot();
+    }
+    private fun startAutoPilot() {
+        val currentAutopilot = RemoteControlAutoPilotParameters()
+        currentAutopilot.isSpeakVoice = false
+        currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409);
+        currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199730,116.735687);
+        currentAutopilot.vehicleType = 10
+        MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot)
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt

@@ -0,0 +1,66 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.api.check.IMogoCheckListener
+import com.mogo.eagle.core.function.call.check.CallerCheckManager
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import kotlinx.android.synthetic.main.view_check_status.view.*
+
+/**
+ *@author        xiaoyuzhou
+ *@date          2021/8/6 12:25 下午
+ */
+class CheckStatusView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), IMogoCheckListener {
+    private val TAG = "CheckStatusView"
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_check_status, this, true)
+
+        setOnClickListener {
+            // 启动检测页面
+            CallerCheckManager.startCheckActivity(getContext())
+        }
+    }
+
+    private fun showErrorIcon() {
+        errorTipImage.visibility = View.VISIBLE
+    }
+
+    private fun dismissErrorIcon() {
+        errorTipImage.visibility = View.GONE
+    }
+
+    override fun updateMonitoringStatus(state: Int?) {
+        Logger.d(TAG, "updateCheckStatus")
+        if (state == 1) {
+            dismissErrorIcon()
+        } else {
+            showErrorIcon()
+        }
+    }
+
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        Logger.d(TAG, "onAttachedToWindow")
+        //车辆监控
+        CallerCheckManager.registerVehicleMonitoringListener(TAG, this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        Logger.d(TAG, "onDetachedFromWindow")
+        //车辆监控
+        CallerCheckManager.unregisterListener(TAG)
+    }
+
+}

core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml

@@ -61,5 +61,13 @@
         app:layout_goneMarginTop="40px"
         tools:visibility="visible" />
 
+    <com.mogo.eagle.core.function.hmi.ui.widget.CheckStatusView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="40px"
+        android:layout_marginBottom="@dimen/dp_490"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clAutopilotStatus"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <!--车辆检测入口-->
+    <TextView
+        android:id="@+id/moduleHmiCheck"
+        android:layout_width="@dimen/dp_128"
+        android:layout_height="@dimen/dp_128"
+        android:background="@drawable/module_ext_check"
+        android:gravity="center"
+        android:text="检测"
+        android:textColor="#fff"
+        android:textSize="@dimen/module_hmi_btn_text_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <ImageView
+        android:id="@+id/errorTipImage"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        android:src="@drawable/check_error_image"
+        android:visibility="invisible"
+        app:layout_constraintRight_toRightOf="@+id/moduleHmiCheck"
+        app:layout_constraintTop_toTopOf="@+id/moduleHmiCheck" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>