[6.1.0]工具箱系统版本增加工控机HDMAP版本显示

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

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.deva.bindingcar.AdUpgradeStateHelper
 import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.map.MogoLocation
@@ -25,6 +26,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.util.*
 import kotlinx.android.synthetic.main.view_system_version.view.*
+import system_master.SsmInfo
+import system_master.SystemStatusInfo
 
 
 /**
@@ -62,6 +65,7 @@ class SystemVersionView @JvmOverloads constructor(
     private fun initView() {
         showCurrentPadVersion()
         showCurrentAdVersion()
+        updateAdHdMapVersion()
 
         //鹰眼版本视图点击事件
         ivPadVersion.setOnClickListener {
@@ -364,4 +368,42 @@ class SystemVersionView @JvmOverloads constructor(
     override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
         location = gnssInfo
     }
+
+    /**
+     * 状态查询应答
+     * @param status 数据
+     * HQ、M1 MAP350开始弃用，其他车型MAP360开始弃用
+     */
+    override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) {
+        if(status.hdMapVer!= null && status.hdMapVer.isNotEmpty()){
+            AppConfigInfo.adHdMapVersion = status.hdMapVer
+            updateAdHdMapVersion()
+        }
+
+    }
+
+    /**
+     * 定频SSM接口
+     * 1hz  hq m1 MAP350开始支持，其他车型MAP360开始支持
+     * 定频SSM接入后 onStatusQueryResp 状态查询应答接口将弃用
+     * @param statusInf 数据
+     */
+    override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) {
+        if(statusInf.hdMapVer!= null && statusInf.hdMapVer.isNotEmpty()){
+            AppConfigInfo.adHdMapVersion = statusInf.hdMapVer
+            updateAdHdMapVersion()
+        }
+    }
+
+    /**
+     * 更新工控机高精地图版本
+     */
+    private fun updateAdHdMapVersion(){
+        if(tvAdHdMapVersionContent.text.isNullOrEmpty() && AppConfigInfo.adHdMapVersion.isNotEmpty() || tvAdHdMapVersionContent.text != AppConfigInfo.adHdMapVersion){
+            ThreadUtils.runOnUiThread {
+                tvAdHdMapVersionContent.text = AppConfigInfo.adHdMapVersion
+            }
+        }
+    }
+
 }

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

@@ -12,10 +12,10 @@
         android:layout_marginStart="113dp"
         android:src="@drawable/icon_version_pad"
         android:layout_marginTop="40dp"
-        android:clickable="true"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/current_system_version"
         />
 
     <ImageView
@@ -62,6 +62,7 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="405dp"
         android:src="@drawable/icon_version_ad_normal"
+        android:contentDescription="@string/current_system_version"
         />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView
@@ -108,10 +109,8 @@
         app:layout_constraintLeft_toLeftOf="@id/tvAdVersionTitle"
         app:layout_constraintRight_toRightOf="@id/tvAdVersionTitle"
         app:layout_constraintTop_toBottomOf="@id/tvAdVersionTitle"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:textColor="#FFA7B6F0"
         android:layout_marginTop="2dp"
-        android:layout_marginBottom="20dp"
         android:textSize="32dp"
         />
 
@@ -124,6 +123,7 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginStart="680dp"
         android:src="@drawable/icon_version_hd_map"
+        android:contentDescription="@string/current_system_version"
         />
 
     <ImageView
@@ -136,4 +136,44 @@
         app:layout_constraintCircleRadius="90dp"
         tools:ignore="MissingConstraints" />
 
+    <!--工控机HDMap版本-->
+    <ImageView
+        android:id="@+id/ivAdHdMapVersion"
+        android:layout_width="@dimen/dp_150"
+        android:layout_height="@dimen/dp_150"
+        app:layout_constraintLeft_toLeftOf="@id/ivPadVersion"
+        app:layout_constraintRight_toRightOf="@id/ivPadVersion"
+        app:layout_constraintTop_toBottomOf="@id/tvPadVersionContent"
+        android:layout_marginTop="60dp"
+        android:src="@drawable/icon_version_ad_hd_map"
+        android:contentDescription="@string/current_system_version"
+        />
+
+    <TextView
+        android:id="@+id/tvAdHdMapVersionTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="@id/ivAdHdMapVersion"
+        app:layout_constraintRight_toRightOf="@id/ivAdHdMapVersion"
+        app:layout_constraintTop_toBottomOf="@id/ivAdHdMapVersion"
+        android:text="@string/current_system_version"
+        android:textColor="#FFA7B6F0"
+        android:layout_marginTop="10dp"
+        android:textSize="32dp"
+        />
+
+    <TextView
+        android:id="@+id/tvAdHdMapVersionContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="@id/ivAdHdMapVersion"
+        app:layout_constraintRight_toRightOf="@id/ivAdHdMapVersion"
+        app:layout_constraintTop_toBottomOf="@id/tvAdHdMapVersionTitle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:textColor="#FFA7B6F0"
+        android:layout_marginTop="2dp"
+        android:textSize="32dp"
+        android:layout_marginBottom="20dp"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>