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

Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify

Browse Source
This commit is contained in:
aibingbing
2023-11-30 19:30:20 +08:00
parent 997c5769cf ce7e723368
commit 5ae0afeb2c
438 changed files with 461 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
View File

@@ -380,14 +380,21 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,DebugConfig.isDebug(),
TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath,
object : OnUploadListener {
override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String) {
CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl")
if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){
CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl)
//将语音文件上传Cos监听移除
removeUploadListener(singlePath)
if(key == TAG){
FileUtil.deleteFile(File(filePath))
override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) {
if(downloadUrl == null){
ToastUtils.showShort("上传语音文件失败，请检查网络")
ThreadUtils.runOnUiThread {
tvInitiativeReport.text = "上报"
}
}else{
CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl")
if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){
CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl)
//将语音文件上传Cos监听移除
removeUploadListener(singlePath)
if(key == TAG){
FileUtil.deleteFile(File(filePath))
}
}
}
}
@@ -446,6 +453,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
})
if (uploadResult == null || uploadResult.code != 200) {
TipToast.shortTip("上报失败")
ThreadUtils.runOnUiThread {
tvInitiativeReport.text = "上报"
}
} else {
TipToast.shortTip("上报成功")
//将上报BI的结果同步给工控机记录保存
@@ -562,8 +572,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
ThreadUtils.runOnUiThread {
if(recordKey==null){
recordKey = recordPanel.key
BadCaseConfig.recordKeyList.add(recordPanel.key)
}
BadCaseConfig.recordKeyList.add(recordPanel.key)
if(recordFileName==null){
recordFileName = recordPanel.filename
}

27
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
View File

@@ -63,6 +63,7 @@ import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
import java.io.File
import java.lang.Exception
import java.lang.StringBuilder
/**
@@ -379,14 +380,21 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext, DebugConfig.isDebug(),
TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath,
object : OnUploadListener {
override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String) {
CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl")
if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){
CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl)
//将语音文件上传Cos监听移除
removeUploadListener(singlePath)
if(key == TAG){
FileUtil.deleteFile(File(filePath))
override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) {
if(downloadUrl == null){
ToastUtils.showShort("上传语音文件失败，请检查网络")
ThreadUtils.runOnUiThread {
tvPassiveReport.text = "上报"
}
}else{
CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl")
if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){
CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl)
//将语音文件上传Cos监听移除
removeUploadListener(singlePath)
if(key == TAG){
FileUtil.deleteFile(File(filePath))
}
}
}
}
@@ -446,6 +454,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
})
if (uploadResult == null || uploadResult.code != 200) {
TipToast.shortTip("上报失败")
ThreadUtils.runOnUiThread{
tvPassiveReport.text = "上报"
}
} else {
TipToast.shortTip("上报成功")
//将上报BI的结果同步给工控机记录保存

4
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt
View File

@@ -25,7 +25,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener {
@Volatile
private var hasInit = false
private val linkedLog by lazy { MainBlockLinkedLog() }
// private val linkedLog by lazy { MainBlockLinkedLog() }
override fun init(ctx: Context) {
BlockDetector.init(BlockMetrics.Builder()
@@ -75,7 +75,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener {
} catch (t: Throwable) {
Log.e(TAG, "onDumped error", t)
}
linkedLog.record(msg)
// linkedLog.record(msg)
}
})
}

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt
View File

@@ -104,7 +104,7 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider,
}
})
.crashConfig(CrashConfig.Builder()
.enabled(true)
.enabled(false)
.crashDir(File(context.getExternalFilesDir(null), "logcat/crash"))
.javaCrash(true)
.anr(true)

3
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt
View File

@@ -43,6 +43,7 @@ internal class MoFangAnalyticUtils {
const val EVENT_EXECUTE_PARAMS_ACC = "acc" // 执行时自车加速度
const val EVENT_EXECUTE_PARAMS_HEADING = "head" // 执行时自车航向角
const val EVENT_EXECUTE_PARAMS_LINE_ID = "line_id" // 执行时的路线id
const val EVENT_EXECUTE_PARAMS_DOCKER_VERSION = "docker" // docker版本
// 魔方按键指令回执-工控机收到
@@ -56,6 +57,7 @@ internal class MoFangAnalyticUtils {
const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_ACC = "acc" // 执行时自车加速度
const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING = "head" // 执行时自车航向角
const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID = "line_id" // 执行时的路线id
const val EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION = "docker" // docker版本
// 魔方按键指令回执-工控机执行
const val EVENT_EXECUTE_FEEDBACK_EXECUTE = "event_mofang_fb_execute"
@@ -68,6 +70,7 @@ internal class MoFangAnalyticUtils {
const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_ACC = "acc" // 执行时自车加速度
const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING = "head" // 执行时自车航向角
const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID = "line_id" // 执行时的路线id
const val EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION = "docker" // docker版本
private val handler by lazy { HandlerThread("mofang-analytic-worker", Process.THREAD_PRIORITY_BACKGROUND).let { it.start(); Handler(it.looper) } }

23
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt
View File

@@ -14,6 +14,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_ACC
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_CODE
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LAT
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID
@@ -24,6 +25,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_ACC
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_CODE
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LAT
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID
@@ -32,6 +34,7 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_NODE
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_ACC
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_DOCKER_VERSION
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_HEADING
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_KEYCODE
import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_EXECUTE_PARAMS_LAT
@@ -123,7 +126,8 @@ internal class MoFangCommandExecutor {
EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
EVENT_EXECUTE_PARAMS_HEADING to location.heading,
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
))
linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $acc"))
CallerAutoPilotControlManager.sendOperatorSetAcceleratedSpeed(acc)
@@ -151,7 +155,8 @@ internal class MoFangCommandExecutor {
EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
EVENT_EXECUTE_PARAMS_HEADING to location.heading,
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
))
if (isLeft) {
linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message"))
@@ -180,7 +185,8 @@ internal class MoFangCommandExecutor {
EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
EVENT_EXECUTE_PARAMS_HEADING to location.heading,
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
))
linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $json"))
Log.d(TAG, "--- 启动自驾 ----入参:$json")
@@ -211,7 +217,8 @@ internal class MoFangCommandExecutor {
EVENT_EXECUTE_PARAMS_SPEED to location.gnssSpeed,
EVENT_EXECUTE_PARAMS_ACC to location.acceleration,
EVENT_EXECUTE_PARAMS_HEADING to location.heading,
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId()
EVENT_EXECUTE_PARAMS_LINE_ID to CallerAutoPilotStatusListenerManager.getLineId(),
EVENT_EXECUTE_PARAMS_DOCKER_VERSION to (CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "")
))
linkedLog?.record(mapOf("执行:${System.currentTimeMillis()}" to "$message, $value"))
CallerAutoPilotControlManager.sendOperatorSetHorn(value)
@@ -425,6 +432,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
@@ -441,6 +449,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
}
@@ -456,6 +465,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
@@ -478,6 +488,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_RECEIVE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
}
@@ -503,6 +514,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
@@ -519,6 +531,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
}
@@ -534,6 +547,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
IMF.SPEED_CHANGE_EXECUTE -> {
@@ -555,6 +569,7 @@ internal class MoFangCommandExecutor {
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_SPEED] = location.gnssSpeed
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_HEADING] = location.heading
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_LINE_ID] = CallerAutoPilotStatusListenerManager.getLineId()
it[EVENT_EXECUTE_FEEDBACK_EXECUTE_PARAMS_DOCKER_VERSION] = CallerAutoPilotStatusListenerManager.getDockerVersion() ?: ""
})
}
}

3
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt
View File

@@ -20,6 +20,7 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.util.TimeUtils
import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat
import com.mogo.eagle.core.widget.AlignTextView
import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
/**
@@ -209,7 +210,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
//小智语音消息
class BubbleVoiceHolder(itemView: View): RecyclerView.ViewHolder(itemView){
var tvPassengerVoiceContent: TextView = itemView.findViewById(R.id.tvPassengerVoiceContent)
var tvPassengerVoiceContent: AlignTextView = itemView.findViewById(R.id.tvPassengerVoiceContent)
}
}

7
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
View File

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
import com.mogo.eagle.core.data.temp.EventLogout
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
@@ -251,6 +252,12 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
private fun initOchView() {
actvLoginout.onClick {
if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING
|| CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING
) {
ToastUtils.showShort("请稍后退出")
return@onClick
}
EventBus.getDefault().post(EventLogout(EventLogout.LOGOUT_TYPE))
//将消息盒子操作记录还原
MsgBoxConfig.setUserRecord(0)

13
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
View File

@@ -78,6 +78,19 @@ class RomaPassengerView @JvmOverloads constructor(
}
}
/**
* 外部调用visible时进行判断
*/
fun updateVisible(visible: Boolean){
if(visible){
if(CallerMapRomaListener.isRange()){
this.visibility = View.VISIBLE
}
}else{
this.visibility = View.GONE
}
}
override fun romaStatus(status: Boolean) {
ThreadUtils.runOnUiThread {
click = true

9
core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_voice.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="@dimen/dp_600"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#FFCEDCF7"
android:background="#8CF5FAFF"
app:roundLayoutRadius="24dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
@@ -12,13 +12,16 @@
android:paddingEnd="@dimen/dp_20"
>
<TextView
<com.mogo.eagle.core.widget.AlignTextView
android:id="@+id/tvPassengerVoiceContent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_32"
android:textColor="#243959"
android:layout_margin="@dimen/dp_54"
android:layout_marginTop="@dimen/dp_54"
android:layout_marginBottom="@dimen/dp_54"
android:layout_marginStart="@dimen/dp_49"
android:layout_marginEnd="@dimen/dp_49"
android:textStyle="bold"
android:gravity="start"
app:layout_constraintStart_toStartOf="parent"

25
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
View File

@@ -162,6 +162,8 @@ class SmallMapView @JvmOverloads constructor(
)
}
private var iconRes = R.drawable.map_car_icon
private fun initAMapView() {
mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel.toFloat())
mAMap = mAMapNaviView!!.map
@@ -172,9 +174,9 @@ class SmallMapView @JvmOverloads constructor(
// 关闭显示实时路况图层，aMap是地图控制器对象。
mAMap?.isTrafficEnabled = false
// 设置 锚点 图标
val iconRes = if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
iconRes = if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
R.drawable.map_bus_icon
} else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
} else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) {
R.drawable.map_m2_icon
} else {
R.drawable.map_car_icon
@@ -261,20 +263,11 @@ class SmallMapView @JvmOverloads constructor(
}
mLocation = mogoLocation
if (mCarMarker == null) {
mCarMarker =
if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
mAMap?.addMarker(
MarkerOptions()
.icon(BitmapDescriptorFactory.fromResource(R.drawable.map_bus_icon))
.anchor(0.5f, 0.5f)
)
} else {
mAMap?.addMarker(
MarkerOptions()
.icon(BitmapDescriptorFactory.fromResource(R.drawable.map_car_icon))
.anchor(0.5f, 0.5f)
)
}
mCarMarker = mAMap?.addMarker(
MarkerOptions()
.icon(BitmapDescriptorFactory.fromResource(iconRes))
.anchor(0.5f, 0.5f)
)
}
if (mCarMarker == null) {
return