yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[shuttle/M1] 1、处理运营消息单发乘客屏bug 2、站点文案修改

Browse Source
This commit is contained in:
wangmingjun
2023-03-17 23:36:21 +08:00
parent 5df38df0c9
commit d313ac52b9
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
View File

@@ -231,16 +231,18 @@ public class OrderModel {
CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext());
List<Integer> list = obj.getScreenList();
CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list));
if ( list!= null && list.size() > 1){
if (list != null && list.contains(1)){ // 1司机端
OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(),
obj.getContext(),OCHSocketMessageManager.OPERATION_SYSTEM);
}
if (list != null && list.contains(2)){ //乘客屏
AppConnectMsg msg = new AppConnectMsg(true,false,obj.getContext());
CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
GsonUtils.toJson(msg).getBytes());
}
OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(),
obj.getContext(),OCHSocketMessageManager.OPERATION_SYSTEM);
}
};

15
OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
View File

@@ -16,10 +16,6 @@ import com.magic.mogo.och.charter.callback.DriverM1OrderCallback
import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback
import com.magic.mogo.och.charter.constant.CharterConst
import com.magic.mogo.och.charter.manager.CharterAnalyticsManager
import com.mogo.och.common.module.manager.CharterSendTripInfoManager
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
import com.magic.mogo.och.charter.manager.CharterTrajectoryManager
import com.magic.mogo.och.charter.net.DriverM1ServiceManager
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
@@ -50,6 +46,10 @@ import com.mogo.och.common.module.biz.provider.LoginService
import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.startLoopAbnormalFactors
import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.stopLoopAbnormalFactors
import com.mogo.och.common.module.manager.CharterSendTripInfoManager
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
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 io.reactivex.exceptions.UndeliverableException
@@ -252,9 +252,12 @@ class DriverM1Model {
d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.context)
pushOperationalToMsgBox(obj.pushTimeStamp, obj.context)
val list = obj.screenList
if (list.size > 1){ //发送乘客屏
d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + GsonUtils.toJson(list))
if (list != null && list.contains(1)){ // 司机端
pushOperationalToMsgBox(obj.pushTimeStamp, obj.context)
}
if (list != null && list.contains(2)){ //发送乘客屏
sendMsgToClient(DPCommonOperationMsg(obj.context))
}

2
OCH/mogo-och-charter/src/main/res/values/strings.xml
View File

@@ -26,7 +26,7 @@
<!-- <string name="bus_arrive_to_end_title">去往下车地点</string>-->
<string name="bus_arrive_to_end_start">起点：</string>
<string name="bus_arrive_to_end_end">终点：</string>
<string name="bus_arrive_to_current_tag">当前站点：</string>
<string name="bus_arrive_to_current_tag">出发站点：</string>
<string name="bus_arrive_to_next_tag1">目的站点：</string>
<string name="bus_arrive_to_next_tag">下一站：</string>
<string name="bus_auto_disable_tip">自动驾驶状态为0不可用</string>

2
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt
View File

@@ -5,7 +5,7 @@ package com.mogo.och.common.module.biz.common.socketmessage.data
*/
data class SystemMsg(
var context: String,
var screenList: MutableList<Int>,
var screenList: MutableList<Int>,//1:司机屏 2:乘客屏
var pushTimeStamp: Long = System.currentTimeMillis() // 消息下发时间戳
)