修复了bug

【在线车辆】每次启动,在线车辆卡片都会选择一辆车显示,但是这辆车根本不在周边,ACCON后应当默认不显示某一车辆的在线车辆卡片,或者选取最近车辆的在线车辆卡片也行
http://jira.zhidaohulian.com/browse/UI-372?jql=project%20%3D%20UI%20AND%20assignee%20in%20(donghongyu)%20ORDER%20BY%20priority%20DESC%2C%20updated%20DESC
This commit is contained in:
董宏宇
2020-02-21 23:30:44 +08:00
parent 6bc17d181b
commit 30edccf509

View File

@@ -20,7 +20,6 @@ import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.map.marker.MogoMarkersHandler;
import com.mogo.module.common.entity.MarkerCarChat;
import com.mogo.module.common.entity.MarkerCardResult;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
@@ -58,7 +57,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
private static final String TAG = "MapMarkerManager";
// 第一次请求到地图的Marker数据
private boolean isFirstMarker = true;
private boolean isOnLineCard = false;
private static Context mContext;
private static IMogoMarker lastMarker;
private static MapMarkerManager mMarkerManager;
@@ -100,17 +98,15 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
public void onSwitched(int position, String moduleName) {
Logger.e(TAG, "======moduleName" + moduleName);
highlightedMarker(moduleName, false);
if (moduleName.equals(ServiceConst.CARD_TYPE_USER_DATA)) {
isOnLineCard = true;
} else {
isOnLineCard = false;
}
mLastHighLightModule = moduleName;
}
});
}
// ACC ON 的时候重置为true
public void setFirstMarker(boolean firstMarker) {
isFirstMarker = firstMarker;
}
/**
* 地图上的Marker点击回调
@@ -375,7 +371,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
}
}
List<MarkerCarChat> carChatList = markerCardResult.getCarChat();
List<MarkerOnlineCar> onlineCarList = markerCardResult.getOnlineCar();
List<MarkerExploreWay> exploreWayList = null;
List<MarkerShareMusic> shareMusicList = null;
@@ -517,7 +512,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
try {
// 在ACC on 之后第一次获取到了在线车辆数据选中最近的一个Marker
if (isFirstMarker && isOnLineCard) {
if (isFirstMarker) {
if (nearlyMogoMarker != null) {
Logger.w(TAG, "ACC ON,或者语音搜索触发默认选中最近的在线车辆nearlyMogoMarker" + nearlyMogoMarker);
onMarkerClicked(nearlyMogoMarker);