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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangcongtao
2020-12-04 18:41:01 +08:00
parent e2d1002236 b46b0aa488
commit f38aec5077
238 changed files with 1084 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
View File

@@ -26,6 +26,7 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener {
// 接收高德
public static final String AUTONAVI_STANDARD_BROADCAST_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND";
private EnumMapUI mLastAMapUiType = null;
public void register( IMogoIntentManager manager ) {
manager.registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this );
@@ -131,11 +132,17 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener {
// 高德改变黑夜白天模式后，传递给launcher，顺便改变其他
if ( extraState == 37 ) {
// 白天模式
mLastAMapUiType = EnumMapUI.Type_Light;
MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Light );
} else if ( extraState == 38 ) {
// 夜间模式
mLastAMapUiType = EnumMapUI.Type_Night;
MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Night );
}
}
}
public EnumMapUI getLastAMapUiType() {
return mLastAMapUiType;
}
}

4
modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java
View File

@@ -103,6 +103,10 @@ class MapControlCommandHandler {
return;
}
if ( mCallback.getAMapLastType() == ui ) {
return;
}
int KEY_TYPE = 10048;
int state = 0;//2黑夜;1白天 ;0自动
switch ( ui ) {

8
modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
View File

@@ -296,6 +296,14 @@ public class MapPresenter extends Presenter< MapView > implements
mRegisterCenter.registerADASControlStatusChangedListener( TAG, this );
}
@Override
public EnumMapUI getAMapLastType() {
if ( mAutoNaviReceiver != null ) {
return mAutoNaviReceiver.getLastAMapUiType();
}
return null;
}
private void initBroadcast() {
mAutoNaviReceiver = new AutoNaviBroadcastIntentHandler();
mAutoNaviReceiver.setCallback( this );

3
modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
View File

@@ -36,4 +36,7 @@ public interface OnMapControlCallback {
// 缩放地图
void onZoomMap( boolean zoomIn );
// 高德地图上次类型
EnumMapUI getAMapLastType();
}