diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index aea76459f3..797b410c62 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -5,7 +5,9 @@ import android.media.AudioAttributes import android.media.AudioFocusRequest import android.media.AudioManager import android.net.ConnectivityManager +import android.os.Build import android.os.Handler +import androidx.annotation.RequiresApi import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager import com.mogo.commons.voice.AIAssist @@ -38,9 +40,11 @@ import com.mogo.och.bus.passenger.callback.DrivingInfoCallback import com.mogo.och.bus.passenger.constant.BusPassengerConst import com.mogo.och.bus.passenger.network.PM2ModelLoopManager import com.mogo.och.common.module.bean.AppConnectMsg +import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil +import com.mogo.och.common.module.utils.DateTimeUtil import mogo.telematics.pad.MessagePad import kotlin.math.abs @@ -145,6 +149,7 @@ class PM2DrivingModel private constructor() { private val mReceivedMsgListener: IReceivedMsgListener = object : IReceivedMsgListener{ + @RequiresApi(Build.VERSION_CODES.O) override fun onReceivedMsg(type: Int, byteArray: ByteArray) {//接收司机端发来的信息 if (OchCommonConst.BUSINESS_STRING == type){ val msg = GsonUtils.fromJson(String(byteArray),AppConnectMsg::class.java) as AppConnectMsg @@ -152,10 +157,15 @@ class PM2DrivingModel private constructor() { if (msg.isPlay){ //播报 speakTTS(msg.msg) } + if (msg.isViewShow){ //消息盒子显示内容 + OCHSocketMessageManager.pushAppOperationalMsgBox( + DateTimeUtil.getCurrentTimeStamp(),msg.msg) + } } } } + @RequiresApi(Build.VERSION_CODES.O) private fun speakTTS(msg: String) { var mAudioManager = mContext?.getSystemService(Context.AUDIO_SERVICE) as AudioManager diff --git a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java index 168aa2af26..bb520d6ffd 100644 --- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java @@ -232,9 +232,9 @@ public class OrderModel { List list = obj.getScreenList(); CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); if ( list!= null && list.size() > 1){ - + AppConnectMsg msg = new AppConnectMsg(true,false,obj.getContext()); CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING, - GsonUtils.toJson(obj.getContext()).getBytes()); + GsonUtils.toJson(msg).getBytes()); } OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),