[2.13.0-arch-opt] change the gradle files and map gradle config

This commit is contained in:
zhongchao
2022-12-28 17:42:38 +08:00
parent b8cbc713c1
commit c411ee4389
21 changed files with 61 additions and 406 deletions

View File

@@ -7,7 +7,6 @@ import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.search.geo.IMogoGeoSearch;
import com.mogo.map.search.poisearch.IMogoPoiSearch;
import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
import com.mogo.map.search.traffic.IMogoTrafficSearch;
import com.mogo.map.uicontroller.IMogoMapUIController;
public
@@ -31,6 +30,4 @@ interface IMogoMapApiBuilder extends IProvider {
IMogoMapView getMapView( Context context );
IMogoTrafficSearch getTrafficSearch();
}

View File

@@ -17,4 +17,8 @@ public interface IMogoGDLocationClient {
*/
String getLastCityCode();
double getLastLat();
double getLastLon();
}

View File

@@ -31,11 +31,6 @@ public class MogoLocationListenerRegister implements IMogoLocationListenerRegist
sInstance = null;
}
private Object readResolve() {
// 阻止反序列化,必须实现 Serializable 接口
return sInstance;
}
private final Set< IMogoLocationListener > sListeners = new HashSet<>( 10 );
/**

View File

@@ -1,29 +0,0 @@
package com.mogo.map.search.traffic;
import com.mogo.eagle.core.data.map.MogoLatLng;
public interface IMogoTrafficSearch {
/**
* 根据道路名称查询交通态势
*
* @param adCode 城市code
* @param roadName 道路名称
*/
void searchTrafficByRoad(String adCode,String roadName);
/**
* 根据圆形区域查询交通态势
*
* @param mogoLatLng 中心点坐标
* @param radius 查询半径
*/
void searchTrafficByCircleArea(MogoLatLng mogoLatLng,int radius);
/**
* 交通态势查询监听
*
* @param listener
*/
void registerTrafficSearchListener(IMogoTrafficSearchListener listener);
}

View File

@@ -1,8 +0,0 @@
package com.mogo.map.search.traffic;
public interface IMogoTrafficSearchListener {
void onTrafficSearchInfo(MogoTrafficResult trafficResult);
void onTrafficSearchError(String errorMsg);
}

View File

@@ -1,48 +0,0 @@
package com.mogo.map.search.traffic;
import java.util.List;
public class MogoTrafficResult {
//路况描述信息
private String description;
//路况评价信息
private MogoTrafficStatusEvaluation evaluation;
//道路列表
private List<MogoTrafficStatusInfo> trafficStatusInfos;
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public MogoTrafficStatusEvaluation getEvaluation() {
return evaluation;
}
public void setEvaluation(MogoTrafficStatusEvaluation evaluation) {
this.evaluation = evaluation;
}
public List<MogoTrafficStatusInfo> getTrafficStatusInfos() {
return trafficStatusInfos;
}
public void setTrafficStatusInfos(List<MogoTrafficStatusInfo> trafficStatusInfos) {
this.trafficStatusInfos = trafficStatusInfos;
}
@Override
public String toString() {
return "MogoTrafficResult{" +
"description='" + description + '\'' +
", evaluation=" + evaluation +
", trafficStatusInfos=" + trafficStatusInfos +
'}';
}
}

View File

@@ -1,83 +0,0 @@
package com.mogo.map.search.traffic;
//交通态势搜索返回的路况信息
public class MogoTrafficStatusEvaluation {
//拥堵所占百分比
private String blocked;
//缓行所占百分比
private String congested;
//路况描述
private String description;
//畅通所占百分比
private String expedite;
//路况状态
private String status;
//未知路段所占百分比
private String unKnown;
public String getBlocked() {
return blocked;
}
public void setBlocked(String blocked) {
this.blocked = blocked;
}
public String getCongested() {
return congested;
}
public void setCongested(String congested) {
this.congested = congested;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getExpedite() {
return expedite;
}
public void setExpedite(String expedite) {
this.expedite = expedite;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getUnKnown() {
return unKnown;
}
public void setUnKnown(String unKnown) {
this.unKnown = unKnown;
}
@Override
public String toString() {
return "MogoTrafficStatusEvaluation{" +
"blocked='" + blocked + '\'' +
", congested='" + congested + '\'' +
", description='" + description + '\'' +
", expedite='" + expedite + '\'' +
", status='" + status + '\'' +
", unKnown='" + unKnown + '\'' +
'}';
}
}

View File

@@ -1,87 +0,0 @@
package com.mogo.map.search.traffic;
import com.mogo.eagle.core.data.map.MogoLatLng;
import java.util.List;
//交通态势查询结果返回道路信息
public class MogoTrafficStatusInfo {
//车行角度
private int angle;
//坐标集合
private List<MogoLatLng> mogoLatLngs;
//方向描述
private String direction;
//方向
private String lcodes;
//设置的道路名称
private String name;
//路况状态
private String status;
public int getAngle() {
return angle;
}
public void setAngle(int angle) {
this.angle = angle;
}
public List<MogoLatLng> getMogoLatLngs() {
return mogoLatLngs;
}
public void setMogoLatLngs(List<MogoLatLng> mogoLatLngs) {
this.mogoLatLngs = mogoLatLngs;
}
public String getDirection() {
return direction;
}
public void setDirection(String direction) {
this.direction = direction;
}
public String getLcodes() {
return lcodes;
}
public void setLcodes(String lcodes) {
this.lcodes = lcodes;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
@Override
public String toString() {
return "MogoTrafficStatusInfo{" +
"angle=" + angle +
", mogoLatLngs=" + mogoLatLngs +
", direction='" + direction + '\'' +
", lcodes='" + lcodes + '\'' +
", name='" + name + '\'' +
", status='" + status + '\'' +
'}';
}
}

View File

@@ -262,6 +262,7 @@ public interface IMogoMapUIController {
}
//todo 改造,此处调用到数据中心同步,删除此处更新。后续更新调用, {@link CallerMapUIServiceManager#getSingletonLocationClient}
/**
* 使用自动驾驶车的定位数据
*
@@ -275,7 +276,6 @@ public interface IMogoMapUIController {
}
/**
* 获取车速资源缓存 id
*

View File

@@ -1,10 +1,8 @@
package com.mogo.map;
import android.content.Context;
import android.util.Log;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.map.location.ALocationClient;
import com.mogo.map.location.IMogoLocationClient;
@@ -13,12 +11,8 @@ import com.mogo.map.search.PoiSearchClient;
import com.mogo.map.search.geo.IMogoGeoSearch;
import com.mogo.map.search.poisearch.IMogoPoiSearch;
import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
import com.mogo.map.search.traffic.IMogoTrafficSearch;
import com.mogo.map.uicontroller.AMapUIController;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.zhidaoauto.map.sdk.open.HDTypes;
import com.zhidaoauto.map.sdk.open.MapAutoApi;
import com.zhidaoauto.map.sdk.open.MapParams;
import com.zhidaoauto.map.sdk.open.view.MapAutoView;
/**
@@ -90,11 +84,6 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder {
return mapView;
}
@Override
public IMogoTrafficSearch getTrafficSearch() {
return null;
}
@Override
public void destroy() {

View File

@@ -7,7 +7,6 @@ import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.search.geo.IMogoGeoSearch;
import com.mogo.map.search.poisearch.IMogoPoiSearch;
import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
import com.mogo.map.search.traffic.IMogoTrafficSearch;
import com.mogo.map.uicontroller.IMogoMapUIController;
@@ -58,8 +57,4 @@ class MogoMapDelegateFactory {
return getApiBuilder().getMapView(context);
}
public static IMogoTrafficSearch getTrafficSearch() {
return getApiBuilder().getTrafficSearch();
}
}

View File

@@ -1,35 +0,0 @@
package com.mogo.map;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.search.traffic.IMogoTrafficSearch;
import com.mogo.map.search.traffic.IMogoTrafficSearchListener;
public class MogoTrafficSearch implements IMogoTrafficSearch {
private IMogoTrafficSearch mDelegate;
public MogoTrafficSearch() {
mDelegate = MogoMapDelegateFactory.getTrafficSearch();
}
@Override
public void searchTrafficByRoad(String adCode, String roadName) {
if (mDelegate != null) {
mDelegate.searchTrafficByRoad(adCode, roadName);
}
}
@Override
public void searchTrafficByCircleArea(MogoLatLng mogoLatLng, int radius) {
if (mDelegate != null) {
mDelegate.searchTrafficByCircleArea(mogoLatLng, radius);
}
}
@Override
public void registerTrafficSearchListener(IMogoTrafficSearchListener listener) {
if (mDelegate != null) {
mDelegate.registerTrafficSearchListener(listener);
}
}
}

View File

@@ -10,7 +10,7 @@ import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.constants.SharedPrefsConstants;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
public class GDLocationClient implements AMapLocationListener,IMogoGDLocationClient {
public class GDLocationClient implements AMapLocationListener, IMogoGDLocationClient {
private volatile static GDLocationClient gdLocationClient;
private static final byte[] obj = new byte[0];
@@ -27,8 +27,9 @@ public class GDLocationClient implements AMapLocationListener,IMogoGDLocationCli
}
//声明LocationClient对象
private AMapLocationClient mLocationClient;
private AMapLocationClient mLocationClient;
private String mCityCode;
private AMapLocation mapLocation;
private GDLocationClient(Context context) {
AMapLocationClient.updatePrivacyShow(context, true, true);
@@ -69,6 +70,7 @@ public class GDLocationClient implements AMapLocationListener,IMogoGDLocationCli
@Override
public void onLocationChanged(AMapLocation aMapLocation) {
if (aMapLocation != null) {
mapLocation = aMapLocation;
String cityCode = aMapLocation.getCityCode();
if (cityCode != null && !cityCode.isEmpty()) {
mCityCode = aMapLocation.getCityCode();
@@ -82,4 +84,14 @@ public class GDLocationClient implements AMapLocationListener,IMogoGDLocationCli
public String getLastCityCode() {
return mCityCode;
}
@Override
public double getLastLat() {
return mapLocation != null ? mapLocation.getLatitude() : 0.0;
}
@Override
public double getLastLon() {
return mapLocation != null ? mapLocation.getLongitude() : 0.0;
}
}