[8.1.2]动态配置鹰眼显示MAP版本修复Bug
This commit is contained in:
@@ -265,8 +265,10 @@ class CarInfoTabView @JvmOverloads constructor(
|
||||
if(AppConfigInfo.mapShowName.isNotEmpty()){
|
||||
tvADVersionName.text = AppConfigInfo.mapShowName
|
||||
}else{
|
||||
CallerAutoPilotStatusListenerManager.getDockerVersion()?.let {
|
||||
tvADVersionName.text = it
|
||||
if(CallerAutoPilotStatusListenerManager.getDockerVersion().isNullOrEmpty()){
|
||||
tvADVersionName.text = ""
|
||||
}else{
|
||||
tvADVersionName.text = CallerAutoPilotStatusListenerManager.getDockerVersion()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,6 +152,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.btChangeEnv
|
||||
import kotlinx.android.synthetic.main.view_debug_setting.view.btnAppReboot
|
||||
import kotlinx.android.synthetic.main.view_debug_setting.view.btnAutoCheck
|
||||
import kotlinx.android.synthetic.main.view_debug_setting.view.btnBrakeThreshold
|
||||
import kotlinx.android.synthetic.main.view_debug_setting.view.btnClearMap
|
||||
import kotlinx.android.synthetic.main.view_debug_setting.view.btnConnectServerIp
|
||||
import kotlinx.android.synthetic.main.view_debug_setting.view.btnDeleteDB
|
||||
import kotlinx.android.synthetic.main.view_debug_setting.view.btnDisconnectIpc
|
||||
@@ -610,8 +611,6 @@ internal class DebugSettingView @JvmOverloads constructor(
|
||||
}
|
||||
}
|
||||
//动态配置鹰眼显示MAP版本
|
||||
etMapShowName.setText(AppConfigInfo.mapShowName)
|
||||
etMapShowName.text?.let { etMapShowName.setSelection(it.length) }
|
||||
btnEnsureMap.setOnClickListener {
|
||||
AppConfigInfo.mapShowName = etMapShowName.text.toString()
|
||||
SPUtils.getInstance().put("mapShowName", AppConfigInfo.mapShowName)
|
||||
@@ -620,6 +619,16 @@ internal class DebugSettingView @JvmOverloads constructor(
|
||||
CallerMapShowNameManager.invokeMapShowName(AppConfigInfo.mapShowName)
|
||||
}
|
||||
|
||||
//清空动态配置鹰眼显示MAP版本
|
||||
btnClearMap.setOnClickListener {
|
||||
etMapShowName.setText("")
|
||||
AppConfigInfo.mapShowName = ""
|
||||
SPUtils.getInstance().put("mapShowName", AppConfigInfo.mapShowName)
|
||||
tvIpcVersionInfo.text = "MAP:${AppConfigInfo.mapShowName}"
|
||||
tvIpcVersionInfoKey.text = "MAP:${AppConfigInfo.mapShowName}"
|
||||
CallerMapShowNameManager.invokeMapShowName(AppConfigInfo.mapShowName)
|
||||
}
|
||||
|
||||
/**
|
||||
* 状态中心
|
||||
*/
|
||||
|
||||
@@ -77,6 +77,12 @@ class VersionNameView @JvmOverloads constructor(
|
||||
it.text = version
|
||||
}
|
||||
}
|
||||
}else if(version.isNullOrEmpty()){
|
||||
scope.launch {
|
||||
tvMapVersionName?.also {
|
||||
it.text = ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -563,19 +563,39 @@
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
android:paddingStart="@dimen/dp_20"
|
||||
android:paddingEnd="@dimen/dp_20"
|
||||
android:hint="请输入要展示的MAP版本"
|
||||
/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnEnsureMap"
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="确定"
|
||||
style="@style/DebugSettingText"
|
||||
android:paddingStart="@dimen/dp_30"
|
||||
android:paddingEnd="@dimen/dp_30"
|
||||
android:paddingTop="@dimen/dp_10"
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
/>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnEnsureMap"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="确定"
|
||||
style="@style/DebugSettingText"
|
||||
android:paddingStart="@dimen/dp_30"
|
||||
android:paddingEnd="@dimen/dp_30"
|
||||
android:paddingTop="@dimen/dp_10"
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnClearMap"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="清空"
|
||||
style="@style/DebugSettingText"
|
||||
android:paddingStart="@dimen/dp_30"
|
||||
android:paddingEnd="@dimen/dp_30"
|
||||
android:paddingTop="@dimen/dp_10"
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
|
||||
Reference in New Issue
Block a user