diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 68c1ac2cb3..346b005424 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -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
@@ -33,7 +34,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
@@ -42,6 +42,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.*
@@ -60,6 +61,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)
@@ -138,19 +141,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 =
@@ -327,12 +319,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()
}
}
@@ -343,6 +359,10 @@ class DebugSettingView @JvmOverloads constructor(
UiThreadHandler.post {
tvAutopilotInfo.post {
tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo)
+
+ mAppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version
+ mAppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
+ drawAppInfo()
}
}
}
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 8881a1ae5a..3f6a4c06b5 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -15,6 +15,33 @@
android:layout_height="match_parent"
android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
{
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, 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,
- index: Int
+ appId: Int,
+ lights: List,
+ 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)
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
index 1a70a97423..dd63a99845 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
@@ -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"
+ }
}
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt
index e943763779..b0206c4d42 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt
@@ -9,6 +9,8 @@ class ObuStatusInfo {
// 当前链接的IP地址, 默认地址 192.168.1.199
var connectIP: String = "192.168.1.199"
+ var obuSdkVersion = ""
+
/**
* false--没有链接,true--链接成功
*/
diff --git a/gradle.properties b/gradle.properties
index b9ca23dd43..76d620d06f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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/
@@ -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
################# 旧版本架构模块版本 #################
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index ed3533eff1..70906cb9f6 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -763,7 +763,7 @@ public class AMapViewWrapper implements IMogoMapView,
sysLocation.setProvider(location.getProvider());
sysLocation.setAccuracy(location.getAcceleration());
sysLocation.setTime(location.getDuration());
- sysLocation.setBearing(location.getHeading());
+ sysLocation.setBearing((float) location.getHeading());
sysLocation.setSpeed(location.getSpeed());
// 将有效经纬度暂存本地,提供给下一次的Http-DNS使用,防止首次请求位置获取不到
@@ -884,6 +884,13 @@ public class AMapViewWrapper implements IMogoMapView,
MogoMapListenerHandler.getInstance().onMapClick(ObjectUtils.fromAMap(lonLatPoint));
}
+
+// @Override
+// public void onMapInit() {
+// Logger.i(TAG, "autoop--onMapInit: ");
+// MogoMapListenerHandler.getInstance().onMapLoaded();
+// }
+
@Override
public void onMapLoaded() {
Logger.i(TAG, "autoop--onMapLoaded: ");
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
index a3ee8fe5f6..cf99b24eb1 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
@@ -154,7 +154,7 @@ public class ObjectUtils {
location.setLatitude(aLocation.getLat());
location.setLongitude(aLocation.getLon());
location.setAltitude(aLocation.getAltitude());
- location.setBearing(aLocation.getHeading());
+ location.setBearing((float) aLocation.getHeading());
location.setCityCode(aLocation.getCityCode());
location.setCityName(aLocation.getCity());
location.setProvider(aLocation.getProvider());
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
index fced5ef10b..f9f749f34d 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
@@ -96,10 +96,6 @@ public class AdasProvider implements IProvider {
}
- public void showAdas() {
-
- }
-
public void killAdas() {
}
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java
index 873761780f..f7f601a81a 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java
@@ -29,9 +29,4 @@ public interface ExtensionsView extends IView {
*/
void renderMsgInfo( boolean hasMsg, int amount );
- /**
- * 刷新个人信息
- * @param userInfo 个人信息
- */
- void renderUserInfo(UserInfo userInfo);
}
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index daef4b551c..5b918a9a9c 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -29,7 +29,6 @@ import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.Group;
import com.alibaba.android.arouter.launcher.ARouter;
-import com.bumptech.glide.request.RequestOptions;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpFragment;
@@ -49,7 +48,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.dialog.WMDialog;
-import com.mogo.module.common.glide.SkinAbleBitmapTarget;
import com.mogo.module.common.map.CustomNaviInterrupter;
import com.mogo.module.common.map.MapCenterPointStrategy;
import com.mogo.module.common.map.Scene;
@@ -77,7 +75,6 @@ import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.utils.LaunchUtils;
import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.glide.GlideApp;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.storage.SharedPrefsMgr;
@@ -131,8 +128,6 @@ public class EntranceFragment extends MvpFragment {
- if (groupFix.getVisibility() == View.VISIBLE) {
- groupFix.setVisibility(View.GONE);
- } else {
- groupFix.setVisibility(View.VISIBLE);
- }
+ mUploadRoadCondition.setOnLongClickListener(view -> {
+ mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog();
return true;
});
}
@@ -300,8 +286,6 @@ public class EntranceFragment extends MvpFragment properties = new HashMap<>();
- properties.put("type", 3);
- ServiceApisManager.serviceApis.getAnalyticsApi().track("Launcher_APP_Icon",
- properties);
- } catch (Exception e) {
- Logger.e(TAG, e, "打开个人中心Exception");
- }
} else if (v.getId() == R.id.module_ext_enter_vr_mode) {
// 进入vr模式
mMApUIController.changeMapMode(EnumMapUI.Type_VR);
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
index 8e9005f11c..78d4ea42e0 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -1,5 +1,7 @@
package com.mogo.module.extensions.entrance;
+import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT;
+
import android.content.Context;
import android.util.ArrayMap;
@@ -8,23 +10,18 @@ import androidx.lifecycle.LifecycleOwner;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.Presenter;
-import com.mogo.eagle.core.network.utils.digest.DigestUtils;
+import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.extensions.R;
import com.mogo.module.extensions.bean.CommonConfig;
import com.mogo.module.extensions.bean.CommonConfigResponse;
import com.mogo.module.extensions.net.GetConfigApiServices;
-import com.mogo.module.extensions.net.UserInfoNetApiServices;
-import com.mogo.module.extensions.userinfo.UserInfo;
-import com.mogo.module.extensions.userinfo.UserInfoResponse;
import com.mogo.module.extensions.weather.Phenomena;
import com.mogo.module.extensions.weather.WeatherCallback;
import com.mogo.module.extensions.weather.WeatherInfo;
import com.mogo.module.extensions.weather.WeatherModel;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.statusmanager.IMogoMsgCenter;
import com.mogo.service.statusmanager.IMogoMsgCenterListener;
@@ -38,8 +35,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
-import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT;
-
/**
* @author congtaowang
* @since 2020-01-07
@@ -105,13 +100,6 @@ public class EntrancePresenter extends Presenter implements Weathe
public void onResume(@NonNull LifecycleOwner owner) {
super.onResume(owner);
isResumed = true;
- if (userInfo != null) {
- mView.renderUserInfo(userInfo);
- }
- if (DebugConfig.isNeedRequestUserInfo()) {
- // 相当于每次onResume都会请求一下个人信息,目的是能够相对及时的同步手机端的个人信息修改
- requestUserInfo();
- }
getCommonConfig();
}
@@ -179,56 +167,4 @@ public class EntrancePresenter extends Presenter implements Weathe
});
}
-
- private UserInfo userInfo;
-
- public void requestUserInfo() {
- Map params = new ArrayMap<>();
- params.put("sn", MoGoAiCloudClientConfig.getInstance().getSn());
- params.put("source", "2");
- String sign = createSign(params, "JGqZw9");
- params.put("sig", sign);
- mNetWork.create(UserInfoNetApiServices.class, HostConst.CARLIFE_HOST).requestUserInfo(params).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new SingleObserver() {
- @Override
- public void onSubscribe(Disposable d) {
- }
-
- @Override
- public void onSuccess(UserInfoResponse userInfoBaseResponse) {
- userInfo = userInfoBaseResponse.getResult();
- if (isResumed) {
- if (userInfo != null) {
- Logger.d(TAG, "获取个人信息成功: " + userInfo);
- mView.renderUserInfo(userInfo);
- } else {
- Logger.e(TAG, "获取个人信息失败");
- }
- }
- }
-
- @Override
- public void onError(Throwable e) {
- e.printStackTrace();
- Logger.e(TAG, e, "获取个人信息失败==");
- }
- });
- }
-
- private String createSign(Map map, String salt) {
- try {
- StringBuilder queryString = new StringBuilder();
- for (Map.Entry entry : map.entrySet()) {
- queryString.append(entry.getKey())
- .append("=")
- .append(entry.getValue())
- .append("&");
- }
- queryString.append("key=").append(DigestUtils.shaHex(salt));
- return DigestUtils.shaHex(queryString.toString()).toUpperCase();
- } catch (Exception e) {
- e.printStackTrace();
- Logger.e(TAG, e, "createSign()");
- return "";
- }
- }
}
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
index 5cb5722d03..10a7fb9e1e 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
@@ -69,33 +69,6 @@
tools:text="···" />
-
-
-
-
-
-
mAdasOCHCallback = new CopyOnWriteArrayList<>();
@Override
- public void openADAS() {
- showADAS();
+ public void init(Context context) {
+ adasProvider = ARouter.getInstance().navigation(AdasProvider.class);
}
@Override
@@ -114,20 +115,6 @@ public class MogoADASController implements IMogoADASController {
public void showADAS() {
Logger.d(TAG, "showADAS()");
init(AbsMogoApplication.getApp());
- adasProvider.addAdasStatusListener(new IAdasStatusListener() {
- @Override
- public void onServiceConnected() {
- Logger.d(TAG, "adas statusListener connected");
- invokeShowADASOperation();
- }
-
- @Override
- public void onServiceDisconnected() {
- Logger.d(TAG, "adas statuslistener disconnected");
- }
- });
- invokeShowADASOperation();
-
if (mAdasDataListener == null) {
mAdasDataListener = new IAdasDataListener() {
@Override
@@ -209,41 +196,6 @@ public class MogoADASController implements IMogoADASController {
}
}
-
- private void invokeShowADASOperation() {
- int delay = 0;
-
- UiThreadHandler.postDelayed(() -> {
-
- if (mStatusManager.isSearchUIShow()) {
- return;
- }
- if (!mStatusManager.isMainPageOnResume()) {
- return;
- }
-
- if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) {
- return;
- }
-
- try {
- adasProvider.showAdas();
- } catch (Exception e) {
- Intent intent = new Intent(ACTION);
- intent.putExtra(PARAM_COMMAND, VAL_COMMAND);
- JSONObject object = new JSONObject();
- try {
- object.put(PARAM_OBJECT, VAL_OBJECT);
- object.put(PARAM_OPERATION, VAL_OPEN);
- intent.putExtra(PARAM_DATA, object.toString());
- sendBroadcast(intent);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
- }, delay);
- }
-
@Override
public void closeADAS() {
@@ -276,11 +228,6 @@ public class MogoADASController implements IMogoADASController {
}
- @Override
- public void init(Context context) {
- adasProvider = ARouter.getInstance().navigation(AdasProvider.class);
- }
-
@Override
public void changeAdasControlMode(EnumMapUI ui) {
if (ui == null || !DebugConfig.isMapBased()) {
@@ -422,9 +369,6 @@ public class MogoADASController implements IMogoADASController {
@Override
public int getAutopilotStatus() {
- if (mockState != -2) {
- return mockState;
- }
int status = IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE;
try {
status = adasProvider.autopilotStateCall().getState();
@@ -434,26 +378,6 @@ public class MogoADASController implements IMogoADASController {
return status;
}
- private int mockState = -2;
-
- @Override
- public void mockOchStatus(int state, String reason) {
- if (state == -1) {
- if (!mAdasOCHCallback.isEmpty()) {
- for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
- cb.onArriveAt(new AutopilotStationInfo(1, 1d, 1d));
- }
- }
- } else {
- mockState = state;
- if (!mAdasOCHCallback.isEmpty()) {
- for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
- cb.onStateChanged(state, reason);
- }
- }
- }
- }
-
@Override
public void cancelAutopilot() {
adasProvider.cancelPilot();
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
index cb6b212d10..918596caf7 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
@@ -52,11 +52,6 @@ public class MogoStatusManager implements IMogoStatusManager {
return get_bool_val(StatusDescriptor.VR_MODE);
}
- @Override
- public boolean isADASShow() {
- return get_bool_val( StatusDescriptor.ADAS_UI );
- }
-
@Override
public boolean isV2XShow() {
return get_bool_val( StatusDescriptor.V2X_UI );
@@ -130,11 +125,6 @@ public class MogoStatusManager implements IMogoStatusManager {
return get_bool_val( StatusDescriptor.MAIN_PAGE_CREATED );
}
- @Override
- public boolean isTopViewShow() {
- return get_bool_val(StatusDescriptor.TOP_VIEW);
- }
-
@Override
public boolean isMediaPlaying() {
return get_bool_val( StatusDescriptor.MEDIA_PLAYER_STATUS );