diff --git a/app/build.gradle b/app/build.gradle index 101a12d2e0..d356c96e47 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply from: rootProject.file('gradle/bytex/bytex.gradle') +//apply from: rootProject.file('gradle/bytex/bytex.gradle') Properties properties = new Properties() properties.load(project.rootProject.file("gradle.properties").newDataInputStream()) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt index 368d5fb89a..b01366a634 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OfflineMapDialog.kt @@ -26,13 +26,10 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) { private const val TAG = "OfflineMapDialog" } - private var roundRootLayout: ConstraintLayout? = null private var offlineTitleView: TextView? = null private var leftView: TextView? = null private var rightView: TextView? = null private var okView: TextView? = null - private var vertLineView: View? = null - private var horizontalLineView: View? = null private var cacheTipView: TextView? = null private var progressBar: ProgressBar? = null @@ -48,22 +45,18 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) { init { setContentView(R.layout.dialog_offline_map) setCanceledOnTouchOutside(true) - initView() } private fun initView() { - roundRootLayout = findViewById(R.id.roundRootLayout) offlineTitleView = findViewById(R.id.tv_cache_title) progressBar = findViewById(R.id.progressBar) downloadPercentView = findViewById(R.id.tvDownloadProgress) leftView = findViewById(R.id.tv_cache_confirm) rightView = findViewById(R.id.tv_cache_cancel) okView = findViewById(R.id.tv_cache_ok) - vertLineView = findViewById(R.id.view_vertical_line) - horizontalLineView = findViewById(R.id.view_horizontal_line) cacheTipView = findViewById(R.id.tv_cache_tips) - downloadResultImg = findViewById(R.id.iv_download_Status) + downloadResultImg = findViewById(R.id.ivDownLoadStatus) leftView?.setOnClickListener { when { @@ -142,20 +135,13 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) { } private fun change2NewStyle() { - roundRootLayout?.layoutParams?.width = AutoSizeUtils.dp2px(context, 1110f) - roundRootLayout?.layoutParams?.height = AutoSizeUtils.dp2px(context, 668f) - val titleParams = offlineTitleView?.layoutParams as ConstraintLayout.LayoutParams - titleParams.topMargin = AutoSizeUtils.dp2px(context, 51f) - - val horizontalLineParams = horizontalLineView?.layoutParams as ConstraintLayout.LayoutParams - horizontalLineParams.topMargin = AutoSizeUtils.dp2px(context, 374f) + titleParams.topMargin = AutoSizeUtils.dp2px(context, 52f) progressBar?.visibility = View.VISIBLE downloadPercentView?.visibility = View.VISIBLE okView?.visibility = View.VISIBLE - vertLineView?.visibility = View.GONE leftView?.visibility = View.GONE rightView?.visibility = View.GONE cacheTipView?.visibility = View.INVISIBLE @@ -169,10 +155,8 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) { isLoading -> { okView?.text = context.resources.getString(R.string.cancel) offlineTitleView?.text = context.resources.getString(R.string.offline_downloading) - downloadResultImg?.visibility = View.GONE } else -> { - downloadResultImg?.visibility = View.VISIBLE when { isSuccess -> { okView?.visibility = View.VISIBLE @@ -182,7 +166,7 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) { progressBar?.visibility = View.GONE downloadPercentView?.visibility = View.GONE downloadResultImg?.background = - ContextCompat.getDrawable(context, R.drawable.download_success_icon) + ContextCompat.getDrawable(context, R.drawable.icon_map_cache_success) hmiAction("$M_HMI$TAG", mapOf("cacheMap" to true)) } else -> { @@ -196,10 +180,9 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) { leftView?.visibility = View.VISIBLE leftView?.text = context.resources.getString(R.string.ok_tip) rightView?.visibility = View.VISIBLE - vertLineView?.visibility = View.VISIBLE rightView?.text = context.resources.getString(R.string.retry) downloadResultImg?.background = - ContextCompat.getDrawable(context, R.drawable.download_fail_icon) + ContextCompat.getDrawable(context, R.drawable.icon_map_cache_failed) hmiAction("$M_HMI$TAG", mapOf("cacheMap" to false)) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_cache_failed.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_cache_failed.png new file mode 100644 index 0000000000..162e8d55ca Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_cache_failed.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_cache_success.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_cache_success.png new file mode 100644 index 0000000000..e4d5d55d73 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_cache_success.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_update.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_update.png new file mode 100644 index 0000000000..b493e772f5 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_map_update.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml new file mode 100644 index 0000000000..e4d8d1c248 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_cache.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_cache.xml new file mode 100644 index 0000000000..f6bce26ddf --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_cache.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml index 6ae72b0a13..8309758064 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml @@ -2,121 +2,99 @@ + + + app:layout_constraintTop_toBottomOf="@+id/ivDownLoadStatus" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_cache_title" /> - - - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/progressBar" /> + app:layout_constraintLeft_toLeftOf="parent" /> + android:layout_marginEnd="@dimen/dp_65" + android:layout_marginBottom="@dimen/dp_62" + app:layout_constraintRight_toRightOf="parent"/> #131415 #B2BED9 #FF1943 + #3B3D44 + #2E323A + #996C6C6C #27FFFFFF #1E111111 #FF213757