diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index 92e1a9844d..cf213a065a 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java @@ -6,7 +6,6 @@ import android.location.Location; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.MotionEvent; -import android.view.animation.LinearInterpolator; import android.widget.RelativeLayout; import androidx.annotation.Nullable; @@ -30,7 +29,6 @@ import com.mogo.map.MogoLatLng; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.view.RoundLayout; -import com.mogo.module.small.map.animation.DirectionRotateAnimation; import com.mogo.module.small.map.utils.MapAssetStyleUtils; import com.mogo.module.small.map.view.ISmallMapDirectionView; import com.mogo.utils.logger.Logger; @@ -48,9 +46,7 @@ public class SmallMapDirectionView extends RelativeLayout implements IMogoCarLocationChangedListener2, ISmallMapDirectionView { - /** - * 小地图名称 - */ + //小地图名称 public static final String MODULE_NAME = "SmallMap"; private RoundLayout rlSmallMapBorder; @@ -60,13 +56,11 @@ public class SmallMapDirectionView private Marker mStartMarker; private Marker mEndMarker; - private int lastAngle = 0; private int zoomLevel = 13; private List mCoordinatesLatLng = new ArrayList<>(); private List mCoordinatesLatLngCurrent = new ArrayList<>(); private Polyline mPolyline; private CameraUpdate mCameraUpdate; - private DirectionRotateAnimation mRotateAnimation; public SmallMapDirectionView(Context context) { this(context, null); @@ -86,8 +80,6 @@ public class SmallMapDirectionView } private void initView(Context context) { - mRotateAnimation = new DirectionRotateAnimation(context, null); - LayoutInflater.from(context).inflate(R.layout.module_small_map_view, this); mAMapNaviView = AbsMogoApplication.getMapNaviView(); @@ -134,18 +126,6 @@ public class SmallMapDirectionView // 关闭显示实时路况图层，aMap是地图控制器对象。 mAMap.setTrafficEnabled(false); - -// MyLocationStyle myLocationStyle; -// myLocationStyle = new MyLocationStyle();//初始化定位蓝点样式类myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);//连续定位、且将视角移动到地图中心点，定位点依照设备方向旋转，并且会跟随设备移动。（1秒1次定位）如果不设置myLocationType，默认也会执行此种模式。 -// myLocationStyle.interval(1000); //设置连续定位模式下的定位间隔，只在连续定位模式下生效，单次定位模式下不会生效。单位为毫秒。 -// myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_MAP_ROTATE);//连续定位、蓝点不会移动到地图中心点，地图依照设备方向旋转，并且蓝点会跟随设备移动。 -// myLocationStyle.myLocationIcon(BitmapDescriptorFactory -// .fromResource(R.drawable.module_small_map_view_my_location_logo)); -// mAMap.setMyLocationStyle(myLocationStyle);//设置定位蓝点的Style -// mAMap.getUiSettings().setMyLocationButtonEnabled(false);//设置默认定位按钮是否显示，非必需设置。 -// mAMap.setMyLocationEnabled(true);// 设置为true表示启动显示定位蓝点，false表示隐藏定位蓝点并不进行定位，默认是false。 -// mAMap.setMyLocationType(AMap.LOCATION_TYPE_MAP_FOLLOW); - // 设置 锚点 图标 mCarMarker = mAMap.addMarker(new MarkerOptions() .icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo)) @@ -193,12 +173,6 @@ public class SmallMapDirectionView LatLng currentLatLng = new LatLng(latLng.getLatitude(), latLng.getLongitude()); if (mCarMarker != null) { - //mAMap.moveCamera(CameraUpdateFactory.changeBearing(latLng.getBearing())); - -// changeAngle((int) latLng.getBearing()); -// mStartMarker.setRotateAngle(360 - latLng.getBearing()); -// mEndMarker.setRotateAngle(360 - latLng.getBearing()); - mCarMarker.setRotateAngle(360 - latLng.getBearing()); mCarMarker.setPosition(currentLatLng); mCarMarker.setToTop(); @@ -277,28 +251,4 @@ public class SmallMapDirectionView } } - /** - * 修改角度 - * - * @param angle 角度 0 - 359 度旋转,相对于自身中心位置 - */ - public void changeAngle(int angle) { -// int tempAngle = 360 - angle; -// if (tempAngle > 180) { -// tempAngle = -(360 - tempAngle); -// } - - mRotateAnimation.setFromDegrees(lastAngle); - mRotateAnimation.setToDegrees(angle); - - //设置线性插值，可以解决旋转一圈后卡顿问题 - mRotateAnimation.setInterpolator(new LinearInterpolator()); - //设置旋转一圈时间 - mRotateAnimation.setDuration(300); - //控件动画结束时是否保持动画最后的状态 - mRotateAnimation.setFillAfter(true); - startAnimation(mRotateAnimation); - // 刷新最后一次角度 - lastAngle = angle; - } } diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png b/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png new file mode 100644 index 0000000000..1c4bf333ca Binary files /dev/null and b/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png differ diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml index 02e8509713..8ad5786c81 100644 --- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml +++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml @@ -8,10 +8,9 @@ + android:background="@drawable/module_small_map_view_border_north" /> 40px + 550px + 360px - 400px - 400px - - 370px - 370px - - 1620px - 780px - - 0px - 0px - 1920px - 1080px \ No newline at end of file diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml index 62836ac9d0..3620ac47d1 100644 --- a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml @@ -1,18 +1,7 @@ 30px - - 288px - 288px - + 450px 260px - 260px - 1620px - 780px - - 0px - 0px - 1920px - 1080px \ No newline at end of file