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

opt

Browse Source
This commit is contained in:
wangcongtao
2020-12-14 20:08:53 +08:00
parent 63daee6eb0
commit 9489ec6dbd
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java
View File

@@ -10,7 +10,7 @@ public class WebSocketConstant {
private static final String HOST_DEMO = "ws://62.234.196.121"; 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 HOST_RELEASE = "ws://62.234.196.121";
// private static final String PORT = ":14001/ws"; // 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://"; public static final String PROTOCOL = "ws://";
private static final String DOMAIN_DEV = "dzt-city.zhidaozhixing.com"; private static final String DOMAIN_DEV = "dzt-city.zhidaozhixing.com";

2
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
View File

@@ -91,7 +91,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder {
@Override @Override
public IMogoMapView getMapView( Context context ) { public IMogoMapView getMapView( Context context ) {
NavAutoApi.INSTANCE.init( context, MapParams.Companion.init() NavAutoApi.INSTANCE.init( context, MapParams.Companion.init()
.setDebugMode( true ) .setDebugMode( false )
.setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 )
.setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D )
.setZoom( 16 ) .setZoom( 16 )

15
modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
View File

@@ -1,5 +1,7 @@
package com.mogo.module.common.map; package com.mogo.module.common.map;
import android.util.Log;
import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoApisHandler;
@@ -243,9 +245,9 @@ public class MapCenterPointStrategy {
// V2X，场景视图右边 // V2X，场景视图右边
Map< String, MapCenterPoint > categoryV2XEvent = new HashMap<>(); Map< String, MapCenterPoint > categoryV2XEvent = new HashMap<>();
MapCenterPoint point1 = new MapCenterPoint( 0.5, 0.7D ); MapCenterPoint point1 = new MapCenterPoint( 0.5, 0.7D );
categoryV2XEvent.put( "d80x",point1 ); categoryV2XEvent.put( "d80x", point1 );
categoryV2XEvent.put( "em4",point1 ); categoryV2XEvent.put( "em4", point1 );
categoryV2XEvent.put( "e8xx",point1 ); categoryV2XEvent.put( "e8xx", point1 );
MapCenterPoint point2 = new MapCenterPoint( 0.5, 0.65D ); MapCenterPoint point2 = new MapCenterPoint( 0.5, 0.65D );
categoryV2XEvent.put( "f80x", point2 ); categoryV2XEvent.put( "f80x", point2 );
categoryV2XEvent.put( "f8xx", point2 ); categoryV2XEvent.put( "f8xx", point2 );
@@ -254,8 +256,8 @@ public class MapCenterPointStrategy {
} }
} }
public static void resetByChangeMode(){ public static void resetByChangeMode() {
setMapCenterPointByScene( MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController(), Scene.AIMLESS); setMapCenterPointByScene( MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController(), Scene.AIMLESS );
} }
/** /**
@@ -268,7 +270,8 @@ public class MapCenterPointStrategy {
if ( controller == null ) { if ( controller == null ) {
return; return;
} }
Map<Integer, Map<String, MapCenterPoint>> strategies = sCommonStrategies; Logger.e( TAG, "scene"+scene );
Map< Integer, Map< String, MapCenterPoint > > strategies = sCommonStrategies;
if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
strategies = sVrStrategies; strategies = sVrStrategies;
} }

2
modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
View File

@@ -80,7 +80,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/main_bitmap_splash_bg" android:background="@drawable/main_bitmap_splash_bg"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:visibility="gone" /> android:visibility="visible" />
<FrameLayout <FrameLayout
android:id="@+id/module_main_id_splash_container" android:id="@+id/module_main_id_splash_container"