yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2100_220816_2.10.0' into dev_robotaxi-d-app-module_2100_220816_2.10.0

Browse Source
This commit is contained in:
“donghongyu-mackbook”
2022-08-25 10:52:43 +08:00
parent 0c681639fa 5d5b53a019
commit ced1fddf61
15 changed files with 96 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
View File

@@ -89,6 +89,7 @@ import com.mogo.module.common.enums.*
import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
import kotlinx.android.synthetic.main.fragment_hmi.*
import kotlinx.android.synthetic.main.view_auto_pilot_check.view.*
import kotlinx.android.synthetic.main.view_och_bus_operation.view.*
import kotlinx.coroutines.*
import mogo_msg.MogoReportMsg
import org.greenrobot.eventbus.EventBus
@@ -338,6 +339,7 @@ import java.util.*
override fun setBusOperationView(view: IOchBusView) {
busOperationStatus = view
busOperationStatus?.showBusOperation()
}
/**

9
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bus_operation_status_bg.xml
View File

@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<!-- <corners android:radius="@dimen/module_mogo_och_autopilot_status_bg_corner" />-->
<gradient
android:startColor="#323C6F"
android:endColor="#323C6F"
android:startColor="#6D7BAF"
android:endColor="#3B4577"
android:angle="315"
/>
<size
android:width="120px"
android:height="120px"
android:width="150px"
android:height="150px"
/>
</shape>

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
View File

@@ -6,6 +6,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="40px"
android:paddingBottom="40px"
android:visibility="gone"
tools:ignore="DuplicateIds">
<View

6
core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -60,9 +60,9 @@
<dimen name="hmi_traffic_light_time_size">60px</dimen>
<dimen name="hmi_traffic_light_source_size">32px</dimen>
<dimen name="och_bus_operation_status_bg_width">112px</dimen>
<dimen name="och_bus_operation_status_bg_height">112px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_size">40px</dimen>
<dimen name="och_bus_operation_status_bg_width">150px</dimen>
<dimen name="och_bus_operation_status_bg_height">150px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_size">42px</dimen>
<dimen name="module_mogo_och_margin_left">40px</dimen>
<dimen name="module_mogo_och_margin_bottom">46px</dimen>

6
core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
View File

@@ -60,9 +60,9 @@
<dimen name="hmi_traffic_light_time_size">60px</dimen>
<dimen name="hmi_traffic_light_source_size">32px</dimen>
<dimen name="och_bus_operation_status_bg_width">100px</dimen>
<dimen name="och_bus_operation_status_bg_height">100px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_size">30px</dimen>
<dimen name="och_bus_operation_status_bg_width">150px</dimen>
<dimen name="och_bus_operation_status_bg_height">150px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_size">42px</dimen>
<dimen name="module_mogo_och_margin_left">40px</dimen>
<dimen name="module_mogo_och_margin_bottom">46px</dimen>
</resources>