From 91bd7607504c14562f1ee3d569647e7fa05bbb10 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 28 Jun 2021 17:13:38 +0800 Subject: [PATCH] fix bug of environment of socket and update map version --- .../com/mogo/launcher/MogoApplication.java | 6 +- gradle.properties | 2 +- .../drawer/AdasRecognizedResultDrawer.java | 61 +++++++++++-------- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 453037681a..12a1cabf11 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -177,7 +177,11 @@ public class MogoApplication extends AbsMogoApplication { break; } // 设置应用服务AppId 长链、鉴权 - clientConfig.setServiceAppId("com.mogo.launcher"); + if(DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE){ + clientConfig.setServiceAppId("com_mogo_launcher"); + }else{ + clientConfig.setServiceAppId("com.mogo.launcher"); + } // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请 // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备） clientConfig.setThirdPartyDeviceId(Utils.getDevicesId()); diff --git a/gradle.properties b/gradle.properties index 329e09eb91..dbd2f51cbd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -187,4 +187,4 @@ applicationId=com.mogo.launcer applicationName=IntelligentPilot versionCode=80007 versionName=8.0.7 -MAP_SDK_VERSION=1.0.0-vr-8.5.53 \ No newline at end of file +MAP_SDK_VERSION=1.0.0-vr-8.5.57 \ No newline at end of file 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 ff3b63e9b8..1a60e7d38b 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 @@ -31,7 +31,7 @@ public */ class AdasRecognizedResultDrawer extends BaseDrawer { - private static final String TAG = "AdasRecognizedResultDrawer"; + private static final String TAG = "RecognizedResultDrawer"; private static volatile AdasRecognizedResultDrawer sInstance; @@ -100,6 +100,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { String uniqueKey = recognizedListResult.uuid; IMogoMarker marker = mMarkersCaches.remove(uniqueKey); if (marker != null && !marker.isDestroyed()) { + Log.d(TAG, "发现缓存marker id : " + uniqueKey); updateCacheMarkerRes(marker, recognizedListResult); renderAdasOneFrame(true, marker, uniqueKey, recognizedListResult, newAdasRecognizedMarkersCaches); } else { @@ -112,50 +113,55 @@ class AdasRecognizedResultDrawer extends BaseDrawer { removeUselessLastRecord(); // 能复用的 marker 数量 - int cachedMarkerSize = mMarkersCaches.size(); +// int cachedMarkerSize = mMarkersCaches.size(); // 需要新增的 marker 数量 int newDiffSetSize = newDiffSet.size(); + Log.d(TAG, "原数据量 ： " + resultList.size() + " 新增marker数量 ： " + newDiffSetSize); // 能复用的数量 - int size = Math.min(cachedMarkerSize, newDiffSetSize); +// int size = Math.min(cachedMarkerSize, newDiffSetSize); // 复用过期 marker if (newDiffSetSize > 0) { - Iterator> entryIterator = mMarkersCaches.entrySet().iterator(); - for (int i = 0; i < size; i++) { - ADASRecognizedResult recognizedListResult = newDiffSet.get(i); - String uniqueKey = recognizedListResult.uuid; - Map.Entry entry = entryIterator.next(); - entryIterator.remove(); - ADASRecognizedResult old = mLastPositions.remove(entry.getKey()); - IMogoMarker marker = entry.getValue(); - if (marker == null) { - Log.d("EmArrow", "存在复用marker为空数据"); - continue; - } - // 复用，更新marker 3D资源 - if (old == null || old.type != recognizedListResult.type) { - updateCacheMarkerRes(marker, recognizedListResult); - } - renderAdasOneFrame(false, marker, uniqueKey, recognizedListResult, newAdasRecognizedMarkersCaches); - } +// Iterator> entryIterator = mMarkersCaches.entrySet().iterator(); +// for (int i = 0; i < size; i++) { +// ADASRecognizedResult recognizedListResult = newDiffSet.get(i); +// String uniqueKey = recognizedListResult.uuid; +// Map.Entry entry = entryIterator.next(); +// entryIterator.remove(); +// ADASRecognizedResult old = mLastPositions.remove(entry.getKey()); +// IMogoMarker marker = entry.getValue(); +// if (marker == null) { +// continue; +// } +// // 复用，更新marker 3D资源 +// if (old == null || old.type != recognizedListResult.type) { +// updateCacheMarkerRes(marker, recognizedListResult); +// } +// Log.d(TAG,"复用marker id : " + uniqueKey); +// renderAdasOneFrame(false, marker, uniqueKey, recognizedListResult, newAdasRecognizedMarkersCaches); +// } // 复用过后还需新增的 marker - for (int i = size; i < newDiffSetSize; i++) { +// for (int i = size; i < newDiffSetSize; i++) { + for (int i = 0; i < newDiffSetSize; i++) { ADASRecognizedResult recognizedListResult = newDiffSet.get(i); String uniqueKey = recognizedListResult.uuid; IMogoMarker marker = drawAdasRecognizedDataMarker(recognizedListResult); if (marker == null) { continue; } + Log.d(TAG, "新增marker id : " + uniqueKey); renderAdasOneFrame(false, marker, uniqueKey, recognizedListResult, newAdasRecognizedMarkersCaches); } } - if (cachedMarkerSize - size > 0) { - sendMessage(MSG_REMOVE_DIRTY_MARKERS, mMarkersCaches); - } +// if (cachedMarkerSize - size > 0) { +// sendMessage(MSG_REMOVE_DIRTY_MARKERS, mMarkersCaches); +// } sendMessage(MSG_REMOVE_DIRTY_MARKERS, mMarkersCaches); + mMarkersCaches.clear(); mMarkersCaches = newAdasRecognizedMarkersCaches; + Log.d(TAG, "更新缓存marker, size : " + mMarkersCaches.size()); } /** @@ -273,8 +279,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { Map newAdasRecognizedMarkersCaches) { final long start = System.currentTimeMillis(); - Log.d("EmArrow", "renderAdasOneFrame uuid : " + uniqueKey + " type : " + recognizedListResult.type); - Log.d("EmArrow", "renderAdasOneFrame Process.myPid : " + android.os.Process.myPid()); + Log.d(TAG, "renderAdasOneFrame uuid : " + uniqueKey + " type : " + recognizedListResult.type); ADASRecognizedResult lastPosition = mLastPositions.remove(uniqueKey); // double lastLon = -1; // double lastLat = -1; @@ -290,6 +295,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { mLastPositions.put(uniqueKey, recognizedListResult); if (useCache) { + Log.d(TAG, "使用缓存 id : " + uniqueKey); long interval = computeAnimDuration(lastPosition.systemTime, recognizedListResult.systemTime, lastPosition.satelliteTime, recognizedListResult.satelliteTime); final MogoLatLng renderLoc = new MogoLatLng(recognizedListResult.lat, recognizedListResult.lon); @@ -297,6 +303,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { final long intervalRef = interval - cost; marker.addDynamicAnchorPosition(renderLoc, (float) recognizedListResult.heading, intervalRef); } else { + Log.d(TAG, "未使用缓存 id : " + uniqueKey); marker.setRotateAngle(((float) recognizedListResult.heading)); marker.setPosition(recognizedListResult.lat, recognizedListResult.lon); }