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 0000000000..c9de0b61b9
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_account_head.png differ
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">
+
+
+ app:layout_constraintTop_toBottomOf="@+id/toolBusOperationView" />
+ app:layout_constraintStart_toStartOf="@+id/tv_check_title"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/v_second_group">
+ app:layout_constraintStart_toEndOf="@+id/v_second_group"
+ app:layout_constraintTop_toTopOf="@+id/v_second_group"
+ app:layout_constraintBottom_toBottomOf="@+id/v_second_group"
+ />
-
-
-
-
-
\ No newline at end of file
+ android:layout_marginTop="40px"/>
+
+
+
+
+
\ 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 @@
调试面板
录包设置
车速设置
- 出收车状态
+ 账户信息
系统运行
关机
重启