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

Merge remote-tracking branch 'origin/dev_robotaxi-d_230711_3.4.0' into dev_robotaxi-d_230711_3.4.0

Browse Source
This commit is contained in:
pangfan
2023-07-25 14:06:31 +08:00
parent 98fe897f61 07e8dd067e
commit a7b2528d4b
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
override fun onBluetoothKeyBoardCombineClicked(vararg keyCodes: Int) {
val keycodesText = keyCodes.joinToString(",") { KeyEvent.keyCodeToString(it).replace("KEYCODE_", "", true) }
if (isTest.get()) {
showToast("组合键[$keycodesText]触发了")
showToast("[$keycodesText]")
}
try {
MoFangAnalyticUtils.track(EVENT_INPUT, mutableMapOf(EVENT_INPUT_SUB_KEYCODE to keycodesText, EVENT_INPUT_SUB_TYPE to "3"))
@@ -192,7 +192,8 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
override fun onBluetoothKeyBoardLongClicked(keyCode: Int) {
if (isTest.get()) {
showToast("长按键[${KeyEvent.keyCodeToString(keyCode).replace("KEYCODE_", "", true)}]触发了")
val key = KeyEvent.keyCodeToString(keyCode).replace("KEYCODE_", "", true)
showToast("[$key$key]")
}
try {
MoFangAnalyticUtils.track(EVENT_INPUT, mutableMapOf(EVENT_INPUT_SUB_KEYCODE to keyCode.toString(), EVENT_INPUT_SUB_TYPE to "2"))
@@ -210,7 +211,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
override fun onBluetoothKeyboardClicked(keyCode: Int) {
val keycodeText = KeyEvent.keyCodeToString(keyCode)
if (isTest.get()) {
showToast("单击键[${keycodeText.replace("KEYCODE_", "", true)}]触发了")
showToast("[${keycodeText.replace("KEYCODE_", "", true)}]")
}
try {
MoFangAnalyticUtils.track(EVENT_INPUT, mutableMapOf(EVENT_INPUT_SUB_KEYCODE to keyCode.toString(), EVENT_INPUT_SUB_TYPE to "1"))

29
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
View File

@@ -279,18 +279,7 @@
app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/tbNew360LookAround"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="360环视"
android:paddingTop="25dp"
android:paddingBottom="25dp"
android:scaleY="1.2"
android:scaleX="1.2"
app:layout_constraintTop_toBottomOf="@id/tbNewV2NData"
app:layout_constraintLeft_toRightOf="@+id/verticalGuideLine"
app:layout_constraintLeft_toLeftOf="parent" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/tbWeakNetSlowDown"
@@ -319,12 +308,26 @@
app:layout_constraintLeft_toRightOf="@+id/verticalGuideLine"
app:layout_constraintRight_toRightOf="parent"/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/tbNew360LookAround"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="360环视"
android:paddingTop="25dp"
android:paddingBottom="25dp"
android:scaleY="1.2"
android:scaleX="1.2"
app:layout_constraintTop_toBottomOf="@id/tbWeakNetSlowDown"
app:layout_constraintRight_toLeftOf="@+id/verticalGuideLine"
app:layout_constraintLeft_toLeftOf="parent"
/>
<TextView
android:id="@+id/tvSpeedThresholdTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tbWeakNetSlowDown"
app:layout_constraintTop_toBottomOf="@id/tbNew360LookAround"
android:text="变道速度阈值："
android:textSize="@dimen/dp_36"
android:textColor="#1A1A1A"