From e60626c05abe373c008ae963e612175a16b2b1b7 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 13 Sep 2023 14:18:24 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=E5=B7=A5=E5=85=B7=E7=AE=B1=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=89=88=E6=9C=AC=E5=A2=9E=E5=8A=A0=E5=B7=A5=E6=8E=A7?= =?UTF-8?q?=E6=9C=BAHDMAP=E7=89=88=E6=9C=AC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/SystemVersionView.kt | 42 ++++++++++++++++ .../drawable-xhdpi/icon_version_ad_hd_map.png | Bin 0 -> 27441 bytes .../main/res/layout/view_system_version.xml | 46 ++++++++++++++++-- .../mogo/eagle/core/data/app/AppConfigInfo.kt | 4 ++ 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_hd_map.png 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 0000000000000000000000000000000000000000..dfe012028eae73d204a3c455c5e5f03e17e608dc GIT binary patch literal 27441 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 @@ -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