diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 0ebaeefb82..d3588781a8 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -429,7 +429,6 @@
android:layout_width="@dimen/dp_1046"
android:layout_height="match_parent"
android:elevation="100dp"
- android:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
index 3d7db44916..d12c273caf 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
@@ -96,7 +96,7 @@ class BindingCarNetWorkManager private constructor() {
"3" -> showModifyBindingCarDialog()
"null" -> TipToast.shortTip("当前工控机没有入库")
}
- updateCarVrIconRes(info.getData().brandId)
+// updateCarVrIconRes(info.getData().brandId)
} else {
SharedPrefsMgr.getInstance()
.putString(SharedPrefsConstants.CAR_INFO, "")
@@ -155,7 +155,7 @@ class BindingCarNetWorkManager private constructor() {
}
callBack.invoke(info)
bindLog(mapOf("bindingStatus" to true, "bindMsg" to info))
- updateCarVrIconRes(info.data.brandId)
+// updateCarVrIconRes(info.data.brandId)
}
}
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
index 58f1c24e6b..4732ee6a9b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/TabSwitchView.kt
@@ -48,11 +48,13 @@ class TabSwitchView @JvmOverloads constructor(
private fun notifyView() {
if (isCheck) {
+ ivTabDefault.visibility = View.GONE
ivTabClick.visibility = View.VISIBLE
ivTabClickBg.visibility = View.VISIBLE
} else {
ivTabClick.visibility = View.GONE
ivTabClickBg.visibility = View.GONE
+ ivTabDefault.visibility = View.VISIBLE
}
}
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
index fc13c32370..63065996be 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
@@ -43,6 +43,9 @@ import system_master.SystemStatusInfo
private fun String.parsePlateNo(): String {
return substring(0, 2) + " " + substring(2)
}
+private fun String.parsePlateNoTel(): String {
+ return takeLast(6)
+}
private fun String.parsePhoneNo(): String {
return take(3) + "****" + takeLast(4)
@@ -178,7 +181,7 @@ class CarInfoTabView @JvmOverloads constructor(
return
}
tvCarNo.visibility = VISIBLE
- tvCarNo.text = it.parsePlateNo()
+ tvCarNo.text = it.parsePlateNoTel()
}
}
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 b01366a634..fdcde8b018 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
@@ -2,21 +2,28 @@ package com.mogo.eagle.core.function.hmi.ui.tools
import android.annotation.SuppressLint
import android.content.Context
+import android.graphics.Color
+import android.graphics.RectF
+import android.graphics.drawable.ClipDrawable
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.LayerDrawable
+import android.view.Gravity
import android.view.View
import android.widget.ImageView
import android.widget.ProgressBar
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
import com.mogo.eagle.core.data.map.MogoLocation
import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.map.MogoData.Companion.mogoMapData
import me.jessyan.autosize.utils.AutoSizeUtils
+
/**
* 离线地图缓存
*/
@@ -31,6 +38,7 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) {
private var rightView: TextView? = null
private var okView: TextView? = null
private var cacheTipView: TextView? = null
+ private var downloadingTip: TextView? = null
private var progressBar: ProgressBar? = null
private var downloadPercentView: TextView? = null
@@ -57,6 +65,7 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) {
okView = findViewById(R.id.tv_cache_ok)
cacheTipView = findViewById(R.id.tv_cache_tips)
downloadResultImg = findViewById(R.id.ivDownLoadStatus)
+ downloadingTip = findViewById(R.id.tv_down_loading)
leftView?.setOnClickListener {
when {
@@ -118,15 +127,19 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) {
}
}
+
@SuppressLint("SetTextI18n")
private fun updateProgress(progress: Int) {
if (this@OfflineMapDialog.isShowing) {
progressBar?.let {
if (it.visibility == View.VISIBLE) {
it.progress = if (progress in 1..5) 5 else progress
+ val p = AutoSizeUtils.dp2px(context, 770f) * (it.progress / 100.0) - AutoSizeUtils.dp2px(context, 30f)
+ CallerLogger.i("$M_HMI$TAG", "updateProgress: $p , pro:${it.progress}")
+ downloadPercentView?.translationX = p.toFloat()
+ downloadPercentView?.text = "${it.progress}%"
}
}
- downloadPercentView?.text = "$progress%"
if (progress == 100) {
showNewContent(isLoading = false, true)
CallerHmiListenerManager.invokeHDDataCacheStatus(true)
@@ -137,11 +150,9 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) {
private fun change2NewStyle() {
val titleParams = offlineTitleView?.layoutParams as ConstraintLayout.LayoutParams
titleParams.topMargin = AutoSizeUtils.dp2px(context, 52f)
-
progressBar?.visibility = View.VISIBLE
downloadPercentView?.visibility = View.VISIBLE
okView?.visibility = View.VISIBLE
-
leftView?.visibility = View.GONE
rightView?.visibility = View.GONE
cacheTipView?.visibility = View.INVISIBLE
@@ -153,36 +164,42 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context) {
change2NewStyle()
when {
isLoading -> {
+ downloadResultImg?.visibility = View.GONE
+ offlineTitleView?.visibility = View.GONE
+ downloadingTip?.visibility = View.VISIBLE
okView?.text = context.resources.getString(R.string.cancel)
- offlineTitleView?.text = context.resources.getString(R.string.offline_downloading)
}
else -> {
when {
isSuccess -> {
okView?.visibility = View.VISIBLE
okView?.text = context.resources.getString(R.string.ok_tip)
+ offlineTitleView?.visibility = View.VISIBLE
offlineTitleView?.text =
context.resources.getString(R.string.offline_download_success)
progressBar?.visibility = View.GONE
downloadPercentView?.visibility = View.GONE
- downloadResultImg?.background =
- ContextCompat.getDrawable(context, R.drawable.icon_map_cache_success)
+ downloadingTip?.visibility = View.GONE
+ downloadResultImg?.visibility = View.VISIBLE
+ downloadResultImg?.setImageDrawable(context.resources.getDrawable(R.drawable.icon_map_cache_success))
hmiAction("$M_HMI$TAG", mapOf("cacheMap" to true))
}
else -> {
isRetry = true
isConfirm = false
+ offlineTitleView?.visibility = View.VISIBLE
offlineTitleView?.text =
context.resources.getString(R.string.offline_download_failure)
okView?.visibility = View.GONE
progressBar?.visibility = View.GONE
downloadPercentView?.visibility = View.GONE
+ downloadingTip?.visibility = View.GONE
leftView?.visibility = View.VISIBLE
leftView?.text = context.resources.getString(R.string.ok_tip)
rightView?.visibility = View.VISIBLE
rightView?.text = context.resources.getString(R.string.retry)
- downloadResultImg?.background =
- ContextCompat.getDrawable(context, R.drawable.icon_map_cache_failed)
+ downloadResultImg?.visibility = View.VISIBLE
+ downloadResultImg?.setImageDrawable(context.resources.getDrawable(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_progress_patch.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png
new file mode 100644
index 0000000000..6dd9358414
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_reboot_system.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_reboot_system.png
new file mode 100644
index 0000000000..3e1e27d6bd
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_reboot_system.png differ
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_bone_dialog.xml
similarity index 100%
rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_cache.xml
rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_bone_dialog.xml
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg.xml
index 753149f4ea..1616644e5d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg.xml
@@ -3,40 +3,45 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- -
+ android:end="2dp"
+ android:start="2dp"
+ android:top="2dp">
-
+
+ android:centerColor="#32C3E1"
+ android:endColor="#44FCCF"
+ android:startColor="#1870FF" />
+
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml
new file mode 100644
index 0000000000..28fd08b44e
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml
@@ -0,0 +1,43 @@
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml
index 83a031c665..560b2b4302 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml
@@ -1,96 +1,71 @@
-
+ android:layout_width="@dimen/dp_900"
+ android:layout_height="@dimen/dp_620"
+ android:background="@drawable/bg_bone_dialog"
+ app:roundLayoutRadius="@dimen/dp_50">
-
+ app:layout_constraintTop_toTopOf="parent" />
+ android:textSize="@dimen/dp_45"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/ivRebootNotice" />
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@id/tv_reboot_tips" />
+ app:layout_constraintLeft_toLeftOf="parent" />
+ app:layout_constraintRight_toRightOf="parent" />
\ No newline at end of file
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 8309758064..ea3e3bf7e3 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
@@ -4,8 +4,8 @@
android:id="@+id/roundRootLayout"
android:layout_width="@dimen/dp_900"
android:layout_height="@dimen/dp_620"
- android:background="@drawable/bg_map_offline_cache"
- app:roundLayoutRadius="32dp">
+ android:background="@drawable/bg_bone_dialog"
+ app:roundLayoutRadius="@dimen/dp_50">
+
+
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintLeft_toLeftOf="@id/progressBar" />
+ app:layout_constraintRight_toRightOf="parent"/>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
index 7f3d0718b3..3572ed5548 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
@@ -101,6 +101,7 @@
android:layout_height="@dimen/dp_72"
android:layout_marginStart="@dimen/dp_16"
android:background="@drawable/bg_tab_car_no"
+ android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/dp_32"
android:visibility="gone"
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 4aa138a031..570c409a1a 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
@@ -19,6 +19,8 @@
#000000
#B3000000
#8F0005
+ #1C1C1C
+ #161618
#2EACFF
#FF0006
#0099dd