From 80483affd1680fe753eb861c74a9725f0803e7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 28 Feb 2020 14:36:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=90=AF?= =?UTF-8?q?=E5=8A=A8Loading=E5=9B=BE=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E9=BB=91=E5=B1=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-ldpi/module_main_launcher_bg.png | Bin 0 -> 12727 bytes .../drawable-xhdpi/module_main_launcher_bg.png | Bin 0 -> 27332 bytes .../res/layout/module_main_activity_main.xml | 2 +- .../src/main/res/values/styles.xml | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 modules/mogo-module-main/src/main/res/drawable-ldpi/module_main_launcher_bg.png create mode 100644 modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_launcher_bg.png diff --git a/modules/mogo-module-main/src/main/res/drawable-ldpi/module_main_launcher_bg.png b/modules/mogo-module-main/src/main/res/drawable-ldpi/module_main_launcher_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..418cb0a2bb8a8c19090ec0f14c549befe1d8e0a4 GIT binary patch literal 12727 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 Nx>~n2^R8LG`akNYnW_K) literal 0 HcmV?d00001 diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_launcher_bg.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_launcher_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd08094f02d215783c8b7222b471f7a844b66de GIT binary patch literal 27332 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ƿ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 literal 0 HcmV?d00001 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 c52dced8ed..598967ebe2 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 @@ -104,6 +104,6 @@ \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/styles.xml b/modules/mogo-module-main/src/main/res/values/styles.xml index 7b786720a0..3a31eb4e55 100644 --- a/modules/mogo-module-main/src/main/res/values/styles.xml +++ b/modules/mogo-module-main/src/main/res/values/styles.xml @@ -7,7 +7,7 @@ @null @null @null - @color/module_main_window_background_color + @drawable/module_main_launcher_bg false @style/MainAnimation @style/noCheckboxStyle From dee62d773db35dc5f9423aef64e8666f069f846c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 28 Feb 2020 14:53:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E3=80=90=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=BD=A6=E8=BE=86=E3=80=91=E9=BB=98=E8=AE=A4=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E4=B8=80=E8=BE=86=E8=BD=A6=E5=90=8E=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=87=BA=E7=8E=B0=E6=98=B5=E7=A7=B0=E6=88=96=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E8=A2=AB=E9=99=84=E8=BF=91=E6=B0=94=E6=B3=A1=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E7=9A=84=E6=83=85=E5=86=B5=20http://jira.zhidaohulian?= =?UTF-8?q?.com/browse/UI-386=3Fjql=3Dproject%20%3D%20UI%20AND%20assignee%?= =?UTF-8?q?20in%20(donghongyu)%20ORDER%20BY%20priority%20DESC%2C%20updated?= =?UTF-8?q?%20DESC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/marker/MapMarkerManager.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) 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 760ec028b5..7b159a1f4e 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 @@ -58,14 +58,15 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag private boolean isCheckOnLineData = false; private static Context mContext; - private static IMogoMarker lastMarker; + // 最后一次选中的气泡 + private static IMogoMarker mLastCHeckMarker; private static MapMarkerManager mMarkerManager; private static String mLastHighLightModule = ""; // 记录其它已经缩小的Marker public static ArrayList alreadySmallMarker = new ArrayList<>(); // 距离用户最近的Marker - private IMogoMarker nearlyMogoMarker = null; + private IMogoMarker mNearlyMogoMarker = null; private MapMarkerManager() { } @@ -122,14 +123,14 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag Logger.d(TAG, "onMarkerClicked 点击了大而全中的Marker:" + marker); try { - if (lastMarker != null) { + if (mLastCHeckMarker != null) { // 判断点击的是否是同一个 - if (marker.equals(lastMarker)) { + if (marker.equals(mLastCHeckMarker)) { Logger.d(TAG, "onMarkerClicked 与上一次点击的Marker一样,不做处理:" + marker); return false; } // 将上次选中 Marker 设置为未选中状态 - closeMarker(lastMarker); + closeMarker(mLastCHeckMarker); } // 将当前的Marker设置为选中 @@ -137,7 +138,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag // 数据统计代码 final Map properties = new HashMap<>(); - switch (lastMarker.getOwner()) { + switch (mLastCHeckMarker.getOwner()) { case ServiceConst.CARD_TYPE_CARS_CHATTING: properties.put("type", 3); break; @@ -148,7 +149,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag properties.put("type", 2); break; case ServiceConst.CARD_TYPE_NOVELTY: - MarkerShowEntity showEntity = (MarkerShowEntity) lastMarker.getObject(); + MarkerShowEntity showEntity = (MarkerShowEntity) mLastCHeckMarker.getObject(); Object bindObj = showEntity.getBindObj(); if (bindObj instanceof MarkerNoveltyInfo) { switch (((MarkerNoveltyInfo) bindObj).getPoiType()) { @@ -235,7 +236,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag if (mogoMarker == null || mogoMarker.isDestroyed()) { continue; } - mogoMarker.setToTop(); try { mogoMarker.startScaleAnimation(0.6f, 1f, 0.6f, 1f, 1000, new BounceInterpolator()); } catch (Exception e) { @@ -274,14 +274,14 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag if (marker != null) { Logger.i(TAG, "closeMarkerSelect 将出Marker详情关闭:" + marker); closeMarker(marker); - lastMarker = null; + mLastCHeckMarker = null; } } // 展开气泡 private void openMarker(IMogoMarker mogoMarker) { if (mogoMarker != null) { - lastMarker = mogoMarker; + mLastCHeckMarker = mogoMarker; Object object = mogoMarker.getObject(); if (object != null) { MarkerShowEntity markerShowEntity = (MarkerShowEntity) object; @@ -308,7 +308,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag // 绘制Marker public synchronized void drawMapMarker(MarkerResponse response) { - lastMarker = null; + mLastCHeckMarker = null; JSONArray array = new JSONArray(); @@ -368,7 +368,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag // 进行比较,保留最近的一个数据 if (calculateDistance < nearlyDistance) { nearlyDistance = calculateDistance; - nearlyMogoMarker = iMogoMarker; + mNearlyMogoMarker = iMogoMarker; } } catch (Exception e) { @@ -465,25 +465,25 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag try { // 在ACC on 之后第一次获取到了在线车辆数据,选中最近的一个Marker if (isCheckOnLineData) { - if (nearlyMogoMarker != null) { - Logger.d(TAG, "语音搜索触发,默认选中最近的在线车辆:" + nearlyMogoMarker); + if (mNearlyMogoMarker != null) { + Logger.d(TAG, "语音搜索触发,默认选中最近的在线车辆:" + mNearlyMogoMarker); // 移动地图到指定位置 MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus(ServiceConst.TYPE, true, false); - MarkerServiceHandler.getMapUIController().moveToCenter(nearlyMogoMarker.getPosition()); + MarkerServiceHandler.getMapUIController().moveToCenter(mNearlyMogoMarker.getPosition()); - onMarkerClicked(nearlyMogoMarker); - MogoMarkersHandler.getInstance().onMarkerClicked(nearlyMogoMarker); + onMarkerClicked(mNearlyMogoMarker); + MogoMarkersHandler.getInstance().onMarkerClicked(mNearlyMogoMarker); isCheckOnLineData = false; } } if (isACC_ON && isSynchronousOnLineData) { isSynchronousOnLineData = false; - if (nearlyMogoMarker != null) { - Logger.d(TAG, "ACC ON 触发,将附近的在线车辆数据同步给卡片:" + nearlyMogoMarker); - openMarker(nearlyMogoMarker); + if (mNearlyMogoMarker != null) { + Logger.d(TAG, "ACC ON 触发,将附近的在线车辆数据同步给卡片:" + mNearlyMogoMarker); + openMarker(mNearlyMogoMarker); // 将数据同步给在线用户卡片 - MogoDataHandler.getInstance().invoke(ServiceConst.CARD_TYPE_USER_DATA, nearlyMogoMarker); + MogoDataHandler.getInstance().invoke(ServiceConst.CARD_TYPE_USER_DATA, mNearlyMogoMarker); } } } catch (Exception e) { @@ -535,9 +535,9 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag */ public synchronized IMogoMarker drawMapMarker(MarkerShowEntity markerShowEntity) { if (!TextUtils.isEmpty(mLastHighLightModule) - && lastMarker != null - && !TextUtils.isEmpty(lastMarker.getOwner()) - && TextUtils.equals(mLastHighLightModule, lastMarker.getOwner()) + && mLastCHeckMarker != null + && !TextUtils.isEmpty(mLastCHeckMarker.getOwner()) + && TextUtils.equals(mLastHighLightModule, mLastCHeckMarker.getOwner()) ) { return drawMapMarker(markerShowEntity, true); } else { From 5415077e20eb9686c67e2f1c23806241db9be5ce Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 28 Feb 2020 15:05:44 +0800 Subject: [PATCH 3/3] opt null --- .../src/main/java/com/mogo/module/share/ShareControl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 3a3e5bab88..522389a88e 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -14,7 +14,7 @@ public class ShareControl implements IShareControl { private static volatile ShareControl sInstance; private Context mContext; - LaucherShareDialog mShareDialog; + private LaucherShareDialog mShareDialog; private ShareControl(Context context) { mContext = context; @@ -41,7 +41,9 @@ public class ShareControl implements IShareControl { @Override public void dismissDialog() { - mShareDialog.dismiss(); + if (mShareDialog != null) { + mShareDialog.dismiss(); + } } }