From 4e78853d0e3f383ef4cbd050d4f208a48b3c0a5a Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 30 Mar 2021 16:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/fragment/OchBusFragment.java | 8 +-- .../och/bus/presenter/OchBusOrderModel.java | 15 ---- .../och/bus/presenter/OchBusPresenter.java | 68 ++++++++++++------ ...mogo_och_autopilot_text_color_selector.xml | 1 - .../module_och_bus_ic_autopilot.png | Bin 0 -> 1781 bytes .../module_mogo_och_autopilot_status_bg.xml | 26 +++---- .../layout/module_mogo_och_base_fragment.xml | 9 +-- OCH/mogo-och/src/main/res/values/dimens.xml | 6 +- .../src/main/res/raw/othercar.n3d | Bin 193668 -> 166020 bytes .../RemoteControlAutoPilotParameters.java | 4 ++ 10 files changed, 75 insertions(+), 62 deletions(-) create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi/module_och_bus_ic_autopilot.png 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 67347b137d..1219ca1f8d 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 @@ -154,12 +154,10 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese } if ( isArriveEndStation ) { -// showNotice( "行程结束,请携带好随身物品,注意侧后方来车,感谢体验蘑菇智行自动驾驶车!" ); showSlidePanle( "单程结束" ); } else if ( isArriveAtStartStation ) { showSlidePanle( "准备出发" ); } else if ( isArriveAtStation ) { -// showNotice( "行程结束,请携带好随身物品,注意侧后方来车,感谢体验蘑菇智行自动驾驶车!" ); showSlidePanle( "乘客已上车,准备出发" ); } @@ -191,7 +189,7 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese @Override public void moveToEnd() { - mPresenter.autoDriveToNextStation(); + mPresenter.autoDriveToNextStation(false); } public void onAutopilotEnableChange( boolean isEnable ) { @@ -210,9 +208,9 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese public void changeOperationStatus( boolean launch ) { if ( launch ) { - tvOperationStatus.setText( "关闭" ); + tvOperationStatus.setText( "收车" ); } else { - tvOperationStatus.setText( "开启" ); + tvOperationStatus.setText( "出车" ); } } } 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 2a54899375..b5826b2631 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 @@ -73,21 +73,6 @@ class OchBusOrderModel { } }; - /** - * 小巴达到站点,推送需要下车的乘客列表 - */ - private IMogoOnMessageListener< OchBusArriveAtStationMsg > mOnBusArriveAtStationMsg = new IMogoOnMessageListener< OchBusArriveAtStationMsg >() { - @Override - public Class< OchBusArriveAtStationMsg > target() { - return OchBusArriveAtStationMsg.class; - } - - @Override - public void onMsgReceived( OchBusArriveAtStationMsg obj ) { - onArriveAtStation(); - } - }; - /** * 站点信息变更推送 */ 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 d5f53226d6..191bd9c882 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 @@ -12,7 +12,6 @@ import com.mogo.commons.mvp.Presenter; import com.mogo.commons.network.SubscribeImpl; import com.mogo.commons.network.Utils; import com.mogo.commons.voice.AIAssist; -import com.mogo.map.location.MogoLocation; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.HostConst; import com.mogo.och.bus.bean.OchBusLeaveStationRequest; @@ -45,7 +44,6 @@ import okhttp3.MediaType; import okhttp3.RequestBody; import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_ARRIVING; -import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_IDLE; import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_LEAVING; import static com.mogo.och.bus.constant.OchBusConst.STATION_STATUS_STOPPED; @@ -105,11 +103,10 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog public void queryBusRoutes() { double lat = 40.1974932972; double lon = 116.7354579447; - MogoLocation lastLocation = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient( getContext() ).getLastKnowLocation(); - if ( lastLocation != null ) { -// lat = lastLocation.getLatitude(); -// lon = lastLocation.getLongitude(); - } + +// 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 ) ); mService.querySiteByCoordinate( requestBody ) @@ -153,6 +150,8 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog * @param site */ private void renderBusStationsStatus( List< OchBusStation > site ) { + int lastStopStation = getNextStopStation(); + stationList.clear(); stationList.addAll( site ); for ( int i = 0; i < stationList.size(); i++ ) { @@ -174,6 +173,29 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog mView.hideSlidePanel(); mView.hideNotice(); } + + resetNextStopStation( lastStopStation ); + + } + + /** + * 重置下一站 + * + * @param lastStopStation + */ + private void resetNextStopStation( int lastStopStation ) { + int nextStopStation = getNextStopStation(); + if ( nextStopStation < 0 ) { + return; + } + if ( lastStopStation <= nextStopStation || nextStopStation <= currentStationIndex ) { + return; + } + if ( MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() + == IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING ) { + // 自动驾驶中动态设置下一个停靠站点 + autoDriveToNextStation( true ); + } } /** @@ -201,7 +223,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog public void restartAutopilot() { Logger.d( TAG, "重启自动驾驶===" + isGoingToNextStation ); if ( isGoingToNextStation ) { - autoDriveToNextStation(); + autoDriveToNextStation( true ); } } @@ -247,7 +269,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog /** * 开启自动驾驶到下一站 */ - public void autoDriveToNextStation() { + public void autoDriveToNextStation( boolean isRestart ) { if ( currentStationIndex >= stationList.size() - 1 ) { // 当前站是最后一站,结束当前行程 travelOver(); @@ -262,6 +284,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog nextStation.setIsCurrentSite( STATION_STATUS_ARRIVING ); RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters(); + currentAutopilot.isSpeakVoice = !isRestart; currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); currentAutopilot.vehicleType = VEHICLE_TYPE; @@ -385,20 +408,25 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog return; } String station = stationList.get( currentStationIndex ).getSiteName(); - String msg = null; + StringBuilder builder = new StringBuilder( "已到达" ); + if ( station.endsWith( "站" ) ) { + builder.append( station ); + } if ( o == null || o.result == null || o.result.info == null || o.result.info.isEmpty() ) { - msg = "已到达" + station + "站,请带好随身物品,下车请注意安全"; - return; - } - - for ( QueryLeaveAwayPassengersResponse.LeaveAwayPassenger leaveAwayPassenger : o.result.info ) { - if ( leaveAwayPassenger == null ) { - continue; + // + } else { + builder.append( ",请尾号为" ); + for ( QueryLeaveAwayPassengersResponse.LeaveAwayPassenger leaveAwayPassenger : o.result.info ) { + if ( leaveAwayPassenger == null ) { + continue; + } + String tailNum = leaveAwayPassenger.userPhone.substring( leaveAwayPassenger.userPhone.length() - 4 ); + builder.append( tailNum ).append( "," ); } - String tailNum = leaveAwayPassenger.userPhone.substring( leaveAwayPassenger.userPhone.length() - 4 ); - + builder.append( "的乘客下车" ); } - AIAssist.getInstance( getContext() ).speakTTSVoice( msg ); + builder.append( ",带好随身物品,下车请注意安全" ); + AIAssist.getInstance( getContext() ).speakTTSVoice( builder.toString() ); } /** diff --git a/OCH/mogo-och/src/main/res/color/module_mogo_och_autopilot_text_color_selector.xml b/OCH/mogo-och/src/main/res/color/module_mogo_och_autopilot_text_color_selector.xml index 4cccf36d32..19f43e5bfd 100644 --- a/OCH/mogo-och/src/main/res/color/module_mogo_och_autopilot_text_color_selector.xml +++ b/OCH/mogo-och/src/main/res/color/module_mogo_och_autopilot_text_color_selector.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/module_och_bus_ic_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/module_och_bus_ic_autopilot.png new file mode 100644 index 0000000000000000000000000000000000000000..be978145dc30849b5e3d240d1f1be6d63e476e48 GIT binary patch literal 1781 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91H=qLm1ONa40RR91Hvj+t07-?+R{#J8Ur9tkRA>d=n%}EcMHI)qshQCa zHTz*+qtFx+HAp4GsFx7ICrf;&KoF$pRg}aa!%F=F(iau_@!~b#^T`OLGA$o^uqY)$ zC4WR(iTUI9`5gB?oU@(Td-l2K{@^b7-r0N2THm$i&g|JUvro^ME=zxZ{{v9I02YBc z;7KqQ+zTdxE8sFX4}JzGz<1zKPfyQ9%8?~BXgb&cj)I$@6VXq9d8QA03rS)&*avQa zZi;;J+Ur9r1f2$Uf@@$fMSkN<8}t?uWIT8e`~!wkjAz{ObsE`|Y7Fs%*!BS@i&Xg? z!;|2T41ZEi1`lO;g0dH+%9j|fV&XZM>QHG%!xn;5ph~V_uphhulAagsGJE~>uM+cE zSebN+0Ys}n)i6Adjl;$s=~(p7c;qV+^LeG?KsrLO0+h{!SE+vo`2Omez;}1XD}PMP zYeh#vahwk>$C%L{0}DDLPjr$$i$f6<^P8VYcgqY1hez2n_7U~tYLRwmY#d;`n3!kU z=f zla;N<41c5ZxZx5w1%495yFi&F#B--|8Wa~4N8nk~gTWLk-9qHO$YnzgVz4Z~DVF#- zT%QLog6DweC2|c^Y@7`}3=V;>$Rj#>$m1Y3FM(FM$<0(3$16cd*0x%EjnQJT0~`UN zXB2hU#W=>>4vM48oYsPnth76yE;b^&KW2%S!|PS>8nAbUT6~5)NfR5$$J4S;!DsZS z8{tNtlto$Su-uRK$qw?llvvIBvMx$KvJ$DvNEws*Qb_4hkIBZ>r zJ_;TKu38=kLoL43T#ft&TymWOcFsJo0~8;vv%aJ~3@u9Oi7v*TN^Jobi;i8sm)|(0 zuPW-#1>*MExb=YwRkQeSlnOSJfXkwklVZ%0MLu~al_o$XHnSqE>#bZGsa#h@oY&(& z2b_rT)K$xqyv)OPT_nI#8#fVzK1KEA$)}WX*o$9)fr$Q1Lj$juO)G|Q9iy^wEex4yEof36*sKXZ(y<-xF4${ z+ON+1>-d?Uc^2i9rh;aB9ufMIa~AzwO~b?se0&B|CmHRMpRqgz^8)5q6x-2$?t@}? z(JH&&niJM3@pZOKk?nPOb6beFM#y*PHq8>lB@yHQ&_C5QOuWFy38v~jXnm~-#PImc z1LhTy@ct7^e?bruKQz?(9-SrO3%E?SB>u0OW{~+^KK7wzU(>L7fm1JteUsZ;w6D5{ zYXK;e(v?SuAF{m>Lh~;F{R#%L6^opkLjlWl_?*-+AitLRh3eqg9N@`S>q9 z?{kkpS*wBg?+S3J+SL}g;s*P&h8?5cO+d9^I0KvpG1*H+(ldx%?0eta)tNLV5C7T5 zi-~#8Na1SQ;IIgU-hFuxAL`0k6q_}LYNAH*gP>CDd~zxsls2exHDRC7A^ zeG`4rQ@0F+#C>5-hTNOfbS@Gj+TYf*H|H3-P^Vh-52 zR+J~S@@S1gxM|aUtN|%{ zg7kveQjMyvig9{V^6IJ$L0xR`0aX(YCbdL9dBcm~uC}6rj3nF-z6IRThmI^zSBif6 z%hSFetB4<~E}r$p?2`2)HWA}zz_S_Lh&}@D1FmX3;r1Zd^HRUHc_bi?vJ<~T*){ne X{%-a4Ah5#400000NkvXXu0mjf^w>N> literal 0 HcmV?d00001 diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml index 85791d509e..b5596fad13 100644 --- a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml +++ b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg.xml @@ -1,14 +1,16 @@ - - - + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index d628006b1b..a5cf07bc35 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -5,8 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="@dimen/module_mogo_och_margin_left" - android:paddingTop="@dimen/module_mogo_och_margin_top" - android:paddingEnd="@dimen/module_mogo_och_margin_right" android:paddingBottom="@dimen/module_mogo_och_margin_bottom"> + tools:visibility="visible" /> - 55px + 40px 40px - 40px + 46px 24px - 400px + 351px 492px 24px diff --git a/modules/mogo-module-common/src/main/res/raw/othercar.n3d b/modules/mogo-module-common/src/main/res/raw/othercar.n3d index af2a40e6b4c732b4daa8491ad6eae014bd80289d..5a3af7e7e3c52fef2d92bdad29b02c18add29cbe 100644 GIT binary patch delta 24968 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 TKNd0Lzz_bj|9^!F-c0@<)J(rx delta 42385 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 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/RemoteControlAutoPilotParameters.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/RemoteControlAutoPilotParameters.java index 2abb1b3fe7..66efd70831 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/RemoteControlAutoPilotParameters.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/RemoteControlAutoPilotParameters.java @@ -16,6 +16,10 @@ class RemoteControlAutoPilotParameters { public AutoPilotLonLat endLatLon; public float speedLimit; public int vehicleType;// 运营类型 + /** + * 是否播放adas的 开始自动驾驶 语音 + */ + public boolean isSpeakVoice = true; public static class AutoPilotLonLat { public double lat;