diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java index a34166a694..c828e0b1d8 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java @@ -10,7 +10,7 @@ public class WebSocketConstant { private static final String HOST_DEMO = "ws://62.234.196.121"; private static final String HOST_RELEASE = "ws://62.234.196.121"; // private static final String PORT = ":14001/ws"; - public static final String PORT = ":4003/ws"; + public static final String PORT = ":4004/ws"; public static final String PROTOCOL = "ws://"; private static final String DOMAIN_DEV = "dzt-city.zhidaozhixing.com"; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 1081ea35b3..e6c9a8d05d 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -91,7 +91,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { @Override public IMogoMapView getMapView( Context context ) { NavAutoApi.INSTANCE.init( context, MapParams.Companion.init() - .setDebugMode( true ) + .setDebugMode( false ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) .setZoom( 16 ) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java index 919eda9ac0..7e8a557f30 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java @@ -1,5 +1,7 @@ package com.mogo.module.common.map; +import android.util.Log; + import com.mogo.commons.debug.DebugConfig; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoApisHandler; @@ -243,9 +245,9 @@ public class MapCenterPointStrategy { // V2X,场景视图右边 Map< String, MapCenterPoint > categoryV2XEvent = new HashMap<>(); MapCenterPoint point1 = new MapCenterPoint( 0.5, 0.7D ); - categoryV2XEvent.put( "d80x",point1 ); - categoryV2XEvent.put( "em4",point1 ); - categoryV2XEvent.put( "e8xx",point1 ); + categoryV2XEvent.put( "d80x", point1 ); + categoryV2XEvent.put( "em4", point1 ); + categoryV2XEvent.put( "e8xx", point1 ); MapCenterPoint point2 = new MapCenterPoint( 0.5, 0.65D ); categoryV2XEvent.put( "f80x", point2 ); categoryV2XEvent.put( "f8xx", point2 ); @@ -254,8 +256,8 @@ public class MapCenterPointStrategy { } } - public static void resetByChangeMode(){ - setMapCenterPointByScene( MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController(), Scene.AIMLESS); + public static void resetByChangeMode() { + setMapCenterPointByScene( MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController(), Scene.AIMLESS ); } /** @@ -268,7 +270,8 @@ public class MapCenterPointStrategy { if ( controller == null ) { return; } - Map> strategies = sCommonStrategies; + Logger.e( TAG, "scene"+scene ); + Map< Integer, Map< String, MapCenterPoint > > strategies = sCommonStrategies; if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { strategies = sVrStrategies; } diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 1314478aa6..fb58d8aef2 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -80,7 +80,7 @@ android:layout_height="match_parent" android:background="@drawable/main_bitmap_splash_bg" android:scaleType="centerCrop" - android:visibility="gone" /> + android:visibility="visible" />