diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java index 787663df60..0ea411d4d7 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java @@ -9,11 +9,11 @@ import com.mogo.commons.network.Utils; */ public class QueryLeaveAwayPassengersRequest { private String sn; - private int siteId; + private int endSiteId; public QueryLeaveAwayPassengersRequest( int siteId ) { this.sn = Utils.getSn(); - this.siteId = siteId; + this.endSiteId = siteId; } public String getSn() { @@ -24,11 +24,11 @@ public class QueryLeaveAwayPassengersRequest { this.sn = sn; } - public int getSiteId() { - return siteId; + public int getEndSiteId() { + return endSiteId; } - public void setSiteId( int siteId ) { - this.siteId = siteId; + public void setEndSiteId(int endSiteId) { + this.endSiteId = endSiteId; } } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java index da0cf9ba6c..feda83c6f5 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java @@ -89,7 +89,9 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese /** * 根据站点列表信息刷新车站面板，滑块面板 * - * @param stationList 车站列表信息 + * @param stationList 车站列表信息 + * @param currentStation 当前站点 + * @param nextStation 下个站点 */ public void refreshBusStations( List< OchBusStation > stationList, int currentStation, int nextStation ) { if ( getActivity() == null ) { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java index babf1a232d..4a3e94e9df 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java @@ -165,7 +165,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog mView.hideSlidePanel(); } - // + // 当前站点信息 if ( s.getIsCurrentSite() == STATION_STATUS_LEAVING || s.getIsCurrentSite() == STATION_STATUS_STOPPED ) { currentStationIndex = i; @@ -425,9 +425,9 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog /** * 播报下车乘客信息 * - * @param o + * @param awayPassengersResponse */ - private void playLeavePassengersMsg( QueryLeaveAwayPassengersResponse o ) { + private void playLeavePassengersMsg( QueryLeaveAwayPassengersResponse awayPassengersResponse ) { Logger.d( TAG, "播报下车乘客信息"); if ( currentStationIndex > stationList.size() - 1 ) { @@ -439,11 +439,11 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog if ( !station.endsWith( "站" ) ) { builder.append( "站" ); } - if ( o == null || o.result == null || o.result.info == null || o.result.info.isEmpty() ) { + if ( awayPassengersResponse == null || awayPassengersResponse.result == null || awayPassengersResponse.result.info == null || awayPassengersResponse.result.info.isEmpty() ) { // } else { builder.append( ",请尾号为" ); - for ( QueryLeaveAwayPassengersResponse.LeaveAwayPassenger leaveAwayPassenger : o.result.info ) { + for ( QueryLeaveAwayPassengersResponse.LeaveAwayPassenger leaveAwayPassenger : awayPassengersResponse.result.info ) { if ( leaveAwayPassenger == null ) { continue; } diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_away_passengers.json b/OCH/mogo-och-bus/src/main/res/raw/bus_away_passengers.json new file mode 100644 index 0000000000..e76436f2dc --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/raw/bus_away_passengers.json @@ -0,0 +1,184 @@ +{ + "code": 0, + "msg": "", + "detailMsg": "", + "result": { + "info": [ + { + "_id": "cee57b3ae07c4486b0357319368487d7", + "orderNo": "XB20210422000002", + "orderType": 10, + "userName": "董QAD", + "userPhone": "15631204018", + "startStationId": 1, + "startStation": "万集东门站", + "startStationCoordinate": [ + 116.7354579447, + 40.1974932972 + ], + "endStationId": 2, + "endStation": "顺密路口站", + "endStationCoordinate": [ + 116.721520973, + 40.1940181096 + ], + "orderDispatchType": 7, + "carNum": "京NB010", + "sn": "F803EB2046PZD00149", + "orderStartTime": "2021-04-22 16:31:58", + "orderEndTime": "2021-04-26 10:38:13", + "arrivedStartStationTime": null, + "arrivedEndStationTime": null, + "cityCode": "010", + "areaCode": "1001", + "createTime": "2021-04-22 16:31:58", + "updateTime": "2021-04-26 10:38:13", + "personNum": 1, + "travelDistance": 1.2, + "vehicleColour": null, + "lastBrandName": null, + "headImgUrl": null + }, + { + "_id": "ce69b1bcfb9840c6a4563bc6ef947caf", + "orderNo": "XB20210426000000", + "orderType": 10, + "userName": "董QAD", + "userPhone": "15631204018", + "startStationId": 1, + "startStation": "万集东门站", + "startStationCoordinate": [ + 116.7354579447, + 40.1974932972 + ], + "endStationId": 2, + "endStation": "顺密路口站", + "endStationCoordinate": [ + 116.721520973, + 40.1940181096 + ], + "orderDispatchType": 7, + "carNum": "京NB010", + "sn": "F803EB2046PZD00149", + "orderStartTime": "2021-04-26 10:38:48", + "orderEndTime": "2021-04-26 10:46:16", + "arrivedStartStationTime": null, + "arrivedEndStationTime": null, + "cityCode": "010", + "areaCode": "1001", + "createTime": "2021-04-26 10:38:48", + "updateTime": "2021-04-26 10:46:16", + "personNum": 1, + "travelDistance": 1.2, + "vehicleColour": null, + "lastBrandName": null, + "headImgUrl": null + }, + { + "_id": "cae07b56f41c4e0fa60ab3543ffc258e", + "orderNo": "XB20210426000001", + "orderType": 10, + "userName": "董QAD", + "userPhone": "15631204018", + "startStationId": 1, + "startStation": "万集东门站", + "startStationCoordinate": [ + 116.7354579447, + 40.1974932972 + ], + "endStationId": 2, + "endStation": "顺密路口站", + "endStationCoordinate": [ + 116.721520973, + 40.1940181096 + ], + "orderDispatchType": 7, + "carNum": "京NB010", + "sn": "F803EB2046PZD00149", + "orderStartTime": "2021-04-26 10:47:05", + "orderEndTime": "2021-04-26 10:48:07", + "arrivedStartStationTime": null, + "arrivedEndStationTime": null, + "cityCode": "010", + "areaCode": "1001", + "createTime": "2021-04-26 10:47:05", + "updateTime": "2021-04-26 10:48:07", + "personNum": 1, + "travelDistance": 1.2, + "vehicleColour": null, + "lastBrandName": null, + "headImgUrl": null + }, + { + "_id": "62bc84afbc434d01b644c74ee406e772", + "orderNo": "XB20210426000002", + "orderType": 10, + "userName": "董QAD", + "userPhone": "15631204018", + "startStationId": 1, + "startStation": "万集东门站", + "startStationCoordinate": [ + 116.7354579447, + 40.1974932972 + ], + "endStationId": 2, + "endStation": "顺密路口站", + "endStationCoordinate": [ + 116.721520973, + 40.1940181096 + ], + "orderDispatchType": 7, + "carNum": "京NB010", + "sn": "F803EB2046PZD00149", + "orderStartTime": "2021-04-26 10:48:22", + "orderEndTime": "2021-04-26 10:50:32", + "arrivedStartStationTime": null, + "arrivedEndStationTime": null, + "cityCode": "010", + "areaCode": "1001", + "createTime": "2021-04-26 10:48:22", + "updateTime": "2021-04-26 10:50:32", + "personNum": 1, + "travelDistance": 1.2, + "vehicleColour": null, + "lastBrandName": null, + "headImgUrl": null + }, + { + "_id": "fa3214c7a6ec411bb3d6edbc98907423", + "orderNo": "XB20210426000009", + "orderType": 10, + "userName": "董QAD", + "userPhone": "15631204018", + "startStationId": 1, + "startStation": "万集东门站", + "startStationCoordinate": [ + 116.7354579447, + 40.1974932972 + ], + "endStationId": 2, + "endStation": "顺密路口站", + "endStationCoordinate": [ + 116.721520973, + 40.1940181096 + ], + "orderDispatchType": 7, + "carNum": "京NB010", + "sn": "F803EB2046PZD00149", + "orderStartTime": "2021-04-26 19:26:05", + "orderEndTime": "2021-04-27 14:35:50", + "arrivedStartStationTime": null, + "arrivedEndStationTime": null, + "cityCode": "010", + "areaCode": "1001", + "createTime": "2021-04-26 19:26:05", + "updateTime": "2021-04-27 14:35:50", + "personNum": 1, + "travelDistance": 1.2, + "vehicleColour": null, + "lastBrandName": null, + "headImgUrl": null + } + ] + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/raw/bug_order_1.json b/OCH/mogo-och-bus/src/main/res/raw/bus_order_1.json similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bug_order_1.json rename to OCH/mogo-och-bus/src/main/res/raw/bus_order_1.json diff --git a/OCH/mogo-och-bus/src/main/res/raw/bug_station_list1.json b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bug_station_list1.json rename to OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json diff --git a/OCH/mogo-och-bus/src/main/res/raw/bug_station_list2.json b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bug_station_list2.json rename to OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json