diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index ca66e001e7..2fefdb0e72 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java @@ -138,9 +138,9 @@ public class SmallMapDirectionView extends RoundLayout { // 2D模式 options.setTilt(0); // 黑夜模式 - //options.setNaviNight(true); + options.setNaviNight(true); // 自定义地图样式 - options.setCustomMapStylePath("/mnt/sdcard/amap/style.data"); +// options.setCustomMapStylePath("/mnt/sdcard/amap/style.data"); mAMapNaviView.setViewOptions(options); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java index 7777ae5c59..9750889c69 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java @@ -57,6 +57,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout { private Button mBtnTriggerCallUserInfo; private Button mBtnTriggerEventUgc; private Button mBtnTriggerTrafficSearch; + private Button nBtnTriggerVR; private Button btnTriggerRearVIPCarTip, btnTriggerVehicleBrakes, @@ -116,6 +117,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout { mBtnTriggerEventUgc = findViewById(R.id.btnTriggerEventUgc); mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo); mBtnTriggerTrafficSearch = findViewById(R.id.btnTriggerTrafficSearch); + nBtnTriggerVR = findViewById(R.id.btnTriggerVR); switch (showType) { case 0: @@ -130,6 +132,12 @@ public class V2XTestConsoleWindow extends ConstraintLayout { break; } + nBtnTriggerVR.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + V2XServiceManager.getMoGoStatusManager().setVrMode("nBtnTriggerVR", true); + } + }); btnTriggerRearVIPCarTip = findViewById(R.id.btnTriggerRearVIPCarTip); btnTriggerVehicleBrakes = findViewById(R.id.btnTriggerVehicleBrakes); @@ -167,7 +175,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout { mogoDriverInfo.setSn("12345678"); mogoDriverInfo.setUserName("测试"); mogoDriverInfo.setUserHead("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1600872867592&di=994e371880ca6ae2814f553e0d0e4139&imgtype=0&src=http%3A%2F%2Fp3.ssl.cdn.btime.com%2Ft014c5d8a1e5cef12ba.jpg%3Fsize%3D506x543"); - if ( V2XServiceManager.getCarsChattingProvider() != null ) { + if (V2XServiceManager.getCarsChattingProvider() != null) { V2XServiceManager.getCarsChattingProvider().showUserWindow("CAR_CALL_USER_TO_" + V2XConst.MODULE_NAME, mogoDriverInfo, context); } }); @@ -267,7 +275,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout { LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); }); - mBtnTriggerTrafficSearch.setOnClickListener(v-> V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus()); + mBtnTriggerTrafficSearch.setOnClickListener(v -> V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus()); /* diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml index 2f384b8a3f..a7876cce9d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml @@ -1,6 +1,7 @@ +