From 11cbb2dc2475d5bb9017a17b900509193719d608 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 20 Feb 2020 20:21:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=80=E5=87=BA?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=9A=84UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/shape_react_blue_grident.xml | 2 ++ .../src/main/res/drawable/shape_react_gray_grident.xml | 2 ++ .../src/main/res/layout/dialog_navi_notice.xml | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) 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" From fb25c335cd8fd563e680d4d83289ad8db8e106c0 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 20 Feb 2020 21:20:49 +0800 Subject: [PATCH 2/5] opt share tips --- .../src/main/res/layout/launcher_dialog_share.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" /> From 03b18dca19a12b74fac94abbc3b3bca851cdc408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 20 Feb 2020 22:58:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E8=87=AA=E5=8A=A8=E5=AE=9A=E4=BD=8D=E5=88=B0?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84Marker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..d231b576a3 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 @@ -142,7 +142,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag marker.setIcon(fromView(markerView.getView())); lastMarker = marker; - MarkerServiceHandler.getMapUIController().moveToCenter(lastMarker.getPosition()); +// MarkerServiceHandler.getMapUIController().moveToCenter(lastMarker.getPosition()); // 数据统计代码 final Map properties = new HashMap<>(); From 05dbf6e59426f55d8569217809510b73e835f4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 20 Feb 2020 23:07:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug=20=E5=A4=8D?= =?UTF-8?q?=E5=8E=9F=E4=BA=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d231b576a3..5475f7e638 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 @@ -142,7 +142,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag marker.setIcon(fromView(markerView.getView())); lastMarker = marker; -// MarkerServiceHandler.getMapUIController().moveToCenter(lastMarker.getPosition()); + MarkerServiceHandler.getMapUIController().moveToCenter(lastMarker.getPosition()); // 数据统计代码 final Map properties = new HashMap<>(); From 43cec56a1f12cf8ef485dabb35deb4ecd20a0ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 21 Feb 2020 01:40:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BA=86=E7=BB=98=E5=88=B6=E6=B0=94=E6=B3=A1=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MogoServiceProvider.java | 2 +- .../service/marker/MapMarkerManager.java | 25 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) 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 23466988e7..90a125dc2f 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 @@ -427,7 +427,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<>();