mogoMarkerMap = MarkerWrapperClickHelper.getInstance().getMogoMarkerMap();
+ if (mogoMarkerMap.containsKey(marker.getId())) {
+ IMogoMarker mogoMarker = mogoMarkerMap.get(marker.getId());
final IMogoMarkerClickListener listener = mogoMarker.getOnMarkerClickListener();
- Logger.d( "AMapMarkerWrapper", "marker 点击回调：%s -> %s", mogoMarker, marker );
- if ( listener != null ) {
- boolean result = listener.onMarkerClicked( mogoMarker );
- if ( result ) {
+ Logger.d("AMapMarkerWrapper", "marker 点击回调：%s -> %s", mogoMarker, marker);
+ if (listener != null) {
+ boolean result = listener.onMarkerClicked(mogoMarker);
+ if (result) {
return true;
}
}
- return MogoMarkersHandler.getInstance().onMarkerClicked( mogoMarker );
+ return MogoMarkersHandler.getInstance().onMarkerClicked(mogoMarker);
}
return false;
}
+
}
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index ebe2ac1cbd..48884d48e5 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -9,7 +9,6 @@ import android.location.Location;
import android.os.Bundle;
import android.os.Trace;
import android.text.TextUtils;
-import android.util.ArrayMap;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
@@ -17,8 +16,8 @@ import android.view.ViewGroup;
import android.view.animation.Interpolator;
import android.widget.TextView;
-import com.autonavi.nge.map.LonLat;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.commons.voice.AIAssist;
import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoMapView;
import com.mogo.map.MogoLatLng;
@@ -35,10 +34,11 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
+import com.mogo.map.uicontroller.VisualAngleMode;
+import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.TipToast;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.zhidaoauto.map.sdk.open.MapAutoApi;
import com.zhidaoauto.map.sdk.open.abs.MapStatusListener;
import com.zhidaoauto.map.sdk.open.abs.OnCameraChangeListener;
@@ -46,6 +46,7 @@ import com.zhidaoauto.map.sdk.open.abs.OnMapClickListener;
import com.zhidaoauto.map.sdk.open.abs.OnMapLoadedListener;
import com.zhidaoauto.map.sdk.open.abs.OnMapStyleListener;
import com.zhidaoauto.map.sdk.open.abs.OnMapTouchListener;
+import com.zhidaoauto.map.sdk.open.abs.OnMapViewVisualAngleChangeListener;
import com.zhidaoauto.map.sdk.open.camera.CameraPosition;
import com.zhidaoauto.map.sdk.open.camera.CameraUpdateFactory;
import com.zhidaoauto.map.sdk.open.camera.LatLngBounds;
@@ -57,7 +58,6 @@ import com.zhidaoauto.map.sdk.open.location.RTKAutopilotLocationBean;
import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory;
import com.zhidaoauto.map.sdk.open.marker.Marker;
import com.zhidaoauto.map.sdk.open.marker.OnMarkClickListener;
-import com.zhidaoauto.map.sdk.open.poyline.PolylineOptions;
import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
import com.zhidaoauto.map.sdk.open.tools.MapTools;
import com.zhidaoauto.map.sdk.open.view.MapAutoView;
@@ -67,12 +67,14 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.json.JSONObject;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
+import static com.mogo.map.uicontroller.VisualAngleMode.MODE_CLOSE_SIGHT;
+import static com.mogo.map.uicontroller.VisualAngleMode.MODE_LONG_SIGHT;
+import static com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT;
+
public class AMapViewWrapper implements IMogoMapView,
IMogoMapUIController,
LocationListener,
@@ -83,28 +85,26 @@ public class AMapViewWrapper implements IMogoMapView,
OnMapTouchListener,
OnMarkClickListener,
OnMapStyleListener,
- MapStyleController.IMapStyleAutoChangedListener {
+ MapStyleController.IMapStyleAutoChangedListener, OnMapViewVisualAngleChangeListener {
private static final String TAG = "AMapViewWrapper";
private final MapAutoView mMapView;
- private IMogoMap mIMap;
-
+ private final IMogoMap mIMap;
private AMapMarkerClickHandler mMarkerClickHandler;
- private EnumMapUI mCurrentCarUIMode;
- private boolean mIsCarLocked = false;
- private int mLockZoom = 16;
- private long startTime;
-
- private float mDefaultZoomLevel = 16.0f;
private final CarCursorOption DEFAULT_OPTION = new CarCursorOption.Builder()
.carCursorRes(R.drawable.map_api_ic_current_location2)
.naviCursorRes(R.drawable.ic_amap_navi_cursor)
.build();
private CarCursorOption mCarCursorOption = DEFAULT_OPTION;
-
- private Location mLastDriveLocationShadow = null;
+ private EnumMapUI mCurrentCarUIMode;
private EnumMapUI mCurrentUI;
+ private VisualAngleMode mVisualAngleMode = MODE_MEDIUM_SIGHT;
+
+ private int mLockZoom = 16;
+ private long startTime;
+ private float mDefaultZoomLevel = 16.0f;
+ private boolean mIsCarLocked = false;
private boolean mIsLightStyle = false;
private boolean mMapLoaded = false;
private boolean mIsFirstLocated = true;
@@ -207,8 +207,9 @@ public class AMapViewWrapper implements IMogoMapView,
mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ZOOM);
mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ROTATE);
mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_3D);
- mMapView.setMOnCameraChangeListener(this);
+ mMapView.setOnCameraChangeListener(this);
mMapView.setOnMapStyleListener(this);
+ mMapView.setOnMapViewVisualAngleChangeListener(this);
Logger.d(TAG, "styleop - initListeners - setOnMapStyleListener - view %s", mMapView);
// mMapView.setOnPolylineClickListener( this );
@@ -271,7 +272,7 @@ public class AMapViewWrapper implements IMogoMapView,
mMapView.setOnMapTouchListener(null);
mMapView.setOnMapClickListener(null);
mMapView.getLocationClient().unRegisterListener(this);
- mMapView.setMOnCameraChangeListener(null);
+ mMapView.setOnCameraChangeListener(null);
mSelfMarker = null;
Logger.d(TAG, "map onDestroy");
}
@@ -374,6 +375,21 @@ public class AMapViewWrapper implements IMogoMapView,
}
}
+ @Override
+ public void changeMapVisualAngle(VisualAngleMode angelMode) {
+ MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper();
+ if (mapAutoViewHelper != null) {
+ Logger.d(TAG," 用户更改视距 currentThread : " + Thread.currentThread().getName());
+ mVisualAngleMode = angelMode;
+ mapAutoViewHelper.setMapViewVisualAngle(angelMode.getCode());
+ }
+ }
+
+ @Override
+ public VisualAngleMode getCurrentMapVisualAngle() {
+ return mVisualAngleMode;
+ }
+
@Override
public void moveToCenter(MogoLatLng latLng) {
moveToCenter(latLng, true);
@@ -706,8 +722,6 @@ public class AMapViewWrapper implements IMogoMapView,
} else {
if (mCarCursorOption.getCarCursorRes() != 0) {
style.myLocationIcon(mCarCursorOption.getCarCursorRes());
- } else {
- style.myLocationIcon(mCarCursorOption.getCarCursorRes());
}
}
mMapView.getMapAutoViewHelper().setMyLocationStyle(style);
@@ -729,6 +743,13 @@ public class AMapViewWrapper implements IMogoMapView,
}
}
+ @Override
+ public long getTileId(double lon, double lat) {
+ return getMap().getUIController().getTileId(lon, lat);
+ }
+
+ private boolean isShowWarn;
+
@Override
public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) {
Location sysLocation = new Location(location.getProvider());
@@ -764,12 +785,47 @@ public class AMapViewWrapper implements IMogoMapView,
try {
mSelfMarker = mMapView.getMapAutoViewHelper().getMyLocationStyle().getSelfMarker();
mSelfMarker.setInfoWindowEnable(true);
+
} catch (Exception e) {
}
+ } else {
+// 通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型
+// if (mAdasResult != null) {
+// Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel);
+// if (mAdasResult.drawlevel == 1 && isShowWarn) {
+// mSelfMarker.marker3DIcon(R.raw.car);
+// isShowWarn = false;
+// } else if (mAdasResult.drawlevel == 2) { //不处理
+//
+// } else if (mAdasResult.drawlevel == 3 && !isShowWarn) {
+// //继续判断相应的方位，目前是只有 前方 TODO
+// mSelfMarker.marker3DIcon(R.raw.qfpz);
+// isShowWarn = true;
+// }
+// } else {
+//// mSelfMarker.marker3DIcon(R.raw.car);
+// }
+
+// UiThreadHandler.postDelayed( () -> {
+// if (!isShowWarn) {
+// mSelfMarker.marker3DIcon(R.raw.qfpz);
+// isShowWarn = true;
+// }
+// }, 6_000L );
+
}
+
showSelfSpeed(location.getSpeed());
}
+ private ADASRecognizedResult mAdasResult;
+
+ @Override
+ public void setAdasRecognizedResult(ADASRecognizedResult result) {
+ mAdasResult = result;
+ }
+
+
private TextView mSpeedView = null;
private int mLastYOffset = 20;
@@ -796,13 +852,13 @@ public class AMapViewWrapper implements IMogoMapView,
String speedVal = String.valueOf(speedIntVal);
String infoResName = ResIdCache.getVal(speedVal);
int offset = 20;
- if ( !mMapView.getMapAutoViewHelper().getLockMode() ) {
+ if (!mMapView.getMapAutoViewHelper().getLockMode()) {
offset = 30;
}
- if ( offset != mLastYOffset ) {
+ if (offset != mLastYOffset) {
mLastYOffset = offset;
}
- mSelfMarker.setInfoWindowOffset( 0, offset );
+ mSelfMarker.setInfoWindowOffset(0, offset);
if (TextUtils.isEmpty(infoResName)) {
if (mSpeedView == null) {
mSpeedView = new TextView(mMapView.getContext());
@@ -829,6 +885,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onMapLoaded() {
Logger.i(TAG, "autoop--onMapLoaded: ");
+ mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);
MogoMapListenerHandler.getInstance().onMapLoaded();
mMapLoaded = true;
CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
@@ -865,6 +922,26 @@ public class AMapViewWrapper implements IMogoMapView,
// Logger.i( TAG, "mapop--onMapStatusChanged-: " + type + "," + value );
}
+ @Override
+ public void onMapViewVisualAngleChange(int i) {
+ Logger.d(TAG," 地图自动更改视距 currentThread : " + Thread.currentThread().getName());
+ mVisualAngleMode = getVisualAngleMode(i);
+ MogoMapListenerHandler.getInstance().onMapVisualAngleChanged(mVisualAngleMode);
+ }
+
+ private VisualAngleMode getVisualAngleMode(int mode) {
+ switch (mode) {
+ case 0:
+ return MODE_CLOSE_SIGHT;
+ case 1:
+ return MODE_MEDIUM_SIGHT;
+ case 2:
+ return MODE_LONG_SIGHT;
+ default:
+ throw new IllegalStateException("mode is unCorrect");
+ }
+ }
+
@Override
public void onCameraChange(int type, int value) {
// Logger.i( TAG, "mapop--onCameraChange-: " + type + "," + value );
@@ -958,7 +1035,7 @@ public class AMapViewWrapper implements IMogoMapView,
/**
* 切换到车头朝上
*/
- private void change2CarUp(){
+ private void change2CarUp() {
mMapView.getMapAutoViewHelper().setMapViewPerspective(MapAutoApi.MAP_PERSPECTIVE_UP_CAR);
}
@@ -1029,9 +1106,9 @@ public class AMapViewWrapper implements IMogoMapView,
bean.setAcceleration(acceleration);
bean.setAlt(alt);
bean.setSystemTime(systemTime);
- bean.setSatelliteTime( satelliteTime );
+ bean.setSatelliteTime(satelliteTime);
bean.setReceiverDataTime(receiverDataTime);
- bean.setAdasSatelliteTime( adasSatelliteTime );
+ bean.setAdasSatelliteTime(adasSatelliteTime);
bean.setLon(lon);
bean.setGnss_speed(((float) speed));
bean.setLat(lat);
@@ -1063,24 +1140,24 @@ public class AMapViewWrapper implements IMogoMapView,
/**
* 带缓存的道路匹配算法
- *
+ *
* 使用{@link MapDataApi#INSTANCE#getSinglePointMatchRoad()}这个方法获取道路数据会存在一定耗时，目前是4-10ms，因为请求频繁，为了
* 减小这部分耗时，使用一个ConcurrentHashMap{@link #roadCacheMap}缓存道路数据，此缓存是以目标车id为key，道路数据为value，以此减少
* 道路数据获取次数。
- *
+ *
* 当出现道路改变的情况，需要重新获取道路数据，采用递归的方式重获道路数据以及添加缓存，为了避免一直获取不到道路数据，一直递归，增加useCache参数跳出递归。
- *
+ *
* 道路改变的情况主要分为：
- * 1. 目标车距离道路中心线距离超过阈值 matchThreshold（取路宽的1/4为阈值）；
- * 2. 目标车到道路中心线的映射点不在道路上（此判断在{@link PointInterpolatorUtil#mergeToRoad(double, double, List)}），也就是说已经驶出了这条道路
+ * 1. 目标车距离道路中心线距离超过阈值 matchThreshold（取路宽的1/4为阈值）；
+ * 2. 目标车到道路中心线的映射点不在道路上（此判断在{@link PointInterpolatorUtil#mergeToRoad(double, double, List)}），也就是说已经驶出了这条道路
*
- * @param id 目标车唯一标识
- * @param lon 目标车经度
- * @param lat 目标车纬度
- * @param angle 目标车角度
+ * @param id 目标车唯一标识
+ * @param lon 目标车经度
+ * @param lat 目标车纬度
+ * @param angle 目标车角度
* @param isGpsLocation true-使用gps定位数据
- * @param isRTK true-使用rtk数据
- * @param usdCache true-使用道路缓存 false-不使用道路缓存
+ * @param isRTK true-使用rtk数据
+ * @param usdCache true-使用道路缓存 false-不使用道路缓存
* @return double[]{匹配后经度，匹配后纬度，目标车距离车道中心线距离}，若匹配后经纬度值为-1，则没有匹配成功
*/
private double[] matchRoad(String id, double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK, boolean usdCache) {
@@ -1089,10 +1166,10 @@ public class AMapViewWrapper implements IMogoMapView,
RoadCacheWrapper roadCache = roadCacheMap.get(id);
double matchThreshold = -1;
- if (roadCache == null||roadCache == noCache) {
+ if (roadCache == null || roadCache == noCache) {
SinglePointRoadInfo singlePointRoadInfo = MapDataApi.INSTANCE.getSinglePointMatchRoad(((float) wgs[0]), ((float) wgs[1]), ((float) angle), isGpsLocation, isRTK);
if (singlePointRoadInfo != null && singlePointRoadInfo.getCoords() != null && !singlePointRoadInfo.getCoords().isEmpty()) {
- Log.i("timer-matchRoad-4", "cost " + (System.currentTimeMillis() - start) + "ms roadId: " + singlePointRoadInfo.getRoadId());
+// Log.i("timer-matchRoad-4", "cost " + (System.currentTimeMillis() - start) + "ms roadId: " + singlePointRoadInfo.getRoadId());
roadCache = new RoadCacheWrapper(singlePointRoadInfo.getCoords());
roadCache.setLaneWidth(singlePointRoadInfo.getLaneWidth());
// 在地图上画点的测试方法
@@ -1118,7 +1195,7 @@ public class AMapViewWrapper implements IMogoMapView,
}
}
- Log.i("timer-matchRoad-1", "cost " + (System.currentTimeMillis() - start) + "ms");
+// Log.i("timer-matchRoad-1", "cost " + (System.currentTimeMillis() - start) + "ms");
if (roadCache != null
&& roadCache.getRoad() != null
&& !roadCache.getRoad().isEmpty()) {
@@ -1127,19 +1204,19 @@ public class AMapViewWrapper implements IMogoMapView,
matchThreshold = roadCache.getLaneWidth() / 4;
double[] matchedPoint = PointInterpolatorUtil.mergeToRoad(wgs[0], wgs[1], roadCache.getRoad());
- if (matchThreshold>0&&matchedPoint[2] > 0 && matchedPoint[2] <= matchThreshold) {
+ if (matchThreshold > 0 && matchedPoint[2] > 0 && matchedPoint[2] <= matchThreshold) {
// 目标车在阈值范围内
roadCacheMap.put(id, roadCache);
- Log.i("timer-matchRoad-3", "cost " + (System.currentTimeMillis() - start) + "ms");
+// Logger.i("timer-matchRoad-3", "cost " + (System.currentTimeMillis() - start) + "ms");
return matchedPoint;
-// Log.i("timer-matchRoad-2", "cost " + (System.currentTimeMillis() - start) + "ms roadId: "+roadCache.getLastLat());
+// Logger.i("timer-matchRoad-2", "cost " + (System.currentTimeMillis() - start) + "ms roadId: "+roadCache.getLastLat());
} else if (matchedPoint[2] > matchThreshold && matchedPoint[2] < 1.5) {
// 目标车在阈值范围外，也就是说距离道路中心线太远了，就不吸附了
return null;
} else {
// 目标车到道路中心线的映射点不在道路上，也就是已经使出了缓存的那条道路，需要重新获取一条道路，用useCache这个参数来避免重复递归
roadCacheMap.put(id, noCache);
- Log.i("timer-matchRoad-2", "cost " + (System.currentTimeMillis() - start) + "ms roadId: " + roadCache.getLastLat());
+// Logger.i("timer-matchRoad-2", "cost " + (System.currentTimeMillis() - start) + "ms roadId: " + roadCache.getLastLat());
if (usdCache) {
return matchRoad(id, lon, lat, angle, isGpsLocation, isRTK, false);
} else {
@@ -1152,12 +1229,13 @@ public class AMapViewWrapper implements IMogoMapView,
}
@Override
- public String getMarkerInfoResName( String speedVal ) {
- return ResIdCache.getVal( speedVal );
+ public String getMarkerInfoResName(String speedVal) {
+ return ResIdCache.getVal(speedVal);
}
@Override
public void setMarkerInfoResName(String speedVal, String val) {
ResIdCache.putVal(speedVal, val);
}
+
}
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
index c8a58396a6..f1e03b51d2 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
@@ -2,7 +2,6 @@ package com.mogo.map.impl.custom;
import android.content.Context;
import android.graphics.Point;
-import android.util.Log;
import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoUiSettings;
@@ -51,13 +50,13 @@ public class AMapWrapper implements IMogoMap {
private IMogoUiSettings mUiSettings;
public AMapWrapper(MapAutoViewHelper map, MapAutoView mapView, IMogoMapUIController controller) {
- Logger.i(TAG, "autoop--AMapWrapper: init"+this);
+ Logger.i(TAG, "autoop--AMapWrapper: init" + this);
this.mAMap = map;
sAMap = map;
this.mMapView = mapView;
mUIcontroller = controller;
// 设置实现自定义 info window
- MapAutoApi.INSTANCE.setInfoWindowAdapter( new AMapInfoWindowAdapter() );
+ MapAutoApi.INSTANCE.setInfoWindowAdapter(new AMapInfoWindowAdapter());
AMapUIController.getInstance().initClient(mUIcontroller);
}
@@ -83,7 +82,7 @@ public class AMapWrapper implements IMogoMap {
@Override
public IMogoMarker addMarker(String tag, MogoMarkerOptions options) {
- Logger.i(TAG, "autoop-addMarker: " + tag + ",MogoMarkerOptions:" + options + ",AMap:" + (mAMap != null)+",this:"+this);
+ Logger.i(TAG, "autoop-addMarker: " + tag + ",MogoMarkerOptions:" + options + ",AMap:" + (mAMap != null) + ",this:" + this);
if (!checkAMap()) {
return null;
}
@@ -134,7 +133,7 @@ public class AMapWrapper implements IMogoMap {
multiPointOverlayOptions.setData(markerOptions);
multiPointOverlayOptions.setMarkerIcon(R.drawable.marker_blue);
List data = mAMap.addMarkers(multiPointOverlayOptions).getOptions().getData();
- for (int i = 0 ;i< data.size();i++){
+ for (int i = 0; i < data.size(); i++) {
markers.add(new Marker(data.get(i)));
}
if (markers == null || markers.isEmpty()) {
@@ -168,7 +167,7 @@ public class AMapWrapper implements IMogoMap {
@Override
public void setPointToCenter(int x, int y) {
if (checkAMap()) {
- LonLatPoint lonLatPoint = MapTools.INSTANCE.fromScreenLocation(new Point(x,y));
+ LonLatPoint lonLatPoint = MapTools.INSTANCE.fromScreenLocation(new Point(x, y));
mAMap.setCenter(lonLatPoint);
}
}
@@ -176,21 +175,21 @@ public class AMapWrapper implements IMogoMap {
@Override
public void setTouchPoiEnable(boolean touchPoiEnable) {
if (checkAMap()) {
- mAMap.setTouchPoiEnable( touchPoiEnable );
+ mAMap.setTouchPoiEnable(touchPoiEnable);
}
}
@Override
public void setTrafficEnable(boolean enable) {
if (checkAMap()) {
- mAMap.setTraffic( enable );
+ mAMap.setTraffic(enable);
}
}
@Override
public void showBuildings(boolean enabled) {
if (checkAMap()) {
- mAMap.showBuildings( enabled );
+ mAMap.showBuildings(enabled);
}
}
@@ -204,7 +203,7 @@ public class AMapWrapper implements IMogoMap {
@Override
public void showMapText(boolean enable) {
if (checkAMap()) {
- mAMap.showMapText( enable );
+ mAMap.showMapText(enable);
}
}
@@ -217,7 +216,7 @@ public class AMapWrapper implements IMogoMap {
@Override
public float getScalePerPixel() {
- if ( checkAMap() ) {
+ if (checkAMap()) {
return mAMap.getScalePerPixel();
}
return 0;
@@ -247,19 +246,19 @@ public class AMapWrapper implements IMogoMap {
@Override
public IMogoPolyline addPolyline(MogoPolylineOptions options) {
- if ( checkAMap() ) {
- PolylineOptions polylineOptions = ObjectUtils.fromMogo( options );
+ if (checkAMap()) {
+ PolylineOptions polylineOptions = ObjectUtils.fromMogo(options);
Logger.d(TAG, "addPolyline %s", polylineOptions.toString());
- if ( polylineOptions == null ) {
+ if (polylineOptions == null) {
return null;
}
Polyline polyline = null;
- if (polylineOptions.getLineWidth() > 0){
+ if (polylineOptions.getLineWidth() > 0) {
polyline = mAMap.drawThickLine(polylineOptions);
- }else {
+ } else {
polyline = mAMap.drawLine(polylineOptions);
}
- return new AMapPolylineWrapper( polyline, options );
+ return new AMapPolylineWrapper(polyline, options);
}
return null;
}
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java
index 72baaebf08..376618d1a3 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java
@@ -264,6 +264,14 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
}
}
+ @Override
+ public String getMarkerAssInfo() {
+ if ( mMarker != null ) {
+ return mMarker.getMarkeOptions().getAssInfo();
+ }
+ return null;
+ }
+
@Override
public void setOnMarkerClickListener( IMogoMarkerClickListener listener ) {
mMogoMarkerClickListener = listener;
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/MarkerWrapperClickHelper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/MarkerWrapperClickHelper.java
index 4f45d44088..ff2c1bbff4 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/MarkerWrapperClickHelper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/MarkerWrapperClickHelper.java
@@ -1,5 +1,6 @@
package com.mogo.map.impl.custom.marker;
+import com.mogo.map.impl.custom.AMapMarkerClickHandler;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.IMogoMarkerClickListener;
@@ -10,9 +11,16 @@ public class MarkerWrapperClickHelper {
private volatile static MarkerWrapperClickHelper markerWrapperClickHelper;
- private Map mogoMarkerMap = new HashMap<>();
+ private final Map mogoMarkerMap = new HashMap<>();
+
+ private MarkerWrapperClickHelper(){
+
+ }
public void setMogoMarkerMap(String id,IMogoMarker iMogoMarker){
+ if(isStaticMarker(id)){
+ return;
+ }
this.mogoMarkerMap.put(id,iMogoMarker);
}
@@ -30,4 +38,8 @@ public class MarkerWrapperClickHelper {
}
return markerWrapperClickHelper;
}
+
+ public boolean isStaticMarker(String id){
+ return id.contains("traffic");
+ }
}
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
index 4dc88d87fb..9998a9bb98 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
@@ -13,6 +13,9 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
+import com.mogo.map.uicontroller.VisualAngleMode;
+import com.mogo.realtime.entity.ADASRecognizedResult;
+import com.zhidaoauto.map.sdk.open.MapAutoApi;
import org.json.JSONObject;
@@ -36,9 +39,9 @@ public class AMapUIController implements IMogoMapUIController {
}
public static AMapUIController getInstance() {
- if ( sInstance == null ) {
- synchronized ( AMapUIController.class ) {
- if ( sInstance == null ) {
+ if (sInstance == null) {
+ synchronized (AMapUIController.class) {
+ if (sInstance == null) {
sInstance = new AMapUIController();
}
}
@@ -46,7 +49,7 @@ public class AMapUIController implements IMogoMapUIController {
return sInstance;
}
- public void initClient( IMogoMapUIController client ) {
+ public void initClient(IMogoMapUIController client) {
this.mClient = client;
}
@@ -55,87 +58,102 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
- public void setTrafficEnabled( boolean visible ) {
- if ( mClient != null ) {
- mClient.setTrafficEnabled( visible );
+ public void setTrafficEnabled(boolean visible) {
+ if (mClient != null) {
+ mClient.setTrafficEnabled(visible);
}
}
@Override
- public MapControlResult changeZoom( boolean zoom ) {
- if ( mClient != null ) {
- return mClient.changeZoom( zoom );
+ public MapControlResult changeZoom(boolean zoom) {
+ if (mClient != null) {
+ return mClient.changeZoom(zoom);
}
return MapControlResult.ERROR;
}
@Override
- public MapControlResult changeZoom( float zoom ) {
- if ( mClient != null ) {
- return mClient.changeZoom( zoom );
+ public MapControlResult changeZoom(float zoom) {
+ if (mClient != null) {
+ return mClient.changeZoom(zoom);
}
return MapControlResult.ERROR;
}
@Override
- public void changeMapMode( EnumMapUI mode ) {
- if ( mClient != null ) {
- mClient.changeMapMode( mode );
+ public void changeMapMode(EnumMapUI mode) {
+ if (mClient != null) {
+ mClient.changeMapMode(mode);
}
}
@Override
- public void moveToCenter( MogoLatLng latLng, boolean animate ) {
- if ( mClient != null ) {
- mClient.moveToCenter( latLng, animate );
+ public void changeMapVisualAngle(VisualAngleMode angelMode) {
+ if (mClient != null) {
+ mClient.changeMapVisualAngle(angelMode);
}
}
@Override
- public void showMyLocation( boolean visible ) {
- if ( mClient != null ) {
- mClient.showMyLocation( visible );
+ public VisualAngleMode getCurrentMapVisualAngle() {
+ if (mClient != null) {
+ return mClient.getCurrentMapVisualAngle();
+ }
+ return null;
+ }
+
+ @Override
+ public void moveToCenter(MogoLatLng latLng, boolean animate) {
+ if (mClient != null) {
+ mClient.moveToCenter(latLng, animate);
}
}
@Override
- public void showMyLocation( View view ) {
- if ( mClient != null ) {
- mClient.showMyLocation( view );
+ public void showMyLocation(boolean visible) {
+ if (mClient != null) {
+ mClient.showMyLocation(visible);
+ }
+ }
+
+ @Override
+ public void showMyLocation(View view) {
+ if (mClient != null) {
+ mClient.showMyLocation(view);
}
}
@Override
public void recoverLockMode() {
- if ( mClient != null ) {
+ if (mClient != null) {
mClient.recoverLockMode();
}
}
@Override
public void loseLockMode() {
- if ( mClient != null ) {
+ if (mClient != null) {
mClient.loseLockMode();
}
}
@Override
- public void setLockZoom( int var1 ) {
- if ( mClient != null ) {
- mClient.setLockZoom( var1 );
+ public void setLockZoom(int var1) {
+ if (mClient != null) {
+ mClient.setLockZoom(var1);
}
}
@Override
- public void displayOverview( Rect bounds ) {
- if ( mClient != null ) {
- mClient.displayOverview( bounds );
+ public void displayOverview(Rect bounds) {
+ if (mClient != null) {
+ mClient.displayOverview(bounds);
}
}
@Override
public float getScalePerPixel() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.getScalePerPixel();
}
return 0;
@@ -143,7 +161,7 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public float getZoomLevel() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.getZoomLevel();
}
return 0;
@@ -151,15 +169,15 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK) {
- if ( mClient != null ) {
- return mClient.getRoadWidth(lon,lat,angle,isGpsLocation,isRTK);
+ if (mClient != null) {
+ return mClient.getRoadWidth(lon, lat, angle, isGpsLocation, isRTK);
}
return 0;
}
@Override
public MogoLatLng getCameraNorthEastPosition() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.getCameraNorthEastPosition();
}
return null;
@@ -167,7 +185,7 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public MogoLatLng getCameraSouthWestPosition() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.getCameraSouthWestPosition();
}
return null;
@@ -175,119 +193,124 @@ public class AMapUIController implements IMogoMapUIController {
@Override
public MogoLatLng getWindowCenterLocation() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.getWindowCenterLocation();
}
return null;
}
@Override
- public void setPointToCenter( double mapCenterX, double mapCenterY ) {
- if ( mClient != null ) {
- mClient.setPointToCenter( mapCenterX, mapCenterY );
+ public void setPointToCenter(double mapCenterX, double mapCenterY) {
+ if (mClient != null) {
+ mClient.setPointToCenter(mapCenterX, mapCenterY);
}
}
@Override
- public Point getLocationPointInScreen( MogoLatLng latLng ) {
- if ( mClient != null ) {
- return mClient.getLocationPointInScreen( latLng );
+ public Point getLocationPointInScreen(MogoLatLng latLng) {
+ if (mClient != null) {
+ return mClient.getLocationPointInScreen(latLng);
}
return null;
}
@Override
- public MogoLatLng getLocationMogoLatLngInScreen( Point point ) {
- if ( mClient != null ) {
- return mClient.getLocationMogoLatLngInScreen( point );
+ public MogoLatLng getLocationMogoLatLngInScreen(Point point) {
+ if (mClient != null) {
+ return mClient.getLocationMogoLatLngInScreen(point);
}
return null;
}
@Override
- public void startJumpAnimation( IMogoMarker marker, float high, Interpolator interpolator,
- long duration ) {
- if ( mClient != null ) {
- mClient.startJumpAnimation( marker, high, interpolator, duration );
+ public void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator,
+ long duration) {
+ if (mClient != null) {
+ mClient.startJumpAnimation(marker, high, interpolator, duration);
}
}
@Override
- public void setRenderFps( int fps ) {
- if ( mClient != null ) {
- mClient.setRenderFps( fps );
+ public void setRenderFps(int fps) {
+ if (mClient != null) {
+ mClient.setRenderFps(fps);
}
}
@Override
- public void showBounds( String tag, MogoLatLng carPosition, List< MogoLatLng > lonLats, Rect bound, boolean lockCarPosition ) {
- if ( mClient != null ) {
- mClient.showBounds( tag, carPosition, lonLats, bound, lockCarPosition );
+ public void showBounds(String tag, MogoLatLng carPosition, List lonLats, Rect bound, boolean lockCarPosition) {
+ if (mClient != null) {
+ mClient.showBounds(tag, carPosition, lonLats, bound, lockCarPosition);
}
}
@Override
public void forceRender() {
- if ( mClient != null ) {
+ if (mClient != null) {
mClient.forceRender();
}
}
@Override
- public float calculateLineDistance( MogoLatLng p1, MogoLatLng p2 ) throws Exception {
- if ( mClient != null ) {
- return mClient.calculateLineDistance( p1, p2 );
+ public float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception {
+ if (mClient != null) {
+ return mClient.calculateLineDistance(p1, p2);
}
return 0;
}
@Override
public EnumMapUI getCurrentUiMode() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.getCurrentUiMode();
}
return null;
}
@Override
- public void changeMyLocation( Location location ) {
- if ( mClient != null ) {
- mClient.changeMyLocation( location );
+ public void changeMyLocation(Location location) {
+ if (mClient != null) {
+ mClient.changeMyLocation(location);
}
}
@Override
public boolean isCarLocked() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.isCarLocked();
}
return false;
}
@Override
- public void setCarCursorOption( CarCursorOption option ) {
- if ( mClient != null ) {
- mClient.setCarCursorOption( option );
+ public void setCarCursorOption(CarCursorOption option) {
+ if (mClient != null) {
+ mClient.setCarCursorOption(option);
}
}
@Override
public MapCameraPosition getMapCameraPosition() {
- if ( mClient != null ) {
+ if (mClient != null) {
return mClient.getMapCameraPosition();
}
return null;
}
@Override
- public void changeBearing( float bearing ) {
- if ( mClient != null ) {
- mClient.changeBearing( bearing );
+ public void changeBearing(float bearing) {
+ if (mClient != null) {
+ mClient.changeBearing(bearing);
}
}
@Override
- public void setAnchorScale( float x, float y ) {
+ public long getTileId(double lon, double lat) {
+ return MapAutoApi.INSTANCE.getTileID(lon, lat, 13); // 13为默认获取瓦片层级级别
+ }
+
+ @Override
+ public void setAnchorScale(float x, float y) {
}
@@ -297,51 +320,51 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
- public void setAnchorRate( float rate ) {
+ public void setAnchorRate(float rate) {
}
@Override
- public void rtkEnable( boolean enable ) {
- if ( mClient != null ) {
- mClient.rtkEnable( enable );
+ public void rtkEnable(boolean enable) {
+ if (mClient != null) {
+ mClient.rtkEnable(enable);
}
}
@Override
- public void syncLocation2Map( JSONObject data ) {
- if ( mClient != null ) {
- mClient.syncLocation2Map( data );
+ public void syncLocation2Map(JSONObject data) {
+ if (mClient != null) {
+ mClient.syncLocation2Map(data);
}
}
@Override
- public void openVrMode( boolean zoomGestureEnable ) {
- if ( mClient != null ) {
- mClient.openVrMode( zoomGestureEnable );
+ public void openVrMode(boolean zoomGestureEnable) {
+ if (mClient != null) {
+ mClient.openVrMode(zoomGestureEnable);
}
}
@Override
- public double[] matchRoad( String id, double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK ) {
- if ( mClient != null ) {
- return mClient.matchRoad( id, lon, lat, angle, isGpsLocation, isRTK );
+ public double[] matchRoad(String id, double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK) {
+ if (mClient != null) {
+ return mClient.matchRoad(id, lon, lat, angle, isGpsLocation, isRTK);
}
return null;
}
@Override
- public String getMarkerInfoResName( String speedVal ) {
- if ( mClient != null ) {
- return mClient.getMarkerInfoResName( speedVal );
+ public String getMarkerInfoResName(String speedVal) {
+ if (mClient != null) {
+ return mClient.getMarkerInfoResName(speedVal);
}
return null;
}
@Override
- public void setMarkerInfoResName( String speedVal, String val ) {
- if ( mClient != null ) {
- mClient.setMarkerInfoResName( speedVal, val );
+ public void setMarkerInfoResName(String speedVal, String val) {
+ if (mClient != null) {
+ mClient.setMarkerInfoResName(speedVal, val);
}
}
@@ -351,4 +374,11 @@ public class AMapUIController implements IMogoMapUIController {
mClient.clearRoadCacheById(id);
}
}
+
+ @Override
+ public void setAdasRecognizedResult(ADASRecognizedResult result) {
+ if (mClient != null) {
+ mClient.setAdasRecognizedResult(result);
+ }
+ }
}
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
index b666458f78..c5655e7cc7 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
@@ -735,6 +735,7 @@ public class ObjectUtils {
}
target.setLineWidth( options.getWidth() );
target.setColor( options.getColor() );
+ target.setGps(options.gps());
// target.zIndex( options.getWidth() );
// target.visible( options.isVisible() );
//// target.geodesic( options.isGeodesic() );
diff --git a/libraries/map-custom/src/main/res/raw/qfpz.n3d b/libraries/map-custom/src/main/res/raw/qfpz.n3d
new file mode 100644
index 0000000000..3abf28fa94
Binary files /dev/null and b/libraries/map-custom/src/main/res/raw/qfpz.n3d differ
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java
index f5667e96c2..53b8db5544 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java
@@ -3,9 +3,9 @@ package com.mogo.map.listener;
import android.view.MotionEvent;
import com.mogo.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
import com.mogo.map.model.MogoPoi;
import com.mogo.map.uicontroller.EnumMapUI;
+import com.mogo.map.uicontroller.VisualAngleMode;
/**
* @author congtaowang
@@ -18,42 +18,56 @@ public interface IMogoMapListener {
/**
* 地图加载完毕
*/
- default void onMapLoaded(){};
+ default void onMapLoaded() {
+ }
/**
* 地图点击
*
* @param motionEvent
*/
- default void onTouch( MotionEvent motionEvent ){};
+ default void onTouch(MotionEvent motionEvent) {
+ }
/**
* 地图上的任意poi点击
*
* @param poi
*/
- default void onPOIClick( MogoPoi poi ){};
+ default void onPOIClick(MogoPoi poi) {
+ }
/**
* 地图点击
*
* @param latLng
*/
- default void onMapClick( MogoLatLng latLng ){}
+ default void onMapClick(MogoLatLng latLng) {
+ }
/**
* 地图锁定
*
* @param isLock
*/
- default void onLockMap( boolean isLock ){}
+ default void onLockMap(boolean isLock) {
+ }
/**
* 地图白天黑夜、导航视角切换
*
* @param ui
*/
- default void onMapModeChanged( EnumMapUI ui ){}
+ default void onMapModeChanged(EnumMapUI ui) {
+ }
+
+ /**
+ * 地图视距切换回调
+ *
+ * @param visualAngleMode
+ */
+ default void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) {
+ }
/**
* @param latLng 中点的经纬度
@@ -61,5 +75,6 @@ public interface IMogoMapListener {
* @param tilt 倾斜度
* @param bearing 旋转角度
*/
- default void onMapChanged( MogoLatLng latLng, float zoom, float tilt, float bearing ){}
+ default void onMapChanged(MogoLatLng latLng, float zoom, float tilt, float bearing) {
+ }
}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java
index 186e614ee8..628c44963c 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java
@@ -3,10 +3,9 @@ package com.mogo.map.listener;
import android.view.MotionEvent;
import com.mogo.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
import com.mogo.map.model.MogoPoi;
-import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.uicontroller.EnumMapUI;
+import com.mogo.map.uicontroller.VisualAngleMode;
/**
* @author congtaowang
@@ -22,9 +21,9 @@ public class MogoMapListenerHandler implements IMogoMapListener, IMogoMapListene
}
public static MogoMapListenerHandler getInstance() {
- if ( sInstance == null ) {
- synchronized ( MogoMapListenerHandler.class ) {
- if ( sInstance == null ) {
+ if (sInstance == null) {
+ synchronized (MogoMapListenerHandler.class) {
+ if (sInstance == null) {
sInstance = new MogoMapListenerHandler();
}
}
@@ -42,7 +41,7 @@ public class MogoMapListenerHandler implements IMogoMapListener, IMogoMapListene
private IMogoMapListener mDelegateListener = null;
@Override
- public void registerHostMapListener( IMogoMapListener listener ) {
+ public void registerHostMapListener(IMogoMapListener listener) {
mDelegateListener = listener;
}
@@ -53,50 +52,57 @@ public class MogoMapListenerHandler implements IMogoMapListener, IMogoMapListene
@Override
public void onMapLoaded() {
- if ( mDelegateListener != null ) {
+ if (mDelegateListener != null) {
mDelegateListener.onMapLoaded();
}
}
@Override
- public void onTouch( MotionEvent motionEvent ) {
- if ( mDelegateListener != null ) {
- mDelegateListener.onTouch( motionEvent );
+ public void onTouch(MotionEvent motionEvent) {
+ if (mDelegateListener != null) {
+ mDelegateListener.onTouch(motionEvent);
}
}
@Override
- public void onPOIClick( MogoPoi poi ) {
- if ( mDelegateListener != null ) {
- mDelegateListener.onPOIClick( poi );
+ public void onPOIClick(MogoPoi poi) {
+ if (mDelegateListener != null) {
+ mDelegateListener.onPOIClick(poi);
}
}
@Override
- public void onMapClick( MogoLatLng latLng ) {
- if ( mDelegateListener != null ) {
- mDelegateListener.onMapClick( latLng );
+ public void onMapClick(MogoLatLng latLng) {
+ if (mDelegateListener != null) {
+ mDelegateListener.onMapClick(latLng);
}
}
@Override
- public void onLockMap( boolean isLock ) {
- if ( mDelegateListener != null ) {
- mDelegateListener.onLockMap( isLock );
+ public void onLockMap(boolean isLock) {
+ if (mDelegateListener != null) {
+ mDelegateListener.onLockMap(isLock);
}
}
@Override
- public void onMapModeChanged( EnumMapUI ui ) {
- if ( mDelegateListener != null ) {
- mDelegateListener.onMapModeChanged( ui );
+ public void onMapModeChanged(EnumMapUI ui) {
+ if (mDelegateListener != null) {
+ mDelegateListener.onMapModeChanged(ui);
}
}
@Override
- public void onMapChanged( MogoLatLng location, float zoom, float tilt, float bearing ) {
- if ( mDelegateListener != null ) {
- mDelegateListener.onMapChanged( location, zoom, tilt, bearing );
+ public void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) {
+ if (mDelegateListener != null) {
+ mDelegateListener.onMapVisualAngleChanged(visualAngleMode);
+ }
+ }
+
+ @Override
+ public void onMapChanged(MogoLatLng location, float zoom, float tilt, float bearing) {
+ if (mDelegateListener != null) {
+ mDelegateListener.onMapChanged(location, zoom, tilt, bearing);
}
}
}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java
index 39dffb4d7e..beb3f8476b 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocationListenerRegister.java
@@ -37,7 +37,7 @@ public class MogoLocationListenerRegister implements IMogoLocationListenerRegist
return sInstance;
}
- private Set< IMogoLocationListener > sListeners = new HashSet<>( 10 );
+ private final Set< IMogoLocationListener > sListeners = new HashSet<>( 10 );
/**
* 注册定位回调
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
index ea7fc5a290..d1605deb43 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
@@ -167,6 +167,12 @@ public interface IMogoMarker {
*/
void showInfoWindow();
+ /**
+ * Marker对象 AssInfo
+ * @return marker对象assInfo
+ */
+ String getMarkerAssInfo();
+
/**
* 设置点击事件
*
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java
index 520afe9932..0298c65686 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java
@@ -14,5 +14,16 @@ public interface IMogoMarkerClickListener {
* @param marker
* @return true - 事件已经处理完毕不继续往下传，否则继续往下传
*/
- boolean onMarkerClicked( IMogoMarker marker );
+ default boolean onMarkerClicked(IMogoMarker marker){
+ return false;
+ };
+
+ /**
+ * 地图上静态Marker点击事件传递
+ * @param marker
+ * @return true - 事件已经处理完毕不继续往下传，否则继续往下传
+ */
+ default boolean onStaticMarkerClicked(IMogoMarker marker){
+ return false;
+ };
}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MarkerType.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MarkerType.java
new file mode 100644
index 0000000000..9f57a444f2
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MarkerType.java
@@ -0,0 +1,7 @@
+package com.mogo.map.marker;
+
+public class MarkerType {
+
+ public static final String MAP_STATIC = "mapStatic";
+ public static final String MAP_STATIC_TRAFFIC = "trafficcamera";
+}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java
index 4aa5b43252..ef265d0788 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java
@@ -383,6 +383,11 @@ public class MogoMarkerOptions extends Observable {
return mAnchorColor;
}
+ public MogoMarkerOptions setGps(boolean gps) {
+ isGps = gps;
+ return this;
+ }
+
@Override
public String toString() {
return "MogoMarkerOptions{" +
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
index a6e5f8f14c..2530bb1f29 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
@@ -34,7 +34,7 @@ public class MogoMarkersHandler implements IMogoMarkerClickListener, IMogoMarker
return sInstance;
}
- private Map< String, List< IMogoMarker > > mServicesMarkers = new ConcurrentHashMap<>();
+ private final Map< String, List< IMogoMarker > > mServicesMarkers = new ConcurrentHashMap<>();
private MogoMarkersHandler() {
}
@@ -121,6 +121,14 @@ public class MogoMarkersHandler implements IMogoMarkerClickListener, IMogoMarker
return false;
}
+ @Override
+ public boolean onStaticMarkerClicked(IMogoMarker marker) {
+ if ( mDelegate != null ) {
+ return mDelegate.onStaticMarkerClicked( marker );
+ }
+ return false;
+ }
+
/**
* @param tag 需要保留的类型
*/
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java
index 9ac5f29631..929390c731 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java
@@ -19,7 +19,7 @@ import java.util.List;
*/
public class MogoPolylineOptions {
- private List< MogoLatLng > mPoints;
+ private List mPoints;
private float mWidth = 10.0F;
private int mColor = Color.BLACK;
private float mZIndex = 0.0F;
@@ -30,7 +30,8 @@ public class MogoPolylineOptions {
private float mTransparency = 1.0F;
private boolean mIsAboveMaskLayer = false;
private boolean mIsPointsUpdated = false;
- private List< Integer > mColorValues;
+ private boolean mGps = false;
+ private List mColorValues;
public MogoPolylineOptions() {
this.mPoints = new ArrayList<>();
@@ -42,9 +43,9 @@ public class MogoPolylineOptions {
* @param points
* @return
*/
- public MogoPolylineOptions points( List< MogoLatLng > points ) {
+ public MogoPolylineOptions points(List points) {
this.mPoints.clear();
- this.mPoints.addAll( points );
+ this.mPoints.addAll(points);
this.mIsPointsUpdated = true;
return this;
}
@@ -55,22 +56,22 @@ public class MogoPolylineOptions {
* @param points
* @return
*/
- public MogoPolylineOptions add( MogoLatLng... points ) {
- if ( points != null ) {
- this.mPoints.addAll( Arrays.asList( points ) );
+ public MogoPolylineOptions add(MogoLatLng... points) {
+ if (points != null) {
+ this.mPoints.addAll(Arrays.asList(points));
this.mIsPointsUpdated = true;
}
return this;
}
- public MogoPolylineOptions add( double lon, double lat ) {
- this.mPoints.add( new MogoLatLng( lat, lon ) );
+ public MogoPolylineOptions add(double lon, double lat) {
+ this.mPoints.add(new MogoLatLng(lat, lon));
return this;
}
- public MogoPolylineOptions add( MogoLocation location ) {
- if ( location != null ) {
- this.mPoints.add( new MogoLatLng( location.getLatitude(), location.getLongitude() ) );
+ public MogoPolylineOptions add(MogoLocation location) {
+ if (location != null) {
+ this.mPoints.add(new MogoLatLng(location.getLatitude(), location.getLongitude()));
}
return this;
}
@@ -78,7 +79,7 @@ public class MogoPolylineOptions {
/**
* 设置线宽
*/
- public MogoPolylineOptions width( float width ) {
+ public MogoPolylineOptions width(float width) {
this.mWidth = width;
return this;
}
@@ -89,7 +90,7 @@ public class MogoPolylineOptions {
* @param color
* @return
*/
- public MogoPolylineOptions color( @ColorInt int color ) {
+ public MogoPolylineOptions color(@ColorInt int color) {
this.mColor = color;
return this;
}
@@ -100,7 +101,7 @@ public class MogoPolylineOptions {
* @param zIndex
* @return
*/
- public MogoPolylineOptions zIndex( float zIndex ) {
+ public MogoPolylineOptions zIndex(float zIndex) {
this.mZIndex = zIndex;
return this;
}
@@ -111,7 +112,7 @@ public class MogoPolylineOptions {
* @param isVisible
* @return
*/
- public MogoPolylineOptions visible( boolean isVisible ) {
+ public MogoPolylineOptions visible(boolean isVisible) {
this.mIsVisible = isVisible;
return this;
}
@@ -122,7 +123,7 @@ public class MogoPolylineOptions {
* @param isGeodesic
* @return
*/
- public MogoPolylineOptions geodesic( boolean isGeodesic ) {
+ public MogoPolylineOptions geodesic(boolean isGeodesic) {
this.mIsGeodesic = isGeodesic;
return this;
}
@@ -133,7 +134,7 @@ public class MogoPolylineOptions {
* @param isDottedLine
* @return
*/
- public MogoPolylineOptions dottedLine( boolean isDottedLine ) {
+ public MogoPolylineOptions dottedLine(boolean isDottedLine) {
this.mIsDottedLine = isDottedLine;
return this;
}
@@ -144,7 +145,7 @@ public class MogoPolylineOptions {
* @param isGradient
* @return
*/
- public MogoPolylineOptions useGradient( boolean isGradient ) {
+ public MogoPolylineOptions useGradient(boolean isGradient) {
this.mIsGradient = isGradient;
return this;
}
@@ -155,7 +156,7 @@ public class MogoPolylineOptions {
* @param transparency
* @return
*/
- public MogoPolylineOptions transparency( float transparency ) {
+ public MogoPolylineOptions transparency(float transparency) {
this.mTransparency = transparency;
return this;
}
@@ -164,7 +165,7 @@ public class MogoPolylineOptions {
* @param isAboveMaskLayer
* @return
*/
- public MogoPolylineOptions aboveMaskLayer( boolean isAboveMaskLayer ) {
+ public MogoPolylineOptions aboveMaskLayer(boolean isAboveMaskLayer) {
this.mIsAboveMaskLayer = isAboveMaskLayer;
return this;
}
@@ -173,12 +174,20 @@ public class MogoPolylineOptions {
* @param colors
* @return
*/
- public MogoPolylineOptions colorValues( List< Integer > colors ) {
+ public MogoPolylineOptions colorValues(List colors) {
mColorValues = colors;
return this;
}
+ public boolean gps() {
+ return mGps;
+ }
- public List< MogoLatLng > getPoints() {
+ public MogoPolylineOptions setGps(boolean gps) {
+ mGps = gps;
+ return this;
+ }
+
+ public List getPoints() {
return mPoints;
}
@@ -222,7 +231,7 @@ public class MogoPolylineOptions {
return mIsPointsUpdated;
}
- public List< Integer > getColorValues() {
+ public List getColorValues() {
return mColorValues;
}
}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/EnumMapUI.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/EnumMapUI.java
index 14bbb7bc52..693d25a125 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/EnumMapUI.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/EnumMapUI.java
@@ -11,51 +11,70 @@ public enum EnumMapUI {
/**
* 正北朝上2D
*/
- NorthUP_2D( 0, 1 ),
+ NorthUP_2D(0, 1),
/**
* 车头朝上2D
*/
- CarUp_2D( 1, 2 ),
+ CarUp_2D(1, 2),
/**
* 3D,只能头朝上
*/
- CarUp_3D( 2, 0 ),
+ CarUp_3D(2, 0),
/**
* 白天模式
*/
- Type_Light( 3, 5 ),
+ Type_Light(3, 5),
/**
* 夜晚模式
*/
- Type_Night( 4, 4 ),
+ Type_Night(4, 4),
/**
* 夜晚模式
*/
- Type_AUTO_LIGHT_Night( 5, 3 ),
+ Type_AUTO_LIGHT_Night(5, 3),
/**
* 自研地图的VR模式
*/
- Type_VR( 0, 0 );
+ Type_VR(0, 0),
+
+ /**
+ * 视距远景
+ */
+ MODE_LONG_SIGHT(6, 7),
+
+ /**
+ * 视距中景
+ */
+ MODE_MEDIUM_SIGHT(7, 8),
+
+ /**
+ * 视距近景
+ */
+ MODE_CLOSE_SIGHT(8, 6);
private int next;
private int code;
- EnumMapUI( int code, int next ) {
+ EnumMapUI(int code, int next) {
this.code = code;
this.next = next;
}
public EnumMapUI next() {
- for ( EnumMapUI value : EnumMapUI.values() ) {
- if ( value.code == next ) {
+ for (EnumMapUI value : EnumMapUI.values()) {
+ if (value.code == next) {
return value;
}
}
return this;
}
+
+ public int getCode(){
+ return code;
+ }
}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
index 4f7ee5a167..7eced2e15e 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
@@ -6,12 +6,12 @@ import android.location.Location;
import android.view.View;
import android.view.animation.Interpolator;
-import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import com.mogo.map.MogoLatLng;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.anim.OnMarkerAnimationListener;
+import com.mogo.realtime.entity.ADASRecognizedResult;
import org.json.JSONObject;
@@ -28,50 +28,64 @@ public interface IMogoMapUIController {
/**
* 实时路况
*/
- void setTrafficEnabled( boolean visible );
+ void setTrafficEnabled(boolean visible);
/**
* 地图缩放
*
* @param zoomIn true - 放大 false - 缩小
*/
- MapControlResult changeZoom( boolean zoomIn );
+ MapControlResult changeZoom(boolean zoomIn);
/**
* 修改缩放级别
*/
- MapControlResult changeZoom( float zoom );
+ MapControlResult changeZoom(float zoom);
/**
* 切换2D/3D模式
*
* @param mode true - 3D模式 false - 2D模式
*/
- void changeMapMode( EnumMapUI mode );
+ void changeMapMode(EnumMapUI mode);
+
+ /**
+ * 切换3D模式下远距，中距，近距视角
+ *
+ * @param angelMode {@link VisualAngleMode}
+ */
+ void changeMapVisualAngle(VisualAngleMode angelMode);
+
+ /**
+ * 获得当前地图视距模式
+ *
+ * @return {@link VisualAngleMode}
+ */
+ VisualAngleMode getCurrentMapVisualAngle();
/**
* 将地图移动至当前位置
*/
- default void moveToCenter( MogoLatLng latLng ) {
- moveToCenter( latLng, false );
+ default void moveToCenter(MogoLatLng latLng) {
+ moveToCenter(latLng, false);
}
/**
* 将地图移动至当前位置
*/
- void moveToCenter( MogoLatLng latLng, boolean animate );
+ void moveToCenter(MogoLatLng latLng, boolean animate);
/**
* 显示我的位置
*
* @param visible true - 显示 false - 不显示
*/
- void showMyLocation( boolean visible );
+ void showMyLocation(boolean visible);
/**
* @param view
*/
- void showMyLocation( View view );
+ void showMyLocation(View view);
/**
* 强调自车位置，加个动画突显一下自车位置
@@ -83,7 +97,7 @@ public interface IMogoMapUIController {
*
* @param location
*/
- void changeMyLocation( Location location );
+ void changeMyLocation(Location location);
/**
* 锁车
@@ -100,14 +114,14 @@ public interface IMogoMapUIController {
*
* @param var1 级别 3-20
*/
- void setLockZoom( int var1 );
+ void setLockZoom(int var1);
/**
* 预览全程
*
* @param bounds 显示范围
*/
- void displayOverview( Rect bounds );
+ void displayOverview(Rect bounds);
/**
* 获取比例尺数据
@@ -147,17 +161,17 @@ public interface IMogoMapUIController {
* @param mapCenterX x 点位置x值与地图宽度的比例
* @param mapCenterY y 点位置x值与地图高度的比例
*/
- void setPointToCenter( double mapCenterX, double mapCenterY );
+ void setPointToCenter(double mapCenterX, double mapCenterY);
/**
* 获取经纬度对应的屏幕的位置
*/
- Point getLocationPointInScreen( MogoLatLng latLng );
+ Point getLocationPointInScreen(MogoLatLng latLng);
/**
* 获取像素点对应的经纬度
*/
- MogoLatLng getLocationMogoLatLngInScreen( Point point );
+ MogoLatLng getLocationMogoLatLngInScreen(Point point);
/**
* marker 跳跃动画
@@ -170,13 +184,13 @@ public interface IMogoMapUIController {
* @param duration 动画时间
*/
@Deprecated
- void startJumpAnimation( IMogoMarker marker, float high, Interpolator interpolator,
- long duration );
+ void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator,
+ long duration);
/**
* 设置刷新帧率
*/
- void setRenderFps( int fps );
+ void setRenderFps(int fps);
/**
* @param tag 调用业务
@@ -185,7 +199,7 @@ public interface IMogoMapUIController {
* @param bound 地图上可显示的范围
* @param lockCarPosition 是否锁定车辆位置
*/
- void showBounds( String tag, MogoLatLng carPosition, List< MogoLatLng > lonLats, Rect bound, boolean lockCarPosition );
+ void showBounds(String tag, MogoLatLng carPosition, List lonLats, Rect bound, boolean lockCarPosition);
/**
* 强制刷新地图
@@ -199,7 +213,7 @@ public interface IMogoMapUIController {
* @param p2
* @return
*/
- float calculateLineDistance( MogoLatLng p1, MogoLatLng p2 ) throws Exception;
+ float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception;
/**
* 当前的视图模式
@@ -221,7 +235,7 @@ public interface IMogoMapUIController {
* @param option 为空时使用
* 默认配置
*/
- void setCarCursorOption( @Nullable CarCursorOption option );
+ void setCarCursorOption(@Nullable CarCursorOption option);
/**
* 获取地图视图描述快照
@@ -235,13 +249,25 @@ public interface IMogoMapUIController {
*
* @param bearing
*/
- void changeBearing( float bearing );
+ void changeBearing(float bearing);
- default void setAnchorScale( float x, float y ) {
+ void setAdasRecognizedResult(ADASRecognizedResult result);
+
+ /**
+ * 获取瓦片id
+ *
+ * @param lon 经度
+ * @param lat 纬度
+ * @return 瓦片id
+ */
+ long getTileId(double lon, double lat);
+
+
+ default void setAnchorScale(float x, float y) {
}
- default void setAnchorRate( float rate ) {
+ default void setAnchorRate(float rate) {
}
@@ -254,7 +280,7 @@ public interface IMogoMapUIController {
*
* @param enable
*/
- default void rtkEnable( boolean enable ) {
+ default void rtkEnable(boolean enable) {
}
@@ -267,7 +293,7 @@ public interface IMogoMapUIController {
*
* @param data
*/
- default void syncLocation2Map( JSONObject data ) {
+ default void syncLocation2Map(JSONObject data) {
}
@@ -276,7 +302,7 @@ public interface IMogoMapUIController {
*
* @param zoomGestureEnable 是否支持手势缩放改变地图样式
*/
- default void openVrMode( boolean zoomGestureEnable ) {
+ default void openVrMode(boolean zoomGestureEnable) {
}
@@ -290,7 +316,7 @@ public interface IMogoMapUIController {
* @param isRTK
* @return
*/
- default double[] matchRoad(String id, double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK ) {
+ default double[] matchRoad(String id, double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK) {
return null;
}
@@ -300,19 +326,21 @@ public interface IMogoMapUIController {
/**
* 获取车速资源缓存 id
+ *
* @param speedVal
* @return
*/
- default String getMarkerInfoResName(String speedVal){
+ default String getMarkerInfoResName(String speedVal) {
return "";
}
/**
* 获取车速资源缓存 id
+ *
* @param speedVal
* @return
*/
- default void setMarkerInfoResName(String speedVal, String val){
+ default void setMarkerInfoResName(String speedVal, String val) {
}
}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapVisualAngle.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapVisualAngle.java
new file mode 100644
index 0000000000..94b75113e8
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapVisualAngle.java
@@ -0,0 +1,10 @@
+package com.mogo.map.uicontroller;
+
+public interface IMogoMapVisualAngle {
+
+ boolean isLongSight();
+
+ boolean isCloseSight();
+
+ boolean isMediumSight();
+}
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.java
new file mode 100644
index 0000000000..3d6462fab2
--- /dev/null
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.java
@@ -0,0 +1,44 @@
+package com.mogo.map.uicontroller;
+
+public enum VisualAngleMode implements IMogoMapVisualAngle {
+
+ /**
+ * 视距近景
+ */
+ MODE_CLOSE_SIGHT(0),
+
+ /**
+ * 视距中景
+ */
+ MODE_MEDIUM_SIGHT(1),
+
+ /**
+ * 视距远景
+ */
+ MODE_LONG_SIGHT(2);
+
+ private int code;
+
+ VisualAngleMode(int code) {
+ this.code = code;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ @Override
+ public boolean isLongSight() {
+ return code == MODE_LONG_SIGHT.getCode();
+ }
+
+ @Override
+ public boolean isCloseSight() {
+ return code == MODE_CLOSE_SIGHT.getCode();
+ }
+
+ @Override
+ public boolean isMediumSight() {
+ return code == MODE_MEDIUM_SIGHT.getCode();
+ }
+}
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
index 9aca5abc2c..b45d5f807f 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
@@ -3,7 +3,6 @@ package com.mogo.map;
import android.graphics.Point;
import android.graphics.Rect;
import android.location.Location;
-import android.util.Log;
import android.view.View;
import android.view.animation.Interpolator;
@@ -13,6 +12,8 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
+import com.mogo.map.uicontroller.VisualAngleMode;
+import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.logger.Logger;
import org.json.JSONObject;
@@ -38,9 +39,9 @@ public class MogoMapUIController implements IMogoMapUIController {
}
public static MogoMapUIController getInstance() {
- if ( sInstance == null ) {
- synchronized ( MogoMapUIController.class ) {
- if ( sInstance == null ) {
+ if (sInstance == null) {
+ synchronized (MogoMapUIController.class) {
+ if (sInstance == null) {
sInstance = new MogoMapUIController();
}
}
@@ -48,7 +49,7 @@ public class MogoMapUIController implements IMogoMapUIController {
return sInstance;
}
- public void setDelegate( IMogoMapUIController mDelegate ) {
+ public void setDelegate(IMogoMapUIController mDelegate) {
this.mDelegate = mDelegate;
}
@@ -57,77 +58,94 @@ public class MogoMapUIController implements IMogoMapUIController {
}
@Override
- public void setTrafficEnabled( boolean visible ) {
+ public void setTrafficEnabled(boolean visible) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.setTrafficEnabled( visible );
+ if (mDelegate != null) {
+ mDelegate.setTrafficEnabled(visible);
}
}
@Override
- public MapControlResult changeZoom( boolean zoom ) {
+ public MapControlResult changeZoom(boolean zoom) {
initDelegate();
- if ( mDelegate != null ) {
- return mDelegate.changeZoom( zoom );
+ if (mDelegate != null) {
+ return mDelegate.changeZoom(zoom);
}
return MapControlResult.ERROR;
}
@Override
- public MapControlResult changeZoom( float zoom ) {
+ public MapControlResult changeZoom(float zoom) {
initDelegate();
- if ( mDelegate != null ) {
- return mDelegate.changeZoom( zoom );
+ if (mDelegate != null) {
+ return mDelegate.changeZoom(zoom);
}
return MapControlResult.ERROR;
}
@Override
- public void changeMapMode( EnumMapUI mode ) {
+ public void changeMapMode(EnumMapUI mode) {
initDelegate();
- if ( mDelegate != null ) {
- Logger.d( TAG, "set type: %s", mode.name() );
- mDelegate.changeMapMode( mode );
- }
- }
-
-
- @Override
- public void moveToCenter( MogoLatLng latLng, boolean animate ) {
- initDelegate();
- if ( mDelegate != null ) {
- mDelegate.moveToCenter( latLng, animate );
+ if (mDelegate != null) {
+ Logger.d(TAG, "set type: %s", mode.name());
+ mDelegate.changeMapMode(mode);
}
}
@Override
- public void showMyLocation( boolean visible ) {
+ public void changeMapVisualAngle(VisualAngleMode angelMode) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.showMyLocation( visible );
+ if (mDelegate != null) {
+ Logger.d(TAG, "set VisualAngle: %s", angelMode.name());
+ mDelegate.changeMapVisualAngle(angelMode);
+ }
+ }
+
+ @Override
+ public VisualAngleMode getCurrentMapVisualAngle() {
+ initDelegate();
+ if (mDelegate != null) {
+ return mDelegate.getCurrentMapVisualAngle();
+ }
+ return null;
+ }
+
+ @Override
+ public void moveToCenter(MogoLatLng latLng, boolean animate) {
+ initDelegate();
+ if (mDelegate != null) {
+ mDelegate.moveToCenter(latLng, animate);
+ }
+ }
+
+ @Override
+ public void showMyLocation(boolean visible) {
+ initDelegate();
+ if (mDelegate != null) {
+ mDelegate.showMyLocation(visible);
}
}
@Override
public void emphasizeMyLocation() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
mDelegate.emphasizeMyLocation();
}
}
@Override
- public void showMyLocation( View view ) {
+ public void showMyLocation(View view) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.showMyLocation( view );
+ if (mDelegate != null) {
+ mDelegate.showMyLocation(view);
}
}
@Override
public void recoverLockMode() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
mDelegate.recoverLockMode();
}
}
@@ -135,31 +153,31 @@ public class MogoMapUIController implements IMogoMapUIController {
@Override
public void loseLockMode() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
mDelegate.loseLockMode();
}
}
@Override
- public void setLockZoom( int var1 ) {
+ public void setLockZoom(int var1) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.setLockZoom( var1 );
+ if (mDelegate != null) {
+ mDelegate.setLockZoom(var1);
}
}
@Override
- public void displayOverview( Rect bounds ) {
+ public void displayOverview(Rect bounds) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.displayOverview( bounds );
+ if (mDelegate != null) {
+ mDelegate.displayOverview(bounds);
}
}
@Override
public float getScalePerPixel() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getScalePerPixel();
}
return 0;
@@ -168,7 +186,7 @@ public class MogoMapUIController implements IMogoMapUIController {
@Override
public float getZoomLevel() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getZoomLevel();
}
return 0;
@@ -177,7 +195,7 @@ public class MogoMapUIController implements IMogoMapUIController {
@Override
public float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK) {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getRoadWidth(lon, lat, angle, isGpsLocation, isRTK);
}
@@ -187,7 +205,7 @@ public class MogoMapUIController implements IMogoMapUIController {
@Override
public MogoLatLng getCameraNorthEastPosition() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getCameraNorthEastPosition();
}
return null;
@@ -196,7 +214,7 @@ public class MogoMapUIController implements IMogoMapUIController {
@Override
public MogoLatLng getCameraSouthWestPosition() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getCameraSouthWestPosition();
}
return null;
@@ -205,75 +223,75 @@ public class MogoMapUIController implements IMogoMapUIController {
@Override
public MogoLatLng getWindowCenterLocation() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getWindowCenterLocation();
}
return null;
}
@Override
- public void setPointToCenter( double mapCenterX, double mapCenterY ) {
+ public void setPointToCenter(double mapCenterX, double mapCenterY) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.setPointToCenter( mapCenterX, mapCenterY );
+ if (mDelegate != null) {
+ mDelegate.setPointToCenter(mapCenterX, mapCenterY);
}
}
@Override
- public Point getLocationPointInScreen( MogoLatLng latLng ) {
+ public Point getLocationPointInScreen(MogoLatLng latLng) {
initDelegate();
- if ( mDelegate != null ) {
- return mDelegate.getLocationPointInScreen( latLng );
+ if (mDelegate != null) {
+ return mDelegate.getLocationPointInScreen(latLng);
}
return null;
}
@Override
- public MogoLatLng getLocationMogoLatLngInScreen( Point point ) {
+ public MogoLatLng getLocationMogoLatLngInScreen(Point point) {
initDelegate();
- if ( mDelegate != null ) {
- return mDelegate.getLocationMogoLatLngInScreen( point );
+ if (mDelegate != null) {
+ return mDelegate.getLocationMogoLatLngInScreen(point);
}
return null;
}
@Override
- public void startJumpAnimation( IMogoMarker marker, float high, Interpolator interpolator, long duration ) {
+ public void startJumpAnimation(IMogoMarker marker, float high, Interpolator interpolator, long duration) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.startJumpAnimation( marker, high, interpolator, duration );
+ if (mDelegate != null) {
+ mDelegate.startJumpAnimation(marker, high, interpolator, duration);
}
}
@Override
- public void setRenderFps( int fps ) {
+ public void setRenderFps(int fps) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.setRenderFps( fps );
+ if (mDelegate != null) {
+ mDelegate.setRenderFps(fps);
}
}
@Override
- public void showBounds( String tag, MogoLatLng carPosition, List< MogoLatLng > lonLats, Rect bound, boolean lockCarPosition ) {
+ public void showBounds(String tag, MogoLatLng carPosition, List lonLats, Rect bound, boolean lockCarPosition) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.showBounds( tag, carPosition, lonLats, bound, lockCarPosition );
+ if (mDelegate != null) {
+ mDelegate.showBounds(tag, carPosition, lonLats, bound, lockCarPosition);
}
}
@Override
public void forceRender() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
mDelegate.forceRender();
}
}
@Override
- public float calculateLineDistance( MogoLatLng p1, MogoLatLng p2 ) throws Exception {
+ public float calculateLineDistance(MogoLatLng p1, MogoLatLng p2) throws Exception {
initDelegate();
- if ( mDelegate != null ) {
- return mDelegate.calculateLineDistance( p1, p2 );
+ if (mDelegate != null) {
+ return mDelegate.calculateLineDistance(p1, p2);
}
return 0;
}
@@ -281,67 +299,72 @@ public class MogoMapUIController implements IMogoMapUIController {
@Override
public EnumMapUI getCurrentUiMode() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getCurrentUiMode();
}
return null;
}
@Override
- public void changeMyLocation( Location location ) {
+ public void changeMyLocation(Location location) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.changeMyLocation( location );
+ if (mDelegate != null) {
+ mDelegate.changeMyLocation(location);
}
}
@Override
public boolean isCarLocked() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.isCarLocked();
}
return false;
}
@Override
- public void setCarCursorOption( CarCursorOption option ) {
+ public void setCarCursorOption(CarCursorOption option) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.setCarCursorOption( option );
+ if (mDelegate != null) {
+ mDelegate.setCarCursorOption(option);
}
}
@Override
public MapCameraPosition getMapCameraPosition() {
initDelegate();
- if ( mDelegate != null ) {
+ if (mDelegate != null) {
return mDelegate.getMapCameraPosition();
}
return null;
}
@Override
- public void changeBearing( float bearing ) {
+ public void changeBearing(float bearing) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.changeBearing( bearing );
+ if (mDelegate != null) {
+ mDelegate.changeBearing(bearing);
}
}
@Override
- public void rtkEnable( boolean enable ) {
+ public long getTileId(double lon, double lat) {
+ return mDelegate.getTileId(lon, lat);
+ }
+
+ @Override
+ public void rtkEnable(boolean enable) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.rtkEnable( enable );
+ if (mDelegate != null) {
+ mDelegate.rtkEnable(enable);
}
}
@Override
- public void syncLocation2Map( JSONObject data ) {
+ public void syncLocation2Map(JSONObject data) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.syncLocation2Map( data );
+ if (mDelegate != null) {
+ mDelegate.syncLocation2Map(data);
}
}
@@ -351,42 +374,42 @@ public class MogoMapUIController implements IMogoMapUIController {
}
private void initDelegate() {
- if ( mDelegate == null ) {
+ if (mDelegate == null) {
mDelegate = MogoMapDelegateFactory.getMapUIControllerDelegate();
}
}
@Override
- public void openVrMode( boolean zoomGestureEnable ) {
+ public void openVrMode(boolean zoomGestureEnable) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.openVrMode( zoomGestureEnable );
+ if (mDelegate != null) {
+ mDelegate.openVrMode(zoomGestureEnable);
}
}
@Override
- public double[] matchRoad( String id, double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK ) {
+ public double[] matchRoad(String id, double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK) {
initDelegate();
- if ( mDelegate != null ) {
- return mDelegate.matchRoad( id, lon, lat, angle, isGpsLocation, isRTK );
+ if (mDelegate != null) {
+ return mDelegate.matchRoad(id, lon, lat, angle, isGpsLocation, isRTK);
}
return null;
}
@Override
- public String getMarkerInfoResName( String speedVal ) {
+ public String getMarkerInfoResName(String speedVal) {
initDelegate();
- if ( mDelegate != null ) {
- return mDelegate.getMarkerInfoResName( speedVal );
+ if (mDelegate != null) {
+ return mDelegate.getMarkerInfoResName(speedVal);
}
return null;
}
@Override
- public void setMarkerInfoResName( String speedVal, String val ) {
+ public void setMarkerInfoResName(String speedVal, String val) {
initDelegate();
- if ( mDelegate != null ) {
- mDelegate.setMarkerInfoResName( speedVal, val );
+ if (mDelegate != null) {
+ mDelegate.setMarkerInfoResName(speedVal, val);
}
}
@@ -397,4 +420,12 @@ public class MogoMapUIController implements IMogoMapUIController {
mDelegate.clearRoadCacheById(id);
}
}
+
+ @Override
+ public void setAdasRecognizedResult(ADASRecognizedResult result) {
+ initDelegate();
+ if (mDelegate != null) {
+ mDelegate.setAdasRecognizedResult(result);
+ }
+ }
}
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index dcb7e4cb5c..c426c99a24 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -7,7 +7,6 @@ import android.os.Process;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
-import android.widget.FrameLayout;
import android.widget.ImageView;
import androidx.annotation.Nullable;
@@ -16,14 +15,11 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.main.MainActivity;
import com.mogo.module.main.cards.MogoModulesManager;
-import com.mogo.module.main.utils.DisplayEffectsHelper;
import com.mogo.module.service.receiver.MogoReceiver;
import com.mogo.och.IMogoOCH;
import com.mogo.service.intent.IMogoIntentListener;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.service.v2x.IV2XListener;
import com.mogo.utils.logger.Logger;
@@ -38,7 +34,7 @@ import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_T
*
* @author tongchenfei
*/
-public class MainLauncherActivity extends MainActivity implements IMogoIntentListener, IMogoStatusChangedListener, IV2XListener {
+public class MainLauncherActivity extends MainActivity implements IMogoIntentListener, IV2XListener {
private static final String TAG = "MainLauncherActivity";
protected boolean mIsHomeKeyDown = false;
private static Handler handlerV2XEvent = new Handler();
@@ -53,9 +49,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
DebugConfig.setNeedRequestUserInfo(true);
Log.d(TAG, "onCreate");
mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this);
- mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG,
- StatusDescriptor.VR_MODE, this);
- DisplayEffectsHelper.getInstance().init(clSpecialEffect);
}
@Override
@@ -164,28 +157,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
Logger.d(TAG, "send msg to AI Voice");
}
- @Override
- public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
- FrameLayout.LayoutParams entranceParams = ((FrameLayout.LayoutParams) mEntrance.getLayoutParams());
- if (isTrue) {
- entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_entrance_fragment_container_marginLeft_in_vr_mode);
- mLeftShadowFrame.setVisibility(View.GONE);
- mApps.setVisibility(View.GONE);
- } else {
- entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_id_entrance_fragment_container_marginLeft);
- mLeftShadowFrame.setVisibility(View.VISIBLE);
- mApps.setVisibility(View.VISIBLE);
- }
- mEntrance.setLayoutParams(entranceParams);
- if (descriptor == StatusDescriptor.VR_MODE) {
- if (isTrue) {
- clSpecialEffect.setVisibility(View.VISIBLE);
- } else {
- clSpecialEffect.setVisibility(View.GONE);
- }
- }
- }
@Override
public void warningChangedWithDirection(int type) {
@@ -252,4 +224,16 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
EXPIRE_TIMER = ALL_EXPIRE_TIMER;
}
}
+
+ @Override
+ public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+ super.onStatusChanged(descriptor,isTrue);
+ if (isTrue) {
+ mLeftShadowFrame.setVisibility(View.GONE);
+ mApps.setVisibility(View.GONE);
+ } else {
+ mLeftShadowFrame.setVisibility(View.VISIBLE);
+ mApps.setVisibility(View.VISIBLE);
+ }
+ }
}
diff --git a/modules.txt b/modules.txt
index c15cf56b13..a5a9ea1689 100644
--- a/modules.txt
+++ b/modules.txt
@@ -50,7 +50,6 @@
:modules:mogo-module-push-noop
:modules:mogo-module-push
:libraries:tanlulib
-:libraries:mogo-tanlu-api
:modules:mogo-module-monitor
:modules:mogo-module-splash
:modules:mogo-module-splash-noop
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/adapter/MogoMapListenerAdapter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/adapter/MogoMapListenerAdapter.java
index 2d21ddc754..6dac8a627a 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/adapter/MogoMapListenerAdapter.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/adapter/MogoMapListenerAdapter.java
@@ -6,6 +6,7 @@ import com.mogo.map.MogoLatLng;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.model.MogoPoi;
import com.mogo.map.uicontroller.EnumMapUI;
+import com.mogo.map.uicontroller.VisualAngleMode;
/**
* @author congtaowang
@@ -45,6 +46,11 @@ public abstract class MogoMapListenerAdapter implements IMogoMapListener {
}
+ @Override
+ public void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) {
+
+ }
+
@Override
public void onMapChanged( MogoLatLng latLng, float zoom, float tilt, float bearing ) {
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/AdasRecognizedType.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/AdasRecognizedType.java
index ac326ff0d9..ce02d9103a 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/AdasRecognizedType.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/AdasRecognizedType.java
@@ -9,34 +9,37 @@ public
*/
enum AdasRecognizedType {
//背景
- classIdBackground( "background", 0 ),
+ classIdBackground("background", 0),
//人
- classIdPerson( "person", 1 ),
+ classIdPerson("person", 1),
//自行车
- classIdBicycle( "bicycle", 2 ),
+ classIdBicycle("bicycle", 2),
//小轿车
- classIdCar( "car", 3 ),
+ classIdCar("car", 3),
//摩托车
- classIdMoto( "moto", 4 ),
+ classIdMoto("moto", 4),
//红绿灯
- classIdTrafficSign( "traffic_sign", 5 ),
+ classIdTrafficSign("traffic_sign", 5),
//bus
- classIdTrafficBus( "traffic_bus", 6 ),
+ classIdTrafficBus("traffic_bus", 6),
//truck
- classIdTrafficTruck( "traffic_truck", 8 ),
+ classIdTrafficTruck("traffic_truck", 8),
//stopLine
- classIdStopLine("warning_stop_line",9),
+ classIdStopLine("warning_stop_line", 9),
//预警箭头
- classIdWarningArrows("warning_arrows",10);
+ classIdWarningArrows("warning_arrows", 10),
- AdasRecognizedType( int code ) {
+ //未知物体
+ classIdUnKnow("unKnow", 100);
+
+ AdasRecognizedType(int code) {
this.code = code;
}
private String res = "";
private int code = -1;
- AdasRecognizedType( String res, int code ) {
+ AdasRecognizedType(String res, int code) {
this.res = res;
this.code = code;
}
@@ -53,14 +56,18 @@ enum AdasRecognizedType {
classIdTrafficTruck,
classIdStopLine,
classIdWarningArrows,
+ classIdUnKnow,
};
public String getRes() {
return res;
}
- public static AdasRecognizedType valueFrom( int code ) {
- if ( code >= 0 && code < VAL.length ) {
+ public static AdasRecognizedType valueFrom(int code) {
+ if (code == 100) {
+ return classIdUnKnow;
+ }
+ if (code >= 0 && code < VAL.length) {
return VAL[code];
}
return null;
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
index 7f21efb15f..dcbfcd4d1d 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
@@ -199,7 +199,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
recognizedListResult.lat = matchLonLat[1];
mLastPositions.put( uniqueKey, recognizedListResult );
- Logger.d( "matchRoad", "cost = %s", System.currentTimeMillis() - start );
+// Logger.d( "matchRoad", "cost = %s", System.currentTimeMillis() - start );
newAdasRecognizedMarkersCaches.put( uniqueKey, marker );
if ( lastPosition != null ) {
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
index 960931c3cc..818a3e7b26 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
@@ -194,7 +194,8 @@ class BaseDrawer {
|| recognizedType == AdasRecognizedType.classIdBicycle
|| recognizedType == AdasRecognizedType.classIdPerson
|| recognizedType == AdasRecognizedType.classIdTrafficBus
- || recognizedType == AdasRecognizedType.classIdTrafficTruck;
+ || recognizedType == AdasRecognizedType.classIdTrafficTruck
+ || recognizedType == AdasRecognizedType.classIdUnKnow; //todo unKnow物体绘制
}
/**
@@ -207,7 +208,8 @@ class BaseDrawer {
AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
return recognizedType != AdasRecognizedType.classIdBicycle
&& recognizedType != AdasRecognizedType.classIdMoto
- && recognizedType != AdasRecognizedType.classIdPerson;
+ && recognizedType != AdasRecognizedType.classIdPerson
+ && recognizedType != AdasRecognizedType.classIdUnKnow; //todo unKnow物体不绘制车速
}
/**
@@ -230,6 +232,8 @@ class BaseDrawer {
return R.raw.stopline;
} else if (recognizedType == AdasRecognizedType.classIdWarningArrows) {
return R.raw.arraw;
+ } else if (recognizedType == AdasRecognizedType.classIdUnKnow) { //todo unKnow物体3D模型
+ return R.raw.othercar;
}
return R.raw.people;
}
@@ -248,6 +252,9 @@ class BaseDrawer {
if (recognizedType == AdasRecognizedType.classIdTrafficBus) {
return "#D8D8D8FF";
}
+ if (recognizedType == AdasRecognizedType.classIdUnKnow){ //todo unKnow颜色绘制
+ return "#FF2894FF";
+ }
// 距离策略
double[] coordinates = getCurCoordinates();
double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100;
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
index 4cc2bc677c..ce4a652999 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
@@ -9,7 +9,10 @@ import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.module.common.MogoApisHandler;
+import com.mogo.module.common.R;
+import com.mogo.module.common.drawer.marker.EmptyMarkerView;
import com.mogo.module.common.drawer.marker.IMarkerView;
+import com.mogo.module.common.drawer.marker.MapMarker3DResAdapter;
import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
import com.mogo.module.common.drawer.marker.OnlineCarMarkerView;
import com.mogo.module.common.entity.MarkerExploreWay;
@@ -41,9 +44,9 @@ class MarkerDrawer {
}
public static MarkerDrawer getInstance() {
- if ( sInstance == null ) {
- synchronized ( MarkerDrawer.class ) {
- if ( sInstance == null ) {
+ if (sInstance == null) {
+ synchronized (MarkerDrawer.class) {
+ if (sInstance == null) {
sInstance = new MarkerDrawer();
}
}
@@ -60,46 +63,61 @@ class MarkerDrawer {
return sInstance;
}
- public IMogoMarker drawMapMarkerImpl( MarkerShowEntity markerShowEntity, int zIndex, IMogoMarkerClickListener listener ) {
- return drawMapMarkerImpl( markerShowEntity, false, zIndex, 0, listener );
+ public IMogoMarker drawMapMarkerImpl(MarkerShowEntity markerShowEntity, int zIndex, IMogoMarkerClickListener listener) {
+ return drawMapMarkerImpl(markerShowEntity, false, zIndex, 0, listener);
}
- public IMogoMarker drawMapMarkerImpl( MarkerShowEntity markerShowEntity, boolean matchRoadSide, int zIndex, IMogoMarkerClickListener listener ) {
- return drawMapMarkerImpl( markerShowEntity, matchRoadSide, zIndex, 0, listener );
+ public IMogoMarker drawMapMarkerImpl(MarkerShowEntity markerShowEntity, boolean matchRoadSide, int zIndex, IMogoMarkerClickListener listener) {
+ return drawMapMarkerImpl(markerShowEntity, matchRoadSide, zIndex, 0, listener);
}
/**
* add marker, {@link OnlineCarDrawer 如果是需要在3D模式下显示，则需要设置 {@link MogoMarkerOptions icon3DRes 资源id}}
+ *
* @param markerShowEntity marker展示数据结构体
- * @param matchRoadSide 设置是否道路吸附，暂时没用到这个字段
- * @param zIndex zOrder
- * @param icon3DRes 3D Res资源
- * @param listener marker回调
+ * @param matchRoadSide 设置是否道路吸附，暂时没用到这个字段
+ * @param zIndex zOrder
+ * @param icon3DRes 3D Res资源
+ * @param listener marker回调
* @return {@link IMogoMarker}
*/
- public IMogoMarker drawMapMarkerImpl( MarkerShowEntity markerShowEntity, boolean matchRoadSide, int zIndex, int icon3DRes, IMogoMarkerClickListener listener ) {
- if ( markerShowEntity == null || markerShowEntity.getMarkerLocation() == null ) {
+ public IMogoMarker drawMapMarkerImpl(MarkerShowEntity markerShowEntity, boolean matchRoadSide, int zIndex, int icon3DRes, IMogoMarkerClickListener listener) {
+ if (markerShowEntity == null || markerShowEntity.getMarkerLocation() == null) {
return null;
}
- MogoMarkerOptions options = new MogoMarkerOptions().icon3DRes( icon3DRes ).set3DMode(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()).matchOnRoadSide( matchRoadSide ).owner( markerShowEntity.getMarkerType() ).zIndex( zIndex ).object( markerShowEntity ).latitude( markerShowEntity.getMarkerLocation().getLat() ).longitude( markerShowEntity.getMarkerLocation().getLon() );
- IMarkerView markerView = MapMarkerAdapter.getMarkerView( AbsMogoApplication.getApp(), markerShowEntity, options );
- if ( markerView instanceof OnlineCarMarkerView ) {
- try {
- options.icon( markerView.getBitmap( ( ( MarkerOnlineCar ) markerShowEntity.getBindObj() ).getCarInfo().getVehicleType() ) );
- } catch ( Exception e ) {
- options.icon( markerView.getBitmap( 0 ) );
+ MogoMarkerOptions options = new MogoMarkerOptions().icon3DRes(icon3DRes).set3DMode(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()).matchOnRoadSide(matchRoadSide).owner(markerShowEntity.getMarkerType()).zIndex(zIndex).object(markerShowEntity).latitude(markerShowEntity.getMarkerLocation().getLat()).longitude(markerShowEntity.getMarkerLocation().getLon());
+
+ if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+ Object bindObj = markerShowEntity.getBindObj();
+ if (bindObj instanceof MarkerExploreWay && ((MarkerExploreWay) bindObj).getPoiType() != null) {
+ String poiType = ((MarkerExploreWay) bindObj).getPoiType();
+ options.icon3DRes(MapMarker3DResAdapter.getMarker3DRes(poiType));
}
- options.anchor( 0.5f, 0.5f );
+
+ }
+ IMarkerView markerView = MapMarkerAdapter.getMarkerView(AbsMogoApplication.getApp(), markerShowEntity, options);
+ if (markerView instanceof OnlineCarMarkerView) {
+ try {
+ options.icon(markerView.getBitmap(((MarkerOnlineCar) markerShowEntity.getBindObj()).getCarInfo().getVehicleType()));
+ } catch (Exception e) {
+ options.icon(markerView.getBitmap(0));
+ }
+ options.anchor(0.5f, 0.5f);
} else {
- options.icon( markerView.getView() );
+ options.icon(markerView.getView());
}
- IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).addMarker( markerShowEntity.getMarkerType(), options );
- if ( marker != null ) {
- marker.setOwner( markerShowEntity.getMarkerType() );
- markerView.setMarker( marker );
- marker.setOnMarkerClickListener( listener );
- markerShowEntity.setMarker( marker );
+ if (options.getIcon3DRes() != 0) {
+ options.icon(new EmptyMarkerView(AbsMogoApplication.getApp()));
+ options.icon(markerView.getBitmap(0));
+ }
+
+ IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).addMarker(markerShowEntity.getMarkerType(), options);
+ if (marker != null) {
+ marker.setOwner(markerShowEntity.getMarkerType());
+ markerView.setMarker(marker);
+ marker.setOnMarkerClickListener(listener);
+ markerShowEntity.setMarker(marker);
}
return marker;
}
@@ -111,42 +129,42 @@ class MarkerDrawer {
* @param newList
* @return
*/
- public Map< String, IMogoMarker > purgeMarkerData( List newList, String markerType ) {
+ public Map purgeMarkerData(List newList, String markerType) {
final long start = System.currentTimeMillis();
- Map< String, IMogoMarker > existMap = new HashMap<>();
- List< IMogoMarker > allCarsList = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).getMarkers( markerType );
- if ( allCarsList == null || allCarsList.isEmpty() ) {
+ Map existMap = new HashMap<>();
+ List allCarsList = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).getMarkers(markerType);
+ if (allCarsList == null || allCarsList.isEmpty()) {
return existMap;
}
- if ( newList == null || newList.isEmpty() ) {
+ if (newList == null || newList.isEmpty()) {
return existMap;
}
- Map< String, IMogoMarker > allMap = new HashMap<>();
- for ( IMogoMarker marker : allCarsList ) {
- String sn = getPrimaryKeyFromMarker( marker );
- allMap.put( sn, marker );
+ Map allMap = new HashMap<>();
+ for (IMogoMarker marker : allCarsList) {
+ String sn = getPrimaryKeyFromMarker(marker);
+ allMap.put(sn, marker);
}
- for ( Object entity : newList ) {
- String sn = getPrimaryKeyFromEntity( entity );
- if ( allMap.containsKey( sn ) ) {
- if ( !isNewVehicleType( entity, allMap.get( sn ) ) ) {
- existMap.put( sn, allMap.get( sn ) );
+ for (Object entity : newList) {
+ String sn = getPrimaryKeyFromEntity(entity);
+ if (allMap.containsKey(sn)) {
+ if (!isNewVehicleType(entity, allMap.get(sn))) {
+ existMap.put(sn, allMap.get(sn));
}
}
}
- for ( String sn : allMap.keySet() ) {
- if ( !existMap.containsKey( sn ) ) {
- IMogoMarker dirtyMarker = allMap.get( sn );
- allCarsList.remove( dirtyMarker );
- if ( dirtyMarker != null ) {
+ for (String sn : allMap.keySet()) {
+ if (!existMap.containsKey(sn)) {
+ IMogoMarker dirtyMarker = allMap.get(sn);
+ allCarsList.remove(dirtyMarker);
+ if (dirtyMarker != null) {
dirtyMarker.destroy();
}
}
}
allMap.clear();
- Logger.i( "timer", "purge data cost " + ( System.currentTimeMillis() - start ) + "ms" );
+ Logger.i("timer", "purge data cost " + (System.currentTimeMillis() - start) + "ms");
return existMap;
}
@@ -156,74 +174,74 @@ class MarkerDrawer {
* @param list
* @return
*/
- public int getAppropriateSize( int maxAmount, List list ) {
- if ( list == null ) {
+ public int getAppropriateSize(int maxAmount, List list) {
+ if (list == null) {
return 0;
}
- return Math.min( maxAmount, list.size() );
+ return Math.min(maxAmount, list.size());
}
- private boolean isNewVehicleType( Object object, IMogoMarker marker ) {
- if ( object instanceof MarkerOnlineCar
+ private boolean isNewVehicleType(Object object, IMogoMarker marker) {
+ if (object instanceof MarkerOnlineCar
&& marker != null
&& marker.getObject() instanceof MarkerShowEntity
- && ( ( MarkerShowEntity ) marker.getObject() ).getBindObj() instanceof MarkerOnlineCar ) {
+ && ((MarkerShowEntity) marker.getObject()).getBindObj() instanceof MarkerOnlineCar) {
try {
- return ( ( MarkerOnlineCar ) object ).getCarInfo().getVehicleType()
- != ( ( MarkerOnlineCar ) ( ( MarkerShowEntity ) marker.getObject() ).getBindObj() ).getCarInfo().getVehicleType();
- } catch ( Exception e ) {
+ return ((MarkerOnlineCar) object).getCarInfo().getVehicleType()
+ != ((MarkerOnlineCar) ((MarkerShowEntity) marker.getObject()).getBindObj()).getCarInfo().getVehicleType();
+ } catch (Exception e) {
}
}
return false;
}
- public String getPrimaryKeyFromEntity( Object entity ) {
- if ( entity instanceof MarkerExploreWay ) {
- String id = ( ( MarkerExploreWay ) entity ).getInfoId();
- if ( !TextUtils.isEmpty( id ) ) {
+ public String getPrimaryKeyFromEntity(Object entity) {
+ if (entity instanceof MarkerExploreWay) {
+ String id = ((MarkerExploreWay) entity).getInfoId();
+ if (!TextUtils.isEmpty(id)) {
return id;
}
}
- return getCarSnFromEntity( entity );
+ return getCarSnFromEntity(entity);
}
- private String getPrimaryKeyFromMarker( IMogoMarker marker ) {
- if ( marker == null || marker.getObject() == null || marker.isDestroyed() ) {
+ private String getPrimaryKeyFromMarker(IMogoMarker marker) {
+ if (marker == null || marker.getObject() == null || marker.isDestroyed()) {
return null;
}
- if ( !( marker.getObject() instanceof MarkerShowEntity ) ) {
+ if (!(marker.getObject() instanceof MarkerShowEntity)) {
return null;
}
- return getPrimaryKeyFromEntity( ( ( MarkerShowEntity ) marker.getObject() ).getBindObj() );
+ return getPrimaryKeyFromEntity(((MarkerShowEntity) marker.getObject()).getBindObj());
}
- private String getCarSnFromEntity( Object entity ) {
+ private String getCarSnFromEntity(Object entity) {
try {
- if ( entity instanceof MarkerOnlineCar ) {
- return ( ( MarkerOnlineCar ) entity ).getUserInfo().getSn();
- } else if ( entity instanceof MarkerShareMusic ) {
- return ( ( MarkerShareMusic ) entity ).getUserInfo().getSn();
- } else if ( entity instanceof MarkerNoveltyInfo ) {
- return ( ( MarkerNoveltyInfo ) entity ).getSn();
- } else if ( entity instanceof MarkerExploreWay ) {
- return ( ( MarkerExploreWay ) entity ).getUserInfo().getSn();
+ if (entity instanceof MarkerOnlineCar) {
+ return ((MarkerOnlineCar) entity).getUserInfo().getSn();
+ } else if (entity instanceof MarkerShareMusic) {
+ return ((MarkerShareMusic) entity).getUserInfo().getSn();
+ } else if (entity instanceof MarkerNoveltyInfo) {
+ return ((MarkerNoveltyInfo) entity).getSn();
+ } else if (entity instanceof MarkerExploreWay) {
+ return ((MarkerExploreWay) entity).getUserInfo().getSn();
}
- } catch ( Exception e ) {
+ } catch (Exception e) {
}
return "";
}
- public String getCarSnFromMarker( IMogoMarker marker ) {
- if ( marker == null || marker.getObject() == null || marker.isDestroyed() ) {
+ public String getCarSnFromMarker(IMogoMarker marker) {
+ if (marker == null || marker.getObject() == null || marker.isDestroyed()) {
return null;
}
- if ( !( marker.getObject() instanceof MarkerShowEntity ) ) {
+ if (!(marker.getObject() instanceof MarkerShowEntity)) {
return null;
}
- return getCarSnFromEntity( ( ( MarkerShowEntity ) marker.getObject() ).getBindObj() );
+ return getCarSnFromEntity(((MarkerShowEntity) marker.getObject()).getBindObj());
}
/**
@@ -233,9 +251,9 @@ class MarkerDrawer {
* @param point2 点二坐标
* @return 两坐标的距离 单位：米（M）
*/
- public static float calculateLineDistance( MogoLatLng point1, MogoLatLng point2 ) {
- if ( point1 != null && point2 != null ) {
- return calculateLineDistance( point1.lon, point1.lat, point2.lon, point2.lat );
+ public static float calculateLineDistance(MogoLatLng point1, MogoLatLng point2) {
+ if (point1 != null && point2 != null) {
+ return calculateLineDistance(point1.lon, point1.lat, point2.lon, point2.lat);
} else {
return 0.0F;
}
@@ -248,7 +266,7 @@ class MarkerDrawer {
* @param lat2
* @return 两坐标的距离 单位：米（M）
*/
- public static float calculateLineDistance( double lon1, double lat1, double lon2, double lat2 ) {
- return CoordinateUtils.calculateLineDistance( lon1, lat1, lon2, lat2 );
+ public static float calculateLineDistance(double lon1, double lat1, double lon2, double lat2) {
+ return CoordinateUtils.calculateLineDistance(lon1, lat1, lon2, lat2);
}
}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java
index dbd1828295..2bfb249fbe 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/RoadConditionDrawer.java
@@ -87,8 +87,8 @@ class RoadConditionDrawer {
try {
if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
mogoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl( markerShowEntity, true, MarkerDrawer.MARKER_Z_INDEX_HIGH, listener );
- mogoMarker.setInfoWindowAdapter( new RoadConditionInfoWindow3DAdapter( markerShowEntity, AbsMogoApplication.getApp(), mogoMarker.getMogoMarkerOptions() ) );
- mogoMarker.showInfoWindow();
+// mogoMarker.setInfoWindowAdapter( new RoadConditionInfoWindow3DAdapter( markerShowEntity, AbsMogoApplication.getApp(), mogoMarker.getMogoMarkerOptions() ) );
+// mogoMarker.showInfoWindow();
} else {
if ( DebugConfig.isRoadEventAnimated() ) {
post2AddAndStartAnimation( markerShowEntity, i * 100L, listener );
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
index 1cca2829bc..137edcf3ef 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
@@ -91,19 +91,21 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
MogoLatLng mogoLatLng = new MogoLatLng(data.getCollisionLat(), data.getCollisionLon());
//2D资源图片位置调整
- MogoLatLng stopLineNew = Trigonometric.getNewLocation(data.getStopLines().get(1), 5, 180);
- MogoLatLng newLocation = Trigonometric.getNewLocation(mogoLatLng, 5, 180);
+// MogoLatLng stopLineNew = Trigonometric.getNewLocation(data.getStopLines().get(1), 5, 180);
+// MogoLatLng newLocation = Trigonometric.getNewLocation(mogoLatLng, 5, 180);
- IMogoMarker marker = drawMarker(markerShowEntity);
- Log.d("liyz", "renderWarnData marker != null direction = " + data.getDirection());
+ IMogoMarker marker = drawMarker(markerShowEntity, modeResType(data.getType()));
//识别物
marker.addDynamicAnchorPosition(new MogoLatLng(
data.getDirection() == 1 ? data.getStopLines().get(1).lat : data.getCollisionLat(),
data.getDirection() == 1 ? data.getStopLines().get(1).lon : data.getCollisionLon()), (float) data.getHeading(), 5000);
//识别物下方的红色圆圈
bottomMarker.addDynamicAnchorPosition(new MogoLatLng(
- data.getDirection() == 1 ? stopLineNew.lat : newLocation.getLat(),
- data.getDirection() == 1 ? stopLineNew.lon : newLocation.getLon()), (float) data.getHeading(), 5000);
+ data.getDirection() == 1 ? data.getStopLines().get(1).lat : data.getCollisionLat(),
+ data.getDirection() == 1 ? data.getStopLines().get(1).lon : data.getCollisionLon()), (float) data.getHeading(), 5000);
+// bottomMarker.addDynamicAnchorPosition(new MogoLatLng(
+// data.getDirection() == 1 ? stopLineNew.lat : newLocation.getLat(),
+// data.getDirection() == 1 ? stopLineNew.lon : newLocation.getLon()), (float) data.getHeading(), 5000);
//移动完成以后，3s后消失
UiThreadHandler.postDelayed(() -> {
marker.remove();
@@ -112,15 +114,32 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
}
+ //根据识别物类型 (行人0/自行车1/摩托车2/小汽车3/公交车4)获取3D模型(对应查看getModelRes)
+ private int modeResType(int dataType) {
+ switch (dataType) {
+ case 0:
+ return 1;
+ case 1:
+ return 2;
+ case 2:
+ return 4;
+ case 3:
+ return 3;
+ case 4:
+ return 6;
+ }
+ return 1;
+ }
- public IMogoMarker drawMarker(MarkerShowEntity markerShowEntity) {
+
+ public IMogoMarker drawMarker(MarkerShowEntity markerShowEntity, int modeResType) {
MogoMarkerOptions options = new MogoMarkerOptions()
.object(markerShowEntity)
.latitude(markerShowEntity.getMarkerLocation().getLat())
- .longitude(markerShowEntity.getMarkerLocation().getLon());
+ .longitude(markerShowEntity.getMarkerLocation().getLon())
+ .setGps(false);
IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options);
- options.icon3DRes(getModelRes(1)); //TODO
-
+ options.icon3DRes(getModelRes(modeResType)); //TODO
options.anchorColor("#FB3C3CFF"); //红色#FF3036 蓝色：#256BFF
IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerShowEntity.getMarkerType(), options);
iMarkerView.setMarker(marker);
@@ -134,6 +153,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
.latitude(location.getLat())
.longitude(location.getLon())
.set3DMode(true)
+ .setGps(false)
.controlAngle(true)
.icon3DRes(getModelRes(type))
.anchorColor("#FB3C3CFF")
@@ -152,6 +172,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
.latitude(newLocation.getLat())
.longitude(newLocation.getLon())
.anchor(1.0f, 1.0f)
+ .setGps(false)
.zIndex(MarkerDrawer.MARKER_Z_INDEX_HIGH);
optionsRipple
.icon(ViewUtils.fromView(new EmptyMarkerView(mContext)));
@@ -192,10 +213,10 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
MogoMarkerOptions options = new MogoMarkerOptions()
.object(markerShowEntity)
.latitude(markerShowEntity.getMarkerLocation().getLat())
- .longitude(markerShowEntity.getMarkerLocation().getLon());
+ .longitude(markerShowEntity.getMarkerLocation().getLon())
+ .setGps(false);
IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options);
options.icon3DRes(getModelRes(9));
-
options.anchorColor("#FB3C3CFF");
IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerShowEntity.getMarkerType(), options);
iMarkerView.setMarker(marker);
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarker3DResAdapter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarker3DResAdapter.java
new file mode 100644
index 0000000000..ded2b29d4a
--- /dev/null
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarker3DResAdapter.java
@@ -0,0 +1,55 @@
+package com.mogo.module.common.drawer.marker;
+
+import android.content.Context;
+
+import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.module.common.R;
+import com.mogo.module.common.entity.MarkerShowEntity;
+
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_ACCIDENT;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_FOG;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_ICE;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_LIVING;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_PONDING;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_ROAD_WORK;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.TRAFFIC_CHECK;
+
+/**
+ * created by wujifei on 2021/4/28 18:04
+ * describe:地图Marker的3d资源适配器
+ */
+public class MapMarker3DResAdapter {
+
+ public static int getMarker3DRes(String poiType) {
+ int res = 0;
+ switch (poiType) {
+ case FOURS_BLOCK_UP:
+ res = R.raw.v2x_yongdu;
+ break;
+ case FOURS_ACCIDENT:
+ res = R.raw.v2x_shigu;
+ break;
+ case FOURS_LIVING:
+ res = R.raw.v2x_shishilukuang;
+ break;
+ case FOURS_FOG:
+ res = R.raw.v2x_nongwu;
+ break;
+ case TRAFFIC_CHECK:
+ res = R.raw.v2x_jiaotongjiancha;
+ break;
+ case FOURS_ROAD_WORK:
+ res = R.raw.v2x_daolushigong;
+ break;
+ case FOURS_ICE:
+ res = R.raw.v2x_daolujiebing;
+ break;
+ case FOURS_PONDING:
+ res = R.raw.v2x_daolujishui;
+ break;
+ }
+
+ return res;
+ }
+}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
index da20e6f206..14b64b223a 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
@@ -1,6 +1,7 @@
package com.mogo.module.common.uploadintime;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.module.common.MogoApisHandler;
import com.mogo.realtime.entity.CloudLocationInfo;
import com.mogo.utils.logger.Logger;
@@ -9,14 +10,13 @@ import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
-public
/*
* @author congtaowang
* @since 2020/12/14
*
* 实时坐标数据处理中心
*/
-class SnapshotLocationController {
+public class SnapshotLocationController {
private static final String TAG = "SnapshotLocationController";
@@ -26,9 +26,9 @@ class SnapshotLocationController {
}
public static SnapshotLocationController getInstance() {
- if ( sInstance == null ) {
- synchronized ( SnapshotLocationController.class ) {
- if ( sInstance == null ) {
+ if (sInstance == null) {
+ synchronized (SnapshotLocationController.class) {
+ if (sInstance == null) {
sInstance = new SnapshotLocationController();
}
}
@@ -43,10 +43,10 @@ class SnapshotLocationController {
private CloudLocationInfo mLastLocationInfo = null;
// GPS(1s1次) RTK(OS侧)缓存数据，
- private final List< CloudLocationInfo > mLocationList = new ArrayList<>();
+ private final List mLocationList = new ArrayList<>();
// adda 工控机数据缓存
- private final List< CloudLocationInfo > mMachineCacheList = new ArrayList<>();
+ private final List mMachineCacheList = new ArrayList<>();
private int mDataAccuracy = 0;
private double mCurSpeed;
@@ -58,15 +58,15 @@ class SnapshotLocationController {
*
* @param cli {@link CloudLocationInfo}
*/
- public void syncLocationInfo( CloudLocationInfo cli ) {
- if ( cli == null ) {
+ public void syncLocationInfo(CloudLocationInfo cli) {
+ if (cli == null) {
return;
}
mLastLocationInfo = cli;
mCurSpeed = cli.getSpeed();
mCurLon = cli.getLon();
mCurLat = cli.getLat();
- mLocationList.add( cli );
+ mLocationList.add(cli);
}
/**
@@ -74,32 +74,39 @@ class SnapshotLocationController {
*
* @param data JSON结构化数据
*/
- public void syncAdasLocationInfo( JSONObject data ) {
- if ( data == null ) {
+ public void syncAdasLocationInfo(JSONObject data) {
+ if (data == null) {
return;
}
- DebugConfig.setStatus( DebugConfig.sLocation, true );
- Logger.d( TAG, "同步到rtk数据" );
- double lon = data.optDouble( "lon", -1 );
- double lat = data.optDouble( "lat", -1 );
- double alt = data.optDouble( "alt", -1 );
- double heading = data.optDouble( "heading", -1 );
- double acceleration = data.optDouble( "acceleration", -1 );
- double yawRate = data.optDouble( "yawRate", -1 );
- double speed = data.optDouble( "speed", -1 );
- long satelliteTime = data.optLong( "satelliteTime" );
- long systemTime = data.optLong( "systemTime" );
+ //测试面板状态同步
+ DebugConfig.setStatus(DebugConfig.sLocation, true);
+
+ Logger.d(TAG, "同步到rtk数据");
+ double lon = data.optDouble("lon", -1);
+ double lat = data.optDouble("lat", -1);
+ double alt = data.optDouble("alt", -1);
+ double heading = data.optDouble("heading", -1);
+ double acceleration = data.optDouble("acceleration", -1);
+ double yawRate = data.optDouble("yawRate", -1);
+ double speed = data.optDouble("speed", -1);
+ long satelliteTime = data.optLong("satelliteTime");
+ long systemTime = data.optLong("systemTime");
+
+ //测试面板状态同步
+ DebugConfig.setStatusData(DebugConfig.sLon, lon);
+ DebugConfig.setStatusData(DebugConfig.sLat, lat);
CloudLocationInfo cloudLocationInfo = new CloudLocationInfo();
- cloudLocationInfo.setAlt( alt );
- cloudLocationInfo.setHeading( heading );
- cloudLocationInfo.setLat( lat );
- cloudLocationInfo.setLon( lon );
- cloudLocationInfo.setSpeed( speed );
- cloudLocationInfo.setSatelliteTime( satelliteTime );
- cloudLocationInfo.setSystemTime( systemTime );
+ cloudLocationInfo.setAlt(alt);
+ cloudLocationInfo.setHeading(heading);
+ cloudLocationInfo.setLat(lat);
+ cloudLocationInfo.setLon(lon);
+ cloudLocationInfo.setSpeed(speed);
+ cloudLocationInfo.setSatelliteTime(satelliteTime);
+ cloudLocationInfo.setSystemTime(systemTime);
+ cloudLocationInfo.setTileId(String.valueOf(MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getTileId(lon, lat)));
mLastLocationInfo = cloudLocationInfo;
- mMachineCacheList.add( cloudLocationInfo );
+ mMachineCacheList.add(cloudLocationInfo);
mCurSpeed = cloudLocationInfo.getSpeed();
mCurLon = cloudLocationInfo.getLon();
@@ -111,29 +118,29 @@ class SnapshotLocationController {
*
* @return 坐标合集
*/
- public List< CloudLocationInfo > getSendLocationData() {
+ public List getSendLocationData() {
- List< CloudLocationInfo > list = null;
- if ( mMachineCacheList != null ) {
+ List list = null;
+ if (mMachineCacheList != null) {
mDataAccuracy = 1;
- list = new ArrayList<>( mMachineCacheList );
+ list = new ArrayList<>(mMachineCacheList);
mMachineCacheList.clear();
}
- if ( list == null || list.isEmpty() ) {
+ if (list == null || list.isEmpty()) {
mDataAccuracy = 0;
- if ( mLocationList != null ) {
- list = new ArrayList<>( mLocationList );
+ if (mLocationList != null) {
+ list = new ArrayList<>(mLocationList);
mLocationList.clear();
}
}
- if ( list == null || list.isEmpty() ) {
- if ( mLastLocationInfo != null ) {
+ if (list == null || list.isEmpty()) {
+ if (mLastLocationInfo != null) {
list = new ArrayList();
- list.add( mLastLocationInfo );
+ list.add(mLastLocationInfo);
mLastLocationInfo = null;
}
}
- Logger.d( TAG, "upload loc size = %s", list == null ? 0 : list.size() );
+ //Logger.d( TAG, "upload loc size = %s", list == null ? 0 : list.size() );
return list;
}
@@ -143,7 +150,7 @@ class SnapshotLocationController {
* @return 精度
*/
public int getDataAccuracy() {
- Logger.d( TAG, "upload loc accuracy = %s", mDataAccuracy );
+ //Logger.d( TAG, "upload loc accuracy = %s", mDataAccuracy );
return mDataAccuracy;
}
diff --git a/modules/mogo-module-common/src/main/res/raw/bus.n3d b/modules/mogo-module-common/src/main/res/raw/bus.n3d
index 80bc09e2d0..b8ef8271a9 100644
Binary files a/modules/mogo-module-common/src/main/res/raw/bus.n3d and b/modules/mogo-module-common/src/main/res/raw/bus.n3d differ
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 5a3af7e7e3..c0559e6232 100644
Binary files a/modules/mogo-module-common/src/main/res/raw/othercar.n3d and b/modules/mogo-module-common/src/main/res/raw/othercar.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.n3d
new file mode 100644
index 0000000000..83c372fbb7
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.n3d
new file mode 100644
index 0000000000..f862aea7f9
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.n3d
new file mode 100644
index 0000000000..b170c54e13
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.n3d
new file mode 100644
index 0000000000..1b6ba3b1bf
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.n3d
new file mode 100644
index 0000000000..0e87e83424
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.n3d
new file mode 100644
index 0000000000..1203a0bdb6
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_shigu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_shigu.n3d
new file mode 100644
index 0000000000..4c3dc1d3ef
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_shigu.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.n3d
new file mode 100644
index 0000000000..fe98148426
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.n3d differ
diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.n3d
new file mode 100644
index 0000000000..978407d06e
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.n3d differ
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 4f3fa1fb7b..8d8322ac3d 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -45,6 +45,7 @@ import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
+import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.dialog.WMDialog;
import com.mogo.module.common.glide.SkinAbleBitmapTarget;
@@ -1082,6 +1083,11 @@ public class EntranceFragment extends MvpFragment seekHelpNoticeListener =
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
index 14bbb3da15..08677fa374 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
@@ -8,6 +8,7 @@ import android.util.Log;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.map.marker.IMogoMarker;
+import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.extensions.R;
@@ -40,16 +41,18 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
mContext = context;
MoGoAiCloudRealTime.registerOnMsgListener(this);
- MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, marker -> {
- //点击的marker的具体数据
- if (mCloudRoadData != null && !TextUtils.isEmpty(mCloudRoadData.getRtmpUrl())) {
- CameraLiveManager.getInstance().init(mCloudRoadData);
- } else {
- Logger.e(TAG, " onMarkerClicked mCloudRoadData == null ");
- TipToast.shortTip("直播流地址为空");
+ MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, new IMogoMarkerClickListener() {
+ @Override
+ public boolean onMarkerClicked(IMogoMarker marker) {
+ //点击的marker的具体数据
+ if (mCloudRoadData != null && !TextUtils.isEmpty(mCloudRoadData.getRtmpUrl())) {
+ CameraLiveManager.getInstance().init(mCloudRoadData);
+ } else {
+ Logger.e(TAG, " onMarkerClicked mCloudRoadData == null ");
+ TipToast.shortTip("直播流地址为空");
+ }
+ return false;
}
-
- return false;
});
// loadMarker(false);
@@ -182,12 +185,12 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
@Override
public void onMsgSend(long id) {
- Logger.d(TAG, "onMsgSend id : " + id);
+ //Logger.d(TAG, "onMsgSend id : " + id);
}
@Override
public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
- Logger.d(TAG, "onMsgReceived mogoSnapshotSetData ： " + mogoSnapshotSetData);
+ //Logger.d(TAG, "onMsgReceived mogoSnapshotSetData ： " + mogoSnapshotSetData);
renderMarker(mogoSnapshotSetData);
}
}
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index bf0a59f349..25b899c7ca 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -30,7 +30,7 @@
android:id="@+id/fl_speed"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_300"
- android:layout_marginLeft="@dimen/dp_10"
+ android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/yi_biao_pan_bg_nor"
android:elevation="@dimen/dp_10"
diff --git a/modules/mogo-module-gps-simulator-debug/.gitignore b/modules/mogo-module-gps-simulator-debug/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/modules/mogo-module-gps-simulator-debug/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/modules/mogo-module-gps-simulator-debug/README.md b/modules/mogo-module-gps-simulator-debug/README.md
deleted file mode 100644
index 3266bdbaae..0000000000
--- a/modules/mogo-module-gps-simulator-debug/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# GPS 轨迹模拟接口 Debug 实现
diff --git a/modules/mogo-module-gps-simulator-debug/build.gradle b/modules/mogo-module-gps-simulator-debug/build.gradle
deleted file mode 100644
index 12fbf4774d..0000000000
--- a/modules/mogo-module-gps-simulator-debug/build.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion rootProject.ext.android.compileSdkVersion
- // buildToolsVersion rootProject.ext.android.buildToolsVersion
- defaultConfig {
- minSdkVersion rootProject.ext.android.minSdkVersion
- targetSdkVersion rootProject.ext.android.targetSdkVersion
- versionCode Integer.valueOf(VERSION_CODE)
- versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
- javaCompileOptions {
- annotationProcessorOptions {
- arguments = [AROUTER_MODULE_NAME: project.getName()]
- }
- }
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles 'consumer-rules.pro'
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- targetCompatibility 1.8
- sourceCompatibility 1.8
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-
- implementation rootProject.ext.dependencies.arouter
- annotationProcessor rootProject.ext.dependencies.aroutercompiler
- implementation "org.java-websocket:Java-WebSocket:1.4.0"
- if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.mogoutils
- implementation rootProject.ext.dependencies.mogocommons
- implementation rootProject.ext.dependencies.gpssimulator
- implementation rootProject.ext.dependencies.mogoserviceapi
- } else {
- implementation project(':foudations:mogo-utils')
- implementation project(":foudations:mogo-commons")
- implementation project(':modules:mogo-module-gps-simulator')
- implementation project(':services:mogo-service-api')
- }
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-gps-simulator-debug/consumer-rules.pro b/modules/mogo-module-gps-simulator-debug/consumer-rules.pro
deleted file mode 100644
index b5cb3815dd..0000000000
--- a/modules/mogo-module-gps-simulator-debug/consumer-rules.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-#-----GPS-DEBUG-SIMULATOR-----
--keep class com.mogo.module.gps.simulator.CationVo.*{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-gps-simulator-debug/gradle.properties b/modules/mogo-module-gps-simulator-debug/gradle.properties
deleted file mode 100644
index cbfd2771ac..0000000000
--- a/modules/mogo-module-gps-simulator-debug/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-gps-simulator-debug
-VERSION_CODE=1
diff --git a/modules/mogo-module-gps-simulator-debug/proguard-rules.pro b/modules/mogo-module-gps-simulator-debug/proguard-rules.pro
deleted file mode 100644
index a49a405e6a..0000000000
--- a/modules/mogo-module-gps-simulator-debug/proguard-rules.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#-----GPS-DEBUG-SIMULATOR-----
--keep class com.mogo.module.gps.simulator.CationVo.*{*;}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/AndroidManifest.xml b/modules/mogo-module-gps-simulator-debug/src/main/AndroidManifest.xml
deleted file mode 100644
index 6c73c51a7e..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/CationVo.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/CationVo.java
deleted file mode 100644
index b30af88de6..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/CationVo.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-
-/**
- * @author zyz
- * 2020-04-08.
- */
-public class CationVo {
-
- /**
- * vehicleSpeed : 1.0
- * instantSpeed : 1.0
- * lon : 116.401615
- * lat : 39.968812
- * carStatus : 1
- * direction : 267
- * sn : ZD801C1928L00371
- * locationTime : 1586339911534
- * distance : 0.0
- * adCode : 2
- * cityCode : 3
- * vehicleType : 0
- */
-
- private float vehicleSpeed;
- private double instantSpeed;
- private double lon;
- private double lat;
- private int carStatus;
- private int direction;
- private String sn;
- private long locationTime;
- private double distance;
- private String adCode;
- private String cityCode;
- private int vehicleType;
-
- public float getVehicleSpeed() {
- return vehicleSpeed;
- }
-
- public void setVehicleSpeed( float vehicleSpeed ) {
- this.vehicleSpeed = vehicleSpeed;
- }
-
- public double getInstantSpeed() {
- return instantSpeed;
- }
-
- public void setInstantSpeed( double instantSpeed ) {
- this.instantSpeed = instantSpeed;
- }
-
- public double getLon() {
- return lon;
- }
-
- public void setLon( double lon ) {
- this.lon = lon;
- }
-
- public double getLat() {
- return lat;
- }
-
- public void setLat( double lat ) {
- this.lat = lat;
- }
-
- public int getCarStatus() {
- return carStatus;
- }
-
- public void setCarStatus( int carStatus ) {
- this.carStatus = carStatus;
- }
-
- public int getDirection() {
- return direction;
- }
-
- public void setDirection( int direction ) {
- this.direction = direction;
- }
-
- public String getSn() {
- return sn;
- }
-
- public void setSn( String sn ) {
- this.sn = sn;
- }
-
- public long getLocationTime() {
- return locationTime;
- }
-
- public void setLocationTime( long locationTime ) {
- this.locationTime = locationTime;
- }
-
- public double getDistance() {
- return distance;
- }
-
- public void setDistance( double distance ) {
- this.distance = distance;
- }
-
- public String getAdCode() {
- return adCode;
- }
-
- public void setAdCode( String adCode ) {
- this.adCode = adCode;
- }
-
- public String getCityCode() {
- return cityCode;
- }
-
- public void setCityCode( String cityCode ) {
- this.cityCode = cityCode;
- }
-
- public int getVehicleType() {
- return vehicleType;
- }
-
- public void setVehicleType( int vehicleType ) {
- this.vehicleType = vehicleType;
- }
-
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/JWebSocketClient.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/JWebSocketClient.java
deleted file mode 100644
index 178452e093..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/JWebSocketClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.mogo.utils.logger.Logger;
-
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.drafts.Draft_6455;
-import org.java_websocket.handshake.ServerHandshake;
-
-import java.net.URI;
-
-/**
- * @author zyz
- * 2020-04-07.
- */
-public class JWebSocketClient extends WebSocketClient {
-
- public JWebSocketClient( URI serverUri ) {
- super( serverUri, new Draft_6455() );
- }
-
- @Override
- public void onOpen( ServerHandshake handshakedata ) {
- Logger.d( "JWebSocketClient", "onOpen()" );
- bindSN();
- }
-
- private void bindSN() {
- String data = String.format( "{ \"sn\": \"%s\", \"bind\": true }", Utils.getSn() );
- send( data );
- }
-
- @Override
- public void onMessage( String message ) {
- Logger.e( "JWebSocketClient", "onMessage()" );
- }
-
- @Override
- public void onClose( int code, String reason, boolean remote ) {
- Logger.d( "JWebSocketClient", "onClose()" );
- }
-
- @Override
- public void onError( Exception ex ) {
- Logger.d( "JWebSocketClient", "onError()" );
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerDebug.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerDebug.java
deleted file mode 100644
index 04c6096eca..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerDebug.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.utils.UiThreadHandler;
-
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * 描述
- */
-@Route( path = GpsSimulatorConstants.API_PATH )
-public class MogoGpsSimulatorManagerDebug implements IMogoGpsSimulatorManager {
-
- private static final String TAG = "MogoGpsSimulatorManagerDebug";
-
- @Override
- public void open() {
- WebSocketManager.getInstance().connect();
- }
-
- @Override
- public void close() {
- WebSocketManager.getInstance().disConnect();
- UiThreadHandler.postDelayed( () -> {
- WebSocketManager.destroy();
- }, 1_000L );
- }
-
- @Override
- public void init( Context context ) {
-
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/Utils.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/Utils.java
deleted file mode 100644
index 660015b14a..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/Utils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.utils.storage.SharedPrefsMgr;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Created by congtaowang on 2018/3/29.
- */
-
-class Utils {
-
- public static final String GET = "get";
- public static final String GSM_SERIAL = "gsm.serial";
- public static final String FOTA_VERSION = "ro.fota.version";
- public static final String PROPERTIES = "android.os.SystemProperties";
-
- public static String getSn() {
- if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
- return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "allocated_sn" );
- }
- return getSystemProperties( GSM_SERIAL );
- }
-
- public static String getFotaVersion() {
- return getSystemProperties( FOTA_VERSION );
- }
-
- public static String getSystemProperties( String name ) {
- String value = "";
-
- try {
- Class< ? > c = Class.forName( PROPERTIES );
- Method get = c.getMethod( GET, String.class );
- value = ( String ) get.invoke( c, name );
- } catch ( ClassNotFoundException var3 ) {
- var3.printStackTrace();
- } catch ( NoSuchMethodException var4 ) {
- var4.printStackTrace();
- } catch ( InvocationTargetException var5 ) {
- var5.printStackTrace();
- } catch ( IllegalAccessException var6 ) {
- var6.printStackTrace();
- }
- return value;
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java
deleted file mode 100644
index cafbf5b56d..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocation;
-import com.mogo.map.navi.IMogoNavi;
-import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.utils.TipToast;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import org.java_websocket.handshake.ServerHandshake;
-import org.json.JSONObject;
-
-import java.net.URI;
-import java.util.Iterator;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * @author zyz
- * 2020-04-07.
- */
-public class WebSocketManager {
-
- private static final String TAG = "WebSocketManager";
-
- private static Object sLock = new Object();
- private static WebSocketManager sWebSocketManager;
-
- private IMogoNavi mNavi;
- private JWebSocketClient mClient;
- private URI mUri;
- private IMogoServiceApis mServiceApis;
-
- private ExecutorService mService;
-
- public static WebSocketManager getInstance() {
- if ( sWebSocketManager == null ) {
- synchronized ( sLock ) {
- if ( sWebSocketManager == null ) {
- sWebSocketManager = new WebSocketManager();
- }
- }
- }
- return sWebSocketManager;
- }
-
- private WebSocketManager() {
- mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
- mNavi = mServiceApis.getMapServiceApi().getNavi( AbsMogoApplication.getApp() );
- mUri = URI.create( "ws://152.136.10.223:4001/realtimeLocations-ws" );
- mClient = new JWebSocketClient( mUri ) {
- @Override
- public void onMessage( String message ) {
- try {
- parseMessage( message );
- } catch ( Exception e ) {
- Logger.e( TAG, e, "error." );
- }
- }
-
- @Override
- public void onOpen( ServerHandshake handshakedata ) {
- super.onOpen( handshakedata );
- UiThreadHandler.post( () -> {
- TipToast.shortTip( "模拟GPS开启成功" );
- mServiceApis.getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).stop();
- } );
- }
-
- @Override
- public void onClose( int code, String reason, boolean remote ) {
- super.onClose( code, reason, remote );
- UiThreadHandler.post( () -> {
- TipToast.shortTip( "模拟GPS关闭成功" );
- mServiceApis.getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).start();
- } );
- shutdownServiceQuietly();
- }
- };
- initThreadService();
- }
-
- private void parseMessage( String jsonStr ) throws Exception {
- //message就是接收到的消息
- Logger.d( TAG, jsonStr );
- JSONObject jsonObject = new JSONObject( jsonStr );
- if ( jsonObject.has( "detailMsg" ) ) {
- Logger.d( TAG, "绑定成功" );
- } else if ( jsonObject.has( "realTimeLocationVo" ) ) {
- Logger.d( TAG, "收到定位消息" );
- CationVo realTimeLocationVo = GsonUtil.objectFromJson( jsonObject.getString( "realTimeLocationVo" ), CationVo.class );
- UiThreadHandler.post( () -> {
- mNavi.setExtraGPSData(
- realTimeLocationVo.getLon(),
- realTimeLocationVo.getLat(),
- realTimeLocationVo.getVehicleSpeed(),
- 1,
- realTimeLocationVo.getDirection(),
- realTimeLocationVo.getLocationTime()
- );
- Iterator< IMogoLocationListener > listeners = mServiceApis.getRegisterCenterApi().getLocationListeners();
- MogoLocation location = new MogoLocation();
- location.setLatitude( realTimeLocationVo.getLat() );
- location.setLongitude( realTimeLocationVo.getLon() );
- location.setSpeed( realTimeLocationVo.getVehicleSpeed() );
- location.setAccuracy( 1 );
- location.setTime( realTimeLocationVo.getLocationTime() );
-
- if ( listeners != null ) {
- while ( listeners.hasNext() ) {
- listeners.next().onLocationChanged( location );
- }
- }
- } );
- }
- }
-
- public void connect() {
- if ( mClient == null ) {
- return;
- }
- mNavi.setUseExtraGPSData( true );
- mService.execute( () -> {
- try {
- mClient.connectBlocking();
- Logger.d( TAG, "connectBlocking done." );
- } catch ( Exception e ) {
- Logger.e( TAG, e, "error." );
- }
- } );
- }
-
- private void initThreadService() {
- if ( mService == null || mService.isShutdown() ) {
- mService = Executors.newSingleThreadExecutor();
- }
- }
-
- public void disConnect() {
- mNavi.setUseExtraGPSData( false );
- mService.execute( () -> {
- try {
- mClient.closeBlocking();
- Logger.d( TAG, "close done." );
- } catch ( InterruptedException e ) {
- Logger.e( TAG, e, "error." );
- }
- } );
- }
-
- public static void destroy() {
- sWebSocketManager = null;
- }
-
- private void shutdownServiceQuietly() {
- if ( mService != null && !mService.isShutdown() ) {
- mService.shutdown();
- }
- mService = null;
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/res/values/strings.xml b/modules/mogo-module-gps-simulator-debug/src/main/res/values/strings.xml
deleted file mode 100644
index 9d884d77ea..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- mogo-module-gps-simulator
-
diff --git a/modules/mogo-module-gps-simulator-noop/.gitignore b/modules/mogo-module-gps-simulator-noop/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/modules/mogo-module-gps-simulator-noop/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/modules/mogo-module-gps-simulator-noop/README.md b/modules/mogo-module-gps-simulator-noop/README.md
deleted file mode 100644
index 6478f3ac12..0000000000
--- a/modules/mogo-module-gps-simulator-noop/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# GPS 轨迹模拟接口 Release 实现
diff --git a/modules/mogo-module-gps-simulator-noop/build.gradle b/modules/mogo-module-gps-simulator-noop/build.gradle
deleted file mode 100644
index 4e4194af0d..0000000000
--- a/modules/mogo-module-gps-simulator-noop/build.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion rootProject.ext.android.compileSdkVersion
- // buildToolsVersion rootProject.ext.android.buildToolsVersion
- defaultConfig {
- minSdkVersion rootProject.ext.android.minSdkVersion
- targetSdkVersion rootProject.ext.android.targetSdkVersion
- versionCode Integer.valueOf(VERSION_CODE)
- versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
- javaCompileOptions {
- annotationProcessorOptions {
- arguments = [AROUTER_MODULE_NAME: project.getName()]
- }
- }
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles 'consumer-rules.pro'
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- targetCompatibility 1.8
- sourceCompatibility 1.8
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-
- implementation rootProject.ext.dependencies.arouter
- annotationProcessor rootProject.ext.dependencies.aroutercompiler
- if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.mogoutils
- implementation rootProject.ext.dependencies.gpssimulator
- } else {
- implementation project(':foudations:mogo-utils')
- implementation project(':modules:mogo-module-gps-simulator')
- }
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-gps-simulator-noop/consumer-rules.pro b/modules/mogo-module-gps-simulator-noop/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/modules/mogo-module-gps-simulator-noop/gradle.properties b/modules/mogo-module-gps-simulator-noop/gradle.properties
deleted file mode 100644
index 20578a681b..0000000000
--- a/modules/mogo-module-gps-simulator-noop/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-gps-simulator-noop
-VERSION_CODE=1
diff --git a/modules/mogo-module-gps-simulator-noop/proguard-rules.pro b/modules/mogo-module-gps-simulator-noop/proguard-rules.pro
deleted file mode 100644
index f1b424510d..0000000000
--- a/modules/mogo-module-gps-simulator-noop/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/modules/mogo-module-gps-simulator-noop/src/main/AndroidManifest.xml b/modules/mogo-module-gps-simulator-noop/src/main/AndroidManifest.xml
deleted file mode 100644
index 3cea50c50c..0000000000
--- a/modules/mogo-module-gps-simulator-noop/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/modules/mogo-module-gps-simulator-noop/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerNoop.java b/modules/mogo-module-gps-simulator-noop/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerNoop.java
deleted file mode 100644
index 9a2478f9c4..0000000000
--- a/modules/mogo-module-gps-simulator-noop/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerNoop.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.utils.logger.Logger;
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * 描述
- */
-@Route( path = GpsSimulatorConstants.API_PATH )
-public class MogoGpsSimulatorManagerNoop implements IMogoGpsSimulatorManager {
-
- private static final String TAG = "MogoGpsSimulatorManagerNoop";
-
- @Override
- public void open() {
- Logger.e( TAG, "no operation when release." );
- }
-
- @Override
- public void close() {
- Logger.e( TAG, "no operation when release." );
- }
-
- @Override
- public void init( Context context ) {
- }
-}
diff --git a/modules/mogo-module-gps-simulator-noop/src/main/res/values/strings.xml b/modules/mogo-module-gps-simulator-noop/src/main/res/values/strings.xml
deleted file mode 100644
index 9d884d77ea..0000000000
--- a/modules/mogo-module-gps-simulator-noop/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- mogo-module-gps-simulator
-
diff --git a/modules/mogo-module-gps-simulator/.gitignore b/modules/mogo-module-gps-simulator/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/modules/mogo-module-gps-simulator/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/modules/mogo-module-gps-simulator/README.md b/modules/mogo-module-gps-simulator/README.md
deleted file mode 100644
index d396740f2b..0000000000
--- a/modules/mogo-module-gps-simulator/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# GPS 轨迹模拟接口抽象
-
-## 常量定义
-
-## 接口
diff --git a/modules/mogo-module-gps-simulator/build.gradle b/modules/mogo-module-gps-simulator/build.gradle
deleted file mode 100644
index 73ea023119..0000000000
--- a/modules/mogo-module-gps-simulator/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion rootProject.ext.android.compileSdkVersion
- // buildToolsVersion rootProject.ext.android.buildToolsVersion
- defaultConfig {
- minSdkVersion rootProject.ext.android.minSdkVersion
- targetSdkVersion rootProject.ext.android.targetSdkVersion
- versionCode Integer.valueOf(VERSION_CODE)
- versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles 'consumer-rules.pro'
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- targetCompatibility 1.8
- sourceCompatibility 1.8
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation rootProject.ext.dependencies.arouter
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-gps-simulator/consumer-rules.pro b/modules/mogo-module-gps-simulator/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/modules/mogo-module-gps-simulator/gradle.properties b/modules/mogo-module-gps-simulator/gradle.properties
deleted file mode 100644
index 44f440bc58..0000000000
--- a/modules/mogo-module-gps-simulator/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-gps-simulator
-VERSION_CODE=1
diff --git a/modules/mogo-module-gps-simulator/proguard-rules.pro b/modules/mogo-module-gps-simulator/proguard-rules.pro
deleted file mode 100644
index 5ee323b27c..0000000000
--- a/modules/mogo-module-gps-simulator/proguard-rules.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#-----MogoGSPSimulator-----
--keep class com.mogo.module.gps.simulator.GpsSimulatorConstants
diff --git a/modules/mogo-module-gps-simulator/src/main/AndroidManifest.xml b/modules/mogo-module-gps-simulator/src/main/AndroidManifest.xml
deleted file mode 100644
index dc9013c712..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/GpsSimulatorConstants.java b/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/GpsSimulatorConstants.java
deleted file mode 100644
index dc87986716..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/GpsSimulatorConstants.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * 描述
- */
-public class GpsSimulatorConstants {
-
- public static final String API_PATH = "/gpssimulator/api";
-}
diff --git a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/IMogoGpsSimulatorManager.java b/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/IMogoGpsSimulatorManager.java
deleted file mode 100644
index aa3bdfff17..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/IMogoGpsSimulatorManager.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * gps 模拟控制开关
- */
-public interface IMogoGpsSimulatorManager extends IProvider {
-
- /**
- * 打开 gps 模拟
- */
- void open();
-
- /**
- * 关闭 gps 模拟
- */
- void close();
-}
diff --git a/modules/mogo-module-gps-simulator/src/main/res/values/strings.xml b/modules/mogo-module-gps-simulator/src/main/res/values/strings.xml
deleted file mode 100644
index 9d884d77ea..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- mogo-module-gps-simulator
-
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
index 9f2b9ccc07..5ebace1479 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
@@ -1,7 +1,6 @@
package com.mogo.module.main;
import android.location.Location;
-import android.util.Log;
import android.view.MotionEvent;
import com.mogo.map.MogoLatLng;
@@ -20,7 +19,7 @@ import com.mogo.map.navi.MogoCongestionInfo;
import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.map.uicontroller.EnumMapUI;
-import com.mogo.module.common.MogoApisHandler;
+import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.module.main.registercenter.MogoRegisterCenterHandler;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.utils.logger.Logger;
@@ -28,6 +27,7 @@ import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode;
import com.zhidao.adasconfig.listener.IAdasSettingUIListener;
import com.zhidao.adasconfig.listener.IAdasSkinStyleListener;
+import java.util.ArrayList;
import java.util.Iterator;
/**
@@ -80,6 +80,22 @@ public class EventDispatchCenter implements
return false;
}
+ @Override
+ public boolean onStaticMarkerClicked(IMogoMarker marker) {
+ ArrayList list = MogoRegisterCenterHandler.getInstance().getStaticMarkerListener( marker.getOwner() );
+ if(list == null){
+ return false;
+ }
+ try {
+ for (IMogoMarkerClickListener listener : list) {
+ return listener.onStaticMarkerClicked( marker );
+ }
+ } catch ( Exception e){
+ Logger.e( TAG, e, "error." );
+ }
+ return false;
+ }
+
@Override
public void onUpdateTraffic2( MogoTraffic traffic ) {
Iterator< IMogoAimlessModeListener > iterator = MogoRegisterCenterHandler.getInstance().getAimlessModeListeners();
@@ -278,6 +294,24 @@ public class EventDispatchCenter implements
}
}
+ @Override
+ public void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) {
+ Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners();
+ if ( iterator == null ) {
+ return;
+ }
+ while ( iterator.hasNext() ) {
+ IMogoMapListener listener = iterator.next();
+ if ( listener != null ) {
+ try {
+ listener.onMapVisualAngleChanged( visualAngleMode );
+ } catch ( Exception e ) {
+ Logger.e( TAG, e, "error." );
+ }
+ }
+ }
+ }
+
@Override
public void onMapChanged( MogoLatLng location, float zoom, float tilt, float bearing ) {
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 02f4ca2e39..3e28dc2f18 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -14,7 +14,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.commons.context.ContextHolderUtil;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpActivity;
-import com.mogo.commons.voice.AIAssist;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.location.MogoLocation;
import com.mogo.map.uicontroller.EnumMapUI;
@@ -31,8 +30,9 @@ import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.fragmentmanager.FragmentStackTransactionListener;
import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.module.IMogoModuleProvider;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.service.v2x.IV2XListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.skin.support.SkinMode;
import com.mogo.utils.NetworkUtils;
import com.mogo.utils.logger.Logger;
@@ -50,6 +50,7 @@ import java.util.List;
*/
public class MainActivity extends MvpActivity implements MainView,
IMogoLocationListener,
+ IMogoStatusChangedListener,
IMogoADASControlStatusChangedListener,
FragmentStackTransactionListener {
@@ -151,8 +152,9 @@ public class MainActivity extends MvpActivity implement
super.onCreate(savedInstanceState);
ContextHolderUtil.holdContext(this);
mPresenter.postLoadModuleMsg();
-
NetworkUtils.listenNetStrength(this);
+ DisplayEffectsHelper.getInstance().init(clSpecialEffect);
+ mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this);
}
private void init() {
@@ -402,4 +404,23 @@ public class MainActivity extends MvpActivity implement
mServiceApis.getShareManager().releaseContext();
mServiceApis.getSkinSupportInstallerApi().onDestroy();
}
+
+ @Override
+ public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+ FrameLayout.LayoutParams entranceParams = ((FrameLayout.LayoutParams) mEntrance.getLayoutParams());
+ if (isTrue) {
+ entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_entrance_fragment_container_marginLeft_in_vr_mode);
+ } else {
+ entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_id_entrance_fragment_container_marginLeft);
+ }
+ mEntrance.setLayoutParams(entranceParams);
+ if (descriptor == StatusDescriptor.VR_MODE) {
+ if (isTrue) {
+ clSpecialEffect.setVisibility(View.VISIBLE);
+ } else {
+ clSpecialEffect.setVisibility(View.GONE);
+ }
+
+ }
+ }
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java
index 447b3005cc..a44091a55d 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java
@@ -22,100 +22,110 @@ import java.util.Iterator;
*
* 描述
*/
-@Route( path = MogoServicePaths.PATH_REGISTER_CENTER )
+@Route(path = MogoServicePaths.PATH_REGISTER_CENTER)
public class MogoRegisterCenter implements IMogoRegisterCenter {
@Override
- public void registerMogoModuleLifecycle( String moduleName, IMogoModuleLifecycle lifecycle ) {
- MogoRegisterCenterHandler.getInstance().registerMogoModuleLifecycle( moduleName, lifecycle );
+ public void registerMogoModuleLifecycle(String moduleName, IMogoModuleLifecycle lifecycle) {
+ MogoRegisterCenterHandler.getInstance().registerMogoModuleLifecycle(moduleName, lifecycle);
}
@Override
- public void unregisterMogoModuleLifecycle( String moduleName ) {
- MogoRegisterCenterHandler.getInstance().unregisterMogoModuleLifecycle( moduleName );
+ public void unregisterMogoModuleLifecycle(String moduleName) {
+ MogoRegisterCenterHandler.getInstance().unregisterMogoModuleLifecycle(moduleName);
}
@Override
- public void registerMogoMapListener( String moduleName, IMogoMapListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerMogoMapListener( moduleName, listener );
+ public void registerMogoMapListener(String moduleName, IMogoMapListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerMogoMapListener(moduleName, listener);
}
@Override
- public void unregisterMogoMapListener( String moduleName ) {
- MogoRegisterCenterHandler.getInstance().unregisterMogoMapListener( moduleName );
+ public void unregisterMogoMapListener(String moduleName) {
+ MogoRegisterCenterHandler.getInstance().unregisterMogoMapListener(moduleName);
}
@Override
- public void registerMogoNaviListener( String moduleName, IMogoNaviListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerMogoNaviListener( moduleName, listener );
+ public void registerMogoNaviListener(String moduleName, IMogoNaviListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerMogoNaviListener(moduleName, listener);
}
@Override
- public void unregisterMogoNaviListener( String moduleName ) {
- MogoRegisterCenterHandler.getInstance().unregisterMogoNaviListener( moduleName );
+ public void unregisterMogoNaviListener(String moduleName) {
+ MogoRegisterCenterHandler.getInstance().unregisterMogoNaviListener(moduleName);
}
@Override
- public void registerMogoLocationListener( String moduleName, IMogoLocationListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerMogoLocationListener( moduleName, listener );
+ public void registerMogoLocationListener(String moduleName, IMogoLocationListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerMogoLocationListener(moduleName, listener);
}
@Override
- public Iterator< IMogoLocationListener > getLocationListeners() {
+ public Iterator getLocationListeners() {
return MogoRegisterCenterHandler.getInstance().getLocationListeners();
}
@Override
- public void unregisterMogoLocationListener( String moduleName ) {
- MogoRegisterCenterHandler.getInstance().unregisterMogoLocationListener( moduleName );
+ public void unregisterMogoLocationListener(String moduleName) {
+ MogoRegisterCenterHandler.getInstance().unregisterMogoLocationListener(moduleName);
}
@Override
- public void registerMogoMarkerClickListener( String moduleName, IMogoMarkerClickListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerMogoMarkerClickListener( moduleName, listener );
+ public void registerMogoMarkerClickListener(String moduleName, IMogoMarkerClickListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerMogoMarkerClickListener(moduleName, listener);
}
@Override
- public void unregisterMogoMarkerClickListener( String moduleName ) {
- MogoRegisterCenterHandler.getInstance().unregisterMogoMarkerClickListener( moduleName );
+ public void unregisterMogoMarkerClickListener(String moduleName) {
+ MogoRegisterCenterHandler.getInstance().unregisterMogoMarkerClickListener(moduleName);
}
@Override
- public void registerMogoAimlessModeListener( String tag, IMogoAimlessModeListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerMogoAimlessModeListener( tag, listener );
+ public void registerMogoStaticMarkerClickListener(String tag, IMogoMarkerClickListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerMogoStaticMarkerClickListener(tag, listener);
}
@Override
- public void unregisterMogoAimlessModeListener( String tag ) {
- MogoRegisterCenterHandler.getInstance().unregisterMogoAimlessModeListener( tag );
+ public void unregisterMogoStaticMarkerClickListener(String tag, IMogoMarkerClickListener listener ) {
+ MogoRegisterCenterHandler.getInstance().unregisterMogoStaticMarkerClickListener(tag, listener);
}
@Override
- public void registerCarLocationChangedListener( String tag, IMogoCarLocationChangedListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerCarLocationChangedListener( tag, listener );
+ public void registerMogoAimlessModeListener(String tag, IMogoAimlessModeListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerMogoAimlessModeListener(tag, listener);
}
@Override
- public void unregisterCarLocationChangedListener( String tag, IMogoCarLocationChangedListener listener ) {
- MogoRegisterCenterHandler.getInstance().unregisterCarLocationChangedListener( tag, listener );
+ public void unregisterMogoAimlessModeListener(String tag) {
+ MogoRegisterCenterHandler.getInstance().unregisterMogoAimlessModeListener(tag);
}
@Override
- public void registerADASControlStatusChangedListener( String tag, IMogoADASControlStatusChangedListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerADASControlStatusChangedListener( tag, listener );
+ public void registerCarLocationChangedListener(String tag, IMogoCarLocationChangedListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerCarLocationChangedListener(tag, listener);
}
@Override
- public void unregisterADASControlStatusChangedListener( String tag ) {
- MogoRegisterCenterHandler.getInstance().unregisterADASControlStatusChangedListener( tag );
+ public void unregisterCarLocationChangedListener(String tag, IMogoCarLocationChangedListener listener) {
+ MogoRegisterCenterHandler.getInstance().unregisterCarLocationChangedListener(tag, listener);
}
@Override
- public Iterator< IMogoADASControlStatusChangedListener > getAdasControlStatusChangedListeners() {
+ public void registerADASControlStatusChangedListener(String tag, IMogoADASControlStatusChangedListener listener) {
+ MogoRegisterCenterHandler.getInstance().registerADASControlStatusChangedListener(tag, listener);
+ }
+
+ @Override
+ public void unregisterADASControlStatusChangedListener(String tag) {
+ MogoRegisterCenterHandler.getInstance().unregisterADASControlStatusChangedListener(tag);
+ }
+
+ @Override
+ public Iterator getAdasControlStatusChangedListeners() {
return MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
}
@Override
- public void init( Context context ) {
+ public void init(Context context) {
}
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
index facba033cc..ce38e2d2c1 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
@@ -12,6 +12,7 @@ import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoRegisterCenter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -27,22 +28,23 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
private static volatile MogoRegisterCenterHandler sInstance;
- private Map< String, IMogoModuleLifecycle > mLifecycle = new HashMap<>();
- private Map< String, IMogoMapListener > mMap = new HashMap<>();
- private Map< String, IMogoNaviListener > mNavi = new ConcurrentHashMap<>();
- private Map< String, IMogoLocationListener > mLocation = new HashMap<>();
- private Map< String, IMogoMarkerClickListener > mMarker = new HashMap<>();
- private Map< String, IMogoAimlessModeListener > mAimless = new HashMap<>();
- private Map< String, IMogoCarLocationChangedListener > mCarLocations = new ConcurrentHashMap<>();
- private Map< String, IMogoADASControlStatusChangedListener > mADAS = new HashMap<>();
+ private final Map mLifecycle = new HashMap<>();
+ private final Map mMap = new HashMap<>();
+ private final Map mNavi = new ConcurrentHashMap<>();
+ private final Map mLocation = new HashMap<>();
+ private final Map mMarker = new HashMap<>();
+ private final Map> mStaticMarker = new HashMap<>();
+ private final Map mAimless = new HashMap<>();
+ private final Map mCarLocations = new ConcurrentHashMap<>();
+ private final Map mADAS = new HashMap<>();
private MogoRegisterCenterHandler() {
}
public static MogoRegisterCenterHandler getInstance() {
- if ( sInstance == null ) {
- synchronized ( MogoRegisterCenterHandler.class ) {
- if ( sInstance == null ) {
+ if (sInstance == null) {
+ synchronized (MogoRegisterCenterHandler.class) {
+ if (sInstance == null) {
sInstance = new MogoRegisterCenterHandler();
}
}
@@ -56,141 +58,166 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
@Override
- public void registerMogoModuleLifecycle( String tag, IMogoModuleLifecycle lifecycle ) {
- mLifecycle.put( tag, lifecycle );
+ public void registerMogoModuleLifecycle(String tag, IMogoModuleLifecycle lifecycle) {
+ mLifecycle.put(tag, lifecycle);
}
@Override
- public void unregisterMogoModuleLifecycle( String tag ) {
- mLifecycle.remove( tag );
+ public void unregisterMogoModuleLifecycle(String tag) {
+ mLifecycle.remove(tag);
}
@Override
- public void registerMogoMapListener( String tag, IMogoMapListener listener ) {
- mMap.put( tag, listener );
+ public void registerMogoMapListener(String tag, IMogoMapListener listener) {
+ mMap.put(tag, listener);
}
@Override
- public void unregisterMogoMapListener( String tag ) {
- mMap.remove( tag );
+ public void unregisterMogoMapListener(String tag) {
+ mMap.remove(tag);
}
@Override
- public void registerMogoNaviListener( String tag, IMogoNaviListener listener ) {
- mNavi.put( tag, listener );
+ public void registerMogoNaviListener(String tag, IMogoNaviListener listener) {
+ mNavi.put(tag, listener);
}
@Override
- public void unregisterMogoNaviListener( String tag ) {
- mNavi.remove( tag );
+ public void unregisterMogoNaviListener(String tag) {
+ mNavi.remove(tag);
}
@Override
- public void registerMogoLocationListener( String tag, IMogoLocationListener listener ) {
- mLocation.put( tag, listener );
+ public void registerMogoLocationListener(String tag, IMogoLocationListener listener) {
+ mLocation.put(tag, listener);
}
@Override
- public void unregisterMogoLocationListener( String tag ) {
- mLocation.remove( tag );
+ public void unregisterMogoLocationListener(String tag) {
+ mLocation.remove(tag);
}
@Override
- public void registerMogoMarkerClickListener( String tag, IMogoMarkerClickListener listener ) {
- mMarker.put( tag, listener );
+ public void registerMogoMarkerClickListener(String tag, IMogoMarkerClickListener listener) {
+ mMarker.put(tag, listener);
}
@Override
- public void unregisterMogoMarkerClickListener( String tag ) {
- mMarker.remove( tag );
+ public void unregisterMogoMarkerClickListener(String tag) {
+ mMarker.remove(tag);
}
@Override
- public void registerMogoAimlessModeListener( String tag, IMogoAimlessModeListener listener ) {
- mAimless.put( tag, listener );
+ public void registerMogoStaticMarkerClickListener(String tag, IMogoMarkerClickListener listener) {
+ ArrayList list = mStaticMarker.get(tag);
+ if (list == null) {
+ list = new ArrayList<>();
+ list.add(listener);
+ mStaticMarker.put(tag, list);
+ }
+ list.add(listener);
+ mStaticMarker.put(tag, list);
}
@Override
- public void unregisterMogoAimlessModeListener( String tag ) {
- mAimless.remove( tag );
+ public void unregisterMogoStaticMarkerClickListener(String tag, IMogoMarkerClickListener listener) {
+ ArrayList list = mStaticMarker.get(tag);
+ if (list == null) {
+ return;
+ }
+ list.remove(listener);
}
@Override
- public void registerCarLocationChangedListener( String tag, IMogoCarLocationChangedListener listener ) {
- mCarLocations.put( tag, listener );
+ public void registerMogoAimlessModeListener(String tag, IMogoAimlessModeListener listener) {
+ mAimless.put(tag, listener);
}
@Override
- public void unregisterCarLocationChangedListener( String tag, IMogoCarLocationChangedListener listener ) {
- mCarLocations.remove( tag );
+ public void unregisterMogoAimlessModeListener(String tag) {
+ mAimless.remove(tag);
}
@Override
- public void registerADASControlStatusChangedListener( String tag, IMogoADASControlStatusChangedListener listener ) {
- mADAS.put( tag, listener );
+ public void registerCarLocationChangedListener(String tag, IMogoCarLocationChangedListener listener) {
+ mCarLocations.put(tag, listener);
}
@Override
- public void unregisterADASControlStatusChangedListener( String tag ) {
- mADAS.remove( tag );
+ public void unregisterCarLocationChangedListener(String tag, IMogoCarLocationChangedListener listener) {
+ mCarLocations.remove(tag);
}
@Override
- public void init( Context context ) {
+ public void registerADASControlStatusChangedListener(String tag, IMogoADASControlStatusChangedListener listener) {
+ mADAS.put(tag, listener);
}
- public IMogoModuleLifecycle getLifecycleListener( String tag ) {
- return mLifecycle.get( tag );
+ @Override
+ public void unregisterADASControlStatusChangedListener(String tag) {
+ mADAS.remove(tag);
}
- public IMogoMapListener getMapListener( String tag ) {
- return mMap.get( tag );
+ @Override
+ public void init(Context context) {
}
- public IMogoNaviListener getNaviListener( String tag ) {
- return mNavi.get( tag );
+ public IMogoModuleLifecycle getLifecycleListener(String tag) {
+ return mLifecycle.get(tag);
}
- public IMogoLocationListener getLocationListener( String tag ) {
- return mLocation.get( tag );
+ public IMogoMapListener getMapListener(String tag) {
+ return mMap.get(tag);
}
- public IMogoMarkerClickListener getMarkerListener( String tag ) {
- return mMarker.get( tag );
+ public IMogoNaviListener getNaviListener(String tag) {
+ return mNavi.get(tag);
}
- public Iterator< IMogoModuleLifecycle > getLifecycleListeners() {
+ public IMogoLocationListener getLocationListener(String tag) {
+ return mLocation.get(tag);
+ }
+
+ public IMogoMarkerClickListener getMarkerListener(String tag) {
+ return mMarker.get(tag);
+ }
+
+ public ArrayList getStaticMarkerListener(String tag){
+ return mStaticMarker.get(tag);
+ }
+
+ public Iterator getLifecycleListeners() {
return mLifecycle.values().iterator();
}
- public Iterator< IMogoMapListener > getMapListeners() {
+ public Iterator getMapListeners() {
return mMap.values().iterator();
}
- public Iterator< IMogoNaviListener > getNaviListeners() {
+ public Iterator getNaviListeners() {
return mNavi.values().iterator();
}
@Override
- public Iterator< IMogoLocationListener > getLocationListeners() {
+ public Iterator getLocationListeners() {
return mLocation.values().iterator();
}
- public Iterator< IMogoMarkerClickListener > getMarkerListeners() {
+ public Iterator getMarkerListeners() {
return mMarker.values().iterator();
}
- public Iterator< IMogoAimlessModeListener > getAimlessModeListeners() {
+ public Iterator getAimlessModeListeners() {
return mAimless.values().iterator();
}
- public Iterator< IMogoCarLocationChangedListener > getCarLocationChangedListener() {
+ public Iterator getCarLocationChangedListener() {
return mCarLocations.values().iterator();
}
@Override
- public Iterator< IMogoADASControlStatusChangedListener > getAdasControlStatusChangedListeners() {
+ public Iterator getAdasControlStatusChangedListeners() {
return mADAS.values().iterator();
}
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
index 214d81ea08..9b9f0d7615 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
@@ -26,7 +26,7 @@ public
*
* 描述
*/
-@Route( path = "/service/base/info" )
+@Route(path = "/service/base/info")
class MogoMainService extends Service implements IMogoLocationListener {
private static final String TAG = "MogoMainService";
@@ -39,10 +39,10 @@ class MogoMainService extends Service implements IMogoLocationListener {
@Override
public void onCreate() {
- Logger.d( TAG, "基本服务启动" );
+ Logger.d(TAG, "基本服务启动");
mServiceApis = MogoApisHandler.getInstance().getApis();
initAndStartLocation();
- UiThreadHandler.postDelayed( () -> {
+ UiThreadHandler.postDelayed(() -> {
loadBaseModules();
startTanluService();
initADAS();
@@ -56,53 +56,61 @@ class MogoMainService extends Service implements IMogoLocationListener {
@Nullable
@Override
- public IBinder onBind( Intent intent ) {
+ public IBinder onBind(Intent intent) {
return null;
}
@Override
- public int onStartCommand( Intent intent, int flags, int startId ) {
+ public int onStartCommand(Intent intent, int flags, int startId) {
return START_STICKY;
}
private void initAndStartLocation() {
- Logger.d( TAG, "开始定位" );
- mLocationClient = mServiceApis.getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() );
- mLocationClient.addLocationListener( this );
- mLocationClient.start( 2_000L );
+ Logger.d(TAG, "开始定位");
+ if (mServiceApis != null) {
+ mLocationClient = mServiceApis.getMapServiceApi().getSingletonLocationClient(AbsMogoApplication.getApp());
+ mLocationClient.addLocationListener(this);
+ mLocationClient.start(2_000L);
+ }
}
private void initGpsSimulatorListener() {
- mServiceApis.getMapServiceApi().getNavi( this ).registerCarLocationChangedListener( EventDispatchCenter.getInstance() );
+ if (mServiceApis != null) {
+ mServiceApis.getMapServiceApi().getNavi(this).registerCarLocationChangedListener(EventDispatchCenter.getInstance());
+ }
}
private void loadBaseModules() {
- Logger.d( TAG, "加载基本模块" );
+ Logger.d(TAG, "加载基本模块");
MogoModulesManager.getInstance().loadBaseModule();
}
private void startTanluService() {
- UiThreadHandler.postDelayed( () -> {
- Logger.d( TAG, "startTanluService ---------- " );
- mServiceApis.getTanluApi().startTanluService();
+ UiThreadHandler.postDelayed(() -> {
+ Logger.d(TAG, "startTanluService ---------- ");
+ if (mServiceApis != null) {
+ mServiceApis.getTanluApi().startTanluService();
+ }
}, 2_000L
);
}
private void initADAS() {
- mServiceApis.getAdasControllerApi().init( AbsMogoApplication.getApp() );
+ if (mServiceApis != null) {
+ mServiceApis.getAdasControllerApi().init(AbsMogoApplication.getApp());
+ }
}
@Override
- public void onLocationChanged( MogoLocation location ) {
- EventDispatchCenter.getInstance().onLocationChanged( location );
+ public void onLocationChanged(MogoLocation location) {
+ EventDispatchCenter.getInstance().onLocationChanged(location);
}
@Override
public void onDestroy() {
super.onDestroy();
- if ( mLocationClient != null ) {
- mLocationClient.removeLocationListener( this );
+ if (mLocationClient != null) {
+ mLocationClient.removeLocationListener(this);
mLocationClient.stop();
mLocationClient.destroy();
mLocationClient = null;
diff --git a/modules/mogo-module-main/src/main/res/drawable/main_splash_bg.xml b/modules/mogo-module-main/src/main/res/drawable/main_splash_bg.xml
new file mode 100644
index 0000000000..2bb9c98c45
--- /dev/null
+++ b/modules/mogo-module-main/src/main/res/drawable/main_splash_bg.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 4a05e4e99e..148d071f3a 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -57,7 +57,7 @@
android:id="@+id/warning_right"
android:layout_width="@dimen/dp_390"
android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/module_main_id_warning_view_marginLeft"
+ android:layout_gravity="right"
android:background="@drawable/module_main_warning_bkg_right"
android:visibility="gone" />
@@ -129,24 +129,40 @@
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" />
+
+
-
+
+ android:background="@drawable/main_splash_bg">
+
+
+
+
+
15px
460px
444px
+ 0px
350px
10px
16px
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
index a65f5d7496..54b1d65a55 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -20,6 +20,7 @@
30px
830px
590px
+ 0px
30px
70px
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
index 234c6a3dbe..43a56ac2bf 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
@@ -20,6 +20,7 @@
30px
830px
800px
+ 0px
20px
30px
@@ -33,5 +34,4 @@
18px
18px
- 1530px
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml
index 545cbff34a..a985fd57d2 100644
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values/dimens.xml
@@ -21,6 +21,7 @@
15px
460px
444px
+ 0px
350px
10px
16px