From e89b315641dfcf1213c61b302824565c3bb3affd Mon Sep 17 00:00:00 2001 From: zhongchao Date: Sat, 31 Jul 2021 09:13:02 +0800 Subject: [PATCH] change the tiny difference of dev or qa branch --- OCH/build/jrebel/project-cleaned.marker | 0 .../build/jrebel/project-cleaned.marker | 0 libraries/build/jrebel/project-cleaned.marker | 0 .../build/jrebel/project-cleaned.marker | 0 modules/build/jrebel/project-cleaned.marker | 0 .../mogo/module/adas/AdasEventManager.java | 1 - .../drawer/AdasRecognizedResultDrawer.java | 2 +- .../mogo/module/common/drawer/BaseDrawer.java | 7 ++- .../service/marker/MapMarkerManager.java | 62 +++++++++---------- services/build/jrebel/project-cleaned.marker | 0 .../service/impl/adas/MogoADASController.java | 1 - skin/build/jrebel/project-cleaned.marker | 0 test/build/jrebel/project-cleaned.marker | 0 tts/build/jrebel/project-cleaned.marker | 0 14 files changed, 33 insertions(+), 40 deletions(-) delete mode 100644 OCH/build/jrebel/project-cleaned.marker delete mode 100644 foudations/build/jrebel/project-cleaned.marker delete mode 100644 libraries/build/jrebel/project-cleaned.marker delete mode 100644 main-extensions/build/jrebel/project-cleaned.marker delete mode 100644 modules/build/jrebel/project-cleaned.marker delete mode 100644 services/build/jrebel/project-cleaned.marker delete mode 100644 skin/build/jrebel/project-cleaned.marker delete mode 100644 test/build/jrebel/project-cleaned.marker delete mode 100644 tts/build/jrebel/project-cleaned.marker diff --git a/OCH/build/jrebel/project-cleaned.marker b/OCH/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/foudations/build/jrebel/project-cleaned.marker b/foudations/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libraries/build/jrebel/project-cleaned.marker b/libraries/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/main-extensions/build/jrebel/project-cleaned.marker b/main-extensions/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules/build/jrebel/project-cleaned.marker b/modules/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index 92e7a60fd0..0e693aaf2a 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -1,6 +1,5 @@ package com.mogo.module.adas; -import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; import com.mogo.module.adas.entity.WarnMessageModel; import com.mogo.module.adas.model.AdasServiceModel; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 527fdca526..0e1b862d33 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -319,7 +319,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { } MogoMarkerOptions options = new MogoMarkerOptions() .owner(DataTypes.TYPE_MARKER_ADAS) - .anchor(0.5f, 0.75f) + .anchor(0.5f, 0.5f) .set3DMode(true) .gps(true) .anchorColor(carColor) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 60b8e51b5a..3af9e6dc0f 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -234,9 +234,9 @@ class BaseDrawer { /** * 根据数据源判断车辆预警颜色 * - * @param speed 车速 - * @param lon 经度 - * @param lat 纬度 + * @param type 车辆类型 + * @param fromType 数据来源 + * @param drawLevel 危险等级 * @return 实际车辆颜色 */ protected String getModelRenderColor(int type, int fromType, int drawLevel) { @@ -328,6 +328,7 @@ class BaseDrawer { * @param isVrMode 是否是vrMode */ public static void showSelfSpeed(IMogoMarker mogoMarker, double speed, String uuid, int type, double heading, boolean isVrMode) { + Log.d("EmArrow", "showSelf uuid : " + uuid + " speed : " + speed); if (mogoMarker == null || mogoMarker.isDestroyed()) { return; } 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 2b291dd21c..2eb40ccf05 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 @@ -3,7 +3,6 @@ package com.mogo.module.service.marker; import android.content.Context; import android.graphics.Rect; import android.text.TextUtils; -import android.util.Log; import com.mogo.cloud.socket.entity.SocketDownData; import com.mogo.commons.AbsMogoApplication; @@ -12,7 +11,6 @@ import com.mogo.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.IMogoMarkerManager; -import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.ModuleNames; import com.mogo.module.common.MogoApisHandler; @@ -31,17 +29,14 @@ import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.utils.CloudPoiManager; -import com.mogo.module.common.utils.Trigonometric; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; import com.mogo.module.service.ServiceConst; import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; -import com.mogo.module.service.polyline.LimberCollisionPolyline; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; -import com.mogo.service.adas.entity.ADASRecognizedResult; import com.mogo.service.connection.IMogoLifecycleListener; import com.mogo.service.module.IMogoBizActionDoneListener; import com.mogo.utils.ResourcesHelper; @@ -56,7 +51,6 @@ import org.json.JSONException; import org.json.JSONObject; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -186,11 +180,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, // msg.what = MSG_ADAS; // msg.sendToTarget(); AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList); - Logger.e("liyz", "addAdasRecognizedDataCallback ------> "); + //添加自车的定位图标，碰撞只有一个预警,还需要和adas 联调， // for ( ADASRecognizedResult result : resultList) { -// if (result.drawlevel == 3 || result.drawlevel == 1) { //找出可能碰撞的车 -// Logger.d("liyz", "result.drawlevel == 3 || ==1 ------> "); +// if (result.drawlevel == 3) { //找出可能碰撞的车 +// Logger.d("liyz", "result.drawlevel == 3 ------> "); //// 绘制他车的线,从列表中查出可能碰撞的车的经纬度(没有或者只有一个)，然后预设20米的长度 //// 绘制碰撞的他车指引线，需要实时给数据更新 TODO // drawLimberCollisionPolyline(result); @@ -203,31 +197,31 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } - /** - * 实时绘制连线 - * - * @param result - */ - private void drawLimberCollisionPolyline(ADASRecognizedResult result) { - if (result != null) { - IMogoPolyline polyLine = LimberCollisionPolyline.getInstance().getPolyLine(); - MogoLatLng startLatLng = new MogoLatLng(result.lat, result.lon); - MogoLatLng endLatlng = Trigonometric.getNewLocation(startLatLng, 20, result.heading); - Log.d(TAG, "红色区域起始点 = " + startLatLng.lon + "," + startLatLng.lat - + "终点" + endLatlng.lon + "," + endLatlng.lat + "--heading =" + result.heading); - if (polyLine != null) { - Log.d(TAG, "drawStopLine polyLine != null"); - polyLine.setPoints(Arrays.asList(startLatLng, endLatlng)); - } else { - List latLngs = new ArrayList<>(); - latLngs.add(startLatLng); - latLngs.add(endLatlng); - LimberCollisionPolyline.getInstance().draw((float) result.roadWidth, latLngs); - } - } else { - LimberCollisionPolyline.getInstance().clearLine(); - } - } +// /** +// * 实时绘制连线 +// * +// * @param result +// */ +// private void drawLimberCollisionPolyline(ADASRecognizedResult result) { +// if (result != null) { +// IMogoPolyline polyLine = LimberCollisionPolyline.getInstance().getPolyLine(); +// MogoLatLng startLatLng = new MogoLatLng(result.lat, result.lon); +// MogoLatLng endLatlng = Trigonometric.getNewLocation(startLatLng, 20, result.heading); +// Log.d(TAG, "红色区域起始点 = " + startLatLng.lon + "," + startLatLng.lat +// + "终点" + endLatlng.lon + "," + endLatlng.lat + "--heading =" + result.heading); +// if (polyLine != null) { +// Log.d(TAG, "drawStopLine polyLine != null"); +// polyLine.setPoints(Arrays.asList(startLatLng, endLatlng)); +// } else { +// List latLngs = new ArrayList<>(); +// latLngs.add(startLatLng); +// latLngs.add(endLatlng); +// LimberCollisionPolyline.getInstance().draw((float) result.roadWidth, latLngs); +// } +// } else { +// LimberCollisionPolyline.getInstance().clearLine(); +// } +// } // private final static int MSG_SNAPSHOT = 1; // private final static int MSG_ADAS = 2; diff --git a/services/build/jrebel/project-cleaned.marker b/services/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 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 cf1ea4c494..b5060af0d3 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 @@ -292,7 +292,6 @@ public class MogoADASController implements IMogoADASController { } } DebugConfig.setStatus(DebugConfig.sAdasRecognized, true); - Log.i("ADAS数据延时", "接收数据 -> 发出 cost :" + TimeUnit.NANOSECONDS.toMillis((System.nanoTime() - start)) + "ms"); } @Override diff --git a/skin/build/jrebel/project-cleaned.marker b/skin/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/build/jrebel/project-cleaned.marker b/test/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tts/build/jrebel/project-cleaned.marker b/tts/build/jrebel/project-cleaned.marker deleted file mode 100644 index e69de29bb2..0000000000