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

[Fix]修复dockerversion为null情况

Browse Source 
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2021-11-19 17:48:03 +08:00
parent 4e9fbf41aa
commit 44e6f66396
2 changed files with 145 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,98 +91,159 @@
android:textOn="显示「车辆检测」"
android:textSize="@dimen/dp_34" />
<!-- <Button
android:id="@+id/tbChangeCarCenter100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_CENTER_100"
android:textSize="@dimen/dp_34" />
<!-- <Button
android:id="@+id/tbChangeCarCenter100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_CENTER_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCarQuarter100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_QUARTER_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCarQuarter100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_QUARTER_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCarTwoFifths100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_TWO_FIFTHS_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCarTwoFifths100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_TWO_FIFTHS_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCarTwoFifths80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_TWO_FIFTHS_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCarTwoFifths80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_TWO_FIFTHS_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_120"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_120"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_120"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_120"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_120"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_120"
android:textSize="@dimen/dp_34" />-->
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_120"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_120"
android:textSize="@dimen/dp_34" />-->
</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_34"
android:textStyle="bold" />
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/flLogControl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
app:alignContent="flex_start"
app:alignItems="center"
app:flexDirection="row"
app:flexWrap="wrap"
app:justifyContent="flex_start"
tools:visibility="visible">
<ToggleButton
android:id="@+id/tbSelfLog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:textOff="关闭「鹰眼」Log"
android:textOn="打开「鹰眼」Log"
android:textSize="@dimen/dp_34" />
<ToggleButton
android:id="@+id/tbADASLog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:textOff="关闭「ADAS」Log"
android:textOn="打开「ADAS」Log"
android:textSize="@dimen/dp_34" />
<ToggleButton
android:id="@+id/tbMapSLog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:textOff="关闭「Map」Log"
android:textOn="打开「Map」Log"
android:textSize="@dimen/dp_34" />
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>
<!--地图呈现数据源控制-->
<LinearLayout
android:layout_width="match_parent"

8
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt
View File

@@ -13,14 +13,14 @@ class AutopilotStatusInfo : Serializable {
/**
* 当前链接的IP地址, 默认地址 192.168.1.102
*/
var connectIP: String = "0.0.0.0"
var connectIP: String? = null
var connectStatus = false
var version: String = "v0.0"
var version: String? = null
/**
* 工控机镜像版本
*/
var dockVersion: String = "v0.0"
var dockVersion: String? = null
/**
* 定位是否可用
@@ -42,7 +42,7 @@ class AutopilotStatusInfo : Serializable {
/**
* 不可用原因
*/
var reason: String = ""
var reason: String? = null
/**
* 摄像头状态 1代表开启，0代表关闭