fix conflict

libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java

@@ -16,6 +16,8 @@ import android.view.ViewGroup;
 import android.view.animation.Interpolator;
 import android.widget.TextView;
 
+import com.autonavi.nge.map.LonLat;
+import com.mogo.commons.data.ADASRecognizedResultConvert;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.IMogoMap;
 import com.mogo.map.IMogoMapView;
@@ -35,6 +37,7 @@ import com.mogo.map.uicontroller.MapCameraPosition;
 import com.mogo.map.uicontroller.MapControlResult;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.UiThreadHandler;
+import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.zhidaoauto.map.sdk.open.MapAutoApi;
 import com.zhidaoauto.map.sdk.open.abs.MapStatusListener;
@@ -284,6 +287,15 @@ public class AMapViewWrapper implements IMogoMapView,
 
     }
 
+    private ADASRecognizedResultConvert mAdasResultConvert;
+
+
+    @Override
+    public void setAdasRecognizedResult(String result) {
+        Log.d("liyz", "------- setAdasRecognizedResult ------>");
+        mAdasResultConvert = GsonUtil.objectFromJson(result, ADASRecognizedResultConvert.class);
+    }
+
     @Override
     public void setTrafficEnabled(boolean visible) {
         if (checkAMapView()) {
@@ -759,12 +771,20 @@ public class AMapViewWrapper implements IMogoMapView,
             }
         }
 
-        if (mSelfMarker == null) {
+        if (mSelfMarker == null) { //TODO mAdasResultConvert
+            Log.d("liyz", "-------1------>");
             try {
                 mSelfMarker = mMapView.getMapAutoViewHelper().getMyLocationStyle().getSelfMarker();
                 mSelfMarker.setInfoWindowEnable(true);
+
             } catch (Exception e) {
             }
+        } else {
+            Log.d("liyz", "-------2------>");
+            mSelfMarker.marker3DIcon(R.raw.people);
+//            WorkThreadHandler.getInstance().postDelayed(() -> {
+//                mSelfMarker.marker3DIcon(R.raw.people);
+//            }, 10000);
         }
         showSelfSpeed(location.getSpeed());
     }
@@ -999,6 +1019,7 @@ public class AMapViewWrapper implements IMogoMapView,
         }
     }
 
+    //TODO
     @Override
     public void syncLocation2Map(JSONObject data) {
         if (!checkAMapView()) {

libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java

@@ -357,4 +357,11 @@ public class AMapUIController implements IMogoMapUIController {
             mClient.clearRoadCacheById(id);
         }
     }
+
+    @Override
+    public void setAdasRecognizedResult(String result) {
+        if (mClient != null) {
+            mClient.setAdasRecognizedResult(result);
+        }
+    }
 }