fix conflict

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java

@@ -1037,4 +1037,9 @@ public class AMapNaviViewWrapper implements IMogoMapView,
             mMapView.getMap().moveCamera( CameraUpdateFactory.changeBearing( bearing ) );
         }
     }
+
+    @Override
+    public void setAdasRecognizedResult(String result) {
+        //liyz
+    }
 }

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

@@ -810,4 +810,9 @@ public class AMapViewWrapper implements IMogoMapView,
             mMapView.getMap().moveCamera( CameraUpdateFactory.changeBearing( bearing ) );
         }
     }
+
+    @Override
+    public void setAdasRecognizedResult(String result) {
+        //liyz
+    }
 }

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

@@ -299,6 +299,13 @@ public class AMapUIController implements IMogoMapUIController {
         }
     }
 
+    @Override
+    public void setAdasRecognizedResult(String result) {
+        if ( mClient != null ) {
+            mClient.setAdasRecognizedResult(result);
+        }
+    }
+
     @Override
     public long getTileId(double lon, double lat) {
         return 0;