From c72318a19e92da9cebb63e82237c6db5b9d99961 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 3 Sep 2024 16:14:28 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=E5=9C=A8saas=E7=8E=AF=E5=A2=83=E7=82=B9?= =?UTF-8?q?=E6=8A=A5=E9=9A=9C=EF=BC=8C=E5=87=BA=E7=8E=B0=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E3=80=82=E5=85=B6=E4=BB=96=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=82=B9=E6=8A=A5=E9=9A=9C=EF=BC=8C=E5=87=BA=E7=8E=B0=E4=BA=BA?= =?UTF-8?q?=E5=B7=A5=E6=8A=A5=E9=9A=9C=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 35 +++++++------------ .../workorder/ReportTypeWindow.kt | 12 +++++-- .../workorder/WorkOrderWindow.kt | 2 +- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index b3dbcfe91e..4889b82e34 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -246,32 +246,21 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis if (ClickUtils.isFastClick()){ if (NetworkUtils.isConnected()){ if (BadCaseConfig.dockerVersion != null){ - if(ProjectUtils.isSaas()){ - //660版本数据闭环增加统一上报问题入口（仅限于saas渠道） - if(reportTypeWindow == null){ - reportTypeWindow = ReportTypeWindow(activity) - reportTypeWindow?.setClickListener(object: ReportTypeWindow.ClickListener{ - override fun closeWindow() { - reportTypeWindow?.hideFloatWindow() - reportTypeWindow = null - } - }) - } - if(reportTypeWindow?.getWindowShowStatus() == true){ - reportTypeWindow?.hideFloatWindow() - reportTypeWindow = null - }else{ - reportTypeWindow?.showFloatWindow(xPosition,yPosition) - } - }else{ - //展示工单上报弹窗 - val workOrderWindow = WorkOrderWindow(activity) - workOrderWindow.setClickListener(object: WorkOrderWindow.ClickListener{ + //660版本数据闭环增加统一上报问题入口（仅限于saas渠道） + if(reportTypeWindow == null){ + reportTypeWindow = ReportTypeWindow(activity) + reportTypeWindow?.setClickListener(object: ReportTypeWindow.ClickListener{ override fun closeWindow() { - workOrderWindow.hideFloatWindow() + reportTypeWindow?.hideFloatWindow() + reportTypeWindow = null } }) - workOrderWindow.showFloatWindow() + } + if(reportTypeWindow?.getWindowShowStatus() == true){ + reportTypeWindow?.hideFloatWindow() + reportTypeWindow = null + }else{ + reportTypeWindow?.showFloatWindow(xPosition,yPosition) } }else{ ToastUtils.showShort("工控机连接状态异常") diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt index 08da21b29f..66d34c26af 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt @@ -21,6 +21,7 @@ import com.amap.api.services.geocoder.GeocodeResult import com.amap.api.services.geocoder.GeocodeSearch import com.amap.api.services.geocoder.RegeocodeQuery import com.amap.api.services.geocoder.RegeocodeResult +import com.mogo.commons.env.ProjectUtils import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.deva.report.CategoryInfo @@ -78,7 +79,6 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { private var level2Name: String = "" private var level3Name: String = "" private var lineName: String = "" //行驶路线 - private var reportNote: String = "" //上报描述 private val reportType: Int = 1 //上报方式：0：小程序 1：司机屏 2：云端上报 private var level: Int = 1 @@ -160,8 +160,14 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { } //故障类 tvReportTypeFault.setOnClickListener { - val faultReasonWindow = FaultReasonWindow(mActivity) - faultReasonWindow.showFloatWindow() + if(ProjectUtils.isSaas()){ + val faultReasonWindow = FaultReasonWindow(mActivity) + faultReasonWindow.showFloatWindow() + }else{ + //展示工单上报弹窗 + val workOrderWindow = WorkOrderWindow(mActivity) + workOrderWindow.showFloatWindow() + } clickListener?.closeWindow() } //主动录包 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 764b20df81..86a46e7efb 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 @@ -239,7 +239,7 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, } //取消 tvWorkOrderCancel.setOnClickListener { - clickListener?.closeWindow() + hideFloatWindow() } }