From 243ab08a58b52684f74cd28a1f79931f8a891eb0 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Fri, 20 Sep 2024 19:29:45 +0800 Subject: [PATCH] [6.7.0] loading fun --- .../main/res/layout/taxi_base_fragment.xml | 1 - .../binding/BindingCarNetWorkManager.kt | 4 +- .../core/function/hmi/bone/TabSwitchView.kt | 2 + .../function/hmi/bone/tab/CarInfoTabView.kt | 5 +- .../function/hmi/ui/tools/OfflineMapDialog.kt | 35 +++++-- .../drawable-nodpi/icon_progress_patch.9.png | Bin 0 -> 1871 bytes .../res/drawable-nodpi/icon_reboot_system.png | Bin 0 -> 18144 bytes ...p_offline_cache.xml => bg_bone_dialog.xml} | 0 .../res/drawable/progressbar_corner_bg.xml | 53 +++++----- .../drawable/progressbar_corner_bg_test.xml | 43 ++++++++ .../main/res/layout/dialog_docker_reboot.xml | 97 +++++++----------- .../main/res/layout/dialog_offline_map.xml | 56 ++++++---- .../src/main/res/layout/view_car_info_tab.xml | 1 + .../src/main/res/values/color.xml | 2 + 14 files changed, 180 insertions(+), 119 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_progress_patch.9.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_reboot_system.png rename core/function-impl/mogo-core-function-hmi/src/main/res/drawable/{bg_map_offline_cache.xml => bg_bone_dialog.xml} (100%) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg_test.xml 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 0000000000000000000000000000000000000000..6dd935841426facd7fb7999df341f544fc146dc9 GIT binary patch literal 1871 zcmV-V2e9~wP)Xs{9|(g<1HBxY3Hb(XvVxapT5hp$jdmFsYga zB*HKukU~UJNqht$MDx%*2ypB(J!ks#>F#?k2ow(Ks&B#EzI{*s<~!fL%uG$q>J3<9 zt>XbTcdbkP_pwCqvH(vI(Vc4~&?K-BtVB=|K=PzaU|b*^gxTmsNu7|dHJYrb9Zub!BtDnU zr}bQb1dRjB0xAkA07y;_!U=(~PzVTt;G1oQ;sdA_=-Fa4Qc)A+>$vzanosBZ00|la zlDTm(C}61k8nn&N85^qp`SVDKF$D6~Pd@sZ|c=x;$aK_Q1~grW+Gj?;WR7uVpx46NP; z4vHK_d6f;4=b|J)+&wmPVsP-Cqc)OYa6=qMhu-)$7;0^Y;kGvDZzr`vVH+1ehI8>8 zJeNZwSR9mXzrOl7B%VnT7o`K@?x8@Y%$cl}aExotHiW?7#&nS-Ah>x2#qCBz9Xa@> zlhgtOkD~Z%IEUsFI9!WhNl;jWb(4jJHB%UF! zoMNFEAPAuu3Okyi_}DhBb~wE=Bs_+5a4vx(V7MkZi$LME$xT=jheVm=LXs|GZRP+< zagS^*6Ud`=g|2V1@26yRqcz0NXyJ(&T#$j1dcufh3oMbYIf?Kv) z#6^c{He~=r+2gjBxm%6b^R^;5rkx1RP=^6yp%4%Sr=Q3{e^(9)Poi32@F^~O9p~U& z4h+}AHF0gc20_AWb4b)~Cb;u;eydRyEenv_Ue-OfwJ;PV9LgDdhwx)@jY!&*z0Ow4<5rg78t?epb9(iT9i*dq}~R<)$+B;ZI%is)Ly=O(8eZ^N18DQ z$T>co;%?lW3#G7EZ}eG|Zk6YZ`kyy4f75ZC>%!{q!ZkyXum-FJYr@*7)qEF)+HBc? zCN|6Lk?z5;EW!Ec^8Vbbw@;|o=4R9zw?Msl1Jt|!fO_v5s1L7zI`Su|PcDHvdJ)uT ze}MY(0;sQl2bKR7)XDRp3O|Dy{t?u-KY*GT2X%f7)YK@b*|VUo41>Bp1ZtrO3I@4m zaxi!z2gUtZ1J)995ziviW=jGT%Aat1ndcpoJ&t?2Zyi=Iz@j?10P2<7pt^5rK-bHF zu4+J+L4Ev}1~d!m(-{qD+5qbLO#}J`RNuKWpr1gEO&CDuG@uI_(8V&K8ye8O2Z*$w z9e0?!h_VQ4PHr=iL(2!`wijiO`rz6=bpRGLAW$#OgL-)m90$FR4$^>*AfQVI(B}wf z$^s$>ona0_K-@tH$ajzfN$1o)$|BijD-MX?-m!=It(^d&rPaat;~EecKrshVi_HdF z3;}5e4Nkf(#vODu)j_1=)MgxzX|sGCzum78AREy9!4P}gwAZON_2S}m1yHHQw1c{} zgWjSHDg&YxBS2q-T8wAVcS~upvI^5!6V`?`Vy*PxD1&QkhqKDkZdLyHxVf7sOtFfLI6+}NEF=F|MQm!pd?61psMc&R2Go= zD+8n$C>It7W}z8yB)-{@_*^=l*0Vq)lo*)IaBxHbnO7o^(m)X`7np_i|NIfB4~T|b zz*#&5D+G)~W*BM#=p4m=b)iG;R65w002ov JPDHLkV1nFFQndg8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3e1e27d6bd4d834d43cdc89e991b1495a4cd0ba2 GIT binary patch literal 18144 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 LNkvXXu0mjfkh3}K literal 0 HcmV?d00001 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