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

Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_robotaxi-d-app-module_251_220125_2.5.1

Browse Source
This commit is contained in:
donghongyu
2022-02-18 17:10:58 +08:00
parent 6f70b0130b 6a2a29f9fc
commit 9648f9ce3c
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
View File

@@ -42,6 +42,8 @@ public class OchBusFragment extends BaseOchBusTabFragment< OchBusFragment, OchBu
private View mBus;
private OchBusStation startStation = null;
private OchBusStation endStation = null;
@Override
public String getTagName() {
@@ -163,8 +165,8 @@ public class OchBusFragment extends BaseOchBusTabFragment< OchBusFragment, OchBu
// 获取当前站点的名称
currentStationName = stationList.get( currentStation ).getName();
OchBusStation startStation = stationList.get(0);
OchBusStation endStation = stationList.get(stationList.size() - 1);
startStation = stationList.get(0);
endStation = stationList.get(stationList.size() - 1);
// 是否到达起点
if ( currentStation == 0 ) {
@@ -278,6 +280,16 @@ public class OchBusFragment extends BaseOchBusTabFragment< OchBusFragment, OchBu
tvOperationStatus.setText("出车");
hideSlidePanel();
hidPanel();
//移除起点终点
if (null != startStation){
setOrRemoveMapMaker(false, OchBusConst.BUS_START_MAP_MAKER,startStation.getLat()
,startStation.getLon(),R.drawable.icon_station_start_end);
}
if (null != endStation){
setOrRemoveMapMaker(false, OchBusConst.BUS_END_MAP_MAKER,endStation.getLat()
,endStation.getLon(),R.drawable.icon_station_start_end);
}
}
}

2
OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -90,7 +90,7 @@
<dimen name="module_mogo_och_autopilot_order_bg_height">414px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_size">44px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_size">36px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_padding_top">13px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12px</dimen>
<dimen name="module_mogo_och_autopilot_status_text_m_l">350px</dimen>