Merge remote-tracking branch 'origin/dev_MogoAP_eagle-220_211207_8.0.17' into dev_MogoAP_eagle-220_211207_8.0.17

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}\""
 }
 
 

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

@@ -374,6 +374,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                         override fun onClose(v: View) {
                             dismissToolsFloatView()
                         }
+
+                        override fun showDebugPanelView() {
+                            toggleDebugView()
+                        }
                     })
                 }
                 toolsViewFloat = WarningFloat.with(it)

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt

@@ -81,17 +81,26 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
         viewCheckStatus.setOnClickListener {
             clickListener?.go2CheckPage()
         }
+        ivDebugPanel.setOnClickListener {
+            clickListener?.showDebugPanelView()
+        }
         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"
@@ -124,5 +133,6 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
     interface ClickListener {
         fun go2CheckPage()
         fun onClose(v: View)
+        fun showDebugPanelView()
     }
 }

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml

@@ -58,6 +58,28 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/viewCheckStatus" />
 
+            <ImageView
+                android:id="@+id/ivDebugPanel"
+                android:layout_width="150px"
+                android:layout_height="150px"
+                android:background="@drawable/debug_icon_nor"
+                app:layout_constraintStart_toEndOf="@id/viewCheckStatus"
+                app:layout_constraintTop_toTopOf="@id/viewCheckStatus"
+                android:layout_marginStart="142px"
+                />
+
+            <TextView
+                android:id="@+id/tvDebug"
+                android:layout_width="128px"
+                android:layout_height="42px"
+                android:layout_marginStart="416px"
+                android:layout_marginTop="23px"
+                android:text="@string/debug_panel"
+                android:textColor="@color/color_FFA7B6F0"
+                android:textSize="32px"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/ivDebugPanel" />
+
             <View
                 android:layout_width="14px"
                 android:layout_height="50px"

core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml

@@ -20,6 +20,7 @@
     <string name="log_text_loading">日志加载中...</string>
 
     <string name="check_vehicle_detection">车辆检测</string>
+    <string name="debug_panel">调试面板</string>
     <string name="check_vehicle_speed_setting">车速设置</string>
     <string name="check_system_operation">系统运行</string>
     <string name="check_system_shut_down">关机</string>