diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt index 3ac0059024..c29775333b 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt @@ -1,6 +1,8 @@ package com.mogo.och.bus.passenger.presenter import androidx.lifecycle.LifecycleOwner +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment @@ -31,6 +33,20 @@ class CharterPassengerNoviceGuidancePresenter(view: NoviceGuidanceFragment?) : }catch (e:Exception){ e.printStackTrace() } + when (it.productType) { + OrderInfoResponse.M1_LOVE -> { + mView?.setProductType("爱情号") + } + OrderInfoResponse.M1_FAMILY -> { + mView?.setProductType("家庭号") + } + OrderInfoResponse.M1_FRIENDLY -> { + mView?.setProductType("朋友号") + } + else -> { + mView?.setProductType("") + } + } } } 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..0009d89f06 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) @@ -291,6 +292,10 @@ class NoviceGuidanceFragment : super.onViewStateRestored(savedInstanceState) } + fun setProductType(type: String) { + actv_start_guildance.text = "欢迎乘坐蘑菇车联自动驾驶$type!" + } + companion object { const val TAG = "NoviceGuidanceFragment" diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml index c1b8af29ec..32e9cf3a81 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml @@ -12,7 +12,7 @@ app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="@dimen/dp_186" android:layout_marginStart="@dimen/dp_280" - android:text="欢迎乘坐蘑菇车联自动驾驶亲情号!" + android:text="欢迎乘坐蘑菇车联自动驾驶!" android:visibility="gone" android:textSize="@dimen/dp_52" android:textStyle="bold" diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml index 376b5fe977..cfe640568d 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml @@ -38,13 +38,13 @@ --:-- 靠边停车 - 欢迎乘坐蘑菇车联自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！小蘑菇预祝您旅途愉快 + 欢迎乘坐蘑菇车联自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！ - 铛铛～接下来由蘑菇小助手为您\'指引方向\'！ - 关闭车门后，点击‘出发’按钮启程，车辆自动判断开始自动驾驶啦！咻～ - 点击‘停车’按钮后，车辆自动靠边停车，车辆停稳后就可以下车游玩啦！ + 接下来由蘑菇小助手为您\'指引方向\'！ + 关闭车门后，点击‘出发’按钮启动 + 点击‘停车’按钮后进行靠边停车，车辆停稳后就可以下车游玩啦！ 最后,蘑菇小助手为您送上乘车小贴士～ - 太棒了！您已完成乘车指南，更多功能欢迎探索～蘑菇小助手预祝您旅途愉快 + 太棒了！您已完成乘车指南，更多功能欢迎探索，蘑菇小助手预祝您旅途愉快 先关闭车门再启动吧～ 自驾系统繁忙，稍后再试试吧～