From b9c923eb11ec16c17e0aa429c6daf48a75287106 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 26 Jun 2024 12:07:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[646]fix:=20=E6=8E=A5=E7=AE=A1=E5=90=8E=20?= =?UTF-8?q?=E8=BD=A6=E5=89=8D=E5=BC=95=E5=AF=BC=E7=BA=BF=20=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E4=BC=9A=E7=AA=81=E5=87=BA=E9=BB=91=E8=BE=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/business/routeoverlay/RouteOverlayDrawer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java index e162b3eadd..b0f89139f7 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java @@ -81,7 +81,7 @@ public class RouteOverlayDrawer { if (mRenderTask != null) { mRenderHandler.removeCallbacks(mRenderTask); } - mogoOverlayManager.removeAllLinesInLevel(Level.GUIDE_ROUTE_LINE); + mogoOverlayManager.hideAllLinesInLevel(Level.GUIDE_ROUTE_LINE); } } From 696996e746b2a66f74e91c78f3bf76b0ac5aaed8 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 26 Jun 2024 16:25:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.4.6]=E4=BF=AE=E5=A4=8D=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E8=BF=87=E7=A8=8BView=E5=B1=95=E7=A4=BA=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/ConnectionProcessView.kt | 123 ++++++++++-------- 1 file changed, 69 insertions(+), 54 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt index c8d9d7023c..e80206edee 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt @@ -84,6 +84,9 @@ class ConnectionProcessView @JvmOverloads constructor( CallerAutoPilotStatusListenerManager.removeListener(TAG) //隐藏视图 dismissConnectionView() + //如果已经开始连接倒计时，则取消Timer + connectSSMTimer?.cancel() + autopilotReadyTimer?.cancel() } } @@ -212,14 +215,16 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示域控连接成功视图 */ private fun showIPCConnectSuccessView(){ - ThreadUtils.runOnUiThread { - this.visibility = View.VISIBLE - pbConnectionProgress.setPadding(5,3,5,8) - pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style) - pbConnectionProgress.progress = 25 - tvConnectionStatus.setPadding(0,0,0,10) - tvConnectionStatus.text = "系统启动中..." - clConnectionTip.visibility = View.GONE + if(HmiBuildConfig.isShowConnectionProgressView){ + ThreadUtils.runOnUiThread { + this.visibility = View.VISIBLE + pbConnectionProgress.setPadding(5,3,5,8) + pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style) + pbConnectionProgress.progress = 25 + tvConnectionStatus.setPadding(0,0,0,10) + tvConnectionStatus.text = "系统启动中..." + clConnectionTip.visibility = View.GONE + } } } @@ -227,14 +232,16 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示SSM连接成功视图 */ private fun showSSMConnectSuccessView(){ - ThreadUtils.runOnUiThread{ - this.visibility = View.VISIBLE - pbConnectionProgress.setPadding(5,3,5,8) - pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style) - pbConnectionProgress.progress = 50 - tvConnectionStatus.setPadding(0,0,0,10) - tvConnectionStatus.text = "系统启动中..." - clConnectionTip.visibility = View.GONE + if(HmiBuildConfig.isShowConnectionProgressView){ + ThreadUtils.runOnUiThread{ + this.visibility = View.VISIBLE + pbConnectionProgress.setPadding(5,3,5,8) + pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style) + pbConnectionProgress.progress = 50 + tvConnectionStatus.setPadding(0,0,0,10) + tvConnectionStatus.text = "系统启动中..." + clConnectionTip.visibility = View.GONE + } } } @@ -242,14 +249,16 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示冷启动成功视图 */ private fun showAutopilotReadySuccessView(){ - ThreadUtils.runOnUiThread{ - this.visibility = View.VISIBLE - pbConnectionProgress.setPadding(0,0,0,0) - pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_success_style) - pbConnectionProgress.progress = 100 - tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动成功" - clConnectionTip.visibility = View.GONE + if(HmiBuildConfig.isShowConnectionProgressView){ + ThreadUtils.runOnUiThread{ + this.visibility = View.VISIBLE + pbConnectionProgress.setPadding(0,0,0,0) + pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_success_style) + pbConnectionProgress.progress = 100 + tvConnectionStatus.setPadding(0,0,0,0) + tvConnectionStatus.text = "系统启动成功" + clConnectionTip.visibility = View.GONE + } } } @@ -257,16 +266,18 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示域控连接失败视图 */ private fun showIPCConnectFailView(){ - ThreadUtils.runOnUiThread { - this.visibility = View.VISIBLE - pbConnectionProgress.setPadding(0,0,0,0) - pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) - pbConnectionProgress.progress = 25 - tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动异常" - clConnectionTip.visibility = View.VISIBLE - tvConnectionTipTitle.text = "Telematics连接异常" - tvConnectionTipContent.text = "建议重启车辆并上报问题" + if(HmiBuildConfig.isShowConnectionProgressView){ + ThreadUtils.runOnUiThread { + this.visibility = View.VISIBLE + pbConnectionProgress.setPadding(0,0,0,0) + pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) + pbConnectionProgress.progress = 25 + tvConnectionStatus.setPadding(0,0,0,0) + tvConnectionStatus.text = "系统启动异常" + clConnectionTip.visibility = View.VISIBLE + tvConnectionTipTitle.text = "Telematics连接异常" + tvConnectionTipContent.text = "建议重启车辆并上报问题" + } } } @@ -274,16 +285,18 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示SSM连接失败视图 */ private fun showSSMConnectFailView(){ - ThreadUtils.runOnUiThread { - this.visibility = View.VISIBLE - pbConnectionProgress.setPadding(0,0,0,0) - pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) - pbConnectionProgress.progress = 50 - tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动异常" - clConnectionTip.visibility = View.VISIBLE - tvConnectionTipTitle.text = "SSM连接异常" - tvConnectionTipContent.text = "建议重启车辆并上报问题" + if(HmiBuildConfig.isShowConnectionProgressView){ + ThreadUtils.runOnUiThread { + this.visibility = View.VISIBLE + pbConnectionProgress.setPadding(0,0,0,0) + pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) + pbConnectionProgress.progress = 50 + tvConnectionStatus.setPadding(0,0,0,0) + tvConnectionStatus.text = "系统启动异常" + clConnectionTip.visibility = View.VISIBLE + tvConnectionTipTitle.text = "SSM连接异常" + tvConnectionTipContent.text = "建议重启车辆并上报问题" + } } } @@ -291,16 +304,18 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示SSM冷启动失败视图 */ private fun showAutopilotReadyFailView(){ - ThreadUtils.runOnUiThread { - this.visibility = View.VISIBLE - pbConnectionProgress.setPadding(0,0,0,0) - pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) - pbConnectionProgress.progress = 100 - tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动异常" - clConnectionTip.visibility = View.VISIBLE - tvConnectionTipTitle.text = "系统冷启动异常" - tvConnectionTipContent.text = "建议重启车辆并上报问题" + if(HmiBuildConfig.isShowConnectionProgressView){ + ThreadUtils.runOnUiThread { + this.visibility = View.VISIBLE + pbConnectionProgress.setPadding(0,0,0,0) + pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) + pbConnectionProgress.progress = 100 + tvConnectionStatus.setPadding(0,0,0,0) + tvConnectionStatus.text = "系统启动异常" + clConnectionTip.visibility = View.VISIBLE + tvConnectionTipTitle.text = "系统冷启动异常" + tvConnectionTipContent.text = "建议重启车辆并上报问题" + } } }