diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 079fffc29c..eb57ea7349 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -1056,7 +1056,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, } @Override - public void setAdasRecognizedResult(ADASRecognizedResult result) { + public void setAdasRecognizedResult(int drawlevel) { } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index a9f3679663..5fd9c1bac6 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -827,7 +827,7 @@ public class AMapViewWrapper implements IMogoMapView, } @Override - public void setAdasRecognizedResult(ADASRecognizedResult result) { + public void setAdasRecognizedResult(int drawlevel) { } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java index 03cfa9936f..6d2af177af 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java @@ -311,9 +311,9 @@ public class AMapUIController implements IMogoMapUIController { } @Override - public void setAdasRecognizedResult(ADASRecognizedResult result) { + public void setAdasRecognizedResult(int drawlevel) { if ( mClient != null ) { - mClient.setAdasRecognizedResult(result); + mClient.setAdasRecognizedResult(drawlevel); } } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 3297bf8e5d..ecca2aff23 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -379,7 +379,7 @@ public class AMapViewWrapper implements IMogoMapView, public void changeMapVisualAngle(VisualAngleMode angelMode) { MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper(); if (mapAutoViewHelper != null) { - Logger.d(TAG," 用户更改视距 currentThread : " + Thread.currentThread().getName()); + Logger.d(TAG, " 用户更改视距 currentThread : " + Thread.currentThread().getName()); mVisualAngleMode = angelMode; mapAutoViewHelper.setMapViewVisualAngle(angelMode.getCode()); } @@ -787,39 +787,34 @@ public class AMapViewWrapper implements IMogoMapView, } } else { // 通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型 -// if (mAdasResult != null) { -// Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel); -// if (mAdasResult.drawlevel == 1 && isShowWarn) { -// mSelfMarker.marker3DIcon(R.raw.car); -// isShowWarn = false; -// } else if (mAdasResult.drawlevel == 2) { //不处理 +// Logger.d("liyz", " mDrawlevel = " + mDrawlevel); +// if (mDrawlevel == 1 && isShowWarn) { +// mSelfMarker.marker3DIcon(R.raw.car); +// isShowWarn = false; +// } else if (mDrawlevel == 2) { //不处理 // -// } else if (mAdasResult.drawlevel == 3 && !isShowWarn) { -// //继续判断相应的方位，目前是只有 前方 TODO -// mSelfMarker.marker3DIcon(R.raw.qfpz); -// isShowWarn = true; -// } -// } else { -//// mSelfMarker.marker3DIcon(R.raw.car); +// } else if (mDrawlevel == 3 && !isShowWarn) { +// //继续判断相应的方位，目前是只有 前方 TODO +// mSelfMarker.marker3DIcon(R.raw.qfpz); +// isShowWarn = true; // } - -// UiThreadHandler.postDelayed( () -> { +// +// UiThreadHandler.postDelayed(() -> { // if (!isShowWarn) { // mSelfMarker.marker3DIcon(R.raw.qfpz); // isShowWarn = true; // } -// }, 6_000L ); +// }, 6_000L); } - showSelfSpeed(location.getSpeed()); } - private ADASRecognizedResult mAdasResult; + private int mDrawlevel; @Override - public void setAdasRecognizedResult(ADASRecognizedResult result) { - mAdasResult = result; + public void setAdasRecognizedResult(int drawlevel) { + mDrawlevel = drawlevel; } @@ -921,7 +916,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onMapViewVisualAngleChange(int i) { - Logger.d(TAG," 地图自动更改视距 currentThread : " + Thread.currentThread().getName()); + Logger.d(TAG, " 地图自动更改视距 currentThread : " + Thread.currentThread().getName()); mVisualAngleMode = getVisualAngleMode(i); MogoMapListenerHandler.getInstance().onMapVisualAngleChanged(mVisualAngleMode); } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java index 9998a9bb98..e287168bd4 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java @@ -376,9 +376,9 @@ public class AMapUIController implements IMogoMapUIController { } @Override - public void setAdasRecognizedResult(ADASRecognizedResult result) { + public void setAdasRecognizedResult(int drawlevel) { if (mClient != null) { - mClient.setAdasRecognizedResult(result); + mClient.setAdasRecognizedResult(drawlevel); } } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 7eced2e15e..5f7d5fb774 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -251,7 +251,7 @@ public interface IMogoMapUIController { */ void changeBearing(float bearing); - void setAdasRecognizedResult(ADASRecognizedResult result); + void setAdasRecognizedResult(int drawlevel); /** * 获取瓦片id diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index b45d5f807f..7ef3e6f7f6 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -422,10 +422,10 @@ public class MogoMapUIController implements IMogoMapUIController { } @Override - public void setAdasRecognizedResult(ADASRecognizedResult result) { + public void setAdasRecognizedResult(int drawlevel) { initDelegate(); if (mDelegate != null) { - mDelegate.setAdasRecognizedResult(result); + mDelegate.setAdasRecognizedResult(drawlevel); } } } diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index d69951b14d..d16e2c13e5 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -59,7 +59,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis super.onCreate(savedInstanceState); DebugConfig.setNeedRequestUserInfo(true); Log.d(TAG, "onCreate"); - Log.d("liyz", "MainLauncherActivity onCreate ------->"); mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this); } 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 b0b47452e4..92e8179ba4 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 @@ -445,14 +445,12 @@ public class MainActivity extends MvpActivity implement boolean isAllGranted = true; // 判断是否所有的权限都已经授予了 for (int grant : grantResults) { - Log.d("liyz", "grant =" + grant); if (grant != PackageManager.PERMISSION_GRANTED) { isAllGranted = false; break; } } - Log.d("liyz", "onRequestPermissionsResult isAllGranted = " + isAllGranted); if (isAllGranted) { isFirst = false; } else { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 6af6921829..12adef687c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -168,7 +168,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, //// 绘制碰撞的他车指引线，需要实时给数据更新 TODO // drawLimberCollisionPolyline(result); // //通过这个传值到 AMapViewWrapper，根据数据更新自车的模型数据 -// MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().setAdasRecognizedResult(result); +// MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().setAdasRecognizedResult(result.drawlevel); // } // }