yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robotaxi-d_240621_6.4.6' into dev_robotaxi-d_240621_6.4.6

Browse Source
This commit is contained in:
yangyakun
2024-06-26 16:28:39 +08:00
parent b7c11f5090 696996e746
commit f975113d8e
2 changed files with 70 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt
View File

@@ -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 = "建议重启车辆并上报问题"
}
}
}

2
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java
View File

@@ -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);
}
}