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

Merge remote-tracking branch 'origin/feature/v1.0.2' into feature/v1.0.2

Browse Source
This commit is contained in:
董宏宇
2020-03-13 15:16:31 +08:00
parent c0ee957d3e 7abcae2db8
commit ec3e01c41f
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java
View File

@@ -23,6 +23,7 @@ public class ExtensionsModuleConst {
public static final String TYPE_ENTRANCE = "entrance";
/*** 分享 开始 **/
//免唤醒语音命令
public static final String[] CMD_CANCLE_SHARE = {"取消分享"};
public static final String[] CMD_CLOSE_PAGE = {"关闭页面"};
@@ -31,12 +32,14 @@ public class ExtensionsModuleConst {
public static final String CANCLE_SHARE = "com.zhidao.launcher.cancle.share";
public static final String CLOSE_PAGE = "com.zhidao.launcher.close.page";
public static final String CLOSE = "com.zhidao.launcher.close";
/*** 分享 结束 **/
/*** 探路 开始 免唤醒 **/
public static final String[] CMD_UPLOAD_BLOCK = {"上报拥堵"};
public static final String[] CMD_TRAFFIC_CHECK = {"上报交通检查"};
public static final String[] CMD_ROAD_CLOSURE = {"上报封路"};
public static final String[] CMD_SHARE_OIL_PRICE = {"分享油价"};
//上报拥堵
public static final String UPLOAD_ROAD_BLOCK = "command_upload_block";
@@ -44,6 +47,9 @@ public class ExtensionsModuleConst {
public static final String UPLOAD_TRAFFIC_CHECK = "command_upload_traffic_check";
//上报封路
public static final String UPLOAD_ROAD_CLOSURE = "command_upload_road_closure";
//分享油价
public static final String SHARE_OIL_PRICE = "command_share_oil_price";
/*** 探路 结束 **/
//埋点
//分享分类 1：路况，2：油价，3：交通检查，4：封路

14
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
View File

@@ -2,6 +2,7 @@ package com.mogo.module.extensions.entrance;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.mvp.Presenter;
@@ -47,7 +48,8 @@ public class EntrancePresenter extends Presenter<EntranceView> {
ExtensionsModuleConst.CMD_TRAFFIC_CHECK, mogoVoiceListener);
AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.UPLOAD_ROAD_CLOSURE,
ExtensionsModuleConst.CMD_ROAD_CLOSURE, mogoVoiceListener);
AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.SHARE_OIL_PRICE,
ExtensionsModuleConst.CMD_SHARE_OIL_PRICE, mogoVoiceListener);
}
/**
@@ -65,6 +67,8 @@ public class EntrancePresenter extends Presenter<EntranceView> {
uploadTrfficCheck();
} else if (cmd.equals(ExtensionsModuleConst.UPLOAD_ROAD_CLOSURE)) { //上报封路
uploadRoadClosed();
} else if (cmd.equals(ExtensionsModuleConst.SHARE_OIL_PRICE)) { //分享油价
shareOilPrice();
}
}
@@ -85,7 +89,6 @@ public class EntrancePresenter extends Presenter<EntranceView> {
}
};
private void uploadRoadCondition() {
traceTanluData("2");
sendShareReceiver("1");
@@ -94,6 +97,13 @@ public class EntrancePresenter extends Presenter<EntranceView> {
ShareControl.getInstance(mContext).dismissDialog();
}
private void shareOilPrice() {
Intent intent = new Intent();
intent.setData(Uri.parse("freshthing://com.zhidao.fresh.things/shareOilPrice"));
mContext.startActivity(intent);
traceTypeData("2");
}
private void uploadTrfficCheck() {
sendShareReceiver("2");
Logger.d("EntrancePresenter", "mogoIntentListener 分享交通检查 ----> ");