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

Merge remote-tracking branch 'origin/feature/v1.0.2' into feature/v1.0.2

Browse Source
This commit is contained in:
zhangyuanzhen
2020-03-02 18:10:09 +08:00
parent a732e92c09 f895e59569
commit 7e8581d9e0
6 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -61,22 +61,22 @@ public class MogoServices implements IMogoMapListener,
IMogoNaviListener,
IMogoStatusChangedListener,
IMogoIntentListener {
private MogoServices(){
private MogoServices() {
// private constructor
}
private static final class InstanceHolder{
private static final MogoServices INSTANCE = new MogoServices();
private static final class InstanceHolder {
private static final MogoServices INSTANCE = new MogoServices();
}
public static MogoServices getInstance(){
return InstanceHolder.INSTANCE;
public static MogoServices getInstance() {
return InstanceHolder.INSTANCE;
}
private Object readResolve(){
// 阻止反序列化，必须实现 Serializable 接口
return InstanceHolder.INSTANCE;
private Object readResolve() {
// 阻止反序列化，必须实现 Serializable 接口
return InstanceHolder.INSTANCE;
}
private static final String TAG = "MogoServices";
@@ -622,12 +622,9 @@ public class MogoServices implements IMogoMapListener,
return;
}
int status = intent.getIntExtra( MogoReceiver.PARAM_ADAS_STATUS, 0 );
if (status == 1 ){
MarkerServiceHandler.getMapUIController().setLockZoom(15);
}else{
MarkerServiceHandler.getMapUIController().setLockZoom(16);
}
mUiController.setLockZoom( status == 1 ? 15 : 16 );
mStatusManager.setADASUIShow( ServiceConst.TYPE, status == 1 );
mUiController.showMyLocation( true );
} else if ( Intent.ACTION_POWER_CONNECTED.equals( command ) ) {
mStatusManager.setAccStatus( ServiceConst.TYPE, true );
} else if ( Intent.ACTION_POWER_DISCONNECTED.equals( command ) ) {

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -586,8 +586,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
@Override
public void onMsgReceived(final MarkerResponse response) {
Logger.d(TAG, "接收到了地图大而全数据");
if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow() && isACC_ON) {
ThreadPoolService.execute( new Runnable() {
if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow()
&& isACC_ON
&& !MarkerServiceHandler.getMogoStatusManager().isV2XShow()) {
Handler handler = new Handler(Looper.getMainLooper());
handler.post(new Runnable() {
@Override
public void run() {
drawMapMarker(response);