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

思必驰实现道路事件上报免唤醒转唤醒

Browse Source
This commit is contained in:
tongchenfei
2020-08-26 16:24:08 +08:00
parent af819a4241
commit 999b59fed7
15 changed files with 204 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,42 +185,16 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
intentManager.registerIntentListener(VOICE_CMD_NO_REPLY_SHARE_DIALOG_CLOSE, this);
intentManager.registerIntentListener(UNWAKE_UPLOAD_ROAD_CONDITION, this);
// 免唤醒词注册
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ROAD_BLOCK,
// CMD_UPLOAD_BLOCK, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_TRAFFIC_CHECK,
// CMD_TRAFFIC_CHECK, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ROAD_CLOSURE,
// CMD_ROAD_CLOSURE, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_CANCEL_SHARE,
// CMD_CANCEL_SHARE, this);
// if (DebugConfig.getAIType() == DebugConfig.AI_TYPE_TXZ) {
// // 使用同行者语义你的话，增加如下免唤醒词
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ACCIDENT,
// CMD_UPLOAD_ACCIDENT, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_REAL_TIME_TRAFFIC,
// UPLOAD_REAL_TIME_TRAFFIC, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_SEEK_HELP,
// UPLOAD_SEEK_HELP, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_STAGNANT_WATER,
// UPLOAD_STAGNANT_WATER, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ROAD_ICY,
// UPLOAD_ROAD_ICY, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_DENSE_FOG,
// UPLOAD_DENSE_FOG, this);
// AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ROAD_CONSTRUCTION,
// UPLOAD_ROAD_CONSTRUCTION, this);
// }
// 免唤醒词注册，全局免唤醒
AIAssist.getInstance(mContext).registerUnWakeupCommand(UNWAKE_UPLOAD_REAL_TIME_TRAFFIC,
UPLOAD_REAL_TIME_TRAFFIC, ShareControl.this);
if(!DebugConfig.isLauncher()) {
ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
if (!isTrue) {
AIAssist.getInstance(mContext).unregisterUnWakeupCommand(UNWAKE_UPLOAD_REAL_TIME_TRAFFIC,ShareControl.this);
dismissShareDialog();
}else{
AIAssist.getInstance(mContext).registerUnWakeupCommand(UNWAKE_UPLOAD_REAL_TIME_TRAFFIC,
UPLOAD_REAL_TIME_TRAFFIC, ShareControl.this);
}
}
});
@@ -389,6 +363,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
default:
break;
}
break;
case VOICE_CMD_PUB_ROAD_CONDITION:
String obCondition =
new JSONObject(intent.getStringExtra("data")).opt("obj").toString();

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt
View File

@@ -27,7 +27,7 @@ class StrategyShareProvider : IProvider {
// 注册事故
apis.getSocketManagerApi(context).registerOnMessageListener(ACCIDENT_STRATEGY_SHARE_PUSH_TYPE, AccidentStrategyReceiver(apis))
apis.registerCenterApi.registerMogoLocationListener(MogoServicePaths.PATH_STRATEGY_SHARE){
Logger.d(S_TAG,"定位发生变化，准备记录速度： ${it.speed}")
// Logger.d(S_TAG,"定位发生变化，准备记录速度： ${it.speed}")
blockStrategy.recordSpeed(it.speed)
}
}

3
modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
View File

@@ -80,6 +80,5 @@ public class ShareConstants {
/**
* 这个是实时路况，不是拥堵，拥堵放在了extention模块里面处理
*/
public static final String VOICE_CMD_PUB_ROAD_CONDITION = "com.zhidao.pathfinder.report" +
".roadCondition";
public static final String VOICE_CMD_PUB_ROAD_CONDITION = "com.zhidao.pathfinder.report.roadCondition";
}

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
View File

@@ -74,6 +74,8 @@ class BlockStrategy(private val apis: IMogoServiceApis) {
Logger.d(TAG, "平均速度为： $ave")
// 上报平均速度
uploadAverageSpeed(ave)
}else{
Logger.d(TAG,"判定为停车，不进行上报")
}
startRecordTime = 0
}