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 f7264de06a..e2c3f5116a 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,7 +38,7 @@ --:-- 靠边停车 - 欢迎乘坐蘑菇车联自动驾驶小巴车,按照桌面屏幕的指引,开始探索吧! + 欢迎乘坐\'蘑菇车联\'自动驾驶小巴车,按照桌面屏幕的指引,开始探索吧! 接下来由蘑菇小助手为您\'指引方向\'! 关闭车门后,点击‘出发’按钮启动 diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index af757ee2b8..3aed6f1ba3 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -16,8 +16,10 @@ import com.magic.mogo.och.charter.manager.CharterAnalyticsManager import com.magic.mogo.och.charter.manager.CharterTrajectoryManager import com.magic.mogo.och.charter.net.DriverM1ServiceManager import com.mogo.aicloud.services.socket.IMogoOnMessageListener +import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager +import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.map.MogoLocation @@ -29,6 +31,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToAllClients +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -51,6 +54,7 @@ import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP import com.mogo.och.common.module.manager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.* +import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.data.bean.* import io.reactivex.exceptions.UndeliverableException import io.reactivex.functions.Consumer @@ -236,6 +240,18 @@ class DriverM1Model { } }else if (msg.type == DPMsgType.TYPE_TASK_DETAILS.type){ updateToClientData() + } else if (msg.type == DPMsgType.TYPE_COMMON.type) { + val msg = GsonUtils.fromJson( + String(byteArray), + AppConnectMsg::class.java + ) as AppConnectMsg + CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "收到数据:常规数据:$msg") + if (msg.isViewShow) { //消息盒子显示内容 + pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), msg.msg) + } + if(msg.isPlay){ + VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1) + } } d(SceneConstant.M_CHARTER_D,"onReceivedMsg = "+ GsonUtils.toJson(msg)) }catch (e: Exception){ @@ -275,7 +291,7 @@ class DriverM1Model { pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), obj.context) } if (list != null && list.contains(2)){ //发送乘客屏 - sendMsgToClient(DPCommonOperationMsg(obj.context)) + sendMsgToClient(AppConnectMsg(msg = obj.context)) } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt index 889849ec7b..7811310639 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt @@ -76,7 +76,7 @@ data class DPOrderClosedMsg( var closed: Boolean = true // true: 结束 ): BaseDPMsg(DPMsgType.TYPE_ORDER_CLOSED.type) -data class AppConnectMsg(var isViewShow: Boolean, var isPlay: Boolean, var msg: String, +data class AppConnectMsg(var isViewShow: Boolean = true, var isPlay: Boolean= false, var msg: String, ): BaseDPMsg(DPMsgType.TYPE_COMMON.type) data class TaskDetailsMsg(