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

[Fix]

Browse Source 
1、降级地图版本2.0.0.18
2、优化控制面板状态展示，增加外部SDK版本展示，合并外部网络连接状态展示

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2021-12-31 15:09:34 +08:00
parent 19ff517971
commit c8ab0ae124
10 changed files with 286 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo
import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo
@@ -30,7 +31,6 @@ import com.mogo.eagle.core.function.call.map.CallerSmpManager
import com.mogo.eagle.core.function.call.obu.CallerOBUManager
import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.network.utils.GsonUtil
import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.eagle.core.utilcode.util.AppUtils
@@ -39,6 +39,7 @@ import com.mogo.eagle.core.utilcode.util.LogUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.map.MogoMap
import com.mogo.utils.DeviceIdUtils
import com.mogo.utils.NetworkUtils
import com.mogo.utils.UiThreadHandler
import com.mogo.utils.storage.SharedPrefsMgr
import kotlinx.android.synthetic.main.view_debug_setting.view.*
@@ -57,6 +58,8 @@ 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)
@@ -135,19 +138,8 @@ class DebugSettingView @JvmOverloads constructor(
tvAutopilotInfo.text =
CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()
// 初始化App 配置信息
val appConfigInfo = AppConfigInfo()
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.mapVersion = MogoMap.getInstance().mogoMap.mapVersion
// 将数据绘制
tvAppInfo.text = GsonUtil.jsonFromObject(appConfigInfo)
// 绘制应用基本信息
drawAppInfo()
// 初始化OBU IP信息
val ipAddress =
@@ -287,12 +279,36 @@ 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()
// 将数据绘制
tvAppInfo.text = mAppConfigInfo.toString()
}
/**
* OBU状态回调
*/
override fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo) {
UiThreadHandler.post {
tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
mAppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
mAppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
drawAppInfo()
}
}
@@ -303,6 +319,10 @@ class DebugSettingView @JvmOverloads constructor(
UiThreadHandler.post {
tvAutopilotInfo.post {
tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo)
mAppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version
mAppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
drawAppInfo()
}
}
}

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

@@ -15,6 +15,33 @@
android:layout_height="match_parent"
android:orientation="vertical">
<!--鹰眼应用配置信息-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#B200BCD4"
android:padding="@dimen/dp_10"
android:text="鹰眼应用信息"
android:textColor="#000"
android:textSize="@dimen/dp_34"
android:textStyle="bold" />
<TextView
android:id="@+id/tvAppInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000"
android:textSize="@dimen/dp_34"
tools:text="应用基础信息" />
</LinearLayout>
<!--鹰眼UI控制-->
<ToggleButton
android:id="@+id/btnOpenDebugSettingViewControl"
android:layout_width="match_parent"
@@ -324,30 +351,6 @@
</LinearLayout>
<!--鹰眼应用配置信息-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#B200BCD4"
android:padding="@dimen/dp_10"
android:text="鹰眼应用配置信息"
android:textColor="#000"
android:textSize="@dimen/dp_34"
android:textStyle="bold" />
<TextView
android:id="@+id/tvAppInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
</LinearLayout>
<!--OBU 配置信息-->
<LinearLayout

4
core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
View File

@@ -261,22 +261,26 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
}
private void startSocketService() {
Logger.d(TAG,"startSocketService");
IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
// 关闭长链服务
apis.getSocketManagerApi(getApplicationContext()).destroy();
apis.getSocketManagerApi(this).registerLifecycleListener(10020, new IMogoLifecycleListener() {
@Override
public void onConnectFailure() {
Logger.d(TAG,"socket-onConnectFailure");
DebugConfig.setDownloadSnapshot(false);
}
@Override
public void onConnectSuccess() {
Logger.d(TAG,"socket-onConnectSuccess");
DebugConfig.setDownloadSnapshot(true);
}
@Override
public void onConnectLost() {
Logger.d(TAG,"socket-onConnectLost");
DebugConfig.setDownloadSnapshot(false);
}
});

197
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
View File

@@ -44,7 +44,7 @@ class MogoPrivateObuManager private constructor() {
fun init(context: Context, ipAddress: String) {
Logger.d(MogoObuConst.TAG_MOGO_OBU, "obuManager初始化--")
mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
.navigation(context) as IMogoServiceApis
.navigation(context) as IMogoServiceApis
mContext = context
mIMogoMapService = mMogoServiceApis!!.mapServiceApi
@@ -55,6 +55,7 @@ class MogoPrivateObuManager private constructor() {
fun connectObu(context: Context, ipAddress: String) {
//自研obu初始化
mObuStatusInfo.connectIP = ipAddress
mObuStatusInfo.obuSdkVersion = MogoObuManager.getInstance().versionName
if (!MogoObuManager.getInstance().isConnected) {
MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP)
@@ -213,11 +214,11 @@ class MogoPrivateObuManager private constructor() {
val status = info.status
val level = info.threat_info.threat_level
val direction =
getMessageDirection(if (info.ext_info != null) info.ext_info.pos_classification else -1)
getMessageDirection(if (info.ext_info != null) info.ext_info.pos_classification else -1)
Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo direction = $direction -- pos_classification = ${info.ext_info.pos_classification}")
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type} --direction = $direction -- pos_classification = ${info.ext_info.pos_classification} "
MogoObuConst.TAG_MOGO_OBU,
"onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type} --direction = $direction -- pos_classification = ${info.ext_info.pos_classification} "
)
when (appId) {
// 道路危险情况预警
@@ -233,13 +234,13 @@ class MogoPrivateObuManager private constructor() {
WarningDirectionEnum.ALERT_WARNING_TOP_LEFT,
WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT -> {
appId =
EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType
EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType
}
WarningDirectionEnum.ALERT_WARNING_RIGHT,
WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT,
WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT -> {
appId =
EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType
EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType
}
}
}
@@ -254,7 +255,7 @@ class MogoPrivateObuManager private constructor() {
//事故
0xC -> {
appId =
EventTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType
EventTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType
}
//拥堵
0xD -> {
@@ -263,7 +264,7 @@ class MogoPrivateObuManager private constructor() {
//行人
0xF -> {
appId =
EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
}
//禁止停车
0x13 -> {
@@ -272,7 +273,7 @@ class MogoPrivateObuManager private constructor() {
//学校
0x14 -> {
appId =
EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
}
//桥梁
0x17 -> {
@@ -285,7 +286,7 @@ class MogoPrivateObuManager private constructor() {
//人行横道
0x19 -> {
appId =
EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
}
//减速慢行
0x1A -> {
@@ -318,8 +319,8 @@ class MogoPrivateObuManager private constructor() {
Logger.d(MogoObuConst.TAG_MOGO_OBU, "ttsContent = $ttsContent --alertContent = $alertContent ---info.threat_info.distance = ${info.threat_info.distance} ")
if (info.threat_info.distance.toInt() != 0) {
alertContent = String.format(
EventTypeEnum.getWarningContent(appId),
info.threat_info.distance.toInt()
EventTypeEnum.getWarningContent(appId),
info.threat_info.distance.toInt()
)
} else {
alertContent = "前方拥堵，减速慢行"
@@ -340,16 +341,16 @@ class MogoPrivateObuManager private constructor() {
//显示弹框，语音提示
CallerHmiManager.showWarningV2X(
appId.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
(appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
object : IMoGoWarningStatusListener {
override fun onDismiss() {
// 关闭警告红边
CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
appId.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
(appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
object : IMoGoWarningStatusListener {
override fun onDismiss() {
// 关闭警告红边
CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
}
}
}
)
// 更新数据
TrafficDataConvertUtils.cvxRtiThreatIndInfo2TrafficData(info)?.let {
@@ -378,15 +379,15 @@ class MogoPrivateObuManager private constructor() {
override fun onCvxIvpThreatIndInfo(info: CvxIvpThreatIndInfo?) {
Logger.d(MogoObuConst.TAG_MOGO_OBU, "CvxIvpThreatIndInfo ------> $info")
if (info != null && info.ext_info != null
&& info.threat_info != null
&& info.ext_info.lights != null
&& info.ext_info.lights.isNotEmpty()
&& info.threat_info != null
&& info.ext_info.lights != null
&& info.ext_info.lights.isNotEmpty()
) {
handlerTrafficLight(
info.threat_info.app_id,
info.status,
info.ext_info.lights,
info.ext_info.index
info.threat_info.app_id,
info.status,
info.ext_info.lights,
info.ext_info.index
)
}
}
@@ -397,8 +398,8 @@ class MogoPrivateObuManager private constructor() {
// 交通参与者类型 0x0:未知 UNKNOWN | 0x1:非机动车 NON_MOTOR | 0x2:行人 PEDESTRIAN 0x3:RSU
if (info != null && (info.ptc_type == 1 || info.ptc_type == 2)) {
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"onCvxPtcInfoIndInfo ---status---> ${info.status}"
MogoObuConst.TAG_MOGO_OBU,
"onCvxPtcInfoIndInfo ---status---> ${info.status}"
)
var v2xType = ""
if (info.ptc_type == 1) { //摩托车
@@ -409,7 +410,7 @@ class MogoPrivateObuManager private constructor() {
val ttsContent = EventTypeEnum.getWarningTts(v2xType)
val alertContent = EventTypeEnum.getWarningContent(v2xType)
val direction =
getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
val level = if (info.threat_info != null) info.threat_info.threat_level else -1
when (info.status) {
@@ -418,9 +419,9 @@ class MogoPrivateObuManager private constructor() {
ObuConstants.STATUS.UPDATE// 更新
-> {
// if (level == 2 || level == 3) { //不考虑level
//显示警告红边
CallerHmiManager.showWarning(direction)
CallerHmiManager.showWarningV2X(
//显示警告红边
CallerHmiManager.showWarning(direction)
CallerHmiManager.showWarningV2X(
v2xType.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
@@ -431,7 +432,7 @@ class MogoPrivateObuManager private constructor() {
CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
}
}
)
)
// }
// 更新数据
TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(info)?.let {
@@ -497,10 +498,10 @@ class MogoPrivateObuManager private constructor() {
val level = info.threat_info.threat_level
val status = info.status
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"onCvxV2vThreatIndInfo target_classification = ${
getMessageDirection(info.ext_info.target_classification)
} --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
MogoObuConst.TAG_MOGO_OBU,
"onCvxV2vThreatIndInfo target_classification = ${
getMessageDirection(info.ext_info.target_classification)
} --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
)
handleSdkObu(appId, direction, status, level, info)
}
@@ -564,8 +565,8 @@ class MogoPrivateObuManager private constructor() {
*/
private fun handlerTrafficLight(appId: Int, status: Int, lights: List<Light>, index: Int) {
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"handlerTrafficLight appId = $appId --- status = $status ---index = $index ---lights.size = ${lights.size} ---lights = $lights "
MogoObuConst.TAG_MOGO_OBU,
"handlerTrafficLight appId = $appId --- status = $status ---index = $index ---lights.size = ${lights.size} ---lights = $lights "
)
when (status) {
// 添加
@@ -591,9 +592,9 @@ class MogoPrivateObuManager private constructor() {
*/
@Synchronized
private fun changeTrafficLightStatus(
appId: Int,
lights: List<Light>,
index: Int
appId: Int,
lights: List<Light>,
index: Int
) {
var ttsContent = ""
var alertContent = ""
@@ -601,8 +602,8 @@ class MogoPrivateObuManager private constructor() {
if (index != -1 && lights.size >= index) {
val currentLight = lights[index]
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} ---rlvw_violation_type = ${currentLight.rlvw_violation_type} --- index = $index ---appId = $appId ---appId = $appId"
MogoObuConst.TAG_MOGO_OBU,
"currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} ---rlvw_violation_type = ${currentLight.rlvw_violation_type} --- index = $index ---appId = $appId ---appId = $appId"
)
// 闯红灯预警
when (currentLight.rlvw_violation_type) {
@@ -615,11 +616,11 @@ class MogoPrivateObuManager private constructor() {
ttsContent = EventTypeEnum.getWarningTts(appId.toString())
alertContent = EventTypeEnum.getWarningContent(appId.toString())
CallerHmiManager.showWarningV2X(
appId,
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
appId.toString(),
null
appId,
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
appId.toString(),
null
)
}
0x3 -> {//闯黄灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_YELLOW_LIGHT
@@ -661,35 +662,35 @@ class MogoPrivateObuManager private constructor() {
CallerHmiManager.changeCountdownYellow(0)
// 拼接建议速度
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"speed_min = ${currentLight.glosa_suggested_speed_min} --speed_max = ${currentLight.glosa_suggested_speed_max.toInt()}"
MogoObuConst.TAG_MOGO_OBU,
"speed_min = ${currentLight.glosa_suggested_speed_min} --speed_max = ${currentLight.glosa_suggested_speed_max.toInt()}"
)
val adviceSpeed =
"${currentLight.glosa_suggested_speed_min.toInt()} - ${currentLight.glosa_suggested_speed_max.toInt()}"
"${currentLight.glosa_suggested_speed_min.toInt()} - ${currentLight.glosa_suggested_speed_max.toInt()}"
val adviceSpeedTts =
"${currentLight.glosa_suggested_speed_min.toInt()}到${currentLight.glosa_suggested_speed_max.toInt()}"
"${currentLight.glosa_suggested_speed_min.toInt()}到${currentLight.glosa_suggested_speed_max.toInt()}"
ttsContent =
String.format(
EventTypeEnum.getWarningTts(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
adviceSpeedTts
)
String.format(
EventTypeEnum.getWarningTts(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
adviceSpeedTts
)
alertContent =
String.format(
EventTypeEnum.getWarningContent(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
adviceSpeed
)
String.format(
EventTypeEnum.getWarningContent(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
adviceSpeed
)
val maxSpeed = currentLight.glosa_suggested_speed_max.toInt()
if (maxSpeed > 0) {
CallerHmiManager.showWarningV2X(
EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
appId.toString(),
null
EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
appId.toString(),
null
)
}
}
@@ -716,16 +717,16 @@ class MogoPrivateObuManager private constructor() {
* @see com.mogo.module.common.enums.EventTypeEnum
*/
private fun handleSdkObu(
appId: Int,
direction: WarningDirectionEnum,
status: Int,
level: Int,
info: CvxV2vThreatIndInfo
appId: Int,
direction: WarningDirectionEnum,
status: Int,
level: Int,
info: CvxV2vThreatIndInfo
) {
// 这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnum 提供的
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
MogoObuConst.TAG_MOGO_OBU,
"handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
)
var alertContent: String
var ttsContent: String
@@ -735,16 +736,16 @@ class MogoPrivateObuManager private constructor() {
alertContent = EventTypeEnum.getWarningContent(appId.toString())
ttsContent = EventTypeEnum.getWarningTts(appId.toString())
if (
direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
) {
ttsContent = String.format(ttsContent, "左")
alertContent = String.format(alertContent, "左")
} else if (
direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
) {
ttsContent = String.format(ttsContent, "右")
alertContent = String.format(alertContent, "右")
@@ -779,16 +780,16 @@ class MogoPrivateObuManager private constructor() {
ttsContent = EventTypeEnum.getWarningTts(appId.toString())
alertContent = EventTypeEnum.getWarningContent(appId.toString())
if (
direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
) { //左后
ttsContent = String.format(ttsContent, "左")
alertContent = String.format(alertContent, "左")
} else if (
direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
) { //右后
ttsContent = String.format(ttsContent, "右")
alertContent = String.format(alertContent, "右")
@@ -807,22 +808,22 @@ class MogoPrivateObuManager private constructor() {
ObuConstants.STATUS.ADD,
ObuConstants.STATUS.UPDATE -> {
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
MogoObuConst.TAG_MOGO_OBU,
"appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
)
if (level == 2 || level == 3) {
//显示弹框，语音提示
CallerHmiManager.showWarningV2X(
appId,
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
(appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
object : IMoGoWarningStatusListener {
override fun onDismiss() {
// 关闭警告红边
CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
appId,
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
(appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
object : IMoGoWarningStatusListener {
override fun onDismiss() {
// 关闭警告红边
CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
}
}
}
)
//显示警告红边
CallerHmiManager.showWarning(direction)

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

@@ -13,11 +13,26 @@ class AppConfigInfo {
var appVersionName: String? = null
var appPackageName: String? = null
var uniqueDeviceId: String? = null
// 高精地图版本
var mapSdkVersion: String? = null
var adasSdkVersion: String? = null
var obuSdkVersion: String? = null
var mogoToken: String? = null
var mogoSN: String? = null
/*依赖的SDK版本信息*/
var mapVersion: String? = null
// 是否可以网络连接
var isConnectNet: Boolean = false
// 长链接是否可用
var isConnectSocket: Boolean = false
// 是否连接工控机
var isConnectAutopilot: Boolean = false
// 是否OBU
var isConnectObu: Boolean = false
/*应用配置信息，这里的配置将影响功能，用来替换productFlavors配置的那种编译渠道*/
// GPS数据提供源： 0-Android系统，1-工控机，2-OBU
@@ -36,4 +51,19 @@ class AppConfigInfo {
// 进入应用的地图模式。0-2D模式，1-VR模式
var MAP_STYLE_MODE = 1
override fun toString(): String {
return "应用名称：${appName}\n" +
"应用版本：${appVersionCode}\n" +
"应用版本名称：${appVersionName}\n" +
"HD-MAP-SDK版本：${mapSdkVersion}\n" +
"ADAS-SDK版本：${adasSdkVersion}\n" +
"OBU-SDK版本：${obuSdkVersion}\n" +
"PAD唯一标志：${uniqueDeviceId}\n" +
//"mogoToken：${mogoToken}\n"+
"中台分配的SN：${mogoSN}\n" +
"网络是否正常：${isConnectNet}\n" +
"Socket是否正常：${isConnectSocket}\n" +
"ADAS连接是否正常：${isConnectAutopilot}\n" +
"OBU连接是否正常：${isConnectObu}\n"
}
}

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt
View File

@@ -9,6 +9,8 @@ class ObuStatusInfo {
// 当前链接的IP地址, 默认地址 192.168.1.199
var connectIP: String = "192.168.1.199"
var obuSdkVersion = ""
/**
* false--没有链接，true--链接成功
*/

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.14.9.aar
android.jetifier.blacklist=module-service-2.1.15.1.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.19
MAP_SDK_VERSION=2.0.0.18
# 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.56.9
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.56.9
MOGO_CORE_DATA_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_API_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.56.9
MOGO_CORE_RES_VERSION=0.0.56.9
MOGO_CORE_UTILS_VERSION=0.0.56.9
MOGO_CORE_NETWORK_VERSION=0.0.56.9
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.1
MOGO_CORE_DATA_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_API_VERSION=0.0.57.1
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.1
MOGO_CORE_RES_VERSION=0.0.57.1
MOGO_CORE_UTILS_VERSION=0.0.57.1
MOGO_CORE_NETWORK_VERSION=0.0.57.1
################# 旧版本架构模块版本 #################
## 工程内模块
MOGO_COMMONS_VERSION=2.1.14.9
MOGO_UTILS_VERSION=2.1.14.9
MAP_AMAP_VERSION=2.1.14.9
MAP_AUTONAVI_VERSION=2.1.14.9
MOGO_MAP_VERSION=2.1.14.9
MOGO_MAP_API_VERSION=2.1.14.9
MOGO_SERVICE_VERSION=2.1.14.9
MOGO_SERVICE_API_VERSION=2.1.14.9
MOGO_CONNECTION_VERSION=2.1.14.9
MOGO_MODULE_APPS_VERSION=2.1.14.9
MOGO_MODULE_NAVI_VERSION=2.1.14.9
MOGO_MODULE_SHARE_VERSION=2.1.14.9
MOGO_MODULE_COMMON_VERSION=2.1.14.9
MOGO_MODULE_MAIN_VERSION=2.1.14.9
MOGO_MODULE_MAP_VERSION=2.1.14.9
MOGO_MODULE_SERVICE_VERSION=2.1.14.9
MOGO_MODULE_EXTENSIONS_VERSION=2.1.14.9
MOGO_MODULE_SEARCH_VERSION=2.1.14.9
MOGO_MODULE_BACK_VERSION=2.1.14.9
MOGO_MODULE_V2X_VERSION=2.1.14.9
MOGO_COMMONS_VERSION=2.1.15.1
MOGO_UTILS_VERSION=2.1.15.1
MAP_AMAP_VERSION=2.1.15.1
MAP_AUTONAVI_VERSION=2.1.15.1
MOGO_MAP_VERSION=2.1.15.1
MOGO_MAP_API_VERSION=2.1.15.1
MOGO_SERVICE_VERSION=2.1.15.1
MOGO_SERVICE_API_VERSION=2.1.15.1
MOGO_CONNECTION_VERSION=2.1.15.1
MOGO_MODULE_APPS_VERSION=2.1.15.1
MOGO_MODULE_NAVI_VERSION=2.1.15.1
MOGO_MODULE_SHARE_VERSION=2.1.15.1
MOGO_MODULE_COMMON_VERSION=2.1.15.1
MOGO_MODULE_MAIN_VERSION=2.1.15.1
MOGO_MODULE_MAP_VERSION=2.1.15.1
MOGO_MODULE_SERVICE_VERSION=2.1.15.1
MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.1
MOGO_MODULE_SEARCH_VERSION=2.1.15.1
MOGO_MODULE_BACK_VERSION=2.1.15.1
MOGO_MODULE_V2X_VERSION=2.1.15.1
# 探路
MOGO_MODULE_TANLU_VERSION=2.1.14.9
MOGO_MODULE_TANLU_VERSION=2.1.15.1
# 推送
MOGO_MODULE_PUSH_VERSION=2.1.14.9
MOGO_MODULE_PUSH_BASE_VERSION=2.1.14.9
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.14.9
MOGO_MODULE_PUSH_VERSION=2.1.15.1
MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.1
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.1
# 探路上报和分享模块
TANLULIB_VERSION=2.1.14.9
MOGO_TANLU_API_VERSION=2.1.14.9
TANLULIB_VERSION=2.1.15.1
MOGO_TANLU_API_VERSION=2.1.15.1
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.14.9
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.14.9
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.1
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.1
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.1.14.9
MOGO_MODULE_WIDGETS_VERSION=2.1.15.1
# obu
MOGO_MODULE_OBU_VERSION=2.1.14.9
MOGO_MODULE_OBU_MOGO_VERSION=2.1.14.9
MOGO_MODULE_OBU_VERSION=2.1.15.1
MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.1
# monitor
MOGO_MODULE_MONITOR_VERSION=2.1.14.9
MOGO_MODULE_MONITOR_VERSION=2.1.15.1
# bugly
CRASHREPORT_VERSION=2.1.14.9
CRASHREPORT_BUGLY_VERSION=2.1.14.9
CRASHREPORT_NOOP_VERSION=2.1.14.9
CRASHREPORT_UPGRADE_VERSION=2.1.14.9
CRASHREPORT_VERSION=2.1.15.1
CRASHREPORT_BUGLY_VERSION=2.1.15.1
CRASHREPORT_NOOP_VERSION=2.1.15.1
CRASHREPORT_UPGRADE_VERSION=2.1.15.1
## tts
TTS_BASE_VERSION=2.1.14.9
TTS_DI_VERSION=2.1.14.9
TTS_ZHI_VERSION=2.1.14.9
TTS_PAD_VERSION=2.1.14.9
TTS_NOOP_VERSION=2.1.14.9
TTS_BASE_VERSION=2.1.15.1
TTS_DI_VERSION=2.1.15.1
TTS_ZHI_VERSION=2.1.15.1
TTS_PAD_VERSION=2.1.15.1
TTS_NOOP_VERSION=2.1.15.1
# 自研地图
MAP_CUSTOM_VERSION=2.1.14.9
MOGO_MODULE_ADAS_VERSION=2.1.14.9
MAP_CUSTOM_VERSION=2.1.15.1
MOGO_MODULE_ADAS_VERSION=2.1.15.1
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.14.9
MOGO_BASE_SERVICES_APK_VERSION=2.1.14.9
MOGO_BASE_SERVICES_SDK_VERSION=2.1.14.9
MOGO_MODULE_CHAT_VERSION=2.1.14.9
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.1
MOGO_BASE_SERVICES_APK_VERSION=2.1.15.1
MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.1
MOGO_MODULE_CHAT_VERSION=2.1.15.1
# 车聊聊
MOGO_MODULE_CARCHATTING_VERSION=2.1.14.9
MOGO_MODULE_CARCHATTING_VERSION=2.1.15.1
# 车聊聊接口
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.14.9
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.1
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.1.14.9
MOGO_SKIN_LIGHT_VERSION=2.1.14.9
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.14.9
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.14.9
SKIN_SUPPORT_VERSION=2.1.14.9
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.14.9
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.14.9
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.14.9
SKIN_SUPPORT_DESIGN_VERSION=2.1.14.9
MOGO_SKIN_SUPPORT_VERSION=2.1.15.1
MOGO_SKIN_LIGHT_VERSION=2.1.15.1
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.1
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.1
SKIN_SUPPORT_VERSION=2.1.15.1
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.1
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.1
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.1
SKIN_SUPPORT_DESIGN_VERSION=2.1.15.1
# OCH
MOGO_OCH_VERSION=2.1.14.9-test
MOGO_OCH_VERSION=2.1.15.1-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.9
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.1
################# 旧版本架构模块版本 #################

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

@@ -885,17 +885,18 @@ public class AMapViewWrapper implements IMogoMapView,
}
@Override
public void onMapInit() {
Logger.i(TAG, "autoop--onMapInit: ");
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();
mMapLoaded = true;
CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
Trace.beginSection("timer.onCameraChangeFinish");

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -25,6 +25,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.traffic.TrafficData;
import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.map.navi.IMogoNaviListener;
@@ -595,7 +596,8 @@ public class MockIntentHandler implements IntentHandler {
case 52:
// 打开连调工控机、ADAS的控制面板
//adb shell am broadcast -a com.mogo.mock --ei oper 52
EnvStatusManager.getInstance().showPanel(context);
//EnvStatusManager.getInstance().showPanel(context);
ToastUtils.showShort("请使用新版调试面板！！");
break;
case 53:// 控制 Adas识别 是否可用
boolean isUseAdasRecognize = intent.getBooleanExtra("status", false);

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
View File

@@ -23,7 +23,7 @@ import com.mogo.utils.storage.SharedPrefsMgr;
import static com.mogo.utils.CommonUtils.getVersionName;
/*
/**
* @author congtaowang
* @since 2021/3/17
*