Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java

@@ -167,6 +167,10 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
             }
             renderAdasOneFrame( recognizedListResult, newAdasRecognizedMarkersCaches );
         }
+        for (String id : mAdasRecognizedMarkersCaches.keySet()) {
+            // 清除道路缓存
+            clearRoadCacheById(id);
+        }
         sendMessage( MSG_REMOVE_DIRTY_MARKERS, mAdasRecognizedMarkersCaches );
         mAdasRecognizedMarkersCaches = newAdasRecognizedMarkersCaches;
     }

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java

@@ -134,7 +134,7 @@ class BaseDrawer {
         if ( recognizedType == AdasRecognizedType.classIdCar
                 || recognizedType == AdasRecognizedType.classIdTrafficBus
                 || recognizedType == AdasRecognizedType.classIdTrafficTruck ) {
-            return R.raw.othercar;
+            return R.raw.othercar2;
         } else if ( recognizedType == AdasRecognizedType.classIdBicycle
                 || recognizedType == AdasRecognizedType.classIdMoto ) {
             return R.raw.motorbike;
@@ -271,6 +271,10 @@ class BaseDrawer {
         return matchRoad;
     }
 
+    public void clearRoadCacheById(String id) {
+        MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().clearRoadCacheById(id);
+    }
+
     /**
      * 使用系统时间或卫星时间计算出动画的运动时间
      *