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

Merge branch 'dev/dev_eagle_wuhan_sikua_obu' into dev/dev_eagle_architecture_upgrade

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
This commit is contained in:
董宏宇
2021-10-12 17:42:55 +08:00
parent 204c7735c0 5aa58fcbb0
commit b8a397b73d
7 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
.setTag(tag)
.setLayout(notificationView)
.setSidePattern(SidePattern.TOP)
.setCountDownTime(10000)
.setCountDownTime(5000)
.setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
.setImmersionStatusBar(true)
.addWarningStatusListener(listenerIMoGo)

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

@@ -49,16 +49,15 @@
android:textSize="@dimen/dp_34"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etObuIP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#32009688"
android:gravity="center"
android:inputType="number"
android:padding="@dimen/dp_5"
android:text="192.168.1.199"
android:textSize="@dimen/dp_34" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etObuIP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#32009688"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="192.168.1.199"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/btnSetObuIP"

5
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
View File

@@ -447,7 +447,8 @@ class MogoPrivateObuManager private constructor() {
-> {
if (info.ext_info != null) {
// 计算为千米每小时 TODO 这里需要做一下向上取整数，40，60，80，120等
CallerHmiManager.showLimitingVelocity((info.ext_info.speed_limit_max.toInt() * 60 * 60) / 1000)
Logger.d(MogoObuConst.TAG_MOGO_OBU, "info.ext_info.speed_limit_max ------> ${info.ext_info.speed_limit_max}")
CallerHmiManager.showLimitingVelocity((Math.ceil(((info.ext_info.speed_limit_max * 60 * 60) / 1000) / 10) * 10).toInt())
}
}
// 删除
@@ -615,7 +616,7 @@ class MogoPrivateObuManager private constructor() {
isGreenLight = false
CallerHmiManager.showWarningTrafficLight(1)
val red = currentLight.count_down.toInt()
val red = currentLight.count_down.toInt() + 1
CallerHmiManager.changeCountdownRed(red)
CallerHmiManager.changeCountdownGreen(0)
CallerHmiManager.changeCountdownYellow(0)