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

Merge branch 'dev_hawk_eye' into dev_merge_shuyi_vr_map

Browse Source
This commit is contained in:
tongchenfei
2020-12-08 17:56:05 +08:00
parent b8ab1ce5e7 fb0a377383
commit f57361ea76
27 changed files with 399 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_navi_in_vr_speed_bg.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/module_ext_navi_in_vr_speed_bg_width"
android:height="@dimen/module_ext_navi_in_vr_speed_bg_height" />
<gradient
android:startColor="#FF344687"
android:endColor="#FF141C35" />
<corners android:radius="@dimen/module_ext_navi_in_vr_bg_corner" />
</shape>

17
modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_navi_in_vr_traffic_bg.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/module_ext_navi_in_vr_speed_bg_width"
android:height="@dimen/module_ext_navi_in_vr_traffic_bg_height" />
<gradient
android:startColor="#FF131D42"
android:centerColor="#FF080F25"
android:endColor="#FF121A35"
android:angle="0"/>
<corners android:bottomLeftRadius="@dimen/module_ext_navi_in_vr_bg_corner"
android:bottomRightRadius="@dimen/module_ext_navi_in_vr_bg_corner"/>
</shape>

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_no_time.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 B

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_straight_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_straight_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_straight_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_straight_yellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_around_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_around_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_around_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_around_yellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_left_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_left_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_left_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_left_yellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_right_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_right_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_right_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_dw_traffic_turn_right_yellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

15
modules/mogo-module-extensions/src/main/res/drawable/module_ext_navi_in_vr_bg.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/module_ext_navi_in_vr_width"
android:height="@dimen/module_ext_navi_in_vr_height" />
<gradient
android:startColor="#9C4F77D1"
android:centerColor="#68203784"
android:endColor="#68203784" />
<corners android:radius="@dimen/module_ext_navi_in_vr_bg_corner" />
</shape>

12
modules/mogo-module-extensions/src/main/res/drawable/module_ext_vr_mode_limit_speed_bg.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size
android:height="@dimen/module_ext_navi_in_vr_limit_speed_size"
android:width="@dimen/module_ext_navi_in_vr_limit_speed_size" />
<gradient
android:startColor="#FF222F5B"
android:endColor="#FF1F2A54" />
</shape>

116
modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml Normal file
View File

@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<merge 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"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<View
android:layout_width="@dimen/module_ext_navi_in_vr_width"
android:layout_height="@dimen/module_ext_navi_in_vr_height"
android:id="@+id/module_ext_id_navi_in_vr_bg"
android:background="@drawable/module_ext_navi_in_vr_bg"/>
<View
android:id="@+id/module_ext_id_navi_in_vr_speed_bg"
android:layout_width="@dimen/module_ext_navi_in_vr_speed_bg_width"
android:layout_height="@dimen/module_ext_navi_in_vr_speed_bg_height"
android:background="@drawable/module_ext_navi_in_vr_speed_bg"
app:layout_constraintLeft_toLeftOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintTop_toTopOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintBottom_toBottomOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintRight_toRightOf="@id/module_ext_id_navi_in_vr_bg"/>
<View
android:id="@+id/module_ext_id_navi_in_vr_traffic_bg"
android:layout_width="@dimen/module_ext_navi_in_vr_speed_bg_width"
android:layout_height="@dimen/module_ext_navi_in_vr_traffic_bg_height"
android:background="@drawable/module_ext_navi_in_vr_traffic_bg"
app:layout_constraintLeft_toLeftOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintRight_toRightOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintBottom_toBottomOf="@id/module_ext_id_navi_in_vr_bg"
android:layout_marginBottom="@dimen/module_ext_navi_in_vr_traffic_bg_margin_bottom" />
<androidx.constraintlayout.widget.Group
android:id="@+id/module_ext_id_group_navi_in_vr_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="module_ext_id_tv_speed,module_ext_id_tv_speed_unit"/>
<TextView
android:id="@+id/module_ext_id_tv_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="78"
app:layout_constraintLeft_toLeftOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintTop_toTopOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintBottom_toTopOf="@id/module_ext_id_navi_in_vr_traffic_bg"
android:layout_marginStart="@dimen/module_ext_navi_in_vr_speed_margin_start"
android:textSize="@dimen/module_ext_navi_in_vr_speed_text_size"
android:textColor="#fff" />
<TextView
android:id="@+id/module_ext_id_tv_speed_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="km/h"
android:textSize="@dimen/module_ext_navi_in_vr_speed_unit_size"
android:textColor="#fff"
app:layout_constraintLeft_toRightOf="@id/module_ext_id_tv_speed"
app:layout_constraintBaseline_toBaselineOf="@id/module_ext_id_tv_speed"
android:layout_marginStart="@dimen/module_ext_navi_in_vr_speed_unit_margin_start" />
<TextView
android:id="@+id/module_ext_id_tv_limit_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/module_ext_vr_mode_limit_speed_bg"
android:text="80"
android:textColor="#FF9CA8D8"
android:gravity="center"
android:textSize="@dimen/module_ext_navi_in_vr_limit_speed_text_size"
app:layout_constraintRight_toRightOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintTop_toTopOf="@id/module_ext_id_navi_in_vr_bg"
app:layout_constraintBottom_toTopOf="@id/module_ext_id_navi_in_vr_traffic_bg"
android:layout_marginEnd="@dimen/module_ext_navi_in_vr_limit_speed_margin_end" />
<com.mogo.module.extensions.view.VerticalTrafficLightView
android:id="@+id/module_ext_id_traffic_light_turn_around"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/module_ext_navi_in_vr_traffic_light_margin_top"
app:iconRes="turnAround"
app:layout_constraintLeft_toLeftOf="@id/module_ext_id_navi_in_vr_traffic_bg"
app:layout_constraintTop_toTopOf="@id/module_ext_id_navi_in_vr_traffic_bg"
app:layout_constraintRight_toLeftOf="@id/module_ext_id_traffic_light_turn_left"/>
<com.mogo.module.extensions.view.VerticalTrafficLightView
android:id="@+id/module_ext_id_traffic_light_turn_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconRes="turnLeft"
app:layout_constraintLeft_toRightOf="@id/module_ext_id_traffic_light_turn_around"
app:layout_constraintRight_toLeftOf="@id/module_ext_id_traffic_light_straight"
app:layout_constraintTop_toTopOf="@id/module_ext_id_traffic_light_turn_around" />
<com.mogo.module.extensions.view.VerticalTrafficLightView
android:id="@+id/module_ext_id_traffic_light_straight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconRes="straight"
app:layout_constraintLeft_toRightOf="@id/module_ext_id_traffic_light_turn_left"
app:layout_constraintRight_toLeftOf="@id/module_ext_id_traffic_light_turn_right"
app:layout_constraintTop_toTopOf="@id/module_ext_id_traffic_light_turn_left" />
<com.mogo.module.extensions.view.VerticalTrafficLightView
android:id="@+id/module_ext_id_traffic_light_turn_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconRes="turnRight"
app:layout_constraintLeft_toRightOf="@id/module_ext_id_traffic_light_straight"
app:layout_constraintTop_toTopOf="@id/module_ext_id_traffic_light_straight"
app:layout_constraintRight_toRightOf="@id/module_ext_id_navi_in_vr_traffic_bg" />
</merge>

53
modules/mogo-module-extensions/src/main/res/layout/merge_vertical_traffic_light_in_vr.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<merge 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"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<androidx.constraintlayout.widget.Group
android:id="@+id/module_ext_id_group_left_time"
app:constraint_referenced_ids="module_ext_id_traffic_light_left_time,module_ext_id_traffic_light_left_time_unit"
android:visibility="gone"
tools:visibility="visible"/>
<ImageView
android:id="@+id/module_ext_id_traffic_light_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/module_ext_dw_traffic_turn_right_red" />
<TextView
android:id="@+id/module_ext_id_traffic_light_left_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="12"
android:textColor="#fff"
app:layout_constraintHorizontal_chainStyle="packed"
android:textSize="@dimen/module_ext_navi_in_vr_traffic_light_left_time_txt_size"
app:layout_constraintLeft_toLeftOf="@id/module_ext_id_traffic_light_icon"
app:layout_constraintRight_toLeftOf="@id/module_ext_id_traffic_light_left_time_unit"
app:layout_constraintTop_toBottomOf="@id/module_ext_id_traffic_light_icon" />
<TextView
android:id="@+id/module_ext_id_traffic_light_left_time_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="s"
android:textColor="#fff"
android:textSize="@dimen/module_ext_navi_in_vr_traffic_light_left_time_unit_size"
app:layout_constraintBaseline_toBaselineOf="@id/module_ext_id_traffic_light_left_time"
app:layout_constraintLeft_toRightOf="@id/module_ext_id_traffic_light_left_time"
app:layout_constraintRight_toRightOf="@id/module_ext_id_traffic_light_icon" />
<ImageView
android:id="@+id/module_ext_id_traffic_light_no_left_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/module_ext_navi_in_vr_traffic_light_no_time_margin_top"
app:layout_constraintLeft_toLeftOf="@id/module_ext_id_traffic_light_icon"
app:layout_constraintRight_toRightOf="@id/module_ext_id_traffic_light_icon"
app:layout_constraintTop_toBottomOf="@id/module_ext_id_traffic_light_icon"
android:src="@drawable/module_ext_dw_traffic_no_time" />
</merge>

11
modules/mogo-module-extensions/src/main/res/values/attrs.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="VerticalTrafficLightView" >
<attr name="iconRes" format="enum">
<enum name="turnAround" value="0" />
<enum name="turnLeft" value="1" />
<enum name="straight" value="2" />
<enum name="turnRight" value="3" />
</attr>
</declare-styleable>
</resources>

22
modules/mogo-module-extensions/src/main/res/values/dimens.xml
View File

@@ -209,4 +209,26 @@
<dimen name="module_ext_vr_mode_self_speed_gonemargin_start">689px</dimen>
<dimen name="module_ext_vr_mode_self_speed_margin_bottom">86px</dimen>
<!-- 仅在vr模式下有此内容，仅增加了xhdpi对应的大小 -->
<dimen name="module_ext_navi_in_vr_width">464px</dimen>
<dimen name="module_ext_navi_in_vr_height">304px</dimen>
<dimen name="module_ext_navi_in_vr_speed_bg_width">458px</dimen>
<dimen name="module_ext_navi_in_vr_speed_bg_height">298px</dimen>
<dimen name="module_ext_navi_in_vr_traffic_bg_height">140px</dimen>
<dimen name="module_ext_navi_in_vr_traffic_bg_margin_bottom">3px</dimen>
<dimen name="module_ext_navi_in_vr_speed_text_size">100px</dimen>
<dimen name="module_ext_navi_in_vr_speed_unit_size">30px</dimen>
<dimen name="module_ext_navi_in_vr_speed_unit_margin_start">30px</dimen>
<dimen name="module_ext_navi_in_vr_speed_margin_start">36px</dimen>
<dimen name="module_ext_navi_in_vr_speed_margin_top">22px</dimen>
<dimen name="module_ext_navi_in_vr_limit_speed_size">78px</dimen>
<dimen name="module_ext_navi_in_vr_limit_speed_margin_end">26px</dimen>
<dimen name="module_ext_navi_in_vr_limit_speed_margin_top">43px</dimen>
<dimen name="module_ext_navi_in_vr_limit_speed_text_size">40px</dimen>
<dimen name="module_ext_navi_in_vr_bg_corner">20px</dimen>
<dimen name="module_ext_navi_in_vr_traffic_light_margin_top">17px</dimen>
<dimen name="module_ext_navi_in_vr_traffic_light_left_time_txt_size">36px</dimen>
<dimen name="module_ext_navi_in_vr_traffic_light_left_time_unit_size">21px</dimen>
<dimen name="module_ext_navi_in_vr_traffic_light_no_time_margin_top">21px</dimen>
</resources>