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

Merge remote-tracking branch 'origin/dev_robotaxi-d_240227_6.3.0' into dev_robotaxi-d_240227_6.3.0

Browse Source
This commit is contained in:
jiaguofeng
2024-03-05 18:37:11 +08:00
parent 5abb444ae4 a94d42c6f0
commit 1208b2dcb6
6 changed files with 162 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1260,8 +1260,11 @@ internal class DebugSettingView @JvmOverloads constructor(
CallerAutoPilotControlManager.recordPackage()
}
}
//是否启用证书认证
cbSsl.isChecked = SharedPrefsMgr.getInstance().getBoolean(MoGoConfig.AUTOPILOT_CERTIFICATION,false)
cbSsl.setOnCheckedChangeListener { _, isChecked ->
SharedPrefsMgr.getInstance().putBoolean(MoGoConfig.AUTOPILOT_CERTIFICATION,isChecked)
}
}
/**

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

@@ -900,12 +900,50 @@
app:layout_constraintTop_toTopOf="@id/btnSetAutopilotIP" />
<View
android:id="@+id/autopilotIPDivider"
android:id="@+id/sslDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#F0F0F0"
app:layout_constraintTop_toBottomOf="@id/btnSetAutopilotIP" />
<View
android:id="@+id/hintView"
android:layout_width="5dp"
android:layout_height="1dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/sslDivider" />
<CheckBox
android:id="@+id/cbSsl"
style="@style/DebugSettingText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="false"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:scaleX="1.3"
android:scaleY="1.3"
android:text="证书认证"
app:layout_constraintStart_toEndOf="@id/hintView"
app:layout_constraintTop_toBottomOf="@id/sslDivider" />
<TextView
style="@style/DebugSettingText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="（此状态会保存，更改后下次连接生效）"
app:layout_constraintBottom_toBottomOf="@id/cbSsl"
app:layout_constraintStart_toEndOf="@id/cbSsl"
app:layout_constraintTop_toTopOf="@id/cbSsl" />
<View
android:id="@+id/autopilotIPDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#F0F0F0"
app:layout_constraintTop_toBottomOf="@id/cbSsl" />
<Button
android:id="@+id/btnRecordPackage"
android:layout_width="wrap_content"