diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt index ebade2c614..ac72f9aebc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt @@ -40,8 +40,8 @@ class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) : val params = window!!.attributes if(isDriver){ setContentView(R.layout.dialog_itinerary_summary) - params.height = AutoSizeUtils.dp2px(context,840f) - params.width = AutoSizeUtils.dp2px(context,1600f) + params.height = AutoSizeUtils.dp2px(context,1200f) + params.width = AutoSizeUtils.dp2px(context,2300f) }else{ setContentView(R.layout.dialog_itinerary_summary_p) params.height = AutoSizeUtils.dp2px(context,1170f) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_summary_zhi_tip.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_summary_zhi_tip.png index 6a1f79ebe3..42466d3d83 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_summary_zhi_tip.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_summary_zhi_tip.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_summary_zhi_tip_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_summary_zhi_tip_p.png new file mode 100644 index 0000000000..6a1f79ebe3 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_summary_zhi_tip_p.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_close.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_close.png index 2fbe977936..00901b1045 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_close.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_close.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_zhi.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_zhi.png index 63c32dc184..82ebca84a2 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_zhi.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_zhi.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_zhi_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_zhi_p.png new file mode 100644 index 0000000000..63c32dc184 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_zhi_p.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml index 1db4cf4783..2111dab033 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml index 80b6c5bb1c..e9ff2ae00a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml index 45c09c6ed6..5f5c8b4fc1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml @@ -1,11 +1,11 @@ - - + + android:width="@dimen/dp_4" + android:color="#202735" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml index e460f7e862..a9059f256a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml @@ -1,56 +1,56 @@ @@ -58,206 +58,191 @@ android:id="@+id/tvIntersectionServices" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - android:textSize="@dimen/sp_20" - android:textColor="@color/summary_service_content" + android:layout_marginStart="@dimen/dp_62" + android:layout_marginBottom="@dimen/dp_62" android:text="@string/summary_intersection_services" - android:layout_marginBottom="@dimen/dp_44" - android:layout_marginStart="@dimen/dp_39" - /> + android:textColor="@color/summary_service_content" + android:textSize="@dimen/sp_28" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintRight_toLeftOf="@id/tvInfoTip" /> + app:layout_constraintRight_toLeftOf="@id/tvVehicleTip" /> + app:layout_constraintRight_toLeftOf="@id/tvVulnerableTip" /> + android:textColor="@color/summary_service_content" + android:textSize="@dimen/sp_28" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintRight_toRightOf="parent" /> + app:layout_constraintLeft_toLeftOf="@id/tvIntersectionServices" + app:layout_constraintRight_toLeftOf="@id/tvIntersectionServicesUnit" /> + android:textColor="@color/summary_service_num" + android:textSize="@dimen/sp_34" + app:layout_constraintBottom_toBottomOf="@id/tvIntersectionServicesNum" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintLeft_toRightOf="@id/tvIntersectionServicesNum" + app:layout_constraintRight_toRightOf="@id/tvIntersectionServices" /> + app:layout_constraintLeft_toLeftOf="@id/tvLightServices" + app:layout_constraintRight_toLeftOf="@id/tvLightServicesUnit" /> + android:textColor="@color/summary_service_num" + android:textSize="@dimen/sp_34" + app:layout_constraintBottom_toBottomOf="@id/tvLightServicesNum" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintLeft_toRightOf="@id/tvLightServicesNum" + app:layout_constraintRight_toRightOf="@id/tvLightServices" /> + app:layout_constraintLeft_toLeftOf="@id/tvInfoTip" + app:layout_constraintRight_toLeftOf="@id/tvInfoTipUnit" /> + android:textColor="@color/summary_service_num" + android:textSize="@dimen/sp_34" + app:layout_constraintBottom_toBottomOf="@id/tvInfoTipNum" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintLeft_toRightOf="@id/tvInfoTipNum" + app:layout_constraintRight_toRightOf="@id/tvInfoTip" /> + app:layout_constraintLeft_toLeftOf="@id/tvVehicleTip" + app:layout_constraintRight_toLeftOf="@id/tvVehicleTipUnit" /> + android:textColor="@color/summary_service_num" + android:textSize="@dimen/sp_34" + app:layout_constraintBottom_toBottomOf="@id/tvVehicleTipNum" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintLeft_toRightOf="@id/tvVehicleTipNum" + app:layout_constraintRight_toRightOf="@id/tvVehicleTip" /> + app:layout_constraintLeft_toLeftOf="@id/tvVulnerableTip" + app:layout_constraintRight_toLeftOf="@id/tvVulnerableTipUnit" /> + android:textColor="@color/summary_service_num" + android:textSize="@dimen/sp_34" + app:layout_constraintBottom_toBottomOf="@id/tvVulnerableTipNum" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintLeft_toRightOf="@id/tvVulnerableTipNum" + app:layout_constraintRight_toRightOf="@id/tvVulnerableTip" /> @@ -267,10 +252,10 @@ app:layout_constraintLeft_toLeftOf="@id/viewDangerLayout" app:layout_constraintRight_toRightOf="@id/viewDangerLayout" app:layout_constraintTop_toTopOf="@id/viewDangerLayout" - android:textSize="@dimen/sp_30" + android:textSize="@dimen/sp_42" android:textColor="@color/white" android:text="@string/summary_danger_title" - android:layout_marginTop="@dimen/dp_44" + android:layout_marginTop="@dimen/dp_66" /> @@ -296,17 +281,17 @@ app:layout_constraintHorizontal_chainStyle="packed" android:layout_marginBottom="@dimen/dp_40" android:textColor="@color/summary_danger_num" - android:textSize="@dimen/sp_40" + android:textSize="@dimen/sp_57" android:text="@string/summary_service_unit" /> @@ -317,9 +302,9 @@ app:layout_constraintRight_toRightOf="@id/viewEfficiencyLayout" app:layout_constraintTop_toTopOf="@id/viewEfficiencyLayout" android:text="@string/summary_efficiency_title" - android:textSize="@dimen/sp_30" + android:textSize="@dimen/sp_42" android:textColor="@color/white" - android:layout_marginTop="@dimen/dp_44" + android:layout_marginTop="@dimen/dp_66" /> @@ -344,7 +329,7 @@ app:layout_constraintLeft_toRightOf="@id/tvEfficiencyNum" app:layout_constraintHorizontal_chainStyle="packed" android:layout_marginBottom="@dimen/dp_40" - android:textSize="@dimen/sp_40" + android:textSize="@dimen/sp_57" android:textColor="@color/summary_danger_num" android:text="@string/summary_efficiency_unit" /> @@ -352,24 +337,24 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml index 41e74f3228..15bf57f270 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml @@ -23,7 +23,7 @@ android:layout_height="@dimen/dp_160" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" - android:src="@drawable/icon_summary_zhi" + android:src="@drawable/icon_summary_zhi_p" android:contentDescription="@string/summary_zhi" android:layout_marginTop="@dimen/dp_150" android:layout_marginStart="@dimen/dp_813" @@ -37,7 +37,7 @@ app:layout_constraintLeft_toRightOf="@id/ivSummaryZhi" android:layout_marginTop="@dimen/dp_20" android:layout_marginStart="@dimen/dp_20" - android:background="@drawable/bg_summary_zhi_tip" + android:background="@drawable/bg_summary_zhi_tip_p" android:textColor="@color/black" android:textSize="@dimen/sp_28" android:gravity="center" @@ -270,6 +270,7 @@ android:textSize="@dimen/sp_39" android:textColor="@color/summary_danger_title" android:text="@string/summary_danger_title" + android:layout_marginTop="@dimen/dp_58" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index af6f482247..b098a18d10 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -86,7 +86,7 @@ #FF1E32D9 #243959 - #7C93C2 + #66FFFFFF #49546A #FFFFFF #464646 diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 47d642104f..14bafd5b4a 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1027,6 +1027,8 @@ 999dp 1000dp 1003dp + 1017dp + 1055dp 1092dp 1100dp 1125dp @@ -1034,11 +1036,13 @@ 1200dp 1261dp 1300dp + 1373dp 1600dp 1860dp 1920dp 2080dp 2158dp + 2300dp @@ -1079,14 +1083,17 @@ 48dp 52dp 55dp + 57dp 69dp 72dp 76dp 90dp 94dp + 102dp 120dp 150dp 195dp + 214dp 50dp