From f2e563dc06025141945fc10ac4ea338b472aeeba Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 7 Apr 2021 10:06:27 +0800 Subject: [PATCH 1/4] opt --- .idea/gradle.xml | 1 - .idea/misc.xml | 2 +- .../och/bus/presenter/OchBusOrderModel.java | 1 + .../och/bus/presenter/OchBusPresenter.java | 20 +++++++++++++++---- .../common/drawer/V2XWarnDataDrawer.java | 2 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 4ff10f68a5..83405b8de1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -91,7 +91,6 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 733acb1920..97b9126cee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java index b5826b2631..80d9a4d381 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java @@ -75,6 +75,7 @@ class OchBusOrderModel { /** * 站点信息变更推送 + * 新订单、取消订单、到达站点等都会导致停靠站点变更，故都会收到此推送 */ private IMogoOnMessageListener< OchBusStationsChangedMsg > mOnBusStationsChangedMsg = new IMogoOnMessageListener< OchBusStationsChangedMsg >() { @Override 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 191bd9c882..1d97dd3a93 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 @@ -71,7 +71,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog private IOchBusApiService mService; /** - * 运营状态 + * 运营状态、后端更具运营状态来判断车辆是否派单 */ private boolean mIsWorking = false; @@ -216,10 +216,16 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog return nextStationIndex; } + /** + * 延时查询站点信心 + */ private void queryBusStationDelay() { handler.sendEmptyMessageDelayed( MSG_QUERY_BUS_STATION, QUERY_BUS_STATION_DELAY ); } + /** + * 在踩刹车、控制方向盘等操作后，会停止自动加水，重启自动驾驶的话相当于重新设置自动驾驶目的地 + */ public void restartAutopilot() { Logger.d( TAG, "重启自动驾驶===" + isGoingToNextStation ); if ( isGoingToNextStation ) { @@ -228,7 +234,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog } /** - * 测试 + * 测试、重置站点状态 */ public void debugResetStationStatus() { OchBusResetRequest request = new OchBusResetRequest( Utils.getSn(), 1 ); @@ -403,14 +409,20 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog } ); } + /** + * 播报下车乘客信息 + * + * @param o + */ private void playLeavePassengersMsg( QueryLeaveAwayPassengersResponse o ) { if ( currentStationIndex > stationList.size() - 1 ) { return; } String station = stationList.get( currentStationIndex ).getSiteName(); StringBuilder builder = new StringBuilder( "已到达" ); - if ( station.endsWith( "站" ) ) { - builder.append( station ); + builder.append( station ); + if ( !station.endsWith( "站" ) ) { + builder.append( "站" ); } if ( o == null || o.result == null || o.result.info == null || o.result.info.isEmpty() ) { // diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java index b9f839be11..43edc1fd20 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java @@ -59,8 +59,6 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { Logger.d(TAG, "%s - %s", descriptor, isTrue); mChangeCarModeStatus = true; - - AdasRecognizedResultDrawer.getInstance().notifyVrModeChanged(); } public boolean isVrMode() { From 7864162cae4185bbcadb212cfee49d88ed7bf8b0 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 12 Apr 2021 14:30:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/bus/presenter/OchBusPresenter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1d97dd3a93..b2552af8e6 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 @@ -104,8 +104,8 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog double lat = 40.1974932972; double lon = 116.7354579447; -// lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); -// lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); + lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); + lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); OchBusRoutesRequest request = new OchBusRoutesRequest( Utils.getSn(), lat, lon ); RequestBody requestBody = RequestBody.create( MediaType.get( "application/json;charset=UTF-8" ), GsonUtil.jsonFromObject( request ) ); From 67899aa16d0847109ba8e876829c642547947329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 15 Apr 2021 16:57:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B0=8F?= =?UTF-8?q?=E5=B7=B4=E8=BD=A6=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1219ca1f8d..eb597d78ac 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 @@ -158,7 +158,7 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese } else if ( isArriveAtStartStation ) { showSlidePanle( "准备出发" ); } else if ( isArriveAtStation ) { - showSlidePanle( "乘客已上车，准备出发" ); + showSlidePanle( "滑动出车" ); } mCurrentStationName.setText( currentStationName ); From 546191a96fb1709f2d05bbc049b7a9a60dcbc8bb Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 15 Apr 2021 09:56:52 +0800 Subject: [PATCH 4/4] no message --- .../com/mogo/service/impl/adas/MogoADASController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 2fed26c73a..db31061e4b 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -138,10 +138,16 @@ public class MogoADASController implements IMogoADASController { super.handleMessage( msg ); final long start = System.currentTimeMillis(); ADASCarStateInfo stateInfo = GsonUtil.objectFromJson( ( ( String ) msg.obj ), ADASCarStateInfo.class ); - Logger.d( "ADAS-LOC-timer", "upd 到 aidl 传输耗时：%s", start - Long.valueOf( stateInfo.getValues().getStartReceiverDataTime() ) ); if ( stateInfo == null || stateInfo.getValues() == null ) { + Logger.d(TAG,"ADAS-LOC-timer","upd 到 aidl 传输数据 stateInfo or stateInfo.getValues() is null"); return; } + if(stateInfo.getValues().getStartReceiverDataTime() != null){ + Logger.d( "ADAS-LOC-timer", "upd 到 aidl 传输耗时：%s", start - Long.valueOf( stateInfo.getValues().getStartReceiverDataTime() ) ); + }else{ + Logger.d( "ADAS-LOC-timer", "upd 到 aidl 传输耗时时间字段 startReceiverDataTime is null"); + } + mLastLon = stateInfo.getValues().getLon(); mLastLat = stateInfo.getValues().getLat(); if ( mMogoAdasCarDataCallback != null ) {