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

Merge branch 'refs/heads/dev_robotaxi-d_240729_6.6.0' into dev_robotaxi-d_240807_6.6.0

Browse Source
This commit is contained in:
yangyakun
2024-08-07 16:06:57 +08:00
parent b2648c0cdc e519886a58
commit ed5694218c
688 changed files with 28713 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java
View File

@@ -12,4 +12,15 @@ public class WriteOffPassenger implements Serializable {
public String ticketName;
public int passengerSize;
public long writeOffTime;
@Override
public String toString() {
return "WriteOffPassenger{" +
"phone='" + phone + '\'' +
", orderNo='" + orderNo + '\'' +
", ticketName='" + ticketName + '\'' +
", passengerSize=" + passengerSize +
", writeOffTime=" + writeOffTime +
'}';
}
}

5
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
View File

@@ -27,6 +27,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage
import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
import com.mogo.och.common.module.manager.autopilot.line.LineManager;
import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager;
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener;
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType;
import com.mogo.och.common.module.voice.VoiceNotice;
@@ -215,8 +216,8 @@ public class OrderModel {
}
};
private final IMogoOnMessageListener<SystemMsg> mMogoOnMessageListener =
new IMogoOnMessageListener<SystemMsg>() {
private final IOchOnMessageListener<SystemMsg> mMogoOnMessageListener =
new IOchOnMessageListener<SystemMsg>() {
@Override
public Class<SystemMsg> target() {
return SystemMsg.class;

3
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt
View File

@@ -27,12 +27,13 @@ import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.manager.loop.LoopInfo
import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener
import io.reactivex.Observable
import io.reactivex.ObservableEmitter
import io.reactivex.ObservableOnSubscribe
import io.reactivex.schedulers.Schedulers
object TicketModel : IReceivedMsgListener, IMogoOnMessageListener<WriteOffPassenger> {
object TicketModel : IReceivedMsgListener, IOchOnMessageListener<WriteOffPassenger> {
private val TAG = "TicketModel"

1
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java
View File

@@ -285,7 +285,6 @@ public class BusPresenter extends Presenter<ShuttleFragment>
@Override
public void onStatusChange(LoginStatusEnum currentStatus) {
ILoginCallback.super.onStatusChange(currentStatus);
CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin());
if(LoginStatusManager.isLogin()){
// OrderModel.getInstance().queryBusRoutes();