From a0c87b48a7c37a919ad9ad0ee67fb6dd09e3b9de Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 11 Oct 2024 15:32:48 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=92=8C=E6=95=85=E9=9A=9C=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=AA=97=E5=8F=A3=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workorder/FaultReasonWindow.kt | 4 ++-- .../mogo_core_function_devatools/workorder/WorkOrderWindow.kt | 4 ++-- .../java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt index e93670d0eb..0e2e19c7dc 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt @@ -220,7 +220,7 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, @SuppressLint("SetTextI18n") private fun initEvent() { - CallerDevaToolsListenerManager.addListener(TAG, this) + CallerDevaToolsListenerManager.addListener(this.hashCode().toString(), this) val iconDown = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_expand) iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight) val iconUp = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_retract) @@ -558,7 +558,7 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, fun hideFloatWindow() { etNoteInput.clearFocus() - CallerDevaToolsListenerManager.removeListener(TAG) + CallerDevaToolsListenerManager.removeListener(this.hashCode().toString()) if (mFloatLayout.parent != null) { mWindowManager!!.removeView(mFloatLayout) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt index 86a46e7efb..a1f053f661 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt @@ -135,7 +135,7 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, @OptIn(DelicateCoroutinesApi::class) @SuppressLint("SetTextI18n") private fun initEvent(){ - CallerDevaToolsListenerManager.addListener(TAG, this) + CallerDevaToolsListenerManager.addListener(this.hashCode().toString(), this) //弹窗展示时间 tvWorkOrderTime.text = mActivity.resources.getString(R.string.work_order_time) + millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat()) @@ -382,7 +382,7 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, if (mFloatLayout.parent != null){ mWindowManager!!.removeView(mFloatLayout) } - CallerDevaToolsListenerManager.removeListener(TAG) + CallerDevaToolsListenerManager.removeListener(this.hashCode().toString()) } override fun workOrderReportSuccess() { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index a407034c73..46421f4de2 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -1240,7 +1240,7 @@ enum class EventTypeEnumNew( FOURS_ACCIDENT_05.poiType -> { R.drawable.v2x_icon_jiaotongshigu_vr } - //事故 + //实时路况 FOURS_LIVING.poiType -> { R.drawable.v_to_x_marker_1 }