diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt index b1f3cbf364..74e9af28f7 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt @@ -43,24 +43,13 @@ object DriverMessage: IReceivedMsgListener { } } DPMsgType.TYPE_COMMON.type -> { - CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "收到数据:常规数据") - val msg = GsonUtils.fromJson( - String(byteArray), - DPCommonOperationMsg::class.java - ) as DPCommonOperationMsg - pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), msg.msg) - } - DPMsgType.TYPE_COMMON.type -> { - CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "收到数据:常规数据") val msg = GsonUtils.fromJson( String(byteArray), AppConnectMsg::class.java ) as AppConnectMsg + CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "收到数据:常规数据:$msg") if (msg.isViewShow) { //消息盒子显示内容 - OCHSocketMessageManager.pushAppOperationalMsgBox( - DateTimeUtil.getCurrentTimeStamp(), msg.msg, - OCHSocketMessageManager.OPERATION_SYSTEM - ) + pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), msg.msg) } if(msg.isPlay){ VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 012c15cf9f..ccee3bd4b1 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -223,6 +223,9 @@ class MainFragment : fun showOpenAndCloseDoor() { val bpFunctionGroup = bpFunctionGroupDialogFragment?.get() bpFunctionGroup?.dismissAllowingStateLoss() + val noviceGuidanceFragment = noviceGuidanceFragment?.get() + noviceGuidanceFragment?.dismissAllowingStateLoss() + if (m1CarUserNoOrderFragment?.get() == null) { m1CarUserNoOrderFragment = WeakReference(M1CarUserNoOrderFragment.newInstance()) } diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt index 7011aa4a80..738013d3d3 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt @@ -67,6 +67,7 @@ class NoviceGuidanceFragment : override fun getTagName(): String = TAG override fun initViews() { + dialog?.setCancelable(false) CallerLogger.d(M_BUS_P + TAG, "initViews") setTargetVisable(startGuidance = true)