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

Merge branch 'dev_robotaxi-d_230912_6.1.0' into dev_minibus-d_230926_6.1.0

Browse Source
This commit is contained in:
yangyakun
2023-10-08 19:05:39 +08:00
parent 72d9c83fdb f5c8c1084b
commit 9dd7ad48e3
12 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener
import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
import com.mogo.eagle.core.utilcode.kotlin.currentPadding
import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
import com.mogo.eagle.core.utilcode.kotlin.onClick
@@ -1352,6 +1353,16 @@ internal class DebugSettingView @JvmOverloads constructor(
mogoMapData.get()?.setDebugMode(isChecked)
}
/**
* 设置是否开启pre check, true-打开，false-关闭
*/
tbTraceEnable.isChecked = SharedPrefsMgr.getInstance(context).getBoolean("TRACE_ENABLE",true)
tbTraceEnable.setOnCheckedChangeListener { _, isChecked ->
HmiActionLog.hmiAction(TAG + "TRACE_ENABLE",isChecked)
SharedPrefsMgr.getInstance(context).putBoolean("TRACE_ENABLE",isChecked)
CallerDevaToolsManager.setTraceEnable(isChecked)
}
cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus()
//链路Log输出日志
cbTraceLog.setOnCheckedChangeListener { _, isChecked ->

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

@@ -126,6 +126,7 @@ class ParallelDriveView @JvmOverloads constructor(
isAutoDriving = false
Log.d(TAG, "onAutopilotStatusResponse-7")
ThreadUtils.runOnUiThread({
this.state = PARALLEL_DRIVING
updateUI(PARALLEL_DRIVING)
}, ThreadUtils.MODE.QUEUE)
}
@@ -159,12 +160,14 @@ class ParallelDriveView @JvmOverloads constructor(
if (!isParallelDrivingAbility) {
Log.d(TAG, "onParallelDrivingAbility-UNAVAILABLE")
ThreadUtils.runOnUiThread({
if (state == PARALLEL_DRIVING) return@runOnUiThread
state = UNAVAILABLE
updateUI(UNAVAILABLE)
}, ThreadUtils.MODE.QUEUE)
} else {
Log.d(TAG, "onParallelDrivingAbility-AVAILABLE")
ThreadUtils.runOnUiThread({
if (state == PARALLEL_DRIVING) return@runOnUiThread
state = 0
updateUI(0)
}, ThreadUtils.MODE.QUEUE)

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

@@ -46,8 +46,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
initTipToast();
initModules();
//todo
CallerMsgBoxManager.INSTANCE.queryAllMessages(this);
}
/**

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

@@ -2099,6 +2099,17 @@
android:textOn="关闭「HD-MAP」Log"
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbTraceEnable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:padding="@dimen/dp_20"
android:gravity="center"
android:textOff="打开链路写/检查"
android:textOn="关闭链路写/检查"
android:textSize="@dimen/dp_24" />
</com.google.android.flexbox.FlexboxLayout>
<com.google.android.flexbox.FlexboxLayout