yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_MogoAP_eagle-220_211207_8.0.15'

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
donghongyu
2021-12-22 16:05:15 +08:00
parent 4eb2277d79 5863ed8892
commit e7919d9e6d
5 changed files with 91 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapLocationListenerManager.kt
View File

@@ -88,12 +88,12 @@ object CallerMapLocationListenerManager : CallerBase() {
*/
fun invokeMapLocationChangeListener(location: MogoLocation?) {
//LogUtils.dTag(TAG, "mapStyleMode:$location")
val longitude = "${location?.longitude}"
if (longitude.length>12){
Log.e("DHY-location", "${location?.longitude},${location?.latitude} CallerMapLocationListenerManager-invokeMapLocationChangeListener")
}else{
Log.w("DHY-location", "${location?.longitude},${location?.latitude} CallerMapLocationListenerManager-invokeMapLocationChangeListener")
}
// val longitude = "${location?.longitude}"
// if (longitude.length>12){
// Log.e("DHY-location", "${location?.longitude},${location?.latitude} CallerMapLocationListenerManager-invokeMapLocationChangeListener")
// }else{
// Log.w("DHY-location", "${location?.longitude},${location?.latitude} CallerMapLocationListenerManager-invokeMapLocationChangeListener")
// }
mLocation = location
mMapStyleChangeListeners.forEach {
val tag = it.key

157
gradle.properties
View File

@@ -37,14 +37,14 @@ kapt.include.compile.classpath=false
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.jetifier.blacklist=module-service-2.1.14.4.aar
android.jetifier.blacklist=module-service-2.1.14.5.aar
## maven 配置
RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
USERNAME=xintai
PASSWORD=xintai2018
# 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
USE_MAVEN_PACKAGE=false
USE_MAVEN_PACKAGE=true
##plugin 插件
android.enableR8.libraries=false
android.enableR8=false
@@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.13
MOGO_LOCATION_VERSION=1.3.13
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.0.0.13
MAP_SDK_VERSION=2.0.0.18
# websocket
WEBSOCKET_VERSION=1.1.7
## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
@@ -89,101 +89,102 @@ applicationName=IntelligentPilot
versionCode=80007
versionName=8.0.15
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.56.4
MOGO_CORE_DATA_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_API_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.56.4
MOGO_CORE_RES_VERSION=0.0.56.4
MOGO_CORE_UTILS_VERSION=0.0.56.4
MOGO_CORE_NETWORK_VERSION=0.0.56.4
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.56.5
MOGO_CORE_DATA_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_API_VERSION=0.0.56.5
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.56.5
MOGO_CORE_RES_VERSION=0.0.56.5
MOGO_CORE_UTILS_VERSION=0.0.56.5
MOGO_CORE_NETWORK_VERSION=0.0.56.5
################# 旧版本架构模块版本 #################
## 工程内模块
MOGO_COMMONS_VERSION=2.1.14.4
MOGO_UTILS_VERSION=2.1.14.4
MAP_AMAP_VERSION=2.1.14.4
MAP_AUTONAVI_VERSION=2.1.14.4
MOGO_MAP_VERSION=2.1.14.4
MOGO_MAP_API_VERSION=2.1.14.4
MOGO_SERVICE_VERSION=2.1.14.4
MOGO_SERVICE_API_VERSION=2.1.14.4
MOGO_CONNECTION_VERSION=2.1.14.4
MOGO_MODULE_APPS_VERSION=2.1.14.4
MOGO_MODULE_NAVI_VERSION=2.1.14.4
MOGO_MODULE_SHARE_VERSION=2.1.14.4
MOGO_MODULE_COMMON_VERSION=2.1.14.4
MOGO_MODULE_MAIN_VERSION=2.1.14.4
MOGO_MODULE_MAP_VERSION=2.1.14.4
MOGO_MODULE_SERVICE_VERSION=2.1.14.4
MOGO_MODULE_EXTENSIONS_VERSION=2.1.14.4
MOGO_MODULE_SEARCH_VERSION=2.1.14.4
MOGO_MODULE_V2X_VERSION=2.1.14.4
MOGO_COMMONS_VERSION=2.1.14.5
MOGO_UTILS_VERSION=2.1.14.5
MAP_AMAP_VERSION=2.1.14.5
MAP_AUTONAVI_VERSION=2.1.14.5
MOGO_MAP_VERSION=2.1.14.5
MOGO_MAP_API_VERSION=2.1.14.5
MOGO_SERVICE_VERSION=2.1.14.5
MOGO_SERVICE_API_VERSION=2.1.14.5
MOGO_CONNECTION_VERSION=2.1.14.5
MOGO_MODULE_APPS_VERSION=2.1.14.5
MOGO_MODULE_NAVI_VERSION=2.1.14.5
MOGO_MODULE_SHARE_VERSION=2.1.14.5
MOGO_MODULE_COMMON_VERSION=2.1.14.5
MOGO_MODULE_MAIN_VERSION=2.1.14.5
MOGO_MODULE_MAP_VERSION=2.1.14.5
MOGO_MODULE_SERVICE_VERSION=2.1.14.5
MOGO_MODULE_EXTENSIONS_VERSION=2.1.14.5
MOGO_MODULE_SEARCH_VERSION=2.1.14.5
MOGO_MODULE_BACK_VERSION=2.1.14.5
MOGO_MODULE_V2X_VERSION=2.1.14.5
# 探路
MOGO_MODULE_TANLU_VERSION=2.1.14.4
MOGO_MODULE_TANLU_VERSION=2.1.14.5
# 推送
MOGO_MODULE_PUSH_VERSION=2.1.14.4
MOGO_MODULE_PUSH_BASE_VERSION=2.1.14.4
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.14.4
MOGO_MODULE_PUSH_VERSION=2.1.14.5
MOGO_MODULE_PUSH_BASE_VERSION=2.1.14.5
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.14.5
# 探路上报和分享模块
TANLULIB_VERSION=2.1.14.4
MOGO_TANLU_API_VERSION=2.1.14.4
TANLULIB_VERSION=2.1.14.5
MOGO_TANLU_API_VERSION=2.1.14.5
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.14.4
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.14.4
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.14.5
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.14.5
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.1.14.4
MOGO_MODULE_WIDGETS_VERSION=2.1.14.5
# obu
MOGO_MODULE_OBU_VERSION=2.1.14.4
MOGO_MODULE_OBU_MOGO_VERSION=2.1.14.4
MOGO_MODULE_OBU_VERSION=2.1.14.5
MOGO_MODULE_OBU_MOGO_VERSION=2.1.14.5
# monitor
MOGO_MODULE_MONITOR_VERSION=2.1.14.4
MOGO_MODULE_MONITOR_VERSION=2.1.14.5
# bugly
CRASHREPORT_VERSION=2.1.14.4
CRASHREPORT_BUGLY_VERSION=2.1.14.4
CRASHREPORT_NOOP_VERSION=2.1.14.4
CRASHREPORT_UPGRADE_VERSION=2.1.14.4
CRASHREPORT_VERSION=2.1.14.5
CRASHREPORT_BUGLY_VERSION=2.1.14.5
CRASHREPORT_NOOP_VERSION=2.1.14.5
CRASHREPORT_UPGRADE_VERSION=2.1.14.5
## tts
TTS_BASE_VERSION=2.1.14.4
TTS_DI_VERSION=2.1.14.4
TTS_ZHI_VERSION=2.1.14.4
TTS_PAD_VERSION=2.1.14.4
TTS_NOOP_VERSION=2.1.14.4
TTS_BASE_VERSION=2.1.14.5
TTS_DI_VERSION=2.1.14.5
TTS_ZHI_VERSION=2.1.14.5
TTS_PAD_VERSION=2.1.14.5
TTS_NOOP_VERSION=2.1.14.5
# 自研地图
MAP_CUSTOM_VERSION=2.1.14.4
MOGO_MODULE_ADAS_VERSION=2.1.14.4
MAP_CUSTOM_VERSION=2.1.14.5
MOGO_MODULE_ADAS_VERSION=2.1.14.5
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.14.4
MOGO_BASE_SERVICES_APK_VERSION=2.1.14.4
MOGO_BASE_SERVICES_SDK_VERSION=2.1.14.4
MOGO_MODULE_CHAT_VERSION=2.1.14.4
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.14.5
MOGO_BASE_SERVICES_APK_VERSION=2.1.14.5
MOGO_BASE_SERVICES_SDK_VERSION=2.1.14.5
MOGO_MODULE_CHAT_VERSION=2.1.14.5
# 车聊聊
MOGO_MODULE_CARCHATTING_VERSION=2.1.14.4
MOGO_MODULE_CARCHATTING_VERSION=2.1.14.5
# 车聊聊接口
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.14.4
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.14.5
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.1.14.4
MOGO_SKIN_LIGHT_VERSION=2.1.14.4
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.14.4
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.14.4
SKIN_SUPPORT_VERSION=2.1.14.4
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.14.4
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.14.4
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.14.4
SKIN_SUPPORT_DESIGN_VERSION=2.1.14.4
MOGO_SKIN_SUPPORT_VERSION=2.1.14.5
MOGO_SKIN_LIGHT_VERSION=2.1.14.5
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.14.5
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.14.5
SKIN_SUPPORT_VERSION=2.1.14.5
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.14.5
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.14.5
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.14.5
SKIN_SUPPORT_DESIGN_VERSION=2.1.14.5
# OCH
MOGO_OCH_VERSION=2.1.14.4-test
MOGO_OCH_VERSION=2.1.14.5-test
MOGO_OCH_BUS_VERSION=2.0.66
MOGO_OCH_NOOP_VERSION=2.0.66
MOGO_OCH_TAXI_VERSION=2.0.66
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.14.4
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.14.5
################# 旧版本架构模块版本 #################

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

@@ -751,9 +751,9 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) {
Log.w("DHY-location", location.getLon() + "," + location.getLat() + " AMapViewWrapper-onLocationChanged：location");
// Log.w("DHY-location", location.getLon() + "," + location.getLat() + " AMapViewWrapper-onLocationChanged：location");
MogoLocation mLastLocation = ObjectUtils.fromLocation(location);
Log.w("DHY-location", mLastLocation.getLongitude() + "," + mLastLocation.getLatitude() + " AMapViewWrapper-onLocationChanged：mLastLocation");
// Log.w("DHY-location", mLastLocation.getLongitude() + "," + mLastLocation.getLatitude() + " AMapViewWrapper-onLocationChanged：mLastLocation");
UiThreadHandler.post(() -> CallerMapLocationListenerManager.INSTANCE.invokeMapLocationChangeListener(mLastLocation));
Location sysLocation = new Location(location.getProvider());

4
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java
View File

@@ -114,7 +114,7 @@ public class ALocationClient implements IMogoLocationClient {
@Override
public void onLocationChanged( @NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location ) {
Log.w("DHY-location", location.getLon() + "," + location.getLat() + " ALocationClient-onLocationChanged:location");
//Log.w("DHY-location", location.getLon() + "," + location.getLat() + " ALocationClient-onLocationChanged:location");
if ( mIsDestroyed ) {
destroyWarming();
return;
@@ -126,7 +126,7 @@ public class ALocationClient implements IMogoLocationClient {
}
Trace.beginSection( "timer.onLocationChanged" );
mLastLocation = ObjectUtils.fromLocation( location );
Log.w("DHY-location", mLastLocation.getLongitude() + "," + mLastLocation.getLatitude() + " ALocationClient-onLocationChanged:mLastLocation");
//Log.w("DHY-location", mLastLocation.getLongitude() + "," + mLastLocation.getLatitude() + " ALocationClient-onLocationChanged:mLastLocation");
UiThreadHandler.post(() -> CallerMapLocationListenerManager.INSTANCE.invokeMapLocationChangeListener(mLastLocation));
Set< IMogoLocationListener > listeners = MogoLocationListenerRegister.getInstance().getListeners();

4
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
View File

@@ -53,10 +53,10 @@ public class OnAdasListenerAdapter implements OnAdasListener {
@Override
public void onCarStateData(CarStateInfo carStateInfo) {
Logger.d(TAG, "--------carStateInfo.toString() = " + carStateInfo.toString());
// Logger.d(TAG, "--------carStateInfo.toString() = " + carStateInfo.toString());
//can数据转发
CarStateInfo.ValuesBean bean = carStateInfo.getValues();
Log.w("DHY-location", bean.getLon() + "," + bean.getLat() + " OnAdasListenerAdapter-onCarStateData：");
// Log.w("DHY-location", bean.getLon() + "," + bean.getLat() + " OnAdasListenerAdapter-onCarStateData：");
if (bean != null) {
int turn_light = bean.getTurn_light(); //转向灯状态 0是正常 1是左转 2是右转