36px
393px
700px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
new file mode 100644
index 0000000000..a66eeed6a0
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -0,0 +1,16 @@
+
+
+ 1100px
+ 460px
+ 460px
+ 320px
+ 320px
+ 15px
+ 110px
+ 40px
+ 279px
+ 119px
+ 22px
+ 36px
+ 50px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index ca44fd8dcb..010482f882 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -98,7 +98,8 @@
40px
30px
34px
- 24px
+ 24px
+
28px
24px
17px
@@ -181,4 +182,13 @@
393px
700px
+ 300px
+ 300px
+
+ 200px
+ 200px
+ 10px
+ 80px
+ 28px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml
index e787bc7500..66347a003a 100644
--- a/modules/mogo-module-extensions/src/main/res/values/colors.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml
@@ -14,4 +14,5 @@
#DB3137
#3E77F6
+ #323C6F
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index d430472dff..b0d6433655 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -243,6 +243,9 @@
11px
400px
300px
-
-
+ 279px
+ 119px
+ 23px
+ 35px
+ 50px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml
index 65e4b58ae8..9b05b089d1 100644
--- a/modules/mogo-module-extensions/src/main/res/values/strings.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml
@@ -69,4 +69,7 @@
- 提前看看出行路况，试试唤醒小智说，“中关村路况怎么样”
+ 默认视角
+ 远距视角
+
diff --git a/modules/mogo-module-gps-simulator-debug/.gitignore b/modules/mogo-module-gps-simulator-debug/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/modules/mogo-module-gps-simulator-debug/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/modules/mogo-module-gps-simulator-debug/README.md b/modules/mogo-module-gps-simulator-debug/README.md
deleted file mode 100644
index 3266bdbaae..0000000000
--- a/modules/mogo-module-gps-simulator-debug/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# GPS 轨迹模拟接口 Debug 实现
diff --git a/modules/mogo-module-gps-simulator-debug/consumer-rules.pro b/modules/mogo-module-gps-simulator-debug/consumer-rules.pro
deleted file mode 100644
index b5cb3815dd..0000000000
--- a/modules/mogo-module-gps-simulator-debug/consumer-rules.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-#-----GPS-DEBUG-SIMULATOR-----
--keep class com.mogo.module.gps.simulator.CationVo.*{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-gps-simulator-debug/gradle.properties b/modules/mogo-module-gps-simulator-debug/gradle.properties
deleted file mode 100644
index cbfd2771ac..0000000000
--- a/modules/mogo-module-gps-simulator-debug/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-gps-simulator-debug
-VERSION_CODE=1
diff --git a/modules/mogo-module-gps-simulator-debug/proguard-rules.pro b/modules/mogo-module-gps-simulator-debug/proguard-rules.pro
deleted file mode 100644
index a49a405e6a..0000000000
--- a/modules/mogo-module-gps-simulator-debug/proguard-rules.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#-----GPS-DEBUG-SIMULATOR-----
--keep class com.mogo.module.gps.simulator.CationVo.*{*;}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/AndroidManifest.xml b/modules/mogo-module-gps-simulator-debug/src/main/AndroidManifest.xml
deleted file mode 100644
index 6c73c51a7e..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/CationVo.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/CationVo.java
deleted file mode 100644
index b30af88de6..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/CationVo.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-
-/**
- * @author zyz
- * 2020-04-08.
- */
-public class CationVo {
-
- /**
- * vehicleSpeed : 1.0
- * instantSpeed : 1.0
- * lon : 116.401615
- * lat : 39.968812
- * carStatus : 1
- * direction : 267
- * sn : ZD801C1928L00371
- * locationTime : 1586339911534
- * distance : 0.0
- * adCode : 2
- * cityCode : 3
- * vehicleType : 0
- */
-
- private float vehicleSpeed;
- private double instantSpeed;
- private double lon;
- private double lat;
- private int carStatus;
- private int direction;
- private String sn;
- private long locationTime;
- private double distance;
- private String adCode;
- private String cityCode;
- private int vehicleType;
-
- public float getVehicleSpeed() {
- return vehicleSpeed;
- }
-
- public void setVehicleSpeed( float vehicleSpeed ) {
- this.vehicleSpeed = vehicleSpeed;
- }
-
- public double getInstantSpeed() {
- return instantSpeed;
- }
-
- public void setInstantSpeed( double instantSpeed ) {
- this.instantSpeed = instantSpeed;
- }
-
- public double getLon() {
- return lon;
- }
-
- public void setLon( double lon ) {
- this.lon = lon;
- }
-
- public double getLat() {
- return lat;
- }
-
- public void setLat( double lat ) {
- this.lat = lat;
- }
-
- public int getCarStatus() {
- return carStatus;
- }
-
- public void setCarStatus( int carStatus ) {
- this.carStatus = carStatus;
- }
-
- public int getDirection() {
- return direction;
- }
-
- public void setDirection( int direction ) {
- this.direction = direction;
- }
-
- public String getSn() {
- return sn;
- }
-
- public void setSn( String sn ) {
- this.sn = sn;
- }
-
- public long getLocationTime() {
- return locationTime;
- }
-
- public void setLocationTime( long locationTime ) {
- this.locationTime = locationTime;
- }
-
- public double getDistance() {
- return distance;
- }
-
- public void setDistance( double distance ) {
- this.distance = distance;
- }
-
- public String getAdCode() {
- return adCode;
- }
-
- public void setAdCode( String adCode ) {
- this.adCode = adCode;
- }
-
- public String getCityCode() {
- return cityCode;
- }
-
- public void setCityCode( String cityCode ) {
- this.cityCode = cityCode;
- }
-
- public int getVehicleType() {
- return vehicleType;
- }
-
- public void setVehicleType( int vehicleType ) {
- this.vehicleType = vehicleType;
- }
-
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/JWebSocketClient.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/JWebSocketClient.java
deleted file mode 100644
index 178452e093..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/JWebSocketClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.mogo.utils.logger.Logger;
-
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.drafts.Draft_6455;
-import org.java_websocket.handshake.ServerHandshake;
-
-import java.net.URI;
-
-/**
- * @author zyz
- * 2020-04-07.
- */
-public class JWebSocketClient extends WebSocketClient {
-
- public JWebSocketClient( URI serverUri ) {
- super( serverUri, new Draft_6455() );
- }
-
- @Override
- public void onOpen( ServerHandshake handshakedata ) {
- Logger.d( "JWebSocketClient", "onOpen()" );
- bindSN();
- }
-
- private void bindSN() {
- String data = String.format( "{ \"sn\": \"%s\", \"bind\": true }", Utils.getSn() );
- send( data );
- }
-
- @Override
- public void onMessage( String message ) {
- Logger.e( "JWebSocketClient", "onMessage()" );
- }
-
- @Override
- public void onClose( int code, String reason, boolean remote ) {
- Logger.d( "JWebSocketClient", "onClose()" );
- }
-
- @Override
- public void onError( Exception ex ) {
- Logger.d( "JWebSocketClient", "onError()" );
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerDebug.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerDebug.java
deleted file mode 100644
index 04c6096eca..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerDebug.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.utils.UiThreadHandler;
-
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * 描述
- */
-@Route( path = GpsSimulatorConstants.API_PATH )
-public class MogoGpsSimulatorManagerDebug implements IMogoGpsSimulatorManager {
-
- private static final String TAG = "MogoGpsSimulatorManagerDebug";
-
- @Override
- public void open() {
- WebSocketManager.getInstance().connect();
- }
-
- @Override
- public void close() {
- WebSocketManager.getInstance().disConnect();
- UiThreadHandler.postDelayed( () -> {
- WebSocketManager.destroy();
- }, 1_000L );
- }
-
- @Override
- public void init( Context context ) {
-
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/Utils.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/Utils.java
deleted file mode 100644
index 660015b14a..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/Utils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.utils.storage.SharedPrefsMgr;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Created by congtaowang on 2018/3/29.
- */
-
-class Utils {
-
- public static final String GET = "get";
- public static final String GSM_SERIAL = "gsm.serial";
- public static final String FOTA_VERSION = "ro.fota.version";
- public static final String PROPERTIES = "android.os.SystemProperties";
-
- public static String getSn() {
- if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
- return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "allocated_sn" );
- }
- return getSystemProperties( GSM_SERIAL );
- }
-
- public static String getFotaVersion() {
- return getSystemProperties( FOTA_VERSION );
- }
-
- public static String getSystemProperties( String name ) {
- String value = "";
-
- try {
- Class< ? > c = Class.forName( PROPERTIES );
- Method get = c.getMethod( GET, String.class );
- value = ( String ) get.invoke( c, name );
- } catch ( ClassNotFoundException var3 ) {
- var3.printStackTrace();
- } catch ( NoSuchMethodException var4 ) {
- var4.printStackTrace();
- } catch ( InvocationTargetException var5 ) {
- var5.printStackTrace();
- } catch ( IllegalAccessException var6 ) {
- var6.printStackTrace();
- }
- return value;
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java
deleted file mode 100644
index cafbf5b56d..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocation;
-import com.mogo.map.navi.IMogoNavi;
-import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.utils.TipToast;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import org.java_websocket.handshake.ServerHandshake;
-import org.json.JSONObject;
-
-import java.net.URI;
-import java.util.Iterator;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * @author zyz
- * 2020-04-07.
- */
-public class WebSocketManager {
-
- private static final String TAG = "WebSocketManager";
-
- private static Object sLock = new Object();
- private static WebSocketManager sWebSocketManager;
-
- private IMogoNavi mNavi;
- private JWebSocketClient mClient;
- private URI mUri;
- private IMogoServiceApis mServiceApis;
-
- private ExecutorService mService;
-
- public static WebSocketManager getInstance() {
- if ( sWebSocketManager == null ) {
- synchronized ( sLock ) {
- if ( sWebSocketManager == null ) {
- sWebSocketManager = new WebSocketManager();
- }
- }
- }
- return sWebSocketManager;
- }
-
- private WebSocketManager() {
- mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
- mNavi = mServiceApis.getMapServiceApi().getNavi( AbsMogoApplication.getApp() );
- mUri = URI.create( "ws://152.136.10.223:4001/realtimeLocations-ws" );
- mClient = new JWebSocketClient( mUri ) {
- @Override
- public void onMessage( String message ) {
- try {
- parseMessage( message );
- } catch ( Exception e ) {
- Logger.e( TAG, e, "error." );
- }
- }
-
- @Override
- public void onOpen( ServerHandshake handshakedata ) {
- super.onOpen( handshakedata );
- UiThreadHandler.post( () -> {
- TipToast.shortTip( "模拟GPS开启成功" );
- mServiceApis.getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).stop();
- } );
- }
-
- @Override
- public void onClose( int code, String reason, boolean remote ) {
- super.onClose( code, reason, remote );
- UiThreadHandler.post( () -> {
- TipToast.shortTip( "模拟GPS关闭成功" );
- mServiceApis.getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).start();
- } );
- shutdownServiceQuietly();
- }
- };
- initThreadService();
- }
-
- private void parseMessage( String jsonStr ) throws Exception {
- //message就是接收到的消息
- Logger.d( TAG, jsonStr );
- JSONObject jsonObject = new JSONObject( jsonStr );
- if ( jsonObject.has( "detailMsg" ) ) {
- Logger.d( TAG, "绑定成功" );
- } else if ( jsonObject.has( "realTimeLocationVo" ) ) {
- Logger.d( TAG, "收到定位消息" );
- CationVo realTimeLocationVo = GsonUtil.objectFromJson( jsonObject.getString( "realTimeLocationVo" ), CationVo.class );
- UiThreadHandler.post( () -> {
- mNavi.setExtraGPSData(
- realTimeLocationVo.getLon(),
- realTimeLocationVo.getLat(),
- realTimeLocationVo.getVehicleSpeed(),
- 1,
- realTimeLocationVo.getDirection(),
- realTimeLocationVo.getLocationTime()
- );
- Iterator< IMogoLocationListener > listeners = mServiceApis.getRegisterCenterApi().getLocationListeners();
- MogoLocation location = new MogoLocation();
- location.setLatitude( realTimeLocationVo.getLat() );
- location.setLongitude( realTimeLocationVo.getLon() );
- location.setSpeed( realTimeLocationVo.getVehicleSpeed() );
- location.setAccuracy( 1 );
- location.setTime( realTimeLocationVo.getLocationTime() );
-
- if ( listeners != null ) {
- while ( listeners.hasNext() ) {
- listeners.next().onLocationChanged( location );
- }
- }
- } );
- }
- }
-
- public void connect() {
- if ( mClient == null ) {
- return;
- }
- mNavi.setUseExtraGPSData( true );
- mService.execute( () -> {
- try {
- mClient.connectBlocking();
- Logger.d( TAG, "connectBlocking done." );
- } catch ( Exception e ) {
- Logger.e( TAG, e, "error." );
- }
- } );
- }
-
- private void initThreadService() {
- if ( mService == null || mService.isShutdown() ) {
- mService = Executors.newSingleThreadExecutor();
- }
- }
-
- public void disConnect() {
- mNavi.setUseExtraGPSData( false );
- mService.execute( () -> {
- try {
- mClient.closeBlocking();
- Logger.d( TAG, "close done." );
- } catch ( InterruptedException e ) {
- Logger.e( TAG, e, "error." );
- }
- } );
- }
-
- public static void destroy() {
- sWebSocketManager = null;
- }
-
- private void shutdownServiceQuietly() {
- if ( mService != null && !mService.isShutdown() ) {
- mService.shutdown();
- }
- mService = null;
- }
-}
diff --git a/modules/mogo-module-gps-simulator-debug/src/main/res/values/strings.xml b/modules/mogo-module-gps-simulator-debug/src/main/res/values/strings.xml
deleted file mode 100644
index 9d884d77ea..0000000000
--- a/modules/mogo-module-gps-simulator-debug/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- mogo-module-gps-simulator
-
diff --git a/modules/mogo-module-gps-simulator-noop/.gitignore b/modules/mogo-module-gps-simulator-noop/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/modules/mogo-module-gps-simulator-noop/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/modules/mogo-module-gps-simulator-noop/README.md b/modules/mogo-module-gps-simulator-noop/README.md
deleted file mode 100644
index 6478f3ac12..0000000000
--- a/modules/mogo-module-gps-simulator-noop/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# GPS 轨迹模拟接口 Release 实现
diff --git a/modules/mogo-module-gps-simulator-noop/build.gradle b/modules/mogo-module-gps-simulator-noop/build.gradle
deleted file mode 100644
index 4e4194af0d..0000000000
--- a/modules/mogo-module-gps-simulator-noop/build.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion rootProject.ext.android.compileSdkVersion
- // buildToolsVersion rootProject.ext.android.buildToolsVersion
- defaultConfig {
- minSdkVersion rootProject.ext.android.minSdkVersion
- targetSdkVersion rootProject.ext.android.targetSdkVersion
- versionCode Integer.valueOf(VERSION_CODE)
- versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
- javaCompileOptions {
- annotationProcessorOptions {
- arguments = [AROUTER_MODULE_NAME: project.getName()]
- }
- }
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles 'consumer-rules.pro'
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- targetCompatibility 1.8
- sourceCompatibility 1.8
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-
- implementation rootProject.ext.dependencies.arouter
- annotationProcessor rootProject.ext.dependencies.aroutercompiler
- if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.mogoutils
- implementation rootProject.ext.dependencies.gpssimulator
- } else {
- implementation project(':foudations:mogo-utils')
- implementation project(':modules:mogo-module-gps-simulator')
- }
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-gps-simulator-noop/gradle.properties b/modules/mogo-module-gps-simulator-noop/gradle.properties
deleted file mode 100644
index 20578a681b..0000000000
--- a/modules/mogo-module-gps-simulator-noop/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-gps-simulator-noop
-VERSION_CODE=1
diff --git a/modules/mogo-module-gps-simulator-noop/src/main/AndroidManifest.xml b/modules/mogo-module-gps-simulator-noop/src/main/AndroidManifest.xml
deleted file mode 100644
index 3cea50c50c..0000000000
--- a/modules/mogo-module-gps-simulator-noop/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/modules/mogo-module-gps-simulator-noop/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerNoop.java b/modules/mogo-module-gps-simulator-noop/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerNoop.java
deleted file mode 100644
index 9a2478f9c4..0000000000
--- a/modules/mogo-module-gps-simulator-noop/src/main/java/com/mogo/module/gps/simulator/MogoGpsSimulatorManagerNoop.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.utils.logger.Logger;
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * 描述
- */
-@Route( path = GpsSimulatorConstants.API_PATH )
-public class MogoGpsSimulatorManagerNoop implements IMogoGpsSimulatorManager {
-
- private static final String TAG = "MogoGpsSimulatorManagerNoop";
-
- @Override
- public void open() {
- Logger.e( TAG, "no operation when release." );
- }
-
- @Override
- public void close() {
- Logger.e( TAG, "no operation when release." );
- }
-
- @Override
- public void init( Context context ) {
- }
-}
diff --git a/modules/mogo-module-gps-simulator-noop/src/main/res/values/strings.xml b/modules/mogo-module-gps-simulator-noop/src/main/res/values/strings.xml
deleted file mode 100644
index 9d884d77ea..0000000000
--- a/modules/mogo-module-gps-simulator-noop/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- mogo-module-gps-simulator
-
diff --git a/modules/mogo-module-gps-simulator/.gitignore b/modules/mogo-module-gps-simulator/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/modules/mogo-module-gps-simulator/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/modules/mogo-module-gps-simulator/README.md b/modules/mogo-module-gps-simulator/README.md
deleted file mode 100644
index d396740f2b..0000000000
--- a/modules/mogo-module-gps-simulator/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# GPS 轨迹模拟接口抽象
-
-## 常量定义
-
-## 接口
diff --git a/modules/mogo-module-gps-simulator/build.gradle b/modules/mogo-module-gps-simulator/build.gradle
deleted file mode 100644
index 73ea023119..0000000000
--- a/modules/mogo-module-gps-simulator/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion rootProject.ext.android.compileSdkVersion
- // buildToolsVersion rootProject.ext.android.buildToolsVersion
- defaultConfig {
- minSdkVersion rootProject.ext.android.minSdkVersion
- targetSdkVersion rootProject.ext.android.targetSdkVersion
- versionCode Integer.valueOf(VERSION_CODE)
- versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles 'consumer-rules.pro'
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- targetCompatibility 1.8
- sourceCompatibility 1.8
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation rootProject.ext.dependencies.arouter
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-gps-simulator/consumer-rules.pro b/modules/mogo-module-gps-simulator/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/modules/mogo-module-gps-simulator/gradle.properties b/modules/mogo-module-gps-simulator/gradle.properties
deleted file mode 100644
index 44f440bc58..0000000000
--- a/modules/mogo-module-gps-simulator/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-gps-simulator
-VERSION_CODE=1
diff --git a/modules/mogo-module-gps-simulator/proguard-rules.pro b/modules/mogo-module-gps-simulator/proguard-rules.pro
deleted file mode 100644
index 5ee323b27c..0000000000
--- a/modules/mogo-module-gps-simulator/proguard-rules.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#-----MogoGSPSimulator-----
--keep class com.mogo.module.gps.simulator.GpsSimulatorConstants
diff --git a/modules/mogo-module-gps-simulator/src/main/AndroidManifest.xml b/modules/mogo-module-gps-simulator/src/main/AndroidManifest.xml
deleted file mode 100644
index dc9013c712..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/GpsSimulatorConstants.java b/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/GpsSimulatorConstants.java
deleted file mode 100644
index dc87986716..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/GpsSimulatorConstants.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * 描述
- */
-public class GpsSimulatorConstants {
-
- public static final String API_PATH = "/gpssimulator/api";
-}
diff --git a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/IMogoGpsSimulatorManager.java b/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/IMogoGpsSimulatorManager.java
deleted file mode 100644
index aa3bdfff17..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/java/com/mogo/module/gps/simulator/IMogoGpsSimulatorManager.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mogo.module.gps.simulator;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
-
-/**
- * @author congtaowang
- * @since 2020-04-13
- *
- * gps 模拟控制开关
- */
-public interface IMogoGpsSimulatorManager extends IProvider {
-
- /**
- * 打开 gps 模拟
- */
- void open();
-
- /**
- * 关闭 gps 模拟
- */
- void close();
-}
diff --git a/modules/mogo-module-gps-simulator/src/main/res/values/strings.xml b/modules/mogo-module-gps-simulator/src/main/res/values/strings.xml
deleted file mode 100644
index 9d884d77ea..0000000000
--- a/modules/mogo-module-gps-simulator/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- mogo-module-gps-simulator
-
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
index f13c5d27d0..5ebace1479 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
@@ -19,6 +19,7 @@ import com.mogo.map.navi.MogoCongestionInfo;
import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.map.uicontroller.EnumMapUI;
+import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.module.main.registercenter.MogoRegisterCenterHandler;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.utils.logger.Logger;
@@ -293,6 +294,24 @@ public class EventDispatchCenter implements
}
}
+ @Override
+ public void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) {
+ Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners();
+ if ( iterator == null ) {
+ return;
+ }
+ while ( iterator.hasNext() ) {
+ IMogoMapListener listener = iterator.next();
+ if ( listener != null ) {
+ try {
+ listener.onMapVisualAngleChanged( visualAngleMode );
+ } catch ( Exception e ) {
+ Logger.e( TAG, e, "error." );
+ }
+ }
+ }
+ }
+
@Override
public void onMapChanged( MogoLatLng location, float zoom, float tilt, float bearing ) {
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index f7536a5eb5..843a95a9e6 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -14,7 +14,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.commons.context.ContextHolderUtil;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpActivity;
-import com.mogo.commons.voice.AIAssist;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.location.MogoLocation;
import com.mogo.map.uicontroller.EnumMapUI;
@@ -34,7 +33,6 @@ import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.service.v2x.IV2XListener;
import com.mogo.skin.support.SkinMode;
import com.mogo.utils.NetworkUtils;
import com.mogo.utils.logger.Logger;
@@ -231,6 +229,9 @@ public class MainActivity extends MvpActivity implement
MapCenterPointStrategy.setMapCenterPointByScene(mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS);
}
+ /**
+ * 加载其它模块
+ */
protected void loadOthersModules() {
// 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
loadContainerModules();
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
index 683134de62..36fdbfc26e 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
@@ -2,6 +2,8 @@ package com.mogo.module.main.utils;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
+import android.content.res.Resources;
+import android.util.DisplayMetrics;
import android.view.View;
import com.mogo.module.main.R;
@@ -44,4 +46,9 @@ public class DisplayEffectsHelper {
public void display() {
animatorSet.start();
}
+
+ private float dp2px(float dp) {
+ DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics();
+ return dp * metrics.density;
+ }
}
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png
new file mode 100644
index 0000000000..0ab8e44e21
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png differ
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png
new file mode 100644
index 0000000000..aff4543048
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png differ
diff --git a/modules/mogo-module-main/src/main/res/drawable/main_splash_bg.xml b/modules/mogo-module-main/src/main/res/drawable/main_splash_bg.xml
new file mode 100644
index 0000000000..2bb9c98c45
--- /dev/null
+++ b/modules/mogo-module-main/src/main/res/drawable/main_splash_bg.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
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 16d9c18a20..5456d236a3 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
@@ -129,24 +129,46 @@
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" />
+
+
-
+
+
+
+
+ android:background="@drawable/main_splash_bg">
+
+
+
+
+