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 5f48ada220..58c69affd5 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
@@ -2,34 +2,54 @@ package com.mogo.eagle.core.function.hmi.ui.widget
import android.app.Dialog
import android.content.Context
-import android.view.LayoutInflater
-import androidx.lifecycle.LifecycleObserver
+import android.os.Bundle
+import android.widget.ImageView
import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
+import me.jessyan.autosize.utils.AutoSizeUtils
/**
* 行程总结View
* 鹰眼6.5.0需求
*/
-class ItinerarySummaryDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver {
+class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: Int) :
+ Dialog(context, theme) {
- companion object {
- private const val TAG = "ItinerarySummaryView"
+ private val mContext: Context
+ private val isDriver: Boolean
-
-
- }
+ private var ivSummaryClose: ImageView ?= null
init {
- setContentView(R.layout.dialog_itinerary_summary)
+ this.mContext = context
+ this.isDriver = isDriver
}
- override fun onAttachedToWindow() {
- super.onAttachedToWindow()
+ override fun onCreate(savedInstanceState: Bundle?){
+ super.onCreate(savedInstanceState)
+ val params = window!!.attributes
+ if(isDriver){
+ setContentView(R.layout.dialog_itinerary_summary)
+ params.height = AutoSizeUtils.dp2px(context,840f)
+ params.width = AutoSizeUtils.dp2px(context,1600f)
+ }else{
+ setContentView(R.layout.dialog_itinerary_summary_p)
+ params.height = AutoSizeUtils.dp2px(context,1170f)
+ params.width = AutoSizeUtils.dp2px(context,2158f)
+ }
+ window!!.attributes = params //向WindowManager设置属性
+ setCanceledOnTouchOutside(false)
+ initEvent()
}
- override fun onDetachedFromWindow() {
- super.onDetachedFromWindow()
+ private fun initEvent(){
+ //关闭Dialog按钮
+ ivSummaryClose = findViewById(R.id.ivSummaryClose)
+ ivSummaryClose?.setOnClickListener {
+ dismiss()
+ }
+
+
+
}
}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_itinerary_summary.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_itinerary_summary_p.png
similarity index 100%
rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_itinerary_summary.png
rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_itinerary_summary_p.png
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 7acdca2329..2fbe977936 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_close_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_close_p.png
new file mode 100644
index 0000000000..7acdca2329
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_summary_close_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
new file mode 100644
index 0000000000..1db4cf4783
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml
@@ -0,0 +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
new file mode 100644
index 0000000000..80b6c5bb1c
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml
@@ -0,0 +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_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement_p.xml
new file mode 100644
index 0000000000..4b879961f7
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement_p.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ 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
new file mode 100644
index 0000000000..45c09c6ed6
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service_p.xml
new file mode 100644
index 0000000000..7963e81783
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service_p.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ 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 889d4a727f..df23d3d702 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,53 +1,56 @@
@@ -147,9 +152,10 @@
app:layout_constraintLeft_toLeftOf="@id/tvLightServices"
app:layout_constraintBottom_toTopOf="@id/tvLightServices"
app:layout_constraintRight_toLeftOf="@id/tvLightServicesUnit"
- android:textSize="@dimen/sp_94"
+ android:textSize="@dimen/sp_72"
android:textColor="@color/summary_service_num"
app:layout_constraintHorizontal_chainStyle="packed"
+ android:text="4"
/>
@@ -172,9 +179,10 @@
app:layout_constraintLeft_toLeftOf="@id/tvInfoTip"
app:layout_constraintBottom_toTopOf="@id/tvInfoTip"
app:layout_constraintRight_toLeftOf="@id/tvInfoTipUnit"
- android:textSize="@dimen/sp_94"
+ android:textSize="@dimen/sp_72"
android:textColor="@color/summary_service_num"
app:layout_constraintHorizontal_chainStyle="packed"
+ android:text="3"
/>
@@ -197,9 +206,10 @@
app:layout_constraintBottom_toTopOf="@id/tvVehicleTip"
app:layout_constraintLeft_toLeftOf="@id/tvVehicleTip"
app:layout_constraintRight_toLeftOf="@id/tvVehicleTipUnit"
- android:textSize="@dimen/sp_94"
+ android:textSize="@dimen/sp_72"
android:textColor="@color/summary_service_num"
app:layout_constraintHorizontal_chainStyle="packed"
+ android:text="2"
/>
@@ -222,9 +233,11 @@
app:layout_constraintLeft_toLeftOf="@id/tvVulnerableTip"
app:layout_constraintBottom_toTopOf="@id/tvVulnerableTip"
app:layout_constraintRight_toLeftOf="@id/tvVulnerableTipUnit"
- android:textSize="@dimen/sp_94"
+ android:textSize="@dimen/sp_72"
android:textColor="@color/summary_service_num"
app:layout_constraintHorizontal_chainStyle="packed"
+ android:text="5"
+
/>
@@ -244,11 +258,12 @@
@@ -338,8 +362,10 @@
app:layout_constraintTop_toBottomOf="@id/viewDangerLayout"
app:layout_constraintLeft_toLeftOf="@id/viewDangerLayout"
android:text="@string/summary_danger_tip"
- android:textSize="@dimen/sp_24"
+ android:textSize="@dimen/sp_16"
android:textColor="@color/summary_tip"
+ android:layout_marginTop="@dimen/dp_15"
+ android:layout_marginStart="@dimen/dp_m_10"
/>
\ 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
new file mode 100644
index 0000000000..e56ca2fdf1
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 820a98b51d..af6f482247 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,11 +86,15 @@
#FF1E32D9
#243959
- #49546A
- #464646
+ #7C93C2
+ #49546A
+ #FFFFFF
+ #464646
#24313E
- #106FF0
- #42464F
+ #2DF0FE
+ #106FF0
+ #6A758D
+ #42464F
#131415
#FF3B2D
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
index 99c0c612b0..7bd309ce51 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
@@ -88,4 +88,20 @@
- @dimen/dp_10
+
+
+
+
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 0458ee6ea7..273a1d3513 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -1079,9 +1079,11 @@
48dp
52dp
55dp
+ 72dp
76dp
94dp
120dp
+ 150dp
195dp