fix conflict

This commit is contained in:
lixiaopeng
2021-04-23 18:43:32 +08:00
parent cc08ef6a14
commit 390da88ced
13 changed files with 356 additions and 7 deletions

View File

@@ -6,7 +6,6 @@ import android.location.Location;
import android.view.View;
import android.view.animation.Interpolator;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import com.mogo.map.MogoLatLng;
@@ -237,6 +236,8 @@ public interface IMogoMapUIController {
*/
void changeBearing( float bearing );
void setAdasRecognizedResult(String result);
/**
* 获取瓦片id
* @param lon 经度