diff --git a/app/build.gradle b/app/build.gradle index 9607c94d7c..ab988cd7c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -326,7 +326,7 @@ def getWorkingBranchHash() { proc.err.eachLine { line -> println line } proc.waitFor() println "Working branch hash: " + workingBranchHash - return workingBranchHash + return "\"${workingBranchHash}\"" } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 0ae3ac68c7..f6eead8bb2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -82,16 +82,22 @@ class AutoPilotAndCheckView @JvmOverloads constructor( clickListener?.go2CheckPage() } etInputSpeed.setOnTouchListener { v, _ -> - if (etInputSpeed.hasFocusable()) { - if (keyBoardUtil == null) { - keyBoardUtil = KeyBoardUtil(sKeyBoardView, etInputSpeed) + if (!connectStatus) { + ToastUtils.showShort("设置车速失败,请启动域控制器") + keyBoardUtil?.hideKeyboard() + return@setOnTouchListener true + } else { + if (etInputSpeed.hasFocusable()) { + if (keyBoardUtil == null) { + keyBoardUtil = KeyBoardUtil(sKeyBoardView, etInputSpeed) + } + keyBoardUtil?.showKeyboard() } - keyBoardUtil?.showKeyboard() + if (!etInputSpeed.hasFocus()) { + etInputSpeed.requestFocus() + } + return@setOnTouchListener false } - if (!etInputSpeed.hasFocus()) { - etInputSpeed.requestFocus() - } - return@setOnTouchListener false } // // 比如需要设置默认速度 // val speed = "30"