diff --git a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml b/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml
index 804e5a8de3..29d764182d 100644
--- a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml
+++ b/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml
@@ -5,5 +5,7 @@
android:angle="180"
android:endColor="#3E7FFC"
android:startColor="#5CC1FF" />
+
+
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_grident.xml b/modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_grident.xml
index 377483211d..5d90ff43e3 100644
--- a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_grident.xml
+++ b/modules/mogo-module-extensions/src/main/res/drawable/shape_react_gray_grident.xml
@@ -5,5 +5,7 @@
android:angle="180"
android:endColor="#50526E"
android:startColor="#333F4057" />
+
+
diff --git a/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml b/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml
index 45dd9cdb22..9b5e0a7fa9 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml
@@ -4,7 +4,6 @@
android:layout_width="@dimen/dp_790"
android:layout_height="@dimen/dp_440"
app:cardPreventCornerOverlap="false"
-
android:orientation="vertical"
app:cardBackgroundColor="#3F4057"
app:cardCornerRadius="@dimen/dp_20"
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
index 1ced0f5533..6f15ca0d62 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
@@ -428,7 +428,7 @@ public class MogoServiceProvider implements IMogoModuleProvider,
@Override
public void onMapChanged( MogoLatLng latLng, float zoom, float tilt, float bearing ) {
-
+ Logger.d(TAG, "onMapChanged==latLng:" + latLng+" mStatusManager.isUserInteracted()==="+mStatusManager.isUserInteracted());
if ( mIsCameraInited ) {
mLastZoomLevel = zoom;
mLastCustomRefreshCenterLocation = latLng;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 5475f7e638..e049d34bb1 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -118,6 +118,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
public boolean onMarkerClicked(IMogoMarker marker) {
Logger.i(TAG, "onMarkerClicked 点击了大而全中的Marker:" + marker);
try {
+ // 移动地图到指定位置
+ MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus(ServiceConst.TYPE, true, true);
+ MarkerServiceHandler.getMapUIController().moveToCenter(marker.getPosition());
+
if (lastMarker != null) {
// 判断点击的是否是同一个
if (marker.equals(lastMarker)) {
@@ -127,22 +131,25 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
// 将上次选中 Marker 设置为未选中状态
MarkerShowEntity lastMarkerShowEntity = (MarkerShowEntity) lastMarker.getObject();
Logger.i(TAG, "onMarkerClicked 点击了大而全中的Marker lastMarkerShowEntity:" + lastMarkerShowEntity);
- lastMarkerShowEntity.setChecked(false);
- lastMarkerShowEntity.setHighlighted(false);
- IMarkerView markerView = MapMarkerAdapter.getMarkerView(mContext, lastMarkerShowEntity, lastMarker.getMogoMarkerOptions());
- lastMarker.setIcon(fromView(markerView.getView()));
+ if (lastMarkerShowEntity != null) {
+ lastMarkerShowEntity.setChecked(false);
+ lastMarkerShowEntity.setHighlighted(false);
+ IMarkerView markerView = MapMarkerAdapter.getMarkerView(mContext, lastMarkerShowEntity, lastMarker.getMogoMarkerOptions());
+ lastMarker.setIcon(fromView(markerView.getView()));
+ }
}
// 将当前的Marker设置为选中
MarkerShowEntity markerShowEntity = (MarkerShowEntity) marker.getObject();
Logger.i(TAG, "onMarkerClicked 点击了大而全中的Marker markerShowEntity:" + markerShowEntity);
- markerShowEntity.setChecked(true);
- markerShowEntity.setHighlighted(true);
- IMarkerView markerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, marker.getMogoMarkerOptions());
- marker.setIcon(fromView(markerView.getView()));
+ if (markerShowEntity != null) {
+ markerShowEntity.setChecked(true);
+ markerShowEntity.setHighlighted(true);
+ IMarkerView markerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, marker.getMogoMarkerOptions());
+ marker.setIcon(fromView(markerView.getView()));
+ }
lastMarker = marker;
- MarkerServiceHandler.getMapUIController().moveToCenter(lastMarker.getPosition());
// 数据统计代码
final Map properties = new HashMap<>();
diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
index 2e9efefec9..edae501d58 100644
--- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
+++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
@@ -135,7 +135,7 @@
android:layout_below="@+id/btn_block_layout"
android:layout_marginTop="@dimen/share_module_bottom_margin_top"
android:gravity="center"
- android:text="可以对小智说:分享拥堵、分享油价、分享查车、分享封路"
+ android:text="可以对小智说:上报路况、分享油价、交通检查、交通管制"
android:textColor="@color/white_40"
android:textSize="@dimen/share_module_bottom_size"
android:textStyle="bold" />