From 49c3bda190dc8b1d4f43d88b702fc4b5b0999d82 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 20 Feb 2023 16:35:09 +0800 Subject: [PATCH 1/5] [2.14.0] fix bug --- .../function/hmi/ui/pnc/PncActionsView.kt | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt index 6a15160b33..60c4f7420e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt @@ -74,16 +74,23 @@ class PncActionsView @JvmOverloads constructor( override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) { try { mAutoPilotStatusInfo?.let { it -> - if (it.state == STATUS_AUTOPILOT_RUNNING) { - UiThreadHandler.post { + UiThreadHandler.post { + if (it.state == STATUS_AUTOPILOT_RUNNING) { var actions: String? = null planningActionMsg.actionMsg?.let { - actions = PncActionsHelper.getAction(it.drivingState.number, it.drivingAction.number) + actions = PncActionsHelper.getAction( + it.drivingState.number, + it.drivingAction.number + ) //如果是存在云端红绿灯数据条件下，设置云端数据 - if (PncActionsHelper.isWaitingTrafficlight(it.drivingState.number, it.drivingAction.number) + if (PncActionsHelper.isWaitingTrafficlight( + it.drivingState.number, + it.drivingAction.number + ) && mTrafficLightResult != null - && getWaitTrafficlightTime().isNotBlank()) { + && getWaitTrafficlightTime().isNotBlank() + ) { actions += ",预计${getWaitTrafficlightTime()}秒后通过" } else { mTrafficLightResult = null @@ -94,16 +101,18 @@ class PncActionsView @JvmOverloads constructor( this.background = null tvHmiPncActions.text = "" } else { - this.background = AppCompatResources.getDrawable(context, R.drawable.pnc_actions_bg) + this.background = + AppCompatResources.getDrawable(context, R.drawable.pnc_actions_bg) tvHmiPncActions.text = actions } + + } else { + this.background = null + tvHmiPncActions.text = "" } - }else{ - this.background = null - tvHmiPncActions.text = "" } } - }catch (e:Exception){ + } catch (e: Exception) { e.printStackTrace() } } From 2b551bcdc3f3af8c3cc27196ee561513f5d941c4 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 20 Feb 2023 16:44:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[2.14.0][adas=20lib]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../high/common/autopilot/ability/AutopilotAbility230.java | 4 ++-- .../high/common/autopilot/ability/AutopilotAbility250.java | 4 ++-- .../com/zhidao/support/adas/high/msg/VehicleStateMessage.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java index ba867d239d..588f741e14 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java @@ -56,13 +56,13 @@ public class AutopilotAbility230 { if (AutopilotAbilityManager.getInstance().isBus()) { if (gear == Chassis.GearPosition.GEAR_N || gear == Chassis.GearPosition.GEAR_R) { isAutopilotAbility = false; - unableAutopilotReason = "挡位不正常"; + unableAutopilotReason = "档位不正常"; } } else { //东风Taxi和红旗 司机端和乘客端 档位不正常 if (gear == Chassis.GearPosition.GEAR_P || gear == Chassis.GearPosition.GEAR_R) { isAutopilotAbility = false; - unableAutopilotReason = "挡位不正常"; + unableAutopilotReason = "档位不正常"; } } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java index 6d61e96e06..18143ec8b0 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java @@ -131,13 +131,13 @@ public class AutopilotAbility250 { if (AutopilotAbilityManager.getInstance().isBus()) { if (gear == Chassis.GearPosition.GEAR_N || gear == Chassis.GearPosition.GEAR_R) { isAutopilotAbility = false; - unableAutopilotReason = "挡位不正常"; + unableAutopilotReason = "档位不正常"; } } else { //东风Taxi和红旗 司机端和乘客端 档位不正常 if (gear == Chassis.GearPosition.GEAR_P || gear == Chassis.GearPosition.GEAR_R) { isAutopilotAbility = false; - unableAutopilotReason = "挡位不正常"; + unableAutopilotReason = "档位不正常"; } } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java index 4295d0fc4d..5a94481d6a 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java @@ -139,7 +139,7 @@ public class VehicleStateMessage extends MyAbstractMessageHandler { ChassisStatesOuterClass.GearSystemStates.Builder gearSystemStates = null; if (vehicleState.hasGear()) { gearSystemStates = ChassisStatesOuterClass.GearSystemStates.newBuilder(); - //挂挡档位数据 + //档位数据 gearSystemStates.setGearPosition(vehicleState.getGear());//鹰眼已用 } if (vehicleState.hasGearSwitchInference()) { From b3045791a960003bfbd0d1a3305bef825dc1337a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 20 Feb 2023 17:23:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[2.14.0]=E5=8C=85=E4=BD=93=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E6=94=B9=E4=B8=BA=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E7=82=B9=E5=90=8E=E4=B8=A4=E4=BD=8D=EF=BC=8C=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?Cos=E5=88=A4=E6=96=ADkey=E6=96=B9=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 5 ++++- .../badcase/biz/adapter/BagManagerListAdapter.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt index 60b299948b..70f318d8fe 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt @@ -114,6 +114,7 @@ class BadCaseManagerView @JvmOverloads constructor( if(bagManagerList.size>0){ bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key + Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity) bagUploadDialog = BagUploadDialog(context) @@ -237,6 +238,7 @@ class BadCaseManagerView @JvmOverloads constructor( Log.i(TAG,"onBagManagerResult Start") Log.i(TAG,"keyReq="+bagManager.keyReq) Log.i(TAG,"reqType="+bagManager.reqType) + Log.i(TAG,"uploadCosResp stat="+bagManager.uploadCosResp.stat) Log.i(TAG,"descReq description="+bagManager.descReq.description +" audioUrl="+bagManager.descReq.audioUrl +" reportBI="+bagManager.descReq.reportBI @@ -352,7 +354,7 @@ class BadCaseManagerView @JvmOverloads constructor( val uploadIterator = bagManagerEntity.bagsInfoResp.iterator() while(uploadIterator.hasNext()){ val uploadBagInfo = uploadIterator.next() - if(uploadBagInfo.key == bagManager.keyReq){ + if(uploadBagInfo.key == bagManager.uploadCosResp.key && bagManager.uploadCosResp.stat!=1){ bagManagerList.remove(uploadBagInfo) if(bagManagerList.size>0){ var remainSize = 0L @@ -363,6 +365,7 @@ class BadCaseManagerView @JvmOverloads constructor( //执行下一个上传Bag命令 bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key + Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt index 0dbf9915b2..d3c8abc803 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt @@ -24,7 +24,7 @@ class BagManagerListAdapter: RecyclerView.Adapter() { private var data:List ?= null private var bagClickListener: BagClickListener ?= null - private val format = DecimalFormat("0.0") + private val format = DecimalFormat("0.00") fun setData(data: List?){ this.data = data From 79717282a9735769fe9c42409c5a6e9d1fecdf44 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 20 Feb 2023 18:35:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[2.14.0]=E6=B6=88=E6=81=AF=E7=9B=92?= =?UTF-8?q?=E5=AD=90=E8=BD=A6=E8=BE=86=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E6=9D=A5=E6=BA=90=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=98=E5=8F=A0=E6=96=87=E5=AD=97=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 6 ++++++ .../res/layout/item_msg_box_ipc_report.xml | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index 9987bfaa74..a0e12d3a8e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -143,6 +143,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvReportTypeNormal.text = resultStr holder.tvReportTypeOpen.text = resultStr holder.tvReportReasonOpen.text = "原因：${reportEntity.msg}" + holder.tvReportSrcOpen.text = "消息来源：${reportEntity.src}" var actionStr = "" for (action in reportEntity.actionsList) { actionStr = @@ -157,6 +158,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) + holder.tvStatusSelect.text = "折叠" holder.ivReportImageNormal.visibility = View.GONE holder.tvReportLevelNormal.visibility = View.GONE holder.tvReportTimeNormal.visibility = View.GONE @@ -167,6 +169,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvReportTimeOpen.visibility = View.VISIBLE holder.tvReportTypeOpen.visibility = View.VISIBLE holder.tvReportReasonOpen.visibility = View.VISIBLE + holder.tvReportSrcOpen.visibility = View.VISIBLE holder.tvReportActionOpen.visibility = View.VISIBLE } else { holder.tvStatusSelect.setCompoundDrawablesWithIntrinsicBounds( @@ -175,6 +178,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) + holder.tvStatusSelect.text = "展开" holder.ivReportImageNormal.visibility = View.VISIBLE holder.tvReportLevelNormal.visibility = View.VISIBLE holder.tvReportTimeNormal.visibility = View.VISIBLE @@ -185,6 +189,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvReportTimeOpen.visibility = View.GONE holder.tvReportTypeOpen.visibility = View.GONE holder.tvReportReasonOpen.visibility = View.GONE + holder.tvReportSrcOpen.visibility = View.GONE holder.tvReportActionOpen.visibility = View.GONE } } @@ -340,6 +345,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : var tvReportTimeOpen: TextView = itemView.findViewById(R.id.tvReportTimeOpen) var tvReportTypeOpen: TextView = itemView.findViewById(R.id.tvReportTypeOpen) var tvReportReasonOpen: TextView = itemView.findViewById(R.id.tvReportReasonOpen) + var tvReportSrcOpen: TextView = itemView.findViewById(R.id.tvReportSrcOpen) var tvReportActionOpen: TextView = itemView.findViewById(R.id.tvReportActionOpen) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml index 5911e16c42..29e1165bfb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml @@ -70,7 +70,7 @@ android:id="@+id/tvStatusSelect" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="折叠" + android:text="展开" android:textColor="#FFFFFFFF" android:textSize="24dp" app:layout_constraintTop_toTopOf="parent" @@ -163,12 +163,26 @@ /> + + Date: Mon, 20 Feb 2023 18:41:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[2.14.0]MAP=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BAView=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt index 12ff7aa0bc..2806810642 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.widget.LinearLayout import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo @@ -66,6 +67,7 @@ class VersionNameView @JvmOverloads constructor( if (!dockerVersion.isNullOrEmpty()) { it.text = " ; MAP:${dockerVersion}" } + Log.i(TAG,"tvMapVersionName text="+tvMapVersionName.text) } } } @@ -88,6 +90,7 @@ class VersionNameView @JvmOverloads constructor( override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { dockerVersion = autoPilotStatusInfo.dockVersion + Log.i(TAG,"dockerVersion=$dockerVersion") showCurrentMapVersion() //将工控机版本赋值给BadCase配置常量 BadCaseConfig.dockerVersion = autoPilotStatusInfo.dockVersion