yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve confiicts

Browse Source
This commit is contained in:
lixiaopeng
2020-02-20 11:00:18 +08:00
parent 948918a31f
commit 45da39251c
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java
View File

@@ -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";

7
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
View File

@@ -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<String, Object> properties = new HashMap<>();
properties.put("from", from);