From 7ada4abc45f605c6585e09031cf25fcc8745a33b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 20 Sep 2022 16:00:02 +0800
Subject: [PATCH] =?UTF-8?q?[2110]=20=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/tools/AutoPilotAndCheckView.kt     |   8 ++-
 .../function/hmi/ui/tools/BusOperationView.kt |  16 +++--
 .../res/drawable-xxhdpi/icon_account_head.png | Bin 0 -> 7164 bytes
 .../main/res/layout/view_auto_pilot_check.xml |  40 +++++++-----
 .../res/layout/view_och_bus_operation.xml     |  60 ++++++++++++------
 .../src/main/res/values/strings.xml           |   2 +-
 6 files changed, 80 insertions(+), 46 deletions(-)
 create mode 100755 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_account_head.png

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
index 2dc8c466e2..371667ad77 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
@@ -160,14 +160,16 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
         actvLoginout.onClick {
             EventBus.getDefault().post(EventLogout())
         }
+        actvLoginout.visibility = View.VISIBLE
+        CallerHmiManager.setBusOperationView(toolBusOperationView)
+        EventBus.getDefault().post(EventBusOperation(0))
 
         when (DebugConfig.getProductFlavor()) {
             "fPadLenovoOchTaxi" -> {
-                actvLoginout.visibility = View.VISIBLE
+                //出租车司机
             }
             "fPadLenovoOchBus" ->{
-                CallerHmiManager.setBusOperationView(toolBusOperationView)
-                EventBus.getDefault().post(EventBusOperation(0))
+                //小巴车司机
             }
             else -> {
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
index bfc83e98b9..5eeb8dd0bf 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
@@ -7,6 +7,8 @@ import android.view.View
 import com.mogo.eagle.core.data.temp.EventBusOperation
 import com.mogo.eagle.core.function.api.hmi.view.IOchBusView
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.ShadowUtils
+import com.mogo.eagle.core.utilcode.util.SharedPrefs
 import kotlinx.android.synthetic.main.view_och_bus_operation.view.*
 import org.greenrobot.eventbus.EventBus
 
@@ -23,6 +25,9 @@ class BusOperationView @JvmOverloads constructor(
         init {
             LayoutInflater.from(context).inflate(R.layout.view_och_bus_operation,this,true)
             ochBusOperationStatus.setOnClickListener(this)
+            context?.let {
+                actvAccountPhone.text = SharedPrefs.getInstance(it).getString("account","")
+            }
         }
 
     override fun showBusOperation() {
@@ -30,10 +35,13 @@ class BusOperationView @JvmOverloads constructor(
     }
 
     override fun changerOperationStatus(isOut: Boolean) {
-        if (isOut){
-            ochBusOperationStatusCTV.text = "收车"
-        }else{
-            ochBusOperationStatusCTV.text = "出车"
+
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        context?.let {
+            actvAccountPhone.text = SharedPrefs.getInstance(it).getString("account","")
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_account_head.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_account_head.png
new file mode 100755
index 0000000000000000000000000000000000000000..c9de0b61b99ab6f4d4dbf572b22a52f75626fd06
GIT binary patch
literal 7164
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

literal 0
HcmV?d00001

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
index 88f719956b..fe20f404b3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
@@ -17,24 +17,34 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <com.mogo.eagle.core.function.hmi.ui.tools.BusOperationView
+                android:id="@+id/toolBusOperationView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="162px"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"/>
+
             <View
+                android:id="@+id/v_second_group"
                 android:layout_width="14px"
                 android:layout_height="50px"
                 android:layout_marginStart="80px"
-                android:layout_marginTop="158px"
+                android:layout_marginTop="90px"
                 android:background="@color/color_FF2966EC"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toBottomOf="@+id/toolBusOperationView" />
 
             <LinearLayout
                 android:id="@+id/checkLayout"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="@dimen/dp_216"
-                android:layout_marginTop="@dimen/dp_266"
+                android:layout_marginTop="@dimen/dp_90"
                 android:orientation="horizontal"
                 android:gravity="center_vertical"
-                android:layout_marginStart="113px"
-                app:layout_constraintTop_toTopOf="parent">
+                app:layout_constraintStart_toStartOf="@+id/tv_check_title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/v_second_group">
 
                 <RelativeLayout
                     android:id="@+id/check"
@@ -135,16 +145,18 @@
             </LinearLayout>
 
             <TextView
+                android:id="@+id/tv_check_title"
                 android:layout_width="84px"
                 android:layout_height="86px"
-                android:layout_marginStart="113px"
-                android:layout_marginTop="140px"
+                android:layout_marginStart="19px"
                 android:gravity="center"
                 android:text="检测"
                 android:textColor="@color/color_FFFFFF"
                 android:textSize="42px"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toEndOf="@+id/v_second_group"
+                app:layout_constraintTop_toTopOf="@+id/v_second_group"
+                app:layout_constraintBottom_toBottomOf="@+id/v_second_group"
+                />
 
             <View
                 android:layout_width="14px"
@@ -280,13 +292,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/viewSystemVersion" />
 
-            <com.mogo.eagle.core.function.hmi.ui.tools.BusOperationView
-                android:id="@+id/toolBusOperationView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@+id/systemVersionView"
-                app:layout_constraintStart_toStartOf="parent"/>
-
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/actvLoginout"
                 app:layout_constraintStart_toStartOf="parent"
@@ -298,6 +303,7 @@
                 android:layout_marginBottom="40px"
                 android:text="退出登录"
                 android:visibility="gone"
+                tools:visibility="visible"
                 android:textColor="@android:color/white"
                 android:textSize="42px"
                 android:layout_width="790px"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
index 267d9a844a..6507f81358 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/ochBusOperationStatus"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="40px"
-    android:paddingBottom="40px"
-    android:visibility="gone"
     tools:visibility="visible"
     tools:ignore="DuplicateIds">
 
     <View
         android:id="@+id/bus_operation_view"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         android:layout_width="14px"
         android:layout_height="50px"
         android:layout_marginStart="80px"
@@ -19,27 +19,45 @@
 
     <TextView
         android:id="@+id/tv_bus_operation_title"
+        app:layout_constraintTop_toTopOf="@+id/bus_operation_view"
+        app:layout_constraintBottom_toBottomOf="@+id/bus_operation_view"
+        app:layout_constraintStart_toEndOf="@+id/bus_operation_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="113px"
-        android:gravity="center"
-        android:paddingBottom="4px"
+        android:layout_marginStart="19px"
         android:text="@string/bus_operation_title"
-        android:textColor="@color/color_FFFFFF"
+        android:textColor="@android:color/white"
         android:textSize="42px" />
 
-    <CheckedTextView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/ochBusOperationStatusCTV"
-        android:layout_width="@dimen/och_bus_operation_status_bg_width"
-        android:layout_height="@dimen/och_bus_operation_status_bg_height"
+        app:layout_constraintStart_toStartOf="@+id/tv_bus_operation_title"
+        app:layout_constraintTop_toBottomOf="@+id/tv_bus_operation_title"
+        android:src="@drawable/icon_account_head"
+        android:layout_width="@dimen/dp_120"
+        android:layout_height="@dimen/dp_120"
         android:layout_below="@+id/tv_bus_operation_title"
-        android:layout_marginStart="113px"
-        android:layout_marginTop="40px"
-        android:background="@drawable/bus_operation_status_bg_selector1"
-        android:gravity="center"
-        android:text="出车"
-        android:textAlignment="center"
-        android:textColor="@color/bus_autopilot_text_color_normal"
-        android:textSize="@dimen/module_mogo_och_autopilot_status_text_size"
-        android:textStyle="bold" />
-</RelativeLayout>
\ No newline at end of file
+        android:layout_marginTop="40px"/>
+
+    <View
+        android:id="@+id/v_account_line"
+        app:layout_constraintTop_toTopOf="@+id/ochBusOperationStatusCTV"
+        app:layout_constraintBottom_toBottomOf="@+id/ochBusOperationStatusCTV"
+        app:layout_constraintStart_toEndOf="@+id/ochBusOperationStatusCTV"
+        android:layout_marginStart="@dimen/dp_60"
+        android:background="@android:color/white"
+        android:layout_width="1px"
+        android:layout_height="60px"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/actvAccountPhone"
+        app:layout_constraintTop_toTopOf="@+id/ochBusOperationStatusCTV"
+        app:layout_constraintBottom_toBottomOf="@+id/ochBusOperationStatusCTV"
+        app:layout_constraintStart_toEndOf="@+id/v_account_line"
+        android:layout_marginStart="@dimen/dp_60"
+        android:text="138***1268"
+        android:textSize="@dimen/dp_54"
+        android:textColor="@android:color/white"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
index 44111ae8da..958c053241 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
@@ -23,7 +23,7 @@
     <string name="debug_panel">调试面板</string>
     <string name="debug_panel_fb">录包设置</string>
     <string name="check_vehicle_speed_setting">车速设置</string>
-    <string name="bus_operation_title">出收车状态</string>
+    <string name="bus_operation_title">账户信息</string>
     <string name="check_system_operation">系统运行</string>
     <string name="check_system_shut_down">关机</string>
     <string name="check_system_reboot">重启</string>