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-09-26 11:29:52 +08:00
parent a222903dc2
commit d5abc0b598
5 changed files with 169 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
View File

@@ -10,6 +10,7 @@ import android.util.ArrayMap;
import com.amap.api.maps.CoordinateConverter;
import com.amap.api.maps.model.LatLng;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.map.location.MogoLocation;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XObuEventEntity;
@@ -241,7 +242,6 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
// 交叉口碰撞预警
V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity =
TestOnLineCarUtils.getV2XScenarioCrossCrash();
Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);

6
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java
View File

@@ -8,6 +8,7 @@ import android.view.View;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.commons.voice.AIAssist;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
@@ -59,6 +60,7 @@ public class V2XAnimationWindow extends ConstraintLayout implements IV2XWindow<V
@Override
public void show(V2XPushMessageEntity entity) {
Uri videoUri = null;
String tts = null;
switch (entity.getSceneId()) {
// 前车紧急制动告警
case "100005":
@@ -67,6 +69,7 @@ public class V2XAnimationWindow extends ConstraintLayout implements IV2XWindow<V
// 十字路口碰撞预警
case "100006":
videoUri = Uri.parse("android.resource://" + getContext().getPackageName() + "/raw/" + R.raw.video_left_right_car);
tts = "注意路口车辆";
break;
// 岔路口碰撞预警
case "100007":
@@ -102,6 +105,9 @@ public class V2XAnimationWindow extends ConstraintLayout implements IV2XWindow<V
vvCarAnimation.start();
Logger.w(MODULE_NAME, "开始播放动画。。。。。");
}
if (tts != null) {
AIAssist.getInstance(V2XServiceManager.getContext()).speakTTSVoice(tts);
}
}
@Override