Merge branch 'dev_robotaxi-d-app-module_2100_yangyakun_2.10.0' into dev_robotaxi-d-app-module_2100_220816_2.10.0

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt

@@ -9,25 +9,24 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
-import com.mogo.cloud.passport.MoGoAiCloudClient
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.temp.EventLogout
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 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.autopilot.CallerAutopilotCarConfigListenerManager
-import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.utils.KeyBoardUtil
 import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_auto_pilot_check.view.*
 import mogo.telematics.pad.MessagePad
+import org.greenrobot.eventbus.EventBus
 
 /**
  * @author ChenFufeng
@@ -142,6 +141,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
         if (speedLimit > 0) {
             etInputSpeed.setText((speedLimit * 3.6).toInt().toString())
         }
+        initOchView()
 //        // 比如需要设置默认速度
 //        val speed = "30"
 //        etInputSpeed.setText(speed)
@@ -149,6 +149,20 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
 
     }
 
+    private fun initOchView() {
+        actvLoginout.onClick {
+            EventBus.getDefault().post(EventLogout())
+        }
+        when (DebugConfig.getProductFlavor()) {
+            "fPadLenovoOchTaxi" -> {
+                actvLoginout.visibility = View.VISIBLE
+            }
+            else -> {
+
+            }
+        }
+    }
+
     fun setClickListener(clickListener: ClickListener) {
         this.clickListener = clickListener
     }

core/function-impl/mogo-core-function-hmi/src/main/res/drawable/taxi_loginout_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="24px"/>
+
+    <gradient android:startColor="#029DFF" android:endColor="#0056FF"/>
+
+</shape>

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

@@ -252,10 +252,25 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="40px"
                 android:layout_marginBottom="40px"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/viewSystemVersion" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/actvLoginout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/systemVersionView"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:gravity="center"
+                android:background="@drawable/taxi_loginout_bg"
+                android:layout_marginBottom="40px"
+                android:text="退出登录"
+                android:visibility="gone"
+                android:textColor="@android:color/white"
+                android:textSize="42px"
+                android:layout_width="790px"
+                android:layout_height="126px"/>
+
             <com.mogo.eagle.core.function.hmi.ui.tools.SpeedKeyboardView
                 android:id="@+id/sKeyBoardView"
                 android:layout_width="match_parent"