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

Merge branch 'test_MogoAP_eagle-220_211207_8.0.15.2'

Browse Source
This commit is contained in:
donghongyu
2022-01-10 19:02:43 +08:00
parent 74a15fede0 60bbb91529
commit 8faf47a41b
15 changed files with 294 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/build.gradle
View File

@@ -106,6 +106,8 @@ android {
// 是否作为 launcher 运行
buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName()
buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash()
// 是否支持目的地导航策略
buildConfigField 'boolean', 'IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH', 'false'
}
@@ -231,3 +233,29 @@ android.applicationVariants.all { variant ->
}
apply from: "./regroup.gradle"
/**
* @return 获取当前分支名称
*/
def getWorkingBranchName() {
def workingBranchName = ""
def proc = "git rev-parse --abbrev-ref HEAD".execute()
proc.in.eachLine { line -> workingBranchName = line }
proc.err.eachLine { line -> println line }
proc.waitFor()
workingBranchName = "\"${workingBranchName}\""
println "Working branch name: " + workingBranchName
return workingBranchName
}
/**
* @return 获取当前分支hash
*/
def getWorkingBranchHash() {
def workingBranchHash = ""
def proc = "git log -n1 --format=format:\"%h\"".execute()
proc.in.eachLine { line -> workingBranchHash = line }
proc.err.eachLine { line -> println line }
proc.waitFor()
println "Working branch hash: " + workingBranchHash
return workingBranchHash
}

5
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -9,6 +9,7 @@ import com.bytedance.apm.insight.ApmInsight;
import com.bytedance.apm.insight.ApmInsightInitConfig;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.app.AppConfigInfo;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.function.main.MainMoGoApplication;
import com.mogo.module.v2x.utils.ObuConfig;
@@ -156,6 +157,10 @@ public class MogoApplication extends MainMoGoApplication {
DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME);
DebugConfig.setObuType(SharedPrefsMgr.getInstance(this).getInt("OBU_TYPE", DebugConfig.OBU_TYPE_CIDI));
// 初始化构建APP的时候的分支及提交HASH，用于辅助定位问题
AppConfigInfo.INSTANCE.setWorkingBranchName(BuildConfig.WORKING_BRANCH_NAME);
AppConfigInfo.INSTANCE.setWorkingBranchHash(BuildConfig.WORKING_BRANCH_HASH);
ObuConfig.useObuLocation = false;
// 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU
FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER;

35
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -61,8 +61,6 @@ class DebugSettingView @JvmOverloads constructor(
IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener, IMoGoMapLocationListener {
private val TAG = "DebugSettingView"
// 初始化App 配置信息
val mAppConfigInfo = AppConfigInfo()
init {
LayoutInflater.from(context).inflate(R.layout.view_debug_setting, this, true)
@@ -323,20 +321,21 @@ class DebugSettingView @JvmOverloads constructor(
* 绘制应用基本
*/
private fun drawAppInfo() {
mAppConfigInfo.appName = AppUtils.getAppName()
mAppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
mAppConfigInfo.appVersionName = AppUtils.getAppVersionName()
mAppConfigInfo.appPackageName = AppUtils.getAppPackageName()
mAppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
mAppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
mAppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
mAppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
mAppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
mAppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()
AppConfigInfo.appName = AppUtils.getAppName()
AppConfigInfo.appName = AppUtils.getAppName()
AppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
AppConfigInfo.appVersionName = AppUtils.getAppVersionName()
AppConfigInfo.appPackageName = AppUtils.getAppPackageName()
AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
AppConfigInfo.netMode = DebugConfig.getNetMode()
AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()
// 将数据绘制
tvAppInfo.text = mAppConfigInfo.toString()
tvAppInfo.text = AppConfigInfo.toString()
}
/**
@@ -346,8 +345,8 @@ class DebugSettingView @JvmOverloads constructor(
UiThreadHandler.post {
tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
mAppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
mAppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
drawAppInfo()
}
}
@@ -360,8 +359,8 @@ class DebugSettingView @JvmOverloads constructor(
tvAutopilotInfo.post {
tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo)
mAppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version
mAppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
AppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version
AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
drawAppInfo()
}
}

21
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -31,6 +31,27 @@
android:textSize="@dimen/dp_34"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PAD系统时间："
android:textColor="#000"
android:textSize="@dimen/dp_36" />
<TextClock
android:id="@+id/tvNowTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:format12Hour="yyyy年MM月dd日 EEEE aa HH:mm:ss"
android:format24Hour="yyyy年MM月dd日 EEEE aa HH:mm:ss"
android:textColor="#000"
android:textSize="@dimen/dp_36" />
</LinearLayout>
<TextView
android:id="@+id/tvAppInfo"
android:layout_width="match_parent"

39
core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
View File

@@ -125,24 +125,15 @@ public class SmallMapDirectionView
.icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_start)));
mEndMarker = mAMap.addMarker(new MarkerOptions()
.icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_end)));
new Thread(() -> {
try {
Thread.sleep(1000L);
} catch (InterruptedException e) {
e.printStackTrace();
}
mAMap.setCustomMapStyle(
new CustomMapStyleOptions()
.setEnable(true)
.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext()))
.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext()))
);
//设置希望展示的地图缩放级别
mAMap.moveCamera(mCameraUpdate);
}).start();
// 加载自定义样式
CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions()
.setEnable(true)
.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext()))
.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext()));
// 设置自定义样式
mAMap.setCustomMapStyle(customMapStyleOptions);
//设置希望展示的地图缩放级别
mAMap.moveCamera(mCameraUpdate);
// 设置地图的样式
UiSettings uiSettings = mAMap.getUiSettings();
uiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮
@@ -152,6 +143,14 @@ public class SmallMapDirectionView
mAMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() {
@Override
public void onMapLoaded() {
Logger.d(TAG, "smp---onMapLoaded");
// 加载自定义样式
CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions()
.setEnable(true)
.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext()))
.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext()));
// 设置自定义样式
mAMap.setCustomMapStyle(customMapStyleOptions);
mAMapNaviView.getMap().setPointToCenter(mAMapNaviView.getWidth() / 2, mAMapNaviView.getHeight() / 2);
}
});
@@ -202,10 +201,10 @@ public class SmallMapDirectionView
clearPolyline();
mCoordinatesLatLng.clear();
}
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
} else {
//设置希望展示的地图缩放级别
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
// mAMap.moveCamera(CameraUpdateFactory.newLatLngZoom(currentLatLng, zoomLevel));
}
mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));

5
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt
View File

@@ -5,7 +5,6 @@ import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_V2X_MODULE
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightManager
import com.mogo.eagle.core.function.v2x.redlightwarning.RedLightWarningManager
import com.mogo.eagle.core.function.v2x.speedlimit.SpeedLimitDataManager
import com.mogo.eagle.core.function.v2x.vip.VipCarManager
@@ -19,11 +18,11 @@ class V2XProvider : IMoGoFunctionServerProvider {
CallTrafficLightManager.getTrafficLightProvider().initTrafficLightServer(context)
VipCarManager.INSTANCE.initServer(context)
SpeedLimitDataManager.getInstance().start();
RedLightWarningManager.INSTANCE.listenTrafficLight()
// RedLightWarningManager.INSTANCE.listenTrafficLight()
}
override fun onDestroy() {
VipCarManager.INSTANCE.destroy()
RedLightWarningManager.INSTANCE.onDestroy()
// RedLightWarningManager.INSTANCE.onDestroy()
}
}

2
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
View File

@@ -78,7 +78,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
trafficLightNetWorkModel.requestTrafficLight(
it.latitude, it.longitude, it.bearing.toDouble(), road, { result ->
trafficLightResult = result
TrafficLightHMIManager.INSTANCE.updateTrafficLight(result)
// TrafficLightHMIManager.INSTANCE.updateTrafficLight(result)
CallTrafficLightListenerManager.invokeTrafficLightStatus(result)
},
{ errorMsg ->

2
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightThreadHandler.kt
View File

@@ -36,7 +36,7 @@ class TrafficLightThreadHandler : Handler {
when (msg.what) {
MSG_WHAT_LOOP_SEARCH_CROSS_ROAD -> {
//handler轮询，后续从地图处获取到车道线(前提获取车道线没有异步调用)，来优化轮询时长
sendEmptyMessageDelayed(MSG_WHAT_LOOP_SEARCH_CROSS_ROAD,1_000L)
sendEmptyMessageDelayed(MSG_WHAT_LOOP_SEARCH_CROSS_ROAD,300L)
loopSearchCrossRoad?.invoke()
}
MSG_WHAT_STOP_SEARCH_CROSS_ROAD -> {

2
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
View File

@@ -127,7 +127,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
lastResult?.let {
//如果上次结果和本次灯态结果变化比较大，则已变灯，控制HMI展示弹窗
if (abs(currentResult!!.remain - it.remain) > 5) {
if (abs(currentResult!!.remain - it.remain) > 5 && currentResult.isGreen()) {
Logger.d(TAG, "调用showWarningV2X to show")
CallerHmiManager.showWarningV2X(EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType.toInt(),
EventTypeEnum.TYPE_VIP_IDENTIFICATION.content,

30
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
View File

@@ -5,7 +5,10 @@ package com.mogo.eagle.core.data.app
* @date 2021/10/12 2:46 下午
* 当前应用的配置信息
*/
class AppConfigInfo {
object AppConfigInfo {
/*应用构建基本信息*/
var workingBranchName: String? = null
var workingBranchHash: String? = null
/*应用基本信息*/
var appName: String? = null
@@ -22,6 +25,13 @@ class AppConfigInfo {
var mogoToken: String? = null
var mogoSN: String? = null
/**
* debug 测试环境--2
* release 生产环境--3
* demo 演示环境--4
*/
var netMode: Int = 3
// 是否可以网络连接
var isConnectNet: Boolean = false
@@ -55,6 +65,8 @@ class AppConfigInfo {
return "应用名称：${appName}\n" +
"应用版本：${appVersionCode}\n" +
"应用版本名称：${appVersionName}\n" +
"Git分支名称：${workingBranchName}\n" +
"Git分支HASH：${workingBranchHash}\n" +
"HD-MAP-SDK版本：${mapSdkVersion}\n" +
"ADAS-SDK版本：${adasSdkVersion}\n" +
"OBU-SDK版本：${obuSdkVersion}\n" +
@@ -62,6 +74,22 @@ class AppConfigInfo {
//"mogoToken：${mogoToken}\n"+
"中台分配的SN：${mogoSN}\n" +
"网络是否正常：${isConnectNet}\n" +
"当前网络服务连接：${netMode} -- ${
(when (netMode) {
2 -> {
"测试环境"
}
3 -> {
"生产环境"
}
4 -> {
"演示环境"
}
else -> {
"未知环境"
}
})
}\n" +
"Socket是否正常：${isConnectSocket}\n" +
"ADAS连接是否正常：${isConnectAutopilot}\n" +
"OBU连接是否正常：${isConnectObu}\n"

156
gradle.properties
View File

@@ -37,7 +37,7 @@ 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.15.2.aar
android.jetifier.blacklist=module-service-2.1.15.9.aar
## maven 配置
RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.15
MOGO_LOCATION_VERSION=1.3.15
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.0.0.18
MAP_SDK_VERSION=2.0.0.20
# websocket
WEBSOCKET_VERSION=1.1.7
## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
@@ -89,102 +89,102 @@ applicationName=IntelligentPilot
versionCode=80007
versionName=8.0.15
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.2
MOGO_CORE_DATA_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_API_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.2
MOGO_CORE_RES_VERSION=0.0.57.2
MOGO_CORE_UTILS_VERSION=0.0.57.2
MOGO_CORE_NETWORK_VERSION=0.0.57.2
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.9
MOGO_CORE_DATA_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_API_VERSION=0.0.57.9
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.9
MOGO_CORE_RES_VERSION=0.0.57.9
MOGO_CORE_UTILS_VERSION=0.0.57.9
MOGO_CORE_NETWORK_VERSION=0.0.57.9
################# 旧版本架构模块版本 #################
## 工程内模块
MOGO_COMMONS_VERSION=2.1.15.2
MOGO_UTILS_VERSION=2.1.15.2
MAP_AMAP_VERSION=2.1.15.2
MAP_AUTONAVI_VERSION=2.1.15.2
MOGO_MAP_VERSION=2.1.15.2
MOGO_MAP_API_VERSION=2.1.15.2
MOGO_SERVICE_VERSION=2.1.15.2
MOGO_SERVICE_API_VERSION=2.1.15.2
MOGO_CONNECTION_VERSION=2.1.15.2
MOGO_MODULE_APPS_VERSION=2.1.15.2
MOGO_MODULE_NAVI_VERSION=2.1.15.2
MOGO_MODULE_SHARE_VERSION=2.1.15.2
MOGO_MODULE_COMMON_VERSION=2.1.15.2
MOGO_MODULE_MAIN_VERSION=2.1.15.2
MOGO_MODULE_MAP_VERSION=2.1.15.2
MOGO_MODULE_SERVICE_VERSION=2.1.15.2
MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.2
MOGO_MODULE_SEARCH_VERSION=2.1.15.2
MOGO_MODULE_BACK_VERSION=2.1.15.2
MOGO_MODULE_V2X_VERSION=2.1.15.2
MOGO_COMMONS_VERSION=2.1.15.9
MOGO_UTILS_VERSION=2.1.15.9
MAP_AMAP_VERSION=2.1.15.9
MAP_AUTONAVI_VERSION=2.1.15.9
MOGO_MAP_VERSION=2.1.15.9
MOGO_MAP_API_VERSION=2.1.15.9
MOGO_SERVICE_VERSION=2.1.15.9
MOGO_SERVICE_API_VERSION=2.1.15.9
MOGO_CONNECTION_VERSION=2.1.15.9
MOGO_MODULE_APPS_VERSION=2.1.15.9
MOGO_MODULE_NAVI_VERSION=2.1.15.9
MOGO_MODULE_SHARE_VERSION=2.1.15.9
MOGO_MODULE_COMMON_VERSION=2.1.15.9
MOGO_MODULE_MAIN_VERSION=2.1.15.9
MOGO_MODULE_MAP_VERSION=2.1.15.9
MOGO_MODULE_SERVICE_VERSION=2.1.15.9
MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.9
MOGO_MODULE_SEARCH_VERSION=2.1.15.9
MOGO_MODULE_BACK_VERSION=2.1.15.9
MOGO_MODULE_V2X_VERSION=2.1.15.9
# 探路
MOGO_MODULE_TANLU_VERSION=2.1.15.2
MOGO_MODULE_TANLU_VERSION=2.1.15.9
# 推送
MOGO_MODULE_PUSH_VERSION=2.1.15.2
MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.2
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.2
MOGO_MODULE_PUSH_VERSION=2.1.15.9
MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.9
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.9
# 探路上报和分享模块
TANLULIB_VERSION=2.1.15.2
MOGO_TANLU_API_VERSION=2.1.15.2
TANLULIB_VERSION=2.1.15.9
MOGO_TANLU_API_VERSION=2.1.15.9
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.2
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.2
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.9
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.9
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.1.15.2
MOGO_MODULE_WIDGETS_VERSION=2.1.15.9
# obu
MOGO_MODULE_OBU_VERSION=2.1.15.2
MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.2
MOGO_MODULE_OBU_VERSION=2.1.15.9
MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.9
# monitor
MOGO_MODULE_MONITOR_VERSION=2.1.15.2
MOGO_MODULE_MONITOR_VERSION=2.1.15.9
# bugly
CRASHREPORT_VERSION=2.1.15.2
CRASHREPORT_BUGLY_VERSION=2.1.15.2
CRASHREPORT_NOOP_VERSION=2.1.15.2
CRASHREPORT_UPGRADE_VERSION=2.1.15.2
CRASHREPORT_VERSION=2.1.15.9
CRASHREPORT_BUGLY_VERSION=2.1.15.9
CRASHREPORT_NOOP_VERSION=2.1.15.9
CRASHREPORT_UPGRADE_VERSION=2.1.15.9
## tts
TTS_BASE_VERSION=2.1.15.2
TTS_DI_VERSION=2.1.15.2
TTS_ZHI_VERSION=2.1.15.2
TTS_PAD_VERSION=2.1.15.2
TTS_NOOP_VERSION=2.1.15.2
TTS_BASE_VERSION=2.1.15.9
TTS_DI_VERSION=2.1.15.9
TTS_ZHI_VERSION=2.1.15.9
TTS_PAD_VERSION=2.1.15.9
TTS_NOOP_VERSION=2.1.15.9
# 自研地图
MAP_CUSTOM_VERSION=2.1.15.2
MOGO_MODULE_ADAS_VERSION=2.1.15.2
MAP_CUSTOM_VERSION=2.1.15.9
MOGO_MODULE_ADAS_VERSION=2.1.15.9
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.2
MOGO_BASE_SERVICES_APK_VERSION=2.1.15.2
MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.2
MOGO_MODULE_CHAT_VERSION=2.1.15.2
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.9
MOGO_BASE_SERVICES_APK_VERSION=2.1.15.9
MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.9
MOGO_MODULE_CHAT_VERSION=2.1.15.9
# 车聊聊
MOGO_MODULE_CARCHATTING_VERSION=2.1.15.2
MOGO_MODULE_CARCHATTING_VERSION=2.1.15.9
# 车聊聊接口
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.2
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.9
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.1.15.2
MOGO_SKIN_LIGHT_VERSION=2.1.15.2
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.2
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.2
SKIN_SUPPORT_VERSION=2.1.15.2
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.2
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.2
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.2
SKIN_SUPPORT_DESIGN_VERSION=2.1.15.2
MOGO_SKIN_SUPPORT_VERSION=2.1.15.9
MOGO_SKIN_LIGHT_VERSION=2.1.15.9
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.9
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.9
SKIN_SUPPORT_VERSION=2.1.15.9
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.9
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.9
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.9
SKIN_SUPPORT_DESIGN_VERSION=2.1.15.9
# OCH
MOGO_OCH_VERSION=2.1.15.2-test
MOGO_OCH_VERSION=2.1.15.9-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.15.2
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.9
################# 旧版本架构模块版本 #################

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

@@ -743,8 +743,6 @@ public class AMapViewWrapper implements IMogoMapView,
return MapDataApi.INSTANCE.getLimitSpeed(lon, lat, angle);
}
private boolean isShowWarn;
@Override
public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) {
// Log.w("DHY-location", location.getLon() + "," + location.getLat() + " AMapViewWrapper-onLocationChanged：location");
@@ -802,20 +800,18 @@ public class AMapViewWrapper implements IMogoMapView,
}
// @Override
// public void onMapInit() {
// Logger.i(TAG, "autoop--onMapInit: ");
// HdMapBuildConfig.isMapLoaded = true;
// MogoMapListenerHandler.getInstance().onMapLoaded();
// }
@Override
public void onMapInit() {
Logger.i(TAG, "autoop--onMapInit: ");
MogoMapListenerHandler.getInstance().onMapLoaded();
}
@Override
public void onMapLoaded() {
Logger.i(TAG, "autoop--onMapLoaded: ");
MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型，未来需区分车的类型
//mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);// 地图刷新频率
MogoMapListenerHandler.getInstance().onMapLoaded();
//MogoMapListenerHandler.getInstance().onMapLoaded();
mMapLoaded = true;
CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
Trace.beginSection("timer.onCameraChangeFinish");
@@ -841,6 +837,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onRoadLoaded(@Nullable String s) {
Logger.i(TAG, "autoop--onMapLoaded: ");
}

7
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java
View File

@@ -10,6 +10,7 @@ import com.mogo.eagle.core.data.traffic.TrafficData;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.AdasRecognizedType;
import com.mogo.module.common.constants.DataTypes;
import com.mogo.utils.logger.Logger;
@@ -82,6 +83,9 @@ public class IdentifyDataDrawer extends BaseDrawer {
if (isUselessValue(recognizedListResult)) {
continue;
}
if (AdasRecognizedType.valueFrom(recognizedListResult.getType().getType()) == AdasRecognizedType.classIdUnKnow) {
continue;
}
// 复用之前存在的 marker
String uniqueKey = recognizedListResult.getUuid();
IMogoMarker marker = mMarkersCaches.remove(uniqueKey);
@@ -102,6 +106,9 @@ public class IdentifyDataDrawer extends BaseDrawer {
if (newDiffSetSize > 0) {
for (int i = 0; i < newDiffSetSize; i++) {
TrafficData recognizedListResult = newDiffSet.get(i);
if (AdasRecognizedType.valueFrom(recognizedListResult.getType().getType()) == AdasRecognizedType.classIdUnKnow) {
continue;
}
String uniqueKey = recognizedListResult.getUuid();
IMogoMarker marker = drawAdasRecognizedDataMarker(recognizedListResult);
if (marker == null) {

46
modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
View File

@@ -1,6 +1,8 @@
package com.mogo.module.service.routeoverlay;
import android.content.Context;
import android.location.Location;
import android.os.SystemClock;
import android.util.Log;
import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
@@ -9,10 +11,14 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
import com.mogo.module.common.MogoApisHandler;
import org.jetbrains.annotations.NotNull;
@@ -21,13 +27,14 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, IMoGoAutopilotStatusListener{
public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, IMoGoAutopilotStatusListener, IMoGoMapLocationListener {
private static volatile MogoRouteOverlayManager sInstance;
private Context mContext;
private String TAG = "MogoRouteOverlayManager";
private String TAG2 = "MogoRouteOverlayManager routes";
private int STATUS_AUTOPILOT = 0;//0 非自动驾驶 ; 1 自动驾驶
private MogoLatLng mEnding;
private MogoLocation mLocation;
private MogoRouteOverlayManager(Context context) {
mContext = context;
}
@@ -35,6 +42,8 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener,
public void init() {
CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, this);
CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this);
CallerMapLocationListenerManager.INSTANCE.addListener(TAG,this);
// intiDrawer();
}
public static MogoRouteOverlayManager getInstance(Context context) {
@@ -48,24 +57,42 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener,
return sInstance;
}
private void intiDrawer(){
RouteOverlayDrawer.getInstance(mContext).initdraw();
}
@Override
public void onAutopilotTrajectory(ArrayList<ADASTrajectoryInfo> trajectoryInfos) {
if (trajectoryInfos == null || trajectoryInfos.size() == 0) {
return;
}
ADASTrajectoryInfo adasTrajectoryInfo = trajectoryInfos.get(0);
double lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat();
double lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon();
Log.d(TAG, "size:" + trajectoryInfos.size());
Log.d(TAG, "trajectoryInfos:" + adasTrajectoryInfo.getLat()+":"+adasTrajectoryInfo.getLon());
Log.d(TAG, "location:" + lat+":"+lon);
// double lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat();
// double lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon();
StringBuilder builder = new StringBuilder();
builder.append("{");
builder.append(System.currentTimeMillis()).append(";");
builder.append(mLocation.getLongitude()).append(";");
builder.append(mLocation.getLatitude()).append(";");
builder.append(mLocation.getAltitude()).append(";");
builder.append(mLocation.getBearing()).append(";");
builder.append(mLocation.getSpeed()).append(";");
// ADASTrajectoryInfo adasTrajectoryInfo = trajectoryInfos.get(0);
// long temp = SystemClock.currentThreadTimeMillis();
// Log.d(TAG, "temp:"+temp+" size:" + trajectoryInfos.size());
// Log.d(TAG, "trajectoryInfos:" + adasTrajectoryInfo.getLat()+":"+adasTrajectoryInfo.getLon());
// Log.d(TAG, "temp:"+temp+" location:" + lat+":"+lon);
List<MogoLatLng> mogoLatLngs = new ArrayList<>();
for (ADASTrajectoryInfo a : trajectoryInfos) {
// Log.d(TAG, "temp:"+temp+" trajectoryInfos:" + a.getLat()+":"+a.getLon());
builder.append(a.getLon()).append(",");
builder.append(a.getLat()).append(",");
mogoLatLngs.add(new MogoLatLng(a.getLat(), a.getLon()));
}
if (STATUS_AUTOPILOT == 1) {
RouteOverlayDrawer.getInstance(mContext).drawTrajectoryList(mogoLatLngs);
}
builder.append("}");
Log.d(TAG,builder.toString());
}
@Override
@@ -108,4 +135,9 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener,
public void onAutopilotSNRequest() {
}
@Override
public void onLocationChanged(@Nullable MogoLocation location) {
mLocation = location;
}
}

42
modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
View File

@@ -3,6 +3,7 @@ package com.mogo.module.service.routeoverlay;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.util.Log;
import com.mogo.commons.debug.DebugConfig;
@@ -38,7 +39,7 @@ public class RouteOverlayDrawer {
private static final String markerType = "route_ending";
private RouteOverlayDrawer(Context context) {
mPolylineOptions = new MogoPolylineOptions();
mPolylineOptions.zIndex(20000f);
mPolylineOptions.zIndex(75000f);
mPolylineOptions.setGps(true);
// 绘制路径集合
mPolylinePointList = new ArrayList<>();
@@ -48,7 +49,6 @@ public class RouteOverlayDrawer {
mogoOverlayManager = MogoApisHandler.getInstance().getApis().getMapServiceApi().getOverlayManager(mContext);
endingBitmap = BitmapFactory.decodeResource(context.getResources(),
R.drawable.icon_route_ending);
}
public static RouteOverlayDrawer getInstance(Context context) {
@@ -112,6 +112,8 @@ public class RouteOverlayDrawer {
public void drawTrajectoryList(List<MogoLatLng> routeList) {
// clearMogoRouteOverlay();
long drawstart = System.currentTimeMillis();
mPolylinePointList.clear();
if (routeList != null) {
for (MogoLatLng latLng : routeList) {
@@ -119,7 +121,17 @@ public class RouteOverlayDrawer {
}
mPolylineColors.clear();
// mPolylineColors.addAll(ColorUtils.gradientAlpha_("#FF2AAFFD", "#7b2965ED", "#002965ED", mPolylinePointList.size()));
mPolylineColors.addAll(ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size()));
long start = System.currentTimeMillis();
List<Integer> list = new ArrayList<>();
// list = ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size());
int[] startColor = ColorUtils.hexToArgb("#FF2AAFFD");
int[] endColor = ColorUtils.hexToArgb("#002965ED");
list.add(Color.argb(startColor[0],startColor[1],startColor[2],startColor[3]));
list.add(Color.argb(endColor[0],endColor[1],endColor[2],endColor[3]));
long end = System.currentTimeMillis();
Log.d("MogoRouteOverlayManager","get color cost : "+ (end-start));
mPolylineColors.addAll(list);
// 线条粗细，渐变，渐变色值
mPolylineOptions.width(12).useGradient(true).colorValues(mPolylineColors);
if (mMoGoPolyline == null || mMoGoPolyline.isDestroyed()){
@@ -130,5 +142,29 @@ public class RouteOverlayDrawer {
mMoGoPolyline.setOption(mPolylineOptions);
}
}
long drawend = System.currentTimeMillis();
Log.d("MogoRouteOverlayManager","drawTrajectoryList cost : "+ (drawend-drawstart));
}
public void initdraw() {
mPolylinePointList.clear();
MogoLatLng latLng = new MogoLatLng(MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(),MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon());
mPolylinePointList.add(latLng);
mPolylinePointList.add(latLng);
mPolylineColors.clear();
long start = System.currentTimeMillis();
List<Integer> list = new ArrayList<>();
list = ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size());
mPolylineColors.addAll(list);
// 线条粗细，渐变，渐变色值
mPolylineOptions.width(12).useGradient(true).colorValues(mPolylineColors);
if (mMoGoPolyline == null || mMoGoPolyline.isDestroyed()){
mPolylineOptions.points(mPolylinePointList);
mMoGoPolyline = mogoOverlayManager.addPolyline(mPolylineOptions);
}else {
mPolylineOptions.points(mPolylinePointList);
mMoGoPolyline.setOption(mPolylineOptions);
}
}
}