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

[2.11.0] [fix]1、bus 小地图清除轨迹 2、taxi自驾按钮显示bug修复

Browse Source
This commit is contained in:
wangmingjun
2022-10-14 19:58:52 +08:00
parent ecda801c35
commit fbe11c22c4
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,7 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
mCurrentArriveStation.setText("----"); mCurrentArriveStation.setText("----");
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init)); mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip)); mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
removeProgressBar();
}else { }else {
mCurrentArriveStation.setText(station); mCurrentArriveStation.setText(station);
if (currentIndex == 0){ if (currentIndex == 0){

2
OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java
View File

@@ -228,7 +228,7 @@ public class BusPassengerMapDirectionView
addRouteColorList(); addRouteColorList();
if (mCoordinatesLatLng.size() > 2) { if (mLinePointsLatLng.size() > 2) {
//设置线段纹理 //设置线段纹理
PolylineOptions polylineOptions = new PolylineOptions(); PolylineOptions polylineOptions = new PolylineOptions();

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

@@ -148,7 +148,7 @@ public class BusPassengerRouteFragment extends
if (latLngList.size() > 0) { if (latLngList.size() > 0) {
drawablePolyline(latLngList,haveArrivedIndex); drawablePolyline(latLngList,haveArrivedIndex);
} else { } else {
clearPolyline(); clearMapView();
} }
} }
@@ -164,7 +164,7 @@ public class BusPassengerRouteFragment extends
}); });
} }
} else { } else {
clearPolyline(); clearMapView();
} }
} }
@@ -185,13 +185,13 @@ public class BusPassengerRouteFragment extends
} }
} }
public void clearPolyline() { public void clearMapView() {
if (mMapDirectionView != null) { if (mMapDirectionView != null) {
UiThreadHandler.post(new Runnable() { UiThreadHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mMapDirectionView.clearPolyline(); mMapDirectionView.clearPolyline();
mMapDirectionView.clearCoordinatesLatLng();
} }
}); });
} }
@@ -230,7 +230,7 @@ public class BusPassengerRouteFragment extends
mNoLineInfoView.setVisibility(View.VISIBLE); mNoLineInfoView.setVisibility(View.VISIBLE);
mRouteInfoView.setVisibility(View.GONE); mRouteInfoView.setVisibility(View.GONE);
updateArrivedStation(null,0,true); updateArrivedStation(null,0,true);
clearPolyline(); clearMapView();
clearMapMarkers(); clearMapMarkers();
} }
} }
@@ -240,10 +240,10 @@ public class BusPassengerRouteFragment extends
mNoLineInfoView.setVisibility(View.VISIBLE); mNoLineInfoView.setVisibility(View.VISIBLE);
mRouteInfoView.setVisibility(View.GONE); mRouteInfoView.setVisibility(View.GONE);
updateArrivedStation(null,0,true); updateArrivedStation(null,0,true);
clearPolyline(); clearMapView();
clearMapMarkers(); clearMapMarkers();
} }
emptyTv.setText(getString(R.string.bus_p_no_task)); emptyTv.setText(getString(R.string.bus_p_no_task));
} }
public void hideNoTaskView(){ public void hideNoTaskView(){
@@ -285,8 +285,7 @@ public class BusPassengerRouteFragment extends
if (currentStationIndex == 0 && isArrived){ //到达始发站且并未出发， 恢复站点marker 清楚路径 清空路径点 if (currentStationIndex == 0 && isArrived){ //到达始发站且并未出发， 恢复站点marker 清楚路径 清空路径点
SharedPrefsMgr.getInstance(getContext()) SharedPrefsMgr.getInstance(getContext())
.remove(BusPassengerConst.BUS_SP_KEY_ORDER_SUM_DIS); .remove(BusPassengerConst.BUS_SP_KEY_ORDER_SUM_DIS);
if (mMapDirectionView != null) mMapDirectionView.clearCoordinatesLatLng(); clearMapView();
clearPolyline();
} }
if (stations.size() > 0){ if (stations.size() > 0){

1
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
View File

@@ -156,6 +156,7 @@ public class BusPresenter extends Presenter<BusFragment>
@Override @Override
public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) { public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) {
CallerLogger.INSTANCE.e( M_BUS + TAG, "onAutopilotArriveAtStation arrive");
BusOrderModel.getInstance().onArriveAt(arrivalNotification); BusOrderModel.getInstance().onArriveAt(arrivalNotification);
} }

6
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -1162,7 +1162,7 @@ public class TaxiModel {
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态 // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
return; return;
} }
if (state != mPrevAPStatus && mADASStatusCallback != null){ if (mADASStatusCallback != null){
mADASStatusCallback.onAutopilotEnable(); mADASStatusCallback.onAutopilotEnable();
} }
mPrevAPStatus = state; mPrevAPStatus = state;
@@ -1174,7 +1174,7 @@ public class TaxiModel {
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态 // 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
return; return;
} }
if (state != mPrevAPStatus && mADASStatusCallback != null){ if (mADASStatusCallback != null){
mADASStatusCallback.onAutopilotDisable(); mADASStatusCallback.onAutopilotDisable();
} }
mPrevAPStatus = state; mPrevAPStatus = state;
@@ -1192,7 +1192,7 @@ public class TaxiModel {
} }
return; return;
} }
if (state != mPrevAPStatus && mADASStatusCallback != null){ if (mADASStatusCallback != null){
mADASStatusCallback.onManMachineCoDriving(); mADASStatusCallback.onManMachineCoDriving();
} }
mPrevAPStatus = state; mPrevAPStatus = state;