diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index d8df708e45..829638c33e 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -420,7 +420,8 @@ public class EntranceFragment extends MvpFragment35px 38px - 460px - 140px - 40px - 530px - 92px - 44px + 300px + 100px + 20px + 345px + 20px + 30px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index b17823e7cb..f31e797e98 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -983,7 +983,7 @@ public class MogoServices implements IMogoMapListener, try { data.putOpt( "systemTime", Long.parseLong( stateInfo.getValues().getSystemTime() ) ); } catch ( Exception e ) { - e.printStackTrace(); +// e.printStackTrace(); } try { data.putOpt( "satelliteTime", Long.parseLong( stateInfo.getValues().getSatelliteTime() ) ); @@ -993,12 +993,12 @@ public class MogoServices implements IMogoMapListener, try { data.putOpt( "receiverDataTime", Long.parseLong( stateInfo.getValues().getReceiverDataTime() ) ); } catch ( Exception e ) { - e.printStackTrace(); +// e.printStackTrace(); } try { data.putOpt( "adasSatelliteTime", Long.parseLong( stateInfo.getValues().getAdasSatelliteTime() ) ); } catch ( Exception e ) { - e.printStackTrace(); +// e.printStackTrace(); } MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().syncLocation2Map( data ); SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo( data ); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 74089874ad..689f7d9c5d 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -164,14 +164,14 @@ public class MogoADASController implements IMogoADASController { ADASCarStateInfo stateInfo = GsonUtil.objectFromJson(((String) msg.obj), ADASCarStateInfo.class); if (stateInfo == null || stateInfo.getValues() == null) { - Logger.d(TAG, "ADAS-LOC-timer", "upd 到 aidl 传输数据 stateInfo or stateInfo.getValues() is null"); +// Logger.d(TAG, "ADAS-LOC-timer", "upd 到 aidl 传输数据 stateInfo or stateInfo.getValues() is null"); return; } - if (stateInfo.getValues().getStartReceiverDataTime() != null) { - Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时:%s", start - Long.valueOf(stateInfo.getValues().getStartReceiverDataTime())); - } else { - Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时时间字段 startReceiverDataTime is null"); - } +// if (stateInfo.getValues().getStartReceiverDataTime() != null) { +// Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时:%s", start - Long.valueOf(stateInfo.getValues().getStartReceiverDataTime())); +// } else { +// Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时时间字段 startReceiverDataTime is null"); +// } mLastLon = stateInfo.getValues().getLon(); mLastLat = stateInfo.getValues().getLat(); @@ -180,7 +180,7 @@ public class MogoADASController implements IMogoADASController { if (mMogoAdasCarDataCallback != null) { mMogoAdasCarDataCallback.onAdasCarDataCallback(stateInfo); } - Logger.i("ADAS-LOC-timer", "cost " + (System.currentTimeMillis() - start) + "ms"); +// Logger.i("ADAS-LOC-timer", "cost " + (System.currentTimeMillis() - start) + "ms"); } }; @@ -362,9 +362,11 @@ public class MogoADASController implements IMogoADASController { public void autopilotArrive(AdasAIDLAutopilotArriveModel autopilotArriveModel) { Logger.d(TAG, "autopilotArriveModel " + autopilotArriveModel); if (autopilotArriveModel == null) { + Logger.d(TAG,"autopilotArrive autopilotArriveModel is null"); return; } - if (mAdasOCHCallback != null) { + Logger.d(TAG,"autopilotArrive : " + autopilotArriveModel.toString()); + if (!mAdasOCHCallback.isEmpty()) { for (IMogoAdasOCHCallback cb : mAdasOCHCallback) { cb.onArriveAt(new AdasOCHData( autopilotArriveModel.getCarType(),