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

[2.11.0/1.6.0] bus司机端，乘客屏路线面板调整

Browse Source
This commit is contained in:
wangmingjun
2022-09-20 20:59:05 +08:00
parent 113c0cac5e
commit 78bf858c2a
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
View File

@@ -22,6 +22,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.bus.passenger.R;
import com.mogo.och.bus.passenger.constant.BusPassengerConst;
import com.mogo.och.common.module.utils.NumberFormatUtil;
import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
/**
* Created on 2022/3/31
@@ -102,6 +103,8 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
public void updateArrivedStation(String station,int currentIndex,boolean isArrived){
if (null == station){
mCurrentArriveStation.setText("----");
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
}else {
mCurrentArriveStation.setText(station);
if (currentIndex == 0){

1
OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -213,6 +213,7 @@ public class BusPassengerRouteFragment extends
} else {
mNoLineInfoView.setVisibility(View.VISIBLE);
mRouteInfoView.setVisibility(View.GONE);
updateArrivedStation(null,0,true);
}
}

2
OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
View File

@@ -27,7 +27,7 @@
app:layout_constraintTop_toTopOf="parent"/>
<com.mogo.och.common.module.wigets.OCHBorderShadowLayout
android:id="@+id/iv_bg"
android:id="@+id/arrive_station_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin_left"

3
OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
View File

@@ -45,7 +45,8 @@
android:layout_height="@dimen/bus_p_station_tag_width_height"
android:background="@drawable/bg_bus_p_end_tag_bg"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="@+id/bus_p_circle"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
<TextView
android:id="@+id/bus_p_tag_txt"
android:layout_width="@dimen/bus_p_station_tag_width_height"

45
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
View File

@@ -173,40 +173,37 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
startStation = stationList.get(0);
endStation = stationList.get(stationList.size() - 1);
//切换路线和结束路线按钮切换
if (arrivingOrArrivedIndex == 0 && isArrived){
showOrHideSwitchLineBtn(true);
}else {
if (arrivingOrArrivedIndex == stationList.size() - 1 && isArrived){
//切换路线和结束路线按钮切换
showOrHideSwitchLineBtn(false);
}
if (arrivingOrArrivedIndex == 0){
setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
, startStation.getLon(),R.raw.star_marker);
setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
showSlidePanle("单程结束");
setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
, endStation.getLon(),R.raw.end_marker);
}else if (arrivingOrArrivedIndex == stationList.size() - 1){
if (isArrived) {
setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
, endStation.getLon(),R.raw.end_marker);
} else {
setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
, endStation.getLon(),R.raw.end_marker);
}
}else if (arrivingOrArrivedIndex == 0 && isArrived){
showOrHideSwitchLineBtn(true);
showSlidePanle("滑动出发");
setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER,
startStation.getLat(), startStation.getLon(),R.raw.star_marker);
setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER,
endStation.getLat(), endStation.getLon(),R.raw.end_marker);
}else {
showOrHideSwitchLineBtn(false);
// 重置滑动按钮文字
showSlidePanle("滑动出发");
setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
, startStation.getLon(),R.raw.star_marker);
setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
, endStation.getLon(),R.raw.end_marker);
}
// 重置滑动按钮文字
if (arrivingOrArrivedIndex == stationList.size() -1 && isArrived) {
showSlidePanle("单程结束");
} else if (isArrived){
showSlidePanle("滑动出发");
}
if (stationList.size() > 2){ //只有两个站点
updateMoreThanTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived);
}else {