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

Merge branch 'feature/v1.0.3' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into feature/v1.0.3

Browse Source
This commit is contained in:
unknown
2020-03-30 20:32:46 +08:00
parent 91db08310b ab62cb113c
commit 6aefc64632
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -32,7 +32,6 @@ import com.amap.api.navi.AMapNaviView;
import com.amap.api.navi.AMapNaviViewListener;
import com.amap.api.navi.AMapNaviViewOptions;
import com.amap.api.navi.enums.AMapNaviViewShowMode;
import com.amap.api.navi.enums.AimLessMode;
import com.amap.api.navi.model.NaviInfo;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.IMogoMap;
@@ -83,7 +82,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
// 自定义定位源的回调信息，前瞻线
private LocationSource.OnLocationChangedListener mOnLocationChangedListener;
private boolean mIsCarLockced = false;
private boolean mIsCarLocked = false;
private float mDefaultZoomLevel = 16.0f;
@@ -337,7 +336,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public void onLockMap( boolean isLock ) {
Logger.d( TAG, "lock status = %s", isLock );
mIsCarLockced = isLock;
mIsCarLocked = isLock;
Trace.beginSection( "timer.onCameraChangeFinish" );
MogoMapListenerHandler.getInstance().onLockMap( isLock );
Trace.endSection();
@@ -384,20 +383,19 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public void changeZoom( boolean zoom ) {
if ( checkAMapView() ) {
mDefaultZoomLevel = getMap().getZoomLevel();
mDefaultZoomLevel = ( int ) ( getMap().getZoomLevel() + 0.5f );
if ( zoom ) {
mDefaultZoomLevel += 1.5f;
mDefaultZoomLevel += 2f;
if ( mDefaultZoomLevel > 20 ) {
mDefaultZoomLevel = 20;
}
} else {
mDefaultZoomLevel -= 1.5f;
mDefaultZoomLevel -= 2f;
if ( mDefaultZoomLevel < 1 ) {
mDefaultZoomLevel = 1;
}
}
changeZoom( mDefaultZoomLevel );
Logger.i( TAG, "mapview zoom = " + mDefaultZoomLevel );
changeZoom( ( int ) mDefaultZoomLevel );
}
}
@@ -562,6 +560,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
}
Logger.d( TAG, "锁车" );
mMapView.recoverLockMode();
mIsCarLocked = true;
}
}
@@ -572,6 +571,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
}
Logger.d( TAG, "解锁锁车" );
mockTouchEvent();
mIsCarLocked = false;
}
/**
@@ -593,7 +593,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "锁定锁车比例尺" );
Logger.d( TAG, "Zoom锁定锁车比例尺 %s", var1 );
mMapView.setLockZoom( var1 );
}
}
@@ -815,6 +815,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public synchronized boolean isCarLocked() {
return mIsCarLockced;
return mIsCarLocked;
}
}

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java
View File

@@ -34,4 +34,6 @@ public interface MarkerPoiTypeEnum {
public String FOURS_PARKING = "10012";
//事故
public String FOURS_ACCIDENT = "10013";
//身边
public String FOURS_NEALY = "10014";
}

3
modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
View File

@@ -79,8 +79,7 @@ public class MapPresenter extends Presenter<MapView> implements
if ( isLocked ) {
// 保持锁车状态
UiThreadHandler.postDelayed( ()->{
int lockZoomLevel = opera_type == 0 ? ( ( int ) mView.getUIController().getZoomLevel() ) : ( ( int ) (mView.getUIController().getZoomLevel() + 0.5 ));
mView.getUIController().setLockZoom( lockZoomLevel );
mView.getUIController().setLockZoom( ( ( int ) mMogoMapService.getMapUIController().getZoomLevel() ) );
mMogoMapService.getMapUIController().recoverLockMode();//缩放地图会导致锁车发生改变，这里强制锁车
}, 1_000 );
} else {

5
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java
View File

@@ -170,6 +170,11 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
ivIcon.setImageResource(R.drawable.module_service_ic_rc_accident2);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red);
case MarkerPoiTypeEnum.FOURS_NEALY:
// TODO: 2020-03-30
ivIcon.setImageResource(R.drawable.module_service_ic_rc_accident2);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red);
break;
default:
ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
View File

@@ -142,6 +142,10 @@ public class MapMarkerView extends MapMarkerBaseView {
case MarkerPoiTypeEnum.FOURS_ACCIDENT:
ivBg.setImageResource(R.drawable.module_service_ic_rc_accident);
break;
case MarkerPoiTypeEnum.FOURS_NEALY:
// TODO: 2020-03-30
ivBg.setImageResource(R.drawable.module_service_ic_rc_accident);
break;
default:
ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);
ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);