[3.4.0-map-sdk] fix merge problem
This commit is contained in:
@@ -1228,7 +1228,7 @@ class RoadHelper {
|
||||
|
||||
cancelCacheHDData()
|
||||
cacheList.add(id)
|
||||
RoadHelper.getInstance()?.cacheHDDataByCity(id,object : IResult<Boolean> {
|
||||
getInstance()?.cacheHDDataByCity(id,object : IResult<Boolean> {
|
||||
override fun result(code: Int, result: Boolean?) {
|
||||
mIsExecute.set(result?:false)
|
||||
if (CompileConfig.DEBUG) {
|
||||
@@ -1248,7 +1248,7 @@ class RoadHelper {
|
||||
cacheHdDataProgressJob = CommonController.instance.scope?.launch(Dispatchers.IO) {
|
||||
var progress = 0.0
|
||||
while (progress < 1.0) {
|
||||
RoadHelper.getInstance()?.getCacheProgressByCity(id,object : IResult<Double> {
|
||||
getCacheProgressByCity(id,object : IResult<Double> {
|
||||
override fun result(code: Int, result: Double?) {
|
||||
progress = result?:0.0
|
||||
if (CompileConfig.DEBUG) {
|
||||
@@ -1278,7 +1278,7 @@ class RoadHelper {
|
||||
if (TransformUtils.outOfChina(lat, lon)) {
|
||||
return
|
||||
}
|
||||
RoadHelper.getInstance()?.getCityCode(lon, lat, object : IResult<Int> {
|
||||
getInstance()?.getCityCode(lon, lat, object : IResult<Int> {
|
||||
override fun result(code: Int, id: Int?) {
|
||||
if (id == 0) {
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user