diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/ColorUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/ColorUtils.java new file mode 100644 index 0000000000..8f04e09bb2 --- /dev/null +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/ColorUtils.java @@ -0,0 +1,71 @@ +package com.mogo.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +/** + * @author donghongyu + * @date 4/13/21 11:48 AM + * 颜色工具类 + */ +public class ColorUtils { + + /** + * @return 获取渐变色集合 + */ + public static List gradient(String startColor, String endColor, int step) { + // 将HEX转为RGB + int[] sColor = hexToRgb(startColor); + int[] eColor = hexToRgb(endColor); + + // 计算每一步的差值 + int rStep = (eColor[0] - sColor[0]) / step; + int gStep = (eColor[1] - sColor[1]) / step; + int bStep = (eColor[2] - sColor[2]) / step; + + // 生成渐变色 + List gradientColorArr = new ArrayList<>(); + + for (int i = 0; i < step; i++) { + + } + + return gradientColorArr; + } + + + /** + * HEX颜色 转 RGB颜色 + */ + public static int[] hexToRgb(String hex) { + int[] rgb = new int[3]; + if (!Pattern.matches("^#[0-9a-f[A-F]]{6}", hex)) { + return rgb; + } + String redStr = hex.substring(1, 3); + String greenStr = hex.substring(3, 5); + String blueStr = hex.substring(5); + + rgb[0] = Integer.valueOf(redStr, 16); + rgb[1] = Integer.valueOf(greenStr, 16); + rgb[2] = Integer.valueOf(blueStr, 16); + + return rgb; + } + + /** + * RGB颜色 转 HEX颜色 + */ + public static String rgbToHex(int red, int green, int blue) { + if (red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 + || blue > 255) { + return ""; + } + String redStr = Integer.toHexString(red); + String greenStr = Integer.toHexString(green); + String blueStr = Integer.toHexString(blue); + return ("#" + redStr + greenStr + blueStr).toUpperCase(); + } + +} diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java index b6a9fe2ca8..626a871b08 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java @@ -46,8 +46,6 @@ public class V2XPushMessageEntity implements Serializable { private double lat; private double lon; - private List polyline; - private List recommendPolyline; public int getViewType() { @@ -273,14 +271,6 @@ public class V2XPushMessageEntity implements Serializable { this.userId = userId; } - public List getPolyline() { - return polyline; - } - - public void setPolyline(List polyline) { - this.polyline = polyline; - } - public List getRecommendPolyline() { return recommendPolyline; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java index 0dea8a3efe..fb0a9eeede 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java @@ -40,61 +40,61 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener { private boolean mIsFirstAccOn = true; @Override - public final void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) { - switch ( descriptor ) { + public final void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + switch (descriptor) { case USER_INTERACTED: - onUserInteracted( isTrue ); + onUserInteracted(isTrue); break; case SEARCH_UI: - onSearchUIShow( isTrue ); + onSearchUIShow(isTrue); break; case MAIN_PAGE_RESUME: - onMainPageResumeStatusChanged( isTrue ); + onMainPageResumeStatusChanged(isTrue); break; case MAIN_PAGE_IS_BACKGROUND: - onMainPageIsBackgroundStatusChanged( isTrue ); + onMainPageIsBackgroundStatusChanged(isTrue); break; case SEEK_HELPING: - onSeekHelpingStatusChanged( isTrue ); + onSeekHelpingStatusChanged(isTrue); break; case ACC_STATUS: - onAccStatusChanged( isTrue ); + onAccStatusChanged(isTrue); break; case VR_MODE: - onVrModeChanged( isTrue ); + onVrModeChanged(isTrue); break; case TOP_VIEW: - onTopViewStatusChanged( isTrue ); + onTopViewStatusChanged(isTrue); break; } } - public void onUserInteracted( boolean userInteracted ) { - if ( userInteracted ) { - MogoServices.getInstance().restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); + public void onUserInteracted(boolean userInteracted) { + if (userInteracted) { + MogoServices.getInstance().restartAutoRefreshAtTime(ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT); } } - public abstract void onSearchUIShow( boolean visible ); + public abstract void onSearchUIShow(boolean visible); - public void onMainPageResumeStatusChanged( boolean resume ) { - if ( resume ) { + public void onMainPageResumeStatusChanged(boolean resume) { + if (resume) { MogoServices.getInstance().registerInternalUnWakeupWords(); - if ( !mIsMainPageFirstResume ) { - MogoServices.getInstance().restartAutoRefreshAtTime( 2_000L ); + if (!mIsMainPageFirstResume) { + MogoServices.getInstance().restartAutoRefreshAtTime(2_000L); } mIsMainPageFirstResume = false; - LauncherCardRefresher.getInstance( AbsMogoApplication.getApp() ).stop(); + LauncherCardRefresher.getInstance(AbsMogoApplication.getApp()).stop(); MogoServices.getInstance().playAppTts(); } else { MogoServices.getInstance().unregisterInternalUnWakeupWords(); MogoServices.getInstance().stopAutoRefreshStrategy(); } - VrModeController.getInstance().onMainPageResumeStatusChanged( resume ); + VrModeController.getInstance().onMainPageResumeStatusChanged(resume); } - public void onMainPageIsBackgroundStatusChanged( boolean isBackground ) { - if ( isBackground ) { + public void onMainPageIsBackgroundStatusChanged(boolean isBackground) { + if (isBackground) { closeAllPanel(); } } @@ -104,76 +104,79 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener { */ private void closeAllPanel() { - if ( mCallProviderResponse == null ) { + if (mCallProviderResponse == null) { mCallProviderResponse = new ICallChatResponse() { @Override - public void hideUserWindowError( @NotNull String errorMsg ) { + public void hideUserWindowError(@NotNull String errorMsg) { } }; } MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus( false ); + MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); - if ( mCarsChattingProvider == null ) { - mCarsChattingProvider = ( ICarsChattingProvider ) ARouter.getInstance().build( CallChattingProviderConstant.CAR_CALL_PROVIDER ).navigation(); + if (mCarsChattingProvider == null) { + mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); } - if ( mCarsChattingProvider != null ) { - mCarsChattingProvider.hideUserWindow( TAG, AbsMogoApplication.getApp(), mCallProviderResponse ); + if (mCarsChattingProvider != null) { + mCarsChattingProvider.hideUserWindow(TAG, AbsMogoApplication.getApp(), mCallProviderResponse); } } - public void onSeekHelpingStatusChanged( boolean isSeekingHelping ) { - CarIconDisplayStrategy.getInstance().changeCarIconStatus( isSeekingHelping ); - notifySeekHelpingStatusChanged( isSeekingHelping ); + public void onSeekHelpingStatusChanged(boolean isSeekingHelping) { + CarIconDisplayStrategy.getInstance().changeCarIconStatus(isSeekingHelping); + notifySeekHelpingStatusChanged(isSeekingHelping); } - private void notifySeekHelpingStatusChanged( boolean seekHelpingStatus ) { - Intent intent = new Intent( "com.mogo.launcher.adas.app" ); + private void notifySeekHelpingStatusChanged(boolean seekHelpingStatus) { + Intent intent = new Intent("com.mogo.launcher.adas.app"); try { JSONObject data = new JSONObject(); - data.put( "object", "辅助驾驶" ); - data.put( "action", seekHelpingStatus ? "2" : "1" ); - data.put( "des", "自身故障报警" ); - data.put( "v2x_warning_type", "20007" );// 后台返回 - intent.putExtra( "data", data.toString() ); - AbsMogoApplication.getApp().sendBroadcast( intent ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + data.put("object", "辅助驾驶"); + data.put("action", seekHelpingStatus ? "2" : "1"); + data.put("des", "自身故障报警"); + data.put("v2x_warning_type", "20007");// 后台返回 + intent.putExtra("data", data.toString()); + AbsMogoApplication.getApp().sendBroadcast(intent); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } - public void onAccStatusChanged( boolean accOn ) { - if ( accOn ) { - if ( mIsFirstAccOn ) { + public void onAccStatusChanged(boolean accOn) { + if (accOn) { + if (mIsFirstAccOn) { mIsFirstAccOn = false; return; } - MogoServices.getInstance().initLocationServiceProcess( AbsMogoApplication.getApp() ); + MogoServices.getInstance().initLocationServiceProcess(AbsMogoApplication.getApp()); MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS(); - MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).start(); - MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers(); - UiThreadHandler.postDelayed( () -> { + MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(AbsMogoApplication.getApp()).start(); + MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).removeMarkers(); + UiThreadHandler.postDelayed(() -> { MogoServices.getInstance().refreshStrategy(); - }, 3_000L ); + }, 3_000L); } else { - MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).stop(); - MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers(); + MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(AbsMogoApplication.getApp()).stop(); + MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).removeMarkers(); } } - public void onVrModeChanged( boolean isVrMode ) { - VrModeController.getInstance().onVrModeChanged( isVrMode ); + public void onVrModeChanged(boolean isVrMode) { + VrModeController.getInstance().onVrModeChanged(isVrMode); + if (MarkerServiceHandler.getMogoStatusManager().isSeekHelping()) { + onSeekHelpingStatusChanged(true); + } } - public void onTopViewStatusChanged( boolean visible ) { - if ( visible ) { + public void onTopViewStatusChanged(boolean visible) { + if (visible) { return; } try { MapMarkerManager.getInstance().onCloseCurrentSelectedMarker(); - } catch ( Exception e ) { - Logger.e( TAG, e, "onTopViewStatusChanged" ); + } catch (Exception e) { + Logger.e(TAG, e, "onTopViewStatusChanged"); } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java index 3c9ba2bab3..5f0f07f942 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java @@ -81,6 +81,35 @@ public class CarIconDisplayStrategy { R.drawable.module_service_ic_warning_circle_orange_00046 }; + // F 系列才有这个帧动画 + public static final int[] sFrameVr = { + R.drawable.module_service_ic_car_for_help_0000, + R.drawable.module_service_ic_car_for_help_0001, + R.drawable.module_service_ic_car_for_help_0002, + R.drawable.module_service_ic_car_for_help_0003, + R.drawable.module_service_ic_car_for_help_0004, + R.drawable.module_service_ic_car_for_help_0005, + R.drawable.module_service_ic_car_for_help_0006, + R.drawable.module_service_ic_car_for_help_0007, + R.drawable.module_service_ic_car_for_help_0008, + R.drawable.module_service_ic_car_for_help_0009, + R.drawable.module_service_ic_car_for_help_0010, + R.drawable.module_service_ic_car_for_help_0011, + R.drawable.module_service_ic_car_for_help_0012, + R.drawable.module_service_ic_car_for_help_0013, + R.drawable.module_service_ic_car_for_help_0014, + R.drawable.module_service_ic_car_for_help_0015, + R.drawable.module_service_ic_car_for_help_0016, + R.drawable.module_service_ic_car_for_help_0017, + R.drawable.module_service_ic_car_for_help_0018, + R.drawable.module_service_ic_car_for_help_0019, + R.drawable.module_service_ic_car_for_help_0020, + R.drawable.module_service_ic_car_for_help_0021, + R.drawable.module_service_ic_car_for_help_0022, + R.drawable.module_service_ic_car_for_help_0023, + R.drawable.module_service_ic_car_for_help_0024 + }; + private static volatile CarIconDisplayStrategy sInstance; private IMogoMarker mSeekHelpingMarker; @@ -165,6 +194,7 @@ public class CarIconDisplayStrategy { switch (msg.what) { case MSG_SEEK_HELPING_ANIM: try { + stopAnim(); playAnim(); } catch (Exception e) { e.printStackTrace(); @@ -191,13 +221,20 @@ public class CarIconDisplayStrategy { private void playAnim() { try { - for (int i : sFrame) { - mBitmapFrames.add(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), i)); + if (MarkerServiceHandler.getMogoStatusManager().isVrMode()) { + for (int i : sFrameVr) { + mBitmapFrames.add(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), i)); + } + } else { + for (int i : sFrame) { + mBitmapFrames.add(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), i)); + } } + mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker(TAG, new MogoMarkerOptions() .icons(mBitmapFrames) - .period(1) + .period(20) .zIndex(0) .autoManager(false) .anchor(0.5f, 0.5f) diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0000.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0000.png new file mode 100644 index 0000000000..3e1a005805 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0000.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0001.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0001.png new file mode 100644 index 0000000000..cf50f496f9 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0001.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0002.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0002.png new file mode 100644 index 0000000000..6e78ad0a5d Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0002.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0003.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0003.png new file mode 100644 index 0000000000..62fb4f6905 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0003.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0004.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0004.png new file mode 100644 index 0000000000..e31c16e5bc Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0004.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0005.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0005.png new file mode 100644 index 0000000000..9b63c26cb0 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0005.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0006.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0006.png new file mode 100644 index 0000000000..bb43dace92 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0006.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0007.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0007.png new file mode 100644 index 0000000000..fbd41c7f46 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0007.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0008.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0008.png new file mode 100644 index 0000000000..22063213c2 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0008.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0009.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0009.png new file mode 100644 index 0000000000..0c7352bd3d Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0009.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0010.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0010.png new file mode 100644 index 0000000000..e3f368072d Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0010.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0011.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0011.png new file mode 100644 index 0000000000..5ab71f95c9 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0011.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0012.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0012.png new file mode 100644 index 0000000000..8cf231388a Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0012.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0013.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0013.png new file mode 100644 index 0000000000..1ce7794873 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0013.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0014.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0014.png new file mode 100644 index 0000000000..1e432c6c60 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0014.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0015.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0015.png new file mode 100644 index 0000000000..d5ac9bcabe Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0015.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0016.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0016.png new file mode 100644 index 0000000000..b9bd28d26e Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0016.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0017.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0017.png new file mode 100644 index 0000000000..0957be0dd0 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0017.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0018.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0018.png new file mode 100644 index 0000000000..b2fa02c103 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0018.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0019.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0019.png new file mode 100644 index 0000000000..89d396bcaa Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0019.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0020.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0020.png new file mode 100644 index 0000000000..f4855c2cc6 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0020.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0021.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0021.png new file mode 100644 index 0000000000..9505ecd1f5 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0021.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0022.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0022.png new file mode 100644 index 0000000000..cb4c5a9e82 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0022.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0023.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0023.png new file mode 100644 index 0000000000..8399cc8d0a Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0023.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0024.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0024.png new file mode 100644 index 0000000000..3e1a005805 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0024.png differ diff --git a/modules/mogo-module-smp/src/main/assets/small_map_style.data b/modules/mogo-module-smp/src/main/assets/small_map_style.data index e3775a88b1..4b1dc9a0da 100644 Binary files a/modules/mogo-module-smp/src/main/assets/small_map_style.data and b/modules/mogo-module-smp/src/main/assets/small_map_style.data differ diff --git a/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data b/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data index d12089b70e..6e201b10d4 100644 Binary files a/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data and b/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data differ diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png b/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png index 1c4bf333ca..ef4182827e 100644 Binary files a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png and b/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_border.png differ diff --git a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png b/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png index e17d0c5eee..16a3e0d511 100644 Binary files a/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png and b/modules/mogo-module-smp/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png differ diff --git a/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml b/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml index 1537b40512..051d2de527 100644 --- a/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml +++ b/modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml @@ -10,8 +10,8 @@ android:top="2dp" /> @@ -19,7 +19,7 @@ - + diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml index 693f7da327..9df217742b 100644 --- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml +++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml @@ -12,7 +12,7 @@ android:layout_width="@dimen/module_small_map_view_border_width" android:layout_height="@dimen/module_small_map_view_border_height" android:layout_centerInParent="true" - android:background="@drawable/bg_module_small_map_view_border" /> + android:background="@drawable/module_small_map_view_border" /> 400px 400px - 260px - 260px + 288px + 288px - 250px - 250px + 270px + 270px 1620px 780px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java index d4d17103f7..66144feea0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java @@ -9,6 +9,7 @@ import com.mogo.module.v2x.listener.V2XMessageListener_401009; import com.mogo.module.v2x.listener.V2XMessageListener_401010; import com.mogo.module.v2x.listener.V2XMessageListener_401011; import com.mogo.module.v2x.listener.V2XMessageListener_401012; +import com.mogo.module.v2x.listener.V2XMessageListener_401019; import com.mogo.utils.logger.Logger; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -32,6 +33,7 @@ public class V2XSocketManager { private V2XMessageListener_401007 v2XMessageListener_401007; private V2XMessageListener_401009 v2XMessageListener_401009; private V2XMessageListener_401010 v2XMessageListener_401010; + private V2XMessageListener_401019 v2XMessageListener_401019; private V2XSocketManager() { @@ -62,6 +64,8 @@ public class V2XSocketManager { } register401007(); register401009(); + register401019(); + // TODO 这里是前瞻需求,量产版本需要注释 register401003(); // TODO 旧版本的一种V2X预警形式,已经废弃了 @@ -108,6 +112,11 @@ public class V2XSocketManager { .getMoGoSocketManager() .unregisterOnMessageListener(401009, v2XMessageListener_401009); } + if (v2XMessageListener_401019 != null) { + V2XServiceManager + .getMoGoSocketManager() + .unregisterOnMessageListener(401019, v2XMessageListener_401019); + } } /** @@ -216,6 +225,21 @@ public class V2XSocketManager { v2XMessageListener_401009 ); } + /** + * * 车路云—场景预警-V1.0 + * * http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=52829799 + * * 最优路线推荐 + */ + public void register401019() { + v2XMessageListener_401019 = new V2XMessageListener_401019(); + // 道路事件,在线车辆绘制 + V2XServiceManager + .getMoGoSocketManager() + .registerOnMessageListener( + 401019, + v2XMessageListener_401019 + ); + } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XOptimalRouteDataRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XOptimalRouteDataRes.java new file mode 100644 index 0000000000..19cfa209e4 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XOptimalRouteDataRes.java @@ -0,0 +1,93 @@ +package com.mogo.module.v2x.entity.net; + +import com.mogo.map.MogoLatLng; + +import java.io.Serializable; +import java.util.List; + +/** + * 最优路线推荐 + */ +public class V2XOptimalRouteDataRes implements Serializable { + private String sn; + /** + * 道路ID + */ + private String road_id; + /** + * 车道ID-2D路段 + */ + private String current_lane_id; + /** + * 车道号:中心线编号为0, 中心线右侧编号为负数,3车道通行Road的车道编号,0,-1,-2,-3 + */ + private int current_lane_num; + /** + * 最优车道平均速度 + */ + private double most_speed; + /** + * 车道号:中心线编号为0, 中心线右侧编号为负数,3车道通行Road的车道编号,0,-1,-2,-3 + */ + private int most_lane_num; + /** + * 线性经纬度轨迹列表 + **/ + private List locus_list; + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public String getRoad_id() { + return road_id; + } + + public void setRoad_id(String road_id) { + this.road_id = road_id; + } + + public String getCurrent_lane_id() { + return current_lane_id; + } + + public void setCurrent_lane_id(String current_lane_id) { + this.current_lane_id = current_lane_id; + } + + public int getCurrent_lane_num() { + return current_lane_num; + } + + public void setCurrent_lane_num(int current_lane_num) { + this.current_lane_num = current_lane_num; + } + + public double getMost_speed() { + return most_speed; + } + + public void setMost_speed(double most_speed) { + this.most_speed = most_speed; + } + + public int getMost_lane_num() { + return most_lane_num; + } + + public void setMost_lane_num(int most_lane_num) { + this.most_lane_num = most_lane_num; + } + + public List getLocus_list() { + return locus_list; + } + + public void setLocus_list(List locus_list) { + this.locus_list = locus_list; + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRouteRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRouteRes.java deleted file mode 100644 index 2f79305dbb..0000000000 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRouteRes.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.module.v2x.entity.net; - -import java.util.List; - -/** - * @author donghongyu - * @date 4/8/21 4:52 PM - * 最优路线推荐 - */ -public class V2XRouteRes { - private String sn;//车机SN - private String roadId;//当前道路唯一标识 - private int laneNum;//当前车道唯一标识 - private int mostLaneNum;//最优车道号 - private double mostSpeed;//最优车道平均速度 - private List locusList;//线性经纬度轨迹列表 - private double locusLat; - private double locusLon; - - private double heading;// 车头朝向 - private long satelliteTime;//定位卫星时间 - private long showTime;//展示时间 - - private int warningType;// 1-最优车道,2-安全距离,3-交通预警 - - -} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401019.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401019.java new file mode 100644 index 0000000000..9bb5f2f364 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401019.java @@ -0,0 +1,25 @@ +package com.mogo.module.v2x.listener; + +import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; +import com.mogo.service.connection.IMogoOnMessageListener; +import com.mogo.utils.logger.Logger; + +import static com.mogo.module.v2x.V2XConst.MODULE_NAME; + +/** + * @author donghongyu + * @description 车路云—场景预警-云下发数据监听 最优路线推荐 + * @since: 2021/4/13 + */ +public class V2XMessageListener_401019 implements IMogoOnMessageListener { + @Override + public Class target() { + return V2XOptimalRouteDataRes.class; + } + + @Override + public void onMsgReceived(V2XOptimalRouteDataRes message) { + Logger.i(MODULE_NAME, "V2XMessageListener_401019:" + message); + + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java index 9fc0e80b67..0e8bd36738 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java @@ -55,11 +55,11 @@ public class V2XOptimalRouteOverlay { mPolylinePointList.add(pointMoGoLatLng); } } + // 替换路径集合 + mPolylineOptions.points(mPolylinePointList); + // 绘制线 + mMoGoPolyline = V2XServiceManager.getMogoOverlayManager().addPolyline(mPolylineOptions); } - // 替换路径集合 - mPolylineOptions.points(mPolylinePointList); - // 绘制线 - mMoGoPolyline = V2XServiceManager.getMogoOverlayManager().addPolyline(mPolylineOptions); return mMoGoPolyline; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java index 5c52454150..13be5af0ac 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java @@ -1,5 +1,6 @@ package com.mogo.module.v2x.scenario.scene.help; +import android.app.ActionBar; import android.content.Intent; import android.view.LayoutInflater; import android.view.View; @@ -82,8 +83,8 @@ public class V2XSeekHelpButton implements IV2XButton { tvCancel.setOnClickListener(v -> { doAction(); }); - ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams((int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_640), - (int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_140)); + ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + (int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_150)); V2XServiceManager.getMogoTopViewManager().addView(topView, layoutParams); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java index 2b07ee047e..9549efdb15 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java @@ -67,12 +67,7 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow { - //移除窗体 - V2XServiceManager - .getMogoTopViewManager() - .removeViewNoLinkage(this); - }); + pushVideoClose.setOnClickListener(v -> close()); } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java index ec954655bd..e5021f98d1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java @@ -55,6 +55,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow : R.layout.window_see_carlive_video, this); CarZegoLiveVideoView mV2XCarLiveVideoView = findViewById(R.id.videoPlayer); tvCountDown = findViewById(R.id.tvCountDown); + ImageView ivLiveVideoClose = findViewById(R.id.liveVideoClose); ivVideoPlayingSign = findViewById(R.id.ivVideoPlayingSign); mV2XCarLiveVideoView.addOnVideoStatusChangeListener(videoPlaying -> { isVideoPlay = videoPlaying; @@ -64,6 +65,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow stopCountDown(); } }); + ivLiveVideoClose.setOnClickListener(v -> close()); } @Override diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vr_close.png new file mode 100644 index 0000000000..c7f8ef2830 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vr_close.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml index 73892b5ac9..b7428f06fb 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml index 79f8efeac3..adfeb53772 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml @@ -275,6 +275,7 @@ android:layout_height="@dimen/dp_70" android:background="@color/v2x_line_color" android:visibility="gone" + android:alpha="0.3" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/tv_play" app:layout_constraintStart_toEndOf="@+id/ll_event" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml index e1766f2434..2ea320afbc 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml @@ -17,5 +17,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" + android:clickable="true" + android:focusable="true" android:src="@drawable/module_common_close_selector" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml index b02a2d05fc..87cf9c95f0 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml @@ -19,5 +19,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/module_common_close_selector" /> + android:clickable="true" + android:focusable="true" + android:src="@drawable/module_v2x_vr_close" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml index 3623d89beb..270f3d8d66 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml @@ -1,55 +1,66 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> - - - - - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml index b120f57ad2..335bf86fc1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml @@ -12,4 +12,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml index c2f05ae98e..b27461dcef 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml @@ -12,4 +12,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json deleted file mode 100644 index d1fd466bcf..0000000000 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json +++ /dev/null @@ -1,744 +0,0 @@ -{ - "sceneId": "200006", - "alarmContent": "及时发现前方障碍物并告知车主,降低事故发生概率", - "expireTime": 20000, - "sceneCategory": 0, - "sceneDescription": "利用用户分享数据以及单车识别能力将障碍物告知其他通过车主,从而降低事故发生概率", - "sceneName": "障碍物绕行", - "sceneLevel": 0, - "sceneChannel": "", - "sceneSn": "", - "tts": "前方发现障碍物注意避让", - "zoom": false, - "zoomScale": 15, - "lat":39.969088, - "lon":116.41808, - "userHead": "", - "msgImgUrl": "", - "polyline": [ - [ - 116.725091, - 40.195123 - ], - [ - 116.725335, - 40.195123 - ], - [ - 116.725499, - 40.195123 - ], - [ - 116.72602, - 40.195109 - ], - [ - 116.726235, - 40.195106 - ], - [ - 116.726424, - 40.195105 - ], - [ - 116.726658, - 40.195104 - ], - [ - 116.726733, - 40.195105 - ], - [ - 116.72688, - 40.195106 - ], - [ - 116.72704, - 40.195109 - ], - [ - 116.727217, - 40.195115 - ], - [ - 116.727388, - 40.195124 - ], - [ - 116.727562, - 40.195136 - ], - [ - 116.727735, - 40.195155 - ], - [ - 116.727887, - 40.195174 - ], - [ - 116.727979, - 40.195186 - ], - [ - 116.728056, - 40.195198 - ], - [ - 116.728165, - 40.195216 - ], - [ - 116.728237, - 40.195228 - ], - [ - 116.728345, - 40.195247 - ], - [ - 116.728411, - 40.19526 - ], - [ - 116.728533, - 40.195283 - ], - [ - 116.728589, - 40.195295 - ], - [ - 116.728694, - 40.195318 - ], - [ - 116.728761, - 40.195334 - ], - [ - 116.728868, - 40.19536 - ], - [ - 116.728918, - 40.195372 - ], - [ - 116.729088, - 40.195416 - ], - [ - 116.729262, - 40.195462 - ], - [ - 116.729424, - 40.195512 - ], - [ - 116.729547, - 40.195553 - ], - [ - 116.729584, - 40.195566 - ], - [ - 116.729692, - 40.195606 - ], - [ - 116.729739, - 40.195624 - ], - [ - 116.729844, - 40.195661 - ], - [ - 116.730011, - 40.195726 - ], - [ - 116.73014, - 40.195778 - ], - [ - 116.730309, - 40.195849 - ], - [ - 116.730467, - 40.195911 - ], - [ - 116.730608, - 40.195962 - ], - [ - 116.730673, - 40.195984 - ], - [ - 116.730766, - 40.196015 - ], - [ - 116.730831, - 40.196036 - ], - [ - 116.730935, - 40.196069 - ], - [ - 116.730993, - 40.196087 - ], - [ - 116.731086, - 40.196113 - ], - [ - 116.731164, - 40.196135 - ], - [ - 116.731285, - 40.196165 - ], - [ - 116.731315, - 40.196173 - ], - [ - 116.731434, - 40.196202 - ], - [ - 116.731486, - 40.196214 - ], - [ - 116.731586, - 40.196238 - ], - [ - 116.731652, - 40.196253 - ], - [ - 116.731749, - 40.196273 - ], - [ - 116.731818, - 40.196287 - ], - [ - 116.731924, - 40.196305 - ], - [ - 116.731991, - 40.196317 - ], - [ - 116.732108, - 40.196336 - ], - [ - 116.732269, - 40.196361 - ], - [ - 116.732333, - 40.19637 - ], - [ - 116.732464, - 40.196385 - ], - [ - 116.732507, - 40.19639 - ], - [ - 116.732628, - 40.196404 - ], - [ - 116.732678, - 40.196409 - ], - [ - 116.732784, - 40.196418 - ], - [ - 116.732851, - 40.196424 - ], - [ - 116.732985, - 40.196433 - ], - [ - 116.73314, - 40.196439 - ], - [ - 116.733198, - 40.196441 - ], - [ - 116.733379, - 40.196445 - ], - [ - 116.733548, - 40.196445 - ], - [ - 116.733722, - 40.196445 - ], - [ - 116.733903, - 40.196445 - ], - [ - 116.734081, - 40.196447 - ], - [ - 116.734251, - 40.196446 - ], - [ - 116.734439, - 40.196445 - ], - [ - 116.734624, - 40.196444 - ], - [ - 116.734805, - 40.196442 - ], - [ - 116.734982, - 40.196442 - ], - [ - 116.735164, - 40.196441 - ], - [ - 116.735329, - 40.19644 - ], - [ - 116.735519, - 40.196438 - ], - [ - 116.735682, - 40.196437 - ], - [ - 116.735855, - 40.196437 - ], - [ - 116.736034, - 40.196436 - ], - [ - 116.73621, - 40.196435 - ], - [ - 116.736385, - 40.196433 - ], - [ - 116.736566, - 40.196433 - ], - [ - 116.736742, - 40.196431 - ], - [ - 116.736926, - 40.196431 - ], - [ - 116.737046, - 40.19643 - ], - [ - 116.737173, - 40.19643 - ], - [ - 116.737298, - 40.196429 - ], - [ - 116.737449, - 40.196427 - ], - [ - 116.737582, - 40.196427 - ], - [ - 116.737662, - 40.196425 - ], - [ - 116.737748, - 40.196425 - ], - [ - 116.73778, - 40.196424 - ] - ], - "recommendPolyline": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ], - "moveTrack": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ] -} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_behind_danger_car_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_behind_danger_car_data.json deleted file mode 100644 index af1fb347f7..0000000000 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_behind_danger_car_data.json +++ /dev/null @@ -1,744 +0,0 @@ -{ - "sceneId": "200003", - "alarmContent": "演示后方危险车辆预警功能", - "expireTime": 20000, - "sceneCategory": 0, - "sceneDescription": "后方危险车辆预警,注意保持车道", - "sceneName": "后方危险车辆预警", - "sceneLevel": 0, - "sceneChannel": "", - "sceneSn": "", - "tts": "发现后方车辆超速,注意保持车道", - "zoom": false, - "zoomScale": 15, - "lat":39.969088, - "lon":116.41808, - "userHead": "", - "msgImgUrl": "", - "polyline": [ - [ - 116.725091, - 40.195123 - ], - [ - 116.725335, - 40.195123 - ], - [ - 116.725499, - 40.195123 - ], - [ - 116.72602, - 40.195109 - ], - [ - 116.726235, - 40.195106 - ], - [ - 116.726424, - 40.195105 - ], - [ - 116.726658, - 40.195104 - ], - [ - 116.726733, - 40.195105 - ], - [ - 116.72688, - 40.195106 - ], - [ - 116.72704, - 40.195109 - ], - [ - 116.727217, - 40.195115 - ], - [ - 116.727388, - 40.195124 - ], - [ - 116.727562, - 40.195136 - ], - [ - 116.727735, - 40.195155 - ], - [ - 116.727887, - 40.195174 - ], - [ - 116.727979, - 40.195186 - ], - [ - 116.728056, - 40.195198 - ], - [ - 116.728165, - 40.195216 - ], - [ - 116.728237, - 40.195228 - ], - [ - 116.728345, - 40.195247 - ], - [ - 116.728411, - 40.19526 - ], - [ - 116.728533, - 40.195283 - ], - [ - 116.728589, - 40.195295 - ], - [ - 116.728694, - 40.195318 - ], - [ - 116.728761, - 40.195334 - ], - [ - 116.728868, - 40.19536 - ], - [ - 116.728918, - 40.195372 - ], - [ - 116.729088, - 40.195416 - ], - [ - 116.729262, - 40.195462 - ], - [ - 116.729424, - 40.195512 - ], - [ - 116.729547, - 40.195553 - ], - [ - 116.729584, - 40.195566 - ], - [ - 116.729692, - 40.195606 - ], - [ - 116.729739, - 40.195624 - ], - [ - 116.729844, - 40.195661 - ], - [ - 116.730011, - 40.195726 - ], - [ - 116.73014, - 40.195778 - ], - [ - 116.730309, - 40.195849 - ], - [ - 116.730467, - 40.195911 - ], - [ - 116.730608, - 40.195962 - ], - [ - 116.730673, - 40.195984 - ], - [ - 116.730766, - 40.196015 - ], - [ - 116.730831, - 40.196036 - ], - [ - 116.730935, - 40.196069 - ], - [ - 116.730993, - 40.196087 - ], - [ - 116.731086, - 40.196113 - ], - [ - 116.731164, - 40.196135 - ], - [ - 116.731285, - 40.196165 - ], - [ - 116.731315, - 40.196173 - ], - [ - 116.731434, - 40.196202 - ], - [ - 116.731486, - 40.196214 - ], - [ - 116.731586, - 40.196238 - ], - [ - 116.731652, - 40.196253 - ], - [ - 116.731749, - 40.196273 - ], - [ - 116.731818, - 40.196287 - ], - [ - 116.731924, - 40.196305 - ], - [ - 116.731991, - 40.196317 - ], - [ - 116.732108, - 40.196336 - ], - [ - 116.732269, - 40.196361 - ], - [ - 116.732333, - 40.19637 - ], - [ - 116.732464, - 40.196385 - ], - [ - 116.732507, - 40.19639 - ], - [ - 116.732628, - 40.196404 - ], - [ - 116.732678, - 40.196409 - ], - [ - 116.732784, - 40.196418 - ], - [ - 116.732851, - 40.196424 - ], - [ - 116.732985, - 40.196433 - ], - [ - 116.73314, - 40.196439 - ], - [ - 116.733198, - 40.196441 - ], - [ - 116.733379, - 40.196445 - ], - [ - 116.733548, - 40.196445 - ], - [ - 116.733722, - 40.196445 - ], - [ - 116.733903, - 40.196445 - ], - [ - 116.734081, - 40.196447 - ], - [ - 116.734251, - 40.196446 - ], - [ - 116.734439, - 40.196445 - ], - [ - 116.734624, - 40.196444 - ], - [ - 116.734805, - 40.196442 - ], - [ - 116.734982, - 40.196442 - ], - [ - 116.735164, - 40.196441 - ], - [ - 116.735329, - 40.19644 - ], - [ - 116.735519, - 40.196438 - ], - [ - 116.735682, - 40.196437 - ], - [ - 116.735855, - 40.196437 - ], - [ - 116.736034, - 40.196436 - ], - [ - 116.73621, - 40.196435 - ], - [ - 116.736385, - 40.196433 - ], - [ - 116.736566, - 40.196433 - ], - [ - 116.736742, - 40.196431 - ], - [ - 116.736926, - 40.196431 - ], - [ - 116.737046, - 40.19643 - ], - [ - 116.737173, - 40.19643 - ], - [ - 116.737298, - 40.196429 - ], - [ - 116.737449, - 40.196427 - ], - [ - 116.737582, - 40.196427 - ], - [ - 116.737662, - 40.196425 - ], - [ - 116.737748, - 40.196425 - ], - [ - 116.73778, - 40.196424 - ] - ], - "recommendPolyline": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ], - "moveTrack": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ] -} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_car_break_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_car_break_data.json deleted file mode 100644 index 78e259ec25..0000000000 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_car_break_data.json +++ /dev/null @@ -1,744 +0,0 @@ -{ - "sceneId": "200002", - "alarmContent": "发现前方车辆急刹,请注意减速", - "expireTime": 20000, - "sceneCategory": 0, - "sceneDescription": "前车急刹,注意减速", - "sceneName": "前车急刹", - "sceneLevel": 0, - "sceneChannel": "", - "sceneSn": "", - "tts": "前车急刹注意减速", - "zoom": false, - "zoomScale": 15, - "lat":39.969088, - "lon":116.41808, - "userHead": "", - "msgImgUrl": "", - "polyline": [ - [ - 116.725091, - 40.195123 - ], - [ - 116.725335, - 40.195123 - ], - [ - 116.725499, - 40.195123 - ], - [ - 116.72602, - 40.195109 - ], - [ - 116.726235, - 40.195106 - ], - [ - 116.726424, - 40.195105 - ], - [ - 116.726658, - 40.195104 - ], - [ - 116.726733, - 40.195105 - ], - [ - 116.72688, - 40.195106 - ], - [ - 116.72704, - 40.195109 - ], - [ - 116.727217, - 40.195115 - ], - [ - 116.727388, - 40.195124 - ], - [ - 116.727562, - 40.195136 - ], - [ - 116.727735, - 40.195155 - ], - [ - 116.727887, - 40.195174 - ], - [ - 116.727979, - 40.195186 - ], - [ - 116.728056, - 40.195198 - ], - [ - 116.728165, - 40.195216 - ], - [ - 116.728237, - 40.195228 - ], - [ - 116.728345, - 40.195247 - ], - [ - 116.728411, - 40.19526 - ], - [ - 116.728533, - 40.195283 - ], - [ - 116.728589, - 40.195295 - ], - [ - 116.728694, - 40.195318 - ], - [ - 116.728761, - 40.195334 - ], - [ - 116.728868, - 40.19536 - ], - [ - 116.728918, - 40.195372 - ], - [ - 116.729088, - 40.195416 - ], - [ - 116.729262, - 40.195462 - ], - [ - 116.729424, - 40.195512 - ], - [ - 116.729547, - 40.195553 - ], - [ - 116.729584, - 40.195566 - ], - [ - 116.729692, - 40.195606 - ], - [ - 116.729739, - 40.195624 - ], - [ - 116.729844, - 40.195661 - ], - [ - 116.730011, - 40.195726 - ], - [ - 116.73014, - 40.195778 - ], - [ - 116.730309, - 40.195849 - ], - [ - 116.730467, - 40.195911 - ], - [ - 116.730608, - 40.195962 - ], - [ - 116.730673, - 40.195984 - ], - [ - 116.730766, - 40.196015 - ], - [ - 116.730831, - 40.196036 - ], - [ - 116.730935, - 40.196069 - ], - [ - 116.730993, - 40.196087 - ], - [ - 116.731086, - 40.196113 - ], - [ - 116.731164, - 40.196135 - ], - [ - 116.731285, - 40.196165 - ], - [ - 116.731315, - 40.196173 - ], - [ - 116.731434, - 40.196202 - ], - [ - 116.731486, - 40.196214 - ], - [ - 116.731586, - 40.196238 - ], - [ - 116.731652, - 40.196253 - ], - [ - 116.731749, - 40.196273 - ], - [ - 116.731818, - 40.196287 - ], - [ - 116.731924, - 40.196305 - ], - [ - 116.731991, - 40.196317 - ], - [ - 116.732108, - 40.196336 - ], - [ - 116.732269, - 40.196361 - ], - [ - 116.732333, - 40.19637 - ], - [ - 116.732464, - 40.196385 - ], - [ - 116.732507, - 40.19639 - ], - [ - 116.732628, - 40.196404 - ], - [ - 116.732678, - 40.196409 - ], - [ - 116.732784, - 40.196418 - ], - [ - 116.732851, - 40.196424 - ], - [ - 116.732985, - 40.196433 - ], - [ - 116.73314, - 40.196439 - ], - [ - 116.733198, - 40.196441 - ], - [ - 116.733379, - 40.196445 - ], - [ - 116.733548, - 40.196445 - ], - [ - 116.733722, - 40.196445 - ], - [ - 116.733903, - 40.196445 - ], - [ - 116.734081, - 40.196447 - ], - [ - 116.734251, - 40.196446 - ], - [ - 116.734439, - 40.196445 - ], - [ - 116.734624, - 40.196444 - ], - [ - 116.734805, - 40.196442 - ], - [ - 116.734982, - 40.196442 - ], - [ - 116.735164, - 40.196441 - ], - [ - 116.735329, - 40.19644 - ], - [ - 116.735519, - 40.196438 - ], - [ - 116.735682, - 40.196437 - ], - [ - 116.735855, - 40.196437 - ], - [ - 116.736034, - 40.196436 - ], - [ - 116.73621, - 40.196435 - ], - [ - 116.736385, - 40.196433 - ], - [ - 116.736566, - 40.196433 - ], - [ - 116.736742, - 40.196431 - ], - [ - 116.736926, - 40.196431 - ], - [ - 116.737046, - 40.19643 - ], - [ - 116.737173, - 40.19643 - ], - [ - 116.737298, - 40.196429 - ], - [ - 116.737449, - 40.196427 - ], - [ - 116.737582, - 40.196427 - ], - [ - 116.737662, - 40.196425 - ], - [ - 116.737748, - 40.196425 - ], - [ - 116.73778, - 40.196424 - ] - ], - "recommendPolyline": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ], - "moveTrack": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ] -} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_shuangshan.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_shuangshan.json deleted file mode 100644 index 58209f8d88..0000000000 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_shuangshan.json +++ /dev/null @@ -1,745 +0,0 @@ -{ - "sceneId": "200008", - "alarmContent": "拥堵路线推荐", - "expireTime": 20000, - "sceneCategory": 0, - "sceneDescription": "拥堵路线推荐", - "sceneName": "拥堵路线推荐", - "sceneLevel": 0, - "videoUrl": "", - "videoChannel": "", - "videoSn": "", - "tts": "发现前方拥堵,最优路线快6分钟", - "zoom": false, - "zoomScale": 15, - "userHead": "", - "msgImgUrl": "", - "lat":39.969088, - "lon":116.41808, - "polyline": [ - [ - 116.725091, - 40.195123 - ], - [ - 116.725335, - 40.195123 - ], - [ - 116.725499, - 40.195123 - ], - [ - 116.72602, - 40.195109 - ], - [ - 116.726235, - 40.195106 - ], - [ - 116.726424, - 40.195105 - ], - [ - 116.726658, - 40.195104 - ], - [ - 116.726733, - 40.195105 - ], - [ - 116.72688, - 40.195106 - ], - [ - 116.72704, - 40.195109 - ], - [ - 116.727217, - 40.195115 - ], - [ - 116.727388, - 40.195124 - ], - [ - 116.727562, - 40.195136 - ], - [ - 116.727735, - 40.195155 - ], - [ - 116.727887, - 40.195174 - ], - [ - 116.727979, - 40.195186 - ], - [ - 116.728056, - 40.195198 - ], - [ - 116.728165, - 40.195216 - ], - [ - 116.728237, - 40.195228 - ], - [ - 116.728345, - 40.195247 - ], - [ - 116.728411, - 40.19526 - ], - [ - 116.728533, - 40.195283 - ], - [ - 116.728589, - 40.195295 - ], - [ - 116.728694, - 40.195318 - ], - [ - 116.728761, - 40.195334 - ], - [ - 116.728868, - 40.19536 - ], - [ - 116.728918, - 40.195372 - ], - [ - 116.729088, - 40.195416 - ], - [ - 116.729262, - 40.195462 - ], - [ - 116.729424, - 40.195512 - ], - [ - 116.729547, - 40.195553 - ], - [ - 116.729584, - 40.195566 - ], - [ - 116.729692, - 40.195606 - ], - [ - 116.729739, - 40.195624 - ], - [ - 116.729844, - 40.195661 - ], - [ - 116.730011, - 40.195726 - ], - [ - 116.73014, - 40.195778 - ], - [ - 116.730309, - 40.195849 - ], - [ - 116.730467, - 40.195911 - ], - [ - 116.730608, - 40.195962 - ], - [ - 116.730673, - 40.195984 - ], - [ - 116.730766, - 40.196015 - ], - [ - 116.730831, - 40.196036 - ], - [ - 116.730935, - 40.196069 - ], - [ - 116.730993, - 40.196087 - ], - [ - 116.731086, - 40.196113 - ], - [ - 116.731164, - 40.196135 - ], - [ - 116.731285, - 40.196165 - ], - [ - 116.731315, - 40.196173 - ], - [ - 116.731434, - 40.196202 - ], - [ - 116.731486, - 40.196214 - ], - [ - 116.731586, - 40.196238 - ], - [ - 116.731652, - 40.196253 - ], - [ - 116.731749, - 40.196273 - ], - [ - 116.731818, - 40.196287 - ], - [ - 116.731924, - 40.196305 - ], - [ - 116.731991, - 40.196317 - ], - [ - 116.732108, - 40.196336 - ], - [ - 116.732269, - 40.196361 - ], - [ - 116.732333, - 40.19637 - ], - [ - 116.732464, - 40.196385 - ], - [ - 116.732507, - 40.19639 - ], - [ - 116.732628, - 40.196404 - ], - [ - 116.732678, - 40.196409 - ], - [ - 116.732784, - 40.196418 - ], - [ - 116.732851, - 40.196424 - ], - [ - 116.732985, - 40.196433 - ], - [ - 116.73314, - 40.196439 - ], - [ - 116.733198, - 40.196441 - ], - [ - 116.733379, - 40.196445 - ], - [ - 116.733548, - 40.196445 - ], - [ - 116.733722, - 40.196445 - ], - [ - 116.733903, - 40.196445 - ], - [ - 116.734081, - 40.196447 - ], - [ - 116.734251, - 40.196446 - ], - [ - 116.734439, - 40.196445 - ], - [ - 116.734624, - 40.196444 - ], - [ - 116.734805, - 40.196442 - ], - [ - 116.734982, - 40.196442 - ], - [ - 116.735164, - 40.196441 - ], - [ - 116.735329, - 40.19644 - ], - [ - 116.735519, - 40.196438 - ], - [ - 116.735682, - 40.196437 - ], - [ - 116.735855, - 40.196437 - ], - [ - 116.736034, - 40.196436 - ], - [ - 116.73621, - 40.196435 - ], - [ - 116.736385, - 40.196433 - ], - [ - 116.736566, - 40.196433 - ], - [ - 116.736742, - 40.196431 - ], - [ - 116.736926, - 40.196431 - ], - [ - 116.737046, - 40.19643 - ], - [ - 116.737173, - 40.19643 - ], - [ - 116.737298, - 40.196429 - ], - [ - 116.737449, - 40.196427 - ], - [ - 116.737582, - 40.196427 - ], - [ - 116.737662, - 40.196425 - ], - [ - 116.737748, - 40.196425 - ], - [ - 116.73778, - 40.196424 - ] - ], - "recommendPolyline": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ], - "moveTrack": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ] -} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json index 457560116b..d8bc8d2541 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json @@ -16,400 +16,6 @@ "msgImgUrl": "", "lat":39.969088, "lon":116.41808, - "polyline": [ - [ - 116.725091, - 40.195123 - ], - [ - 116.725335, - 40.195123 - ], - [ - 116.725499, - 40.195123 - ], - [ - 116.72602, - 40.195109 - ], - [ - 116.726235, - 40.195106 - ], - [ - 116.726424, - 40.195105 - ], - [ - 116.726658, - 40.195104 - ], - [ - 116.726733, - 40.195105 - ], - [ - 116.72688, - 40.195106 - ], - [ - 116.72704, - 40.195109 - ], - [ - 116.727217, - 40.195115 - ], - [ - 116.727388, - 40.195124 - ], - [ - 116.727562, - 40.195136 - ], - [ - 116.727735, - 40.195155 - ], - [ - 116.727887, - 40.195174 - ], - [ - 116.727979, - 40.195186 - ], - [ - 116.728056, - 40.195198 - ], - [ - 116.728165, - 40.195216 - ], - [ - 116.728237, - 40.195228 - ], - [ - 116.728345, - 40.195247 - ], - [ - 116.728411, - 40.19526 - ], - [ - 116.728533, - 40.195283 - ], - [ - 116.728589, - 40.195295 - ], - [ - 116.728694, - 40.195318 - ], - [ - 116.728761, - 40.195334 - ], - [ - 116.728868, - 40.19536 - ], - [ - 116.728918, - 40.195372 - ], - [ - 116.729088, - 40.195416 - ], - [ - 116.729262, - 40.195462 - ], - [ - 116.729424, - 40.195512 - ], - [ - 116.729547, - 40.195553 - ], - [ - 116.729584, - 40.195566 - ], - [ - 116.729692, - 40.195606 - ], - [ - 116.729739, - 40.195624 - ], - [ - 116.729844, - 40.195661 - ], - [ - 116.730011, - 40.195726 - ], - [ - 116.73014, - 40.195778 - ], - [ - 116.730309, - 40.195849 - ], - [ - 116.730467, - 40.195911 - ], - [ - 116.730608, - 40.195962 - ], - [ - 116.730673, - 40.195984 - ], - [ - 116.730766, - 40.196015 - ], - [ - 116.730831, - 40.196036 - ], - [ - 116.730935, - 40.196069 - ], - [ - 116.730993, - 40.196087 - ], - [ - 116.731086, - 40.196113 - ], - [ - 116.731164, - 40.196135 - ], - [ - 116.731285, - 40.196165 - ], - [ - 116.731315, - 40.196173 - ], - [ - 116.731434, - 40.196202 - ], - [ - 116.731486, - 40.196214 - ], - [ - 116.731586, - 40.196238 - ], - [ - 116.731652, - 40.196253 - ], - [ - 116.731749, - 40.196273 - ], - [ - 116.731818, - 40.196287 - ], - [ - 116.731924, - 40.196305 - ], - [ - 116.731991, - 40.196317 - ], - [ - 116.732108, - 40.196336 - ], - [ - 116.732269, - 40.196361 - ], - [ - 116.732333, - 40.19637 - ], - [ - 116.732464, - 40.196385 - ], - [ - 116.732507, - 40.19639 - ], - [ - 116.732628, - 40.196404 - ], - [ - 116.732678, - 40.196409 - ], - [ - 116.732784, - 40.196418 - ], - [ - 116.732851, - 40.196424 - ], - [ - 116.732985, - 40.196433 - ], - [ - 116.73314, - 40.196439 - ], - [ - 116.733198, - 40.196441 - ], - [ - 116.733379, - 40.196445 - ], - [ - 116.733548, - 40.196445 - ], - [ - 116.733722, - 40.196445 - ], - [ - 116.733903, - 40.196445 - ], - [ - 116.734081, - 40.196447 - ], - [ - 116.734251, - 40.196446 - ], - [ - 116.734439, - 40.196445 - ], - [ - 116.734624, - 40.196444 - ], - [ - 116.734805, - 40.196442 - ], - [ - 116.734982, - 40.196442 - ], - [ - 116.735164, - 40.196441 - ], - [ - 116.735329, - 40.19644 - ], - [ - 116.735519, - 40.196438 - ], - [ - 116.735682, - 40.196437 - ], - [ - 116.735855, - 40.196437 - ], - [ - 116.736034, - 40.196436 - ], - [ - 116.73621, - 40.196435 - ], - [ - 116.736385, - 40.196433 - ], - [ - 116.736566, - 40.196433 - ], - [ - 116.736742, - 40.196431 - ], - [ - 116.736926, - 40.196431 - ], - [ - 116.737046, - 40.19643 - ], - [ - 116.737173, - 40.19643 - ], - [ - 116.737298, - 40.196429 - ], - [ - 116.737449, - 40.196427 - ], - [ - 116.737582, - 40.196427 - ], - [ - 116.737662, - 40.196425 - ], - [ - 116.737748, - 40.196425 - ], - [ - 116.73778, - 40.196424 - ] - ], "recommendPolyline": [ [ 116.731239, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json index c993011696..2983745a97 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json @@ -16,32 +16,6 @@ "msgImgUrl": "", "lat":39.969088, "lon":116.41808, - "polyline": [ - [ - 116.417437,39.983323 - ], - [ - 116.41924,39.983364 - ], - [ - 116.421396,39.983397 - ], - [ - 116.422984,39.983421 - ], - [ - 116.423016,39.983405 - ], - [ - 116.424272,39.983397 - ], - [ - 116.425948,39.983465 - ], - [ - 116.42628,39.983399 - ] - ], "recommendPolyline": [ [ 116.417437,39.983323 diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json index 1f41a45323..ce65c29987 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json @@ -16,32 +16,6 @@ "msgImgUrl": "", "lat":39.969088, "lon":116.41808, - "polyline": [ - [ - 116.417388,39.983351 - ], - [ - 116.417351,39.9841 - ], - [ - 116.417286,39.985423 - ], - [ - 116.417233,39.98673 - ], - [ - 116.417179,39.988156 - ], - [ - 116.417158,39.988493 - ], - [ - 116.417142,39.989245 - ], - [ - 116.417174,39.990199 - ] - ], "recommendPolyline": [ [ 116.417388,39.983351 diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_vip_light_change_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_vip_light_change_data.json deleted file mode 100644 index 2e80f28202..0000000000 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_vip_light_change_data.json +++ /dev/null @@ -1,744 +0,0 @@ -{ - "sceneId": "200005", - "alarmContent": "让救护车、警车、消防车等VIP车辆通行时免去等待红灯时间,提高vip车辆通过效率", - "expireTime": 20000, - "sceneCategory": 0, - "sceneDescription": "VIP车辆通过可改变路口红绿灯状态", - "sceneName": "VIP变灯通行", - "sceneLevel": 0, - "sceneChannel": "", - "sceneSn": "", - "tts": "已为您变灯,可优先通行", - "zoom": false, - "zoomScale": 15, - "lat":39.969088, - "lon":116.41808, - "userHead": "", - "msgImgUrl": "", - "polyline": [ - [ - 116.725091, - 40.195123 - ], - [ - 116.725335, - 40.195123 - ], - [ - 116.725499, - 40.195123 - ], - [ - 116.72602, - 40.195109 - ], - [ - 116.726235, - 40.195106 - ], - [ - 116.726424, - 40.195105 - ], - [ - 116.726658, - 40.195104 - ], - [ - 116.726733, - 40.195105 - ], - [ - 116.72688, - 40.195106 - ], - [ - 116.72704, - 40.195109 - ], - [ - 116.727217, - 40.195115 - ], - [ - 116.727388, - 40.195124 - ], - [ - 116.727562, - 40.195136 - ], - [ - 116.727735, - 40.195155 - ], - [ - 116.727887, - 40.195174 - ], - [ - 116.727979, - 40.195186 - ], - [ - 116.728056, - 40.195198 - ], - [ - 116.728165, - 40.195216 - ], - [ - 116.728237, - 40.195228 - ], - [ - 116.728345, - 40.195247 - ], - [ - 116.728411, - 40.19526 - ], - [ - 116.728533, - 40.195283 - ], - [ - 116.728589, - 40.195295 - ], - [ - 116.728694, - 40.195318 - ], - [ - 116.728761, - 40.195334 - ], - [ - 116.728868, - 40.19536 - ], - [ - 116.728918, - 40.195372 - ], - [ - 116.729088, - 40.195416 - ], - [ - 116.729262, - 40.195462 - ], - [ - 116.729424, - 40.195512 - ], - [ - 116.729547, - 40.195553 - ], - [ - 116.729584, - 40.195566 - ], - [ - 116.729692, - 40.195606 - ], - [ - 116.729739, - 40.195624 - ], - [ - 116.729844, - 40.195661 - ], - [ - 116.730011, - 40.195726 - ], - [ - 116.73014, - 40.195778 - ], - [ - 116.730309, - 40.195849 - ], - [ - 116.730467, - 40.195911 - ], - [ - 116.730608, - 40.195962 - ], - [ - 116.730673, - 40.195984 - ], - [ - 116.730766, - 40.196015 - ], - [ - 116.730831, - 40.196036 - ], - [ - 116.730935, - 40.196069 - ], - [ - 116.730993, - 40.196087 - ], - [ - 116.731086, - 40.196113 - ], - [ - 116.731164, - 40.196135 - ], - [ - 116.731285, - 40.196165 - ], - [ - 116.731315, - 40.196173 - ], - [ - 116.731434, - 40.196202 - ], - [ - 116.731486, - 40.196214 - ], - [ - 116.731586, - 40.196238 - ], - [ - 116.731652, - 40.196253 - ], - [ - 116.731749, - 40.196273 - ], - [ - 116.731818, - 40.196287 - ], - [ - 116.731924, - 40.196305 - ], - [ - 116.731991, - 40.196317 - ], - [ - 116.732108, - 40.196336 - ], - [ - 116.732269, - 40.196361 - ], - [ - 116.732333, - 40.19637 - ], - [ - 116.732464, - 40.196385 - ], - [ - 116.732507, - 40.19639 - ], - [ - 116.732628, - 40.196404 - ], - [ - 116.732678, - 40.196409 - ], - [ - 116.732784, - 40.196418 - ], - [ - 116.732851, - 40.196424 - ], - [ - 116.732985, - 40.196433 - ], - [ - 116.73314, - 40.196439 - ], - [ - 116.733198, - 40.196441 - ], - [ - 116.733379, - 40.196445 - ], - [ - 116.733548, - 40.196445 - ], - [ - 116.733722, - 40.196445 - ], - [ - 116.733903, - 40.196445 - ], - [ - 116.734081, - 40.196447 - ], - [ - 116.734251, - 40.196446 - ], - [ - 116.734439, - 40.196445 - ], - [ - 116.734624, - 40.196444 - ], - [ - 116.734805, - 40.196442 - ], - [ - 116.734982, - 40.196442 - ], - [ - 116.735164, - 40.196441 - ], - [ - 116.735329, - 40.19644 - ], - [ - 116.735519, - 40.196438 - ], - [ - 116.735682, - 40.196437 - ], - [ - 116.735855, - 40.196437 - ], - [ - 116.736034, - 40.196436 - ], - [ - 116.73621, - 40.196435 - ], - [ - 116.736385, - 40.196433 - ], - [ - 116.736566, - 40.196433 - ], - [ - 116.736742, - 40.196431 - ], - [ - 116.736926, - 40.196431 - ], - [ - 116.737046, - 40.19643 - ], - [ - 116.737173, - 40.19643 - ], - [ - 116.737298, - 40.196429 - ], - [ - 116.737449, - 40.196427 - ], - [ - 116.737582, - 40.196427 - ], - [ - 116.737662, - 40.196425 - ], - [ - 116.737748, - 40.196425 - ], - [ - 116.73778, - 40.196424 - ] - ], - "recommendPolyline": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ], - "moveTrack": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ] -} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json deleted file mode 100644 index 5c9ac8e5da..0000000000 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json +++ /dev/null @@ -1,744 +0,0 @@ -{ - "sceneId": "200007", - "alarmContent": "展现行人预测、提前预警能力", - "expireTime": 20000, - "sceneCategory": 0, - "sceneDescription": "行人碰撞预警系统可提前告知通过车辆有行人通过,降低该类型交通事件发生概率", - "sceneName": "行人预警,行人路线预测", - "sceneLevel": 0, - "sceneChannel": "", - "sceneSn": "", - "tts": "检测到路口行人穿行注意避让", - "zoom": false, - "zoomScale": 15, - "lat":39.969088, - "lon":116.41808, - "userHead": "", - "msgImgUrl": "", - "polyline": [ - [ - 116.725091, - 40.195123 - ], - [ - 116.725335, - 40.195123 - ], - [ - 116.725499, - 40.195123 - ], - [ - 116.72602, - 40.195109 - ], - [ - 116.726235, - 40.195106 - ], - [ - 116.726424, - 40.195105 - ], - [ - 116.726658, - 40.195104 - ], - [ - 116.726733, - 40.195105 - ], - [ - 116.72688, - 40.195106 - ], - [ - 116.72704, - 40.195109 - ], - [ - 116.727217, - 40.195115 - ], - [ - 116.727388, - 40.195124 - ], - [ - 116.727562, - 40.195136 - ], - [ - 116.727735, - 40.195155 - ], - [ - 116.727887, - 40.195174 - ], - [ - 116.727979, - 40.195186 - ], - [ - 116.728056, - 40.195198 - ], - [ - 116.728165, - 40.195216 - ], - [ - 116.728237, - 40.195228 - ], - [ - 116.728345, - 40.195247 - ], - [ - 116.728411, - 40.19526 - ], - [ - 116.728533, - 40.195283 - ], - [ - 116.728589, - 40.195295 - ], - [ - 116.728694, - 40.195318 - ], - [ - 116.728761, - 40.195334 - ], - [ - 116.728868, - 40.19536 - ], - [ - 116.728918, - 40.195372 - ], - [ - 116.729088, - 40.195416 - ], - [ - 116.729262, - 40.195462 - ], - [ - 116.729424, - 40.195512 - ], - [ - 116.729547, - 40.195553 - ], - [ - 116.729584, - 40.195566 - ], - [ - 116.729692, - 40.195606 - ], - [ - 116.729739, - 40.195624 - ], - [ - 116.729844, - 40.195661 - ], - [ - 116.730011, - 40.195726 - ], - [ - 116.73014, - 40.195778 - ], - [ - 116.730309, - 40.195849 - ], - [ - 116.730467, - 40.195911 - ], - [ - 116.730608, - 40.195962 - ], - [ - 116.730673, - 40.195984 - ], - [ - 116.730766, - 40.196015 - ], - [ - 116.730831, - 40.196036 - ], - [ - 116.730935, - 40.196069 - ], - [ - 116.730993, - 40.196087 - ], - [ - 116.731086, - 40.196113 - ], - [ - 116.731164, - 40.196135 - ], - [ - 116.731285, - 40.196165 - ], - [ - 116.731315, - 40.196173 - ], - [ - 116.731434, - 40.196202 - ], - [ - 116.731486, - 40.196214 - ], - [ - 116.731586, - 40.196238 - ], - [ - 116.731652, - 40.196253 - ], - [ - 116.731749, - 40.196273 - ], - [ - 116.731818, - 40.196287 - ], - [ - 116.731924, - 40.196305 - ], - [ - 116.731991, - 40.196317 - ], - [ - 116.732108, - 40.196336 - ], - [ - 116.732269, - 40.196361 - ], - [ - 116.732333, - 40.19637 - ], - [ - 116.732464, - 40.196385 - ], - [ - 116.732507, - 40.19639 - ], - [ - 116.732628, - 40.196404 - ], - [ - 116.732678, - 40.196409 - ], - [ - 116.732784, - 40.196418 - ], - [ - 116.732851, - 40.196424 - ], - [ - 116.732985, - 40.196433 - ], - [ - 116.73314, - 40.196439 - ], - [ - 116.733198, - 40.196441 - ], - [ - 116.733379, - 40.196445 - ], - [ - 116.733548, - 40.196445 - ], - [ - 116.733722, - 40.196445 - ], - [ - 116.733903, - 40.196445 - ], - [ - 116.734081, - 40.196447 - ], - [ - 116.734251, - 40.196446 - ], - [ - 116.734439, - 40.196445 - ], - [ - 116.734624, - 40.196444 - ], - [ - 116.734805, - 40.196442 - ], - [ - 116.734982, - 40.196442 - ], - [ - 116.735164, - 40.196441 - ], - [ - 116.735329, - 40.19644 - ], - [ - 116.735519, - 40.196438 - ], - [ - 116.735682, - 40.196437 - ], - [ - 116.735855, - 40.196437 - ], - [ - 116.736034, - 40.196436 - ], - [ - 116.73621, - 40.196435 - ], - [ - 116.736385, - 40.196433 - ], - [ - 116.736566, - 40.196433 - ], - [ - 116.736742, - 40.196431 - ], - [ - 116.736926, - 40.196431 - ], - [ - 116.737046, - 40.19643 - ], - [ - 116.737173, - 40.19643 - ], - [ - 116.737298, - 40.196429 - ], - [ - 116.737449, - 40.196427 - ], - [ - 116.737582, - 40.196427 - ], - [ - 116.737662, - 40.196425 - ], - [ - 116.737748, - 40.196425 - ], - [ - 116.73778, - 40.196424 - ] - ], - "recommendPolyline": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ], - "moveTrack": [ - [ - 116.731239, - 40.196264 - ], - [ - 116.731082, - 40.19622 - ], - [ - 116.730919, - 40.196173 - ], - [ - 116.730762, - 40.196125 - ], - [ - 116.730596, - 40.196069 - ], - [ - 116.730437, - 40.196013 - ], - [ - 116.730296, - 40.195959 - ], - [ - 116.730122, - 40.19589 - ], - [ - 116.729956, - 40.195823 - ], - [ - 116.729841, - 40.195777 - ], - [ - 116.729797, - 40.195759 - ], - [ - 116.729696, - 40.195721 - ], - [ - 116.729624, - 40.195695 - ], - [ - 116.729498, - 40.195649 - ], - [ - 116.729464, - 40.195637 - ], - [ - 116.729366, - 40.195604 - ], - [ - 116.729294, - 40.195583 - ], - [ - 116.729122, - 40.195533 - ], - [ - 116.728954, - 40.195489 - ], - [ - 116.728781, - 40.195448 - ], - [ - 116.728616, - 40.195412 - ], - [ - 116.728442, - 40.195376 - ], - [ - 116.728269, - 40.195341 - ], - [ - 116.728087, - 40.195311 - ], - [ - 116.727909, - 40.195283 - ], - [ - 116.727746, - 40.195263 - ], - [ - 116.727561, - 40.195242 - ], - [ - 116.727386, - 40.195226 - ], - [ - 116.727213, - 40.195217 - ], - [ - 116.727036, - 40.19521 - ], - [ - 116.726865, - 40.195206 - ], - [ - 116.72669, - 40.195206 - ], - [ - 116.726512, - 40.195207 - ], - [ - 116.726333, - 40.195209 - ], - [ - 116.726144, - 40.195211 - ], - [ - 116.725959, - 40.195214 - ], - [ - 116.725771, - 40.195217 - ], - [ - 116.725588, - 40.195221 - ], - [ - 116.725411, - 40.195225 - ], - [ - 116.725201, - 40.195228 - ], - [ - 116.72509, - 40.195228 - ] - ] -} \ No newline at end of file