From 45da39251c3769430eaeb831869bfdd19be727f2 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 20 Feb 2020 11:00:18 +0800 Subject: [PATCH 1/2] resolve confiicts --- .idea/misc.xml | 2 +- .../extensions/entrance/EntranceFragment.java | 15 +++++++++++++++ .../module/tanlu/constant/TanluConstants.java | 2 +- .../tanlu/fragment/TanluCardViewFragment.java | 7 +++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 0506ff0a2f..9360f554d3 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -30,6 +30,7 @@ import com.mogo.module.extensions.dialog.NaviNoticeDialog; import com.mogo.module.extensions.navi.NaviInfoView; import com.mogo.module.share.ShareControl; import com.mogo.service.MogoServicePaths; +import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.fragmentmanager.FragmentDescriptor; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.map.IMogoMapService; @@ -38,6 +39,9 @@ import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.statusmanager.IMogoStatusManager; +import java.util.HashMap; +import java.util.Map; + /** * @author congtaowang * @since 2020-01-07 @@ -77,6 +81,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent private IMogoMarkerManager mMogoMarkerManager; private IMogoRegisterCenter mMogoRegisterCenter; + private IMogoAnalytics mAnalytics; private IMogoStatusManager mMogoStatusManager; /** @@ -118,6 +123,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent mUploadRoadCondition = findViewById( R.id.module_entrance_id_upload_road_condition ); mUploadRoadCondition.setOnClickListener( view -> { ShareControl.getInstance(getActivity()).showDialog(); + traceData("1"); } ); mVRMode = findViewById( R.id.module_entrance_id_vr_mode ); @@ -166,6 +172,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent mMApUIController = mService.getMapUIController(); mMogoLocationClient = mService.getSingletonLocationClient( getContext() ); mMogoNavi = mService.getNavi( getContext() ); + mAnalytics = (IMogoAnalytics) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_ANALYTICS).navigation(getContext()); mMogoStatusManager = (IMogoStatusManager )ARouter.getInstance().build( MogoServicePaths.PATH_STATUS_MANAGER ).navigation( getContext() ); mMogoRegisterCenter.registerMogoNaviListener( ExtensionsModuleConst.TYPE_ENTRANCE, this ); @@ -269,4 +276,12 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent public void onMapChanged( MogoLatLng latLng, float zoom, float tilt, float bearing ) { } + + + private void traceData(String from) { + Map properties = new HashMap<>(); + properties.put("from", from); + mAnalytics.track("Launcher_Share_Click", properties); + } + } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java index 5ed6632629..2506814f49 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java @@ -33,7 +33,7 @@ public class TanluConstants { //埋点数据 //marker点击 public static final String LAUNCHER_ICON_CLICK = "Launcher_Icon_Click"; - //分享分类 + //分享分类 1：路况，2：油价，3：交通检查，4：封路 public static final String LAUNCHER_SHARE_TYPE = "Launcher_Share_type"; //分享/上报按钮点击 from=1 手动点击 from=2 语音打开 public static final String LAUNCHER_SHARE_CLICK = "Launcher_Share_Click"; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index 0ae5ad5d53..590548d498 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -465,18 +465,17 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; traceTypeData("1"); ShareControl.getInstance(getActivity()).dismissDialog(); } else if (intentStr.equals(TanluConstants.SHARE_ROAD_CLOSURE)) { //分享封路(封路了) --ok - traceData("2"); sendShareReceiver("3"); Logger.d(TAG, "mogoIntentListener 分享封路 ----> "); traceTypeData("4"); } else if (intentStr.equals(TanluConstants.SHARE_TRAFFIC_CHECK)) { //分享交通检查(交通检查) --ok - traceData("2"); sendShareReceiver("2"); Logger.d(TAG, "mogoIntentListener 分享交通检查 ----> "); traceTypeData("3"); } else if (intentStr.equals(TanluConstants.GO_TO_SHARE)) { //我要分享 --ok ShareControl.getInstance(getActivity()).showDialog(); Logger.d(TAG, "mogoIntentListener 我要分享 ----> "); + traceData("2"); } } }; @@ -534,6 +533,10 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; mAnalytics.track(TanluConstants.LAUNCHER_SHARE_TYPE, properties); } + /** + * 分享/上报按钮点击 from=1 手动点击 from=2 语音打开 + * @param from + */ private void traceData(String from) { Map properties = new HashMap<>(); properties.put("from", from); From f3121cec44db6d85db19392a0ebadc72333858da 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 11:22:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=96=E9=83=A8=E8=B0=83=E7=94=A8=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/service/marker/MapMarkerManager.java | 5 ++++- 1 file changed, 4 insertions(+), 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 63ee4c3b1c..1398d59ee3 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 @@ -216,8 +216,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag } } - // 对指定类型高亮处理 + public synchronized static void highlightedMarker(final String typeTag) { + highlightedMarker(typeTag, false); + } + public synchronized static void highlightedMarker(final String typeTag, final boolean netDataRefresh) { try { Logger.e(TAG, "上一次选中的卡片类型：mLastHighLightModule==" + mLastHighLightModule);