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

Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev

Browse Source
This commit is contained in:
wangcongtao
2020-07-17 17:17:14 +08:00
parent 136bcab311 3568e1c142
commit e8d12d8971
8 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

57
modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml
View File

@@ -1,15 +1,16 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<View
android:id="@+id/module_map_id_navi_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/module_ext_navi_info_panel_height"
android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
android:focusable="true"
android:clickable="true"
android:focusable="true"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container"
app:layout_constraintRight_toRightOf="@id/module_entrance_id_top_container"
@@ -88,17 +89,17 @@
android:id="@+id/module_map_id_remaining_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_657"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_navi_bg"
android:layout_marginStart="@dimen/dp_627"
android:text="3599"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_distance_textSize"
android:textStyle="bold"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintBottom_toTopOf="@+id/module_map_id_remaining_distance_notice"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_navi_bg"
app:layout_constraintRight_toLeftOf="@+id/module_map_id_remaining_time"
app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed"/>
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/module_map_id_remaining_distance_unit"
@@ -114,12 +115,13 @@
android:id="@+id/module_map_id_remaining_distance_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toTopOf="@+id/module_map_id_remaining_distance_notice"
android:src="@drawable/module_ext_ic_navi_info1"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_remaining_distance_notice"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance"
app:layout_constraintRight_toLeftOf="@+id/module_map_id_remaining_distance_notice"
android:src="@drawable/module_ext_ic_navi_info1" />
app:layout_constraintTop_toTopOf="@+id/module_map_id_remaining_distance_notice" />
<TextView
android:id="@+id/module_map_id_remaining_distance_notice"
android:layout_width="wrap_content"
@@ -128,8 +130,8 @@
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintRight_toRightOf="@+id/module_map_id_remaining_distance_unit"
app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_distance_icon"
app:layout_constraintRight_toRightOf="@+id/module_map_id_remaining_distance_unit"
app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_distance" />
<androidx.constraintlayout.widget.Group
@@ -146,11 +148,11 @@
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_time_textSize"
android:textStyle="bold"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
app:layout_constraintRight_toLeftOf="@+id/module_map_id_arrive_time"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time_notice"
app:layout_constraintLeft_toRightOf="@+id/module_map_id_remaining_distance"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time_notice" />
app:layout_constraintRight_toLeftOf="@+id/module_map_id_arrive_time"
app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/module_map_id_remaining_time_unit"
@@ -161,17 +163,18 @@
android:textSize="@dimen/module_ext_remaining_time_unit_textSize"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_time"
app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_time" />
<ImageView
android:id="@+id/module_map_id_remaining_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/module_ext_ic_navi_info2"
app:layout_constraintBottom_toBottomOf="@id/module_map_id_remaining_time_notice"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time"
app:layout_constraintRight_toLeftOf="@id/module_map_id_remaining_time_notice"
app:layout_constraintTop_toTopOf="@id/module_map_id_remaining_time_notice"
app:layout_constraintBottom_toBottomOf="@id/module_map_id_remaining_time_notice"
/>
app:layout_constraintTop_toTopOf="@id/module_map_id_remaining_time_notice" />
<TextView
android:id="@+id/module_map_id_remaining_time_notice"
android:layout_width="wrap_content"
@@ -195,26 +198,28 @@
android:id="@+id/module_map_id_arrive_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_76"
android:text="3599"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_arrive_time_textSize"
android:layout_marginEnd="@dimen/dp_96"
android:textStyle="bold"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
app:layout_constraintRight_toRightOf="@id/module_map_id_navi_bg"
app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time_notice"
app:layout_constraintLeft_toRightOf="@+id/module_map_id_remaining_time"
app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time_notice"/>
app:layout_constraintRight_toRightOf="@id/module_map_id_navi_bg"
app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<ImageView
android:id="@+id/module_map_id_arrive_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time"
app:layout_constraintTop_toTopOf="@+id/module_map_id_arrive_time_notice"
android:src="@drawable/module_ext_ic_navi_info3"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_arrive_time_notice"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time"
app:layout_constraintRight_toLeftOf="@+id/module_map_id_arrive_time_notice"
android:src="@drawable/module_ext_ic_navi_info3" />
app:layout_constraintTop_toTopOf="@+id/module_map_id_arrive_time_notice" />
<TextView
android:id="@+id/module_map_id_arrive_time_notice"
android:layout_width="wrap_content"
@@ -222,8 +227,8 @@
android:text="到达"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toRightOf="@id/module_map_id_arrive_time_icon"
app:layout_constraintRight_toRightOf="@id/module_map_id_arrive_time"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintTop_toBottomOf="@id/module_map_id_arrive_time" />
</merge>

2
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -202,7 +202,7 @@
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
android:visibility="gone"
app:constraint_referenced_ids="btnDebugCtrlNaviView,btnDebugCtrlSubView,btnDebugCtrlTopView"
android:id="@+id/groupTopViewDebug" />

BIN
modules/mogo-module-splash/src/main/res/drawable-xhdpi-1920x1000/module_byd_splash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB

8
modules/mogo-module-splash/src/main/res/drawable/byd_count_down_bg.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#000" />
<size
android:width="@dimen/dp_100"
android:height="@dimen/dp_100" />
</shape>

10
modules/mogo-module-splash/src/main/res/drawable/byd_enter_btn_bg.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient android:startColor="#256BFF" android:endColor="#5CC1FF" android:angle="45" />
<corners android:radius="@dimen/dp_46" />
<padding android:bottom="@dimen/dp_12" android:left="@dimen/dp_75" android:top="@dimen/dp_12" android:right="@dimen/dp_75" />
</shape>
</item>
</selector>

0
modules/mogo-module-splash/src/main/res/drawable-xhdpi/binli.jpg → modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

33
modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
View File

@@ -2,32 +2,37 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#fff">
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/module_byd_splash" />
<TextView
android:id="@+id/tvByd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#fff"
android:drawableTop="@drawable/binli"
android:drawablePadding="10dp"
android:gravity="center"
android:text="比亚迪"
android:textSize="40sp"
android:background="@drawable/byd_enter_btn_bg"
android:textColor="#0D172C"
android:text="开启行程"
android:textSize="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_182"
android:layout_marginBottom="@dimen/dp_251"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="parent"/>
<TextView
android:id="@+id/tvCountDown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="20dp"
android:text="5"
android:textColor="#000"
android:textSize="30sp"
android:gravity="center"
android:textColor="#fff"
android:textSize="@dimen/dp_54"
android:layout_marginTop="@dimen/dp_48"
android:layout_marginEnd="@dimen/dp_60"
android:background="@drawable/byd_count_down_bg"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />