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

Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev

Browse Source
This commit is contained in:
wangcongtao
2020-06-15 15:20:21 +08:00
parent 1c0fa6a1e7 85ae50d908
commit 10d64b8796
2 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
View File

@@ -16,6 +16,7 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.marker.MogoMarkersHandler;
import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant;
@@ -38,6 +39,10 @@ import com.mogo.utils.logger.Logger;
import org.jetbrains.annotations.NotNull;
import org.json.JSONObject;
import java.util.HashMap;
import java.util.Map;
import com.mogo.commons.analytics.AnalyticsUtils;
import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SEEK_HELP;
import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SHOW_DIALOG;
import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_UPLOAD;
@@ -208,6 +213,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK);
}
trackVoiceWithType(TYPE_BLOCK);
break;
case UNWAKE_UPLOAD_TRAFFIC_CHECK:
if (needAuth()) {
@@ -215,6 +221,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_TRAFFIC_CHECK);
}
trackVoiceWithType(TYPE_TRAFFIC_CHECK);
break;
case UNWAKE_UPLOAD_ROAD_CLOSURE:
if (needAuth()) {
@@ -222,6 +229,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_CLOSURE);
}
trackVoiceWithType(TYPE_CLOSURE);
break;
case UNWAKE_UPLOAD_ACCIDENT:
if (needAuth()) {
@@ -229,6 +237,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_ACCIDENT);
}
trackVoiceWithType(TYPE_ACCIDENT);
break;
case UNWAKE_UPLOAD_REAL_TIME_TRAFFIC:
if (needAuth()) {
@@ -236,6 +245,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_REAL_TIME_TRAFFIC);
}
trackVoiceWithType(TYPE_REAL_TIME_TRAFFIC);
break;
case UNWAKE_UPLOAD_SEEK_HELP:
if (needAuth()) {
@@ -243,6 +253,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
seekHelp();
}
break;
case UNWAKE_UPLOAD_STAGNANT_WATER:
if (needAuth()) {
@@ -250,6 +261,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_STAGNANT_WATER);
}
trackVoiceWithType(TYPE_STAGNANT_WATER);
break;
case UNWAKE_UPLOAD_ROAD_ICY:
if (needAuth()) {
@@ -257,6 +269,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_ICY);
}
trackVoiceWithType(TYPE_ROAD_ICY);
break;
case UNWAKE_UPLOAD_DENSE_FOG:
if (needAuth()) {
@@ -264,6 +277,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_DENSE_FOG);
}
trackVoiceWithType(TYPE_DENSE_FOG);
break;
case UNWAKE_UPLOAD_ROAD_CONSTRUCTION:
if (needAuth()) {
@@ -271,11 +285,19 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
} else {
UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_CONSTRUCTION);
}
trackVoiceWithType(TYPE_ROAD_CONSTRUCTION);
break;
default:
break;
}
}
//TODO V2X语音免唤醒词信息上报埋点v2x_share_type
private void trackVoiceWithType(String type){
Map<String, Object> properties = new HashMap<>();
properties.put("type",type);
properties.put("from","2");
AnalyticsUtils.track("v2x_share_type",properties);
}
@Override
public void onIntentReceived(String intentStr, Intent intent) {
@@ -304,6 +326,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_STAGNANT_WATER);
dismissShareDialog();
}
trackVoiceWithType(TYPE_STAGNANT_WATER);
break;
case "积冰":
if (needAuth()) {
@@ -312,6 +335,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_ICY);
dismissShareDialog();
}
trackVoiceWithType(TYPE_ROAD_ICY);
break;
case "雾":
if (needAuth()) {
@@ -320,6 +344,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_DENSE_FOG);
dismissShareDialog();
}
trackVoiceWithType(TYPE_DENSE_FOG);
break;
case "交通事故":
if (needAuth()) {
@@ -328,6 +353,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_ACCIDENT);
dismissShareDialog();
}
trackVoiceWithType(TYPE_ACCIDENT);
break;
case "施工":
if (needAuth()) {
@@ -336,6 +362,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_ROAD_CONSTRUCTION);
dismissShareDialog();
}
trackVoiceWithType(TYPE_ROAD_CONSTRUCTION);
break;
case "封路":
if (needAuth()) {
@@ -344,6 +371,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_CLOSURE);
dismissShareDialog();
}
trackVoiceWithType(TYPE_CLOSURE);
break;
case "交通检查":
if (needAuth()) {
@@ -352,9 +380,9 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_TRAFFIC_CHECK);
dismissShareDialog();
}
trackVoiceWithType(TYPE_TRAFFIC_CHECK);
break;
default:
// showShareDialog();
break;
}
case VOICE_CMD_PUB_ROAD_CONDITION:
@@ -370,6 +398,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_REAL_TIME_TRAFFIC);
dismissShareDialog();
}
trackVoiceWithType(TYPE_REAL_TIME_TRAFFIC);
break;
case "拥堵":
if (needAuth()) {
@@ -379,6 +408,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UploadHelper.INSTANCE.upload(mContext, TYPE_BLOCK);
dismissShareDialog();
}
trackVoiceWithType(TYPE_BLOCK);
break;
default:
break;

31
modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
View File

@@ -115,21 +115,19 @@ public class LaucherShareDialog implements View.OnClickListener {
Logger.d(TAG,"点击拥堵");
traceTanluData("1");
sendShareReceiver(ShareConstants.TYPE_BLOCK);
traceTypeData("1");
trackWithType(ShareConstants.TYPE_BLOCK);
dismiss();
} else if (id == R.id.tvTrafficCheck) {
//交通检查
Logger.d(TAG,"点击交通检查");
traceData("1");
sendShareReceiver(ShareConstants.TYPE_TRAFFIC_CHECK);
traceTypeData("3");
trackWithType(ShareConstants.TYPE_TRAFFIC_CHECK);
dismiss();
} else if (id == R.id.tvClosure) {
//封路
Logger.d(TAG,"点击封路");
traceData("1");
sendShareReceiver(ShareConstants.TYPE_CLOSURE);
traceTypeData("4");
trackWithType(ShareConstants.TYPE_CLOSURE);
dismiss();
} else if (id == R.id.tvSeekHelp) {
// 故障求助
@@ -145,6 +143,7 @@ public class LaucherShareDialog implements View.OnClickListener {
// 道路施工
Logger.d(TAG,"点击道路施工");
sendShareReceiver(ShareConstants.TYPE_ROAD_CONSTRUCTION);
trackWithType(ShareConstants.TYPE_ROAD_CONSTRUCTION);
dismiss();
} else if (id == R.id.tvRealTimeTraffic) {
// 实时路况
@@ -155,19 +154,28 @@ public class LaucherShareDialog implements View.OnClickListener {
// 道路积水
Logger.d(TAG,"点击道路积水");
sendShareReceiver(ShareConstants.TYPE_STAGNANT_WATER);
trackWithType(ShareConstants.TYPE_STAGNANT_WATER);
dismiss();
} else if (id == R.id.tvRoadIcy) {
// 道路结冰
Logger.d(TAG,"点击道路结冰");
sendShareReceiver(ShareConstants.TYPE_ROAD_ICY);
trackWithType(ShareConstants.TYPE_ROAD_ICY);
dismiss();
} else if (id == R.id.tvDenseFog) {
// 浓雾
Logger.d(TAG,"点击浓雾");
sendShareReceiver(ShareConstants.TYPE_DENSE_FOG);
trackWithType(ShareConstants.TYPE_DENSE_FOG);
dismiss();
}
}
//TODO 手动信息上报埋点
private void trackWithType(String type){
Map<String, Object> properties = new HashMap<>();
properties.put("type",type);
properties.put("from","2");
mAnalytics.track(ShareConstants.LAUNCHER_SHARE_TYPE, properties);
}
private ISeekHelpListener seekListener = new ISeekHelpListener() {
@@ -204,17 +212,6 @@ public class LaucherShareDialog implements View.OnClickListener {
*
* @param type
*/
private void traceTypeData(String type) {
Map<String, Object> properties = new HashMap<>();
properties.put("type", type);
mAnalytics.track(ShareConstants.LAUNCHER_SHARE_TYPE, properties);
}
private void traceData(String from) {
Map<String, Object> properties = new HashMap<>();
properties.put("from", from);
mAnalytics.track(ShareConstants.LAUNCHER_SHARE_TYPE, properties);
}
private void traceTanluData(String type) {
Map<String, Object> properties = new HashMap<>();