From 05a75395d4396b9e4c2f6c100765a6afe5105c0a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 18 Oct 2024 16:37:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.7.0]BUS=E4=B9=98=E5=AE=A2=E7=AB=AF?= =?UTF-8?q?=E7=BA=A2=E7=BB=BF=E7=81=AFUI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi_view_fusion_traffic_light_p_bus.xml | 22 +++++----- .../view_traffic_light_prompt_p_bus.xml | 42 +++++++++++-------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml index 2037dead22..23c3fe2edb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml @@ -19,6 +19,17 @@ app:ringWidth="@dimen/dp_5" /> + + - - - + app:layout_constraintRight_toRightOf="parent" + android:layout_marginEnd="@dimen/dp_25" + > - + + + + + \ No newline at end of file From 6f255551ebc64f4c02b4eb614a16364f3776306a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 18 Oct 2024 17:51:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.7.0]=20[fea]=20[=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=AE=97=E8=B7=AF=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt index 658afd4800..68d6a2c50e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt @@ -40,6 +40,7 @@ data class RoutingSite( temp.gcjLat = gcjLat temp.gcjLon = gcjLon temp.pointType = pointType + temp.isLeaving = true return temp } } From cfcd54a93bef99ecea6c2b2afd33b5d8164e05d0 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 18 Oct 2024 19:36:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.7.0]=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E2=80=9C=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E2=80=9D=E5=90=8E=E5=87=BA=E7=8E=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/bone/tab/FaultReasonView.kt | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt index 34f1fc6804..1b17a56554 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt @@ -199,7 +199,7 @@ class FaultReasonView @JvmOverloads constructor( tvFaultType.setCompoundDrawables(null, null, iconUp, null) //展示列表 rvFaultList.visibility = View.VISIBLE - (rvFaultList.layoutParams as ConstraintLayout.LayoutParams).topToBottom = + (rvFaultList.layoutParams as LayoutParams).topToBottom = R.id.tvFaultType source = 1 if (typeList.isNullOrEmpty()) { @@ -223,6 +223,11 @@ class FaultReasonView @JvmOverloads constructor( ToastUtils.showShort("请先选择故障类型") return@setOnClickListener } + if(!hasLevel3){ + ToastUtils.showShort("后台未配置故障原因") + return@setOnClickListener + } + if (faultReasonSelectStatus) { //关闭 faultReasonSelectStatus = false @@ -235,7 +240,7 @@ class FaultReasonView @JvmOverloads constructor( tvFaultReason.setCompoundDrawables(null, null, iconUp, null) //展示列表 rvFaultList.visibility = View.VISIBLE - (rvFaultList.layoutParams as ConstraintLayout.LayoutParams).topToBottom = + (rvFaultList.layoutParams as LayoutParams).topToBottom = R.id.tvFaultReason } } @@ -540,6 +545,8 @@ class FaultReasonView @JvmOverloads constructor( override fun onVisibilityAggregated(isVisible: Boolean) { super.onVisibilityAggregated(isVisible) if(visibility == View.VISIBLE){ + //获取一级分类 + CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId, 1, 0, type, 0) //弹窗展示时间 tvFaultTime.text = millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat()) @@ -547,9 +554,11 @@ class FaultReasonView @JvmOverloads constructor( workOrderOccurrenceTime = System.currentTimeMillis() tvOccurrenceTime.text = millis2String(workOrderOccurrenceTime, TimeUtils.getHourMinFormat()) //关闭故障类型选择 + tvFaultType.text = "" faultTypeSelectStatus = false tvFaultType.setCompoundDrawables(null, null, iconDown, null) //关闭故障原因选择 + tvFaultReason.text = "" faultReasonSelectStatus = false tvFaultReason.setCompoundDrawables(null, null, iconDown, null) //隐藏列表 @@ -564,6 +573,13 @@ class FaultReasonView @JvmOverloads constructor( ) ) setAudio(false) + level1Id = 0 //一级分类ID + level2Id = 0 //二级分类ID + level3Id = 0 //三级分类ID + level1Name = "" + level2Name = "" + level3Name = "" + reportNote = "" //上报描述 } }