diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 5e911bb87b..1567698216 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/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 + } + } + } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_hd_map.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_hd_map.png new file mode 100644 index 0000000000..dfe012028e Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_hd_map.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml index 68330ae43c..8510cc7a26 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml +++ b/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" /> @@ -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" /> + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt index 1a4d759209..e97023a865 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt @@ -51,6 +51,10 @@ object AppConfigInfo { //工控机协议版本 var protocolVersionNumber: Int = 0 + //工控机MAP高精地图版本 + @Volatile + var adHdMapVersion: String = "" + //业务状态信息 /** * debug 测试环境--2