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

Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

Browse Source
This commit is contained in:
donghongyu
2022-02-15 16:14:47 +08:00
parent 7e23e65159 c17927fb72
commit 29203da02b
6 changed files with 278 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
View File

@@ -64,6 +64,8 @@ public class MoGoHandAdasMsgManager implements
ThreadUtils.getSinglePool().execute(() ->
IdentifyDataDrawer.getInstance().renderAdasRecognizedResult(trafficData)
);
} else {
IdentifyDataDrawer.getInstance().clearOldMarker();
}
} catch (Exception e) {
e.printStackTrace();

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

@@ -238,26 +238,16 @@ class DebugSettingView @JvmOverloads constructor(
}
}
// 初始化 感知数据是否绘制 选择情况
rgIsDrawIdentifyData.check(
when (FunctionBuildConfig.isDrawIdentifyData) {
true -> {
R.id.rbDraw
}
false -> {
R.id.rbDoNotDraw
}
}
)
rgIsDrawIdentifyData.setOnCheckedChangeListener { group, checkedId ->
when (checkedId) {
R.id.rbDraw -> {
FunctionBuildConfig.isDrawIdentifyData = true
}
R.id.rbDoNotDraw -> {
FunctionBuildConfig.isDrawIdentifyData = false
}
}
// 初始化 ADAS感知数据是否绘制 选择情况
tbIsDrawIdentifyData.isChecked = FunctionBuildConfig.isDrawIdentifyData
tbIsDrawIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
FunctionBuildConfig.isDrawIdentifyData = isChecked
}
// 初始化 OBU感知数据是否绘制 选择情况
tbIsDrawOBUIdentifyData.isChecked = FunctionBuildConfig.isDrawObuIdentifyData
tbIsDrawOBUIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
FunctionBuildConfig.isDrawObuIdentifyData = isChecked
}
// 演示模式,上一次勾选的数据
@@ -269,9 +259,9 @@ class DebugSettingView @JvmOverloads constructor(
val isDemoMode =
SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false)
CallerAutoPilotManager.setDemoMode(isDemoMode)
rbIsDemoMode.isChecked = isDemoMode
tbIsDemoMode.isChecked = isDemoMode
// 演示模式
rbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked ->
tbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked ->
CallerAutoPilotManager.setDemoMode(isChecked)
FunctionBuildConfig.isDemoMode = isChecked
SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked)

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

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import kotlinx.android.synthetic.main.view_system_version.view.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
@@ -207,10 +208,12 @@ class SystemVersionView @JvmOverloads constructor(
* 展示当前工控机版本
*/
private fun showCurrentAdVersion(){
tvAdVersionContent?.let {
UiThreadHandler.post {
tvAdVersionContent?.let {
// it.text = AdasManager.getInstance().getAdasConfig().getDockVersion())
if(!dockerVersion.isNullOrEmpty()){
it.text = dockerVersion
if(!dockerVersion.isNullOrEmpty()){
it.text = dockerVersion
}
}
}
}
@@ -229,6 +232,7 @@ class SystemVersionView @JvmOverloads constructor(
connectStatus = autoPilotStatusInfo.connectStatus
dockerVersion = autoPilotStatusInfo.dockVersion
autopilotStatus = autoPilotStatusInfo.state
Logger.i(TAG,"onAutopilotStatusResponse connectStatus="+connectStatus+" dockerVersion="+dockerVersion+" autopilotStatus="+autopilotStatus)
setViewStatus()
}

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

@@ -2,8 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_900"
android:layout_height="@dimen/dp_1000"
android:layout_width="@dimen/dp_800"
android:layout_height="match_parent"
android:background="#FFFFFF">
<ScrollView
@@ -28,7 +28,7 @@
android:padding="@dimen/dp_10"
android:text="鹰眼应用信息"
android:textColor="#000"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_28"
android:textStyle="bold" />
<!-- <LinearLayout
@@ -57,6 +57,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000"
android:lineSpacingExtra="3dp"
android:textSize="@dimen/dp_30"
tools:text="应用基础信息" />
@@ -89,7 +90,7 @@
android:textColor="#000"
android:textOff="打开「HMI」调试控制台"
android:textOn="关闭「HMI」调试控制台"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_24"
android:textStyle="bold" />
<com.google.android.flexbox.FlexboxLayout
@@ -113,7 +114,7 @@
android:gravity="center"
android:textOff="修改自车为「小巴车」"
android:textOn="修改自车为「出租车」"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbSpeedView"
@@ -123,7 +124,7 @@
android:gravity="center"
android:textOff="隐藏「脉速表」"
android:textOn="显示 脉速表"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbAutopilotStatusView"
@@ -133,7 +134,7 @@
android:gravity="center"
android:textOff="隐藏「自动驾驶控制按钮」"
android:textOn="显示「自动驾驶控制按钮」"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbPerspectiveSwitchView"
@@ -143,7 +144,7 @@
android:gravity="center"
android:textOff="隐藏「视角切换按钮」"
android:textOn="显示「视角切换按钮」"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbCheckStatusView"
@@ -153,7 +154,7 @@
android:gravity="center"
android:textOff="隐藏「工具箱」"
android:textOn="显示「工具箱」"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbControlView"
@@ -163,62 +164,7 @@
android:gravity="center"
android:textOff="隐藏「小地图」"
android:textOn="显示「小地图」"
android:textSize="@dimen/dp_34" />
<ToggleButton
android:id="@+id/tbChangeSight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:textOff="隐藏「视角切换工具」"
android:textOn="显示「视角切换工具」"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/changesight_top_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 顶视角"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/changesight_back_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 后方来车视角"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/changesight_cross_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 十字路口视角"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/changesight_far_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 远视角"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/reset_changesight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="恢复视角"
android:textSize="@dimen/dp_34"/>
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbOpenLight"
@@ -228,9 +174,162 @@
android:gravity="center"
android:textOff="关闭「转向灯控制」"
android:textOn="打开「转向灯控制」"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<Button
android:id="@+id/changesight_top_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 顶视角"
android:textSize="@dimen/dp_24" />
<Button
android:id="@+id/changesight_back_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 后方来车视角"
android:textSize="@dimen/dp_24" />
<Button
android:id="@+id/changesight_cross_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 十字路口视角"
android:textSize="@dimen/dp_24" />
<Button
android:id="@+id/changesight_far_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 远视角"
android:textSize="@dimen/dp_24" />
<Button
android:id="@+id/reset_changesight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="恢复视角"
android:textSize="@dimen/dp_24" />
</com.google.android.flexbox.FlexboxLayout>
<!--地图呈现数据源控制-->
<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_28"
android:textStyle="bold" />
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:alignContent="flex_start"
app:alignItems="center"
app:flexDirection="row"
app:flexWrap="wrap"
app:justifyContent="flex_start">
<ToggleButton
android:id="@+id/tbIsDrawIdentifyData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:textOff="显示鹰眼感知"
android:textOn="关闭鹰眼感知"
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbIsDrawOBUIdentifyData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:textOff="显示OBU感知"
android:textOn="关闭OBU感知"
android:textSize="@dimen/dp_24"
android:visibility="gone" />
<ToggleButton
android:id="@+id/tbIsDemoMode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:textColor="#000"
android:textOff="开启美化模式"
android:textOn="关闭美化模式"
android:textSize="@dimen/dp_24" />
</com.google.android.flexbox.FlexboxLayout>
<RadioGroup
android:id="@+id/rgGpsProvider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#FFFCCC"
android:orientation="vertical">
<RadioButton
android:id="@+id/rbGpsProviderAndroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="使用Android定位数据"
android:textColor="#000"
android:textSize="@dimen/dp_24" />
<RadioButton
android:id="@+id/rbGpsProviderRTK"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="使用RTK定位数据"
android:textColor="#000"
android:textSize="@dimen/dp_24" />
<RadioButton
android:id="@+id/rbGpsProviderOBU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="使用OBU定位数据"
android:textColor="#000"
android:textSize="@dimen/dp_24" />
</RadioGroup>
<CheckBox
android:id="@+id/cbIsDrawAutopilotTrajectoryData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="选中绘制车前引导线"
android:textColor="#000"
android:textSize="@dimen/dp_24" />
</LinearLayout>
<!--日志输出控制-->
<LinearLayout
android:layout_width="match_parent"
@@ -244,7 +343,7 @@
android:padding="@dimen/dp_10"
android:text="日志输出控制"
android:textColor="#000"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_28"
android:textStyle="bold" />
<com.google.android.flexbox.FlexboxLayout
@@ -267,7 +366,7 @@
android:gravity="center"
android:textOff="关闭「鹰眼」Log"
android:textOn="打开「鹰眼」Log"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbADASLog"
@@ -277,7 +376,7 @@
android:gravity="center"
android:textOff="关闭「ADAS」Log"
android:textOn="打开「ADAS」Log"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbLogCatch"
@@ -287,7 +386,7 @@
android:gravity="center"
android:textOff="开始抓取全量日志"
android:textOn="停止抓取全量日志"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbLogDebugView"
@@ -297,11 +396,11 @@
android:gravity="center"
android:textOff="展示日志过滤面板"
android:textOn="关闭日志过滤面板"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>
<!--地图呈现数据源控制-->
<!--域控制器（工控机）配置信息-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -312,93 +411,59 @@
android:layout_height="wrap_content"
android:background="#B200BCD4"
android:padding="@dimen/dp_10"
android:text="地图呈现数据源控制"
android:text="域控制器（工控机）配置信息"
android:textColor="#000"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_28"
android:textStyle="bold" />
<RadioGroup
android:id="@+id/rgGpsProvider"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="horizontal">
<RadioButton
android:id="@+id/rbGpsProviderAndroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="使用Android定位数据"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etAutopilotIP"
android:layout_width="0dp"
android:layout_height="@dimen/dp_80"
android:layout_weight="3"
android:background="#32009688"
android:gravity="center"
android:minHeight="48dp"
android:padding="@dimen/dp_5"
android:text="192.168.1.102"
android:textSize="@dimen/dp_24" />
<RadioButton
android:id="@+id/rbGpsProviderRTK"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="使用RTK定位数据"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/btnSetAutopilotIP"
android:layout_width="0dp"
android:layout_height="@dimen/dp_80"
android:layout_weight="1"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="设置IP"
android:textSize="@dimen/dp_24" />
<RadioButton
android:id="@+id/rbGpsProviderOBU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="使用OBU定位数据"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
</LinearLayout>
</RadioGroup>
<RadioGroup
android:id="@+id/rgIsDrawIdentifyData"
android:layout_width="wrap_content"
<Button
android:id="@+id/btnRecordPackage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="录制Bag包"
android:textSize="@dimen/dp_24" />
<RadioButton
android:id="@+id/rbDraw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="绘制感知数据"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
<RadioButton
android:id="@+id/rbDoNotDraw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="不绘制感知数据"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
</RadioGroup>
<CheckBox
android:id="@+id/cbIsDrawAutopilotTrajectoryData"
android:layout_width="wrap_content"
<TextView
android:id="@+id/tvAutopilotInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="选中绘制车前引导线"
android:text="工控机配置信息"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
<CheckBox
android:id="@+id/rbIsDemoMode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="选中开启美化模式"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
</LinearLayout>
<!--OBU 配置信息-->
<LinearLayout
android:layout_width="match_parent"
@@ -412,91 +477,48 @@
android:padding="@dimen/dp_10"
android:text="OBU 配置信息"
android:textColor="#000"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_28"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etObuIP"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#32009688"
android:gravity="center"
android:minHeight="48dp"
android:padding="@dimen/dp_5"
android:text="192.168.1.199"
android:textSize="@dimen/dp_34" />
android:orientation="horizontal">
<Button
android:id="@+id/btnSetObuIP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="设置IP"
android:textSize="@dimen/dp_34" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etObuIP"
android:layout_width="0dp"
android:layout_height="@dimen/dp_80"
android:layout_weight="3"
android:background="#32009688"
android:gravity="center"
android:minHeight="48dp"
android:padding="@dimen/dp_5"
android:text="192.168.1.199"
android:textSize="@dimen/dp_24" />
<Button
android:id="@+id/btnSetObuIP"
android:layout_width="0dp"
android:layout_height="@dimen/dp_80"
android:layout_weight="1"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="设置IP"
android:textSize="@dimen/dp_24" />
</LinearLayout>
<TextView
android:id="@+id/tvObuInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="OBU配置信息"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_24" />
</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" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etAutopilotIP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#32009688"
android:gravity="center"
android:minHeight="48dp"
android:padding="@dimen/dp_5"
android:text="192.168.1.102"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/btnSetAutopilotIP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="设置IP"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/btnRecordPackage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="录制Bag包"
android:textSize="@dimen/dp_34" />
<TextView
android:id="@+id/tvAutopilotInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000"
android:textSize="@dimen/dp_34" />
</LinearLayout>
</LinearLayout>