From 974ab381554844ef85e40b0547521f3da3e8dd8d Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Fri, 14 Jan 2022 14:11:48 +0800 Subject: [PATCH] =?UTF-8?q?V2.2.1-=E5=B7=A5=E6=8E=A7=E6=9C=BA=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 工控机升级需求，UI代码 --- config.gradle | 2 +- .../function/hmi/ui/tools/AdUpgradeDialog.kt | 46 ++++++++ .../hmi/ui/widget/SystemVersionView.kt | 73 ++++++++++++ .../src/main/res/drawable-xxhdpi/icon_ad.png | Bin 0 -> 1713 bytes .../drawable-xxhdpi/icon_latest_version.png | Bin 0 -> 7270 bytes .../src/main/res/drawable-xxhdpi/icon_pad.png | Bin 0 -> 2014 bytes .../drawable/version_latest_background.xml | 12 ++ .../version_upgrade_tips_background.xml | 10 ++ .../version_upgradeable_background.xml | 11 ++ .../drawable/version_upgrading_background.xml | 5 + .../src/main/res/layout/dialog_ad_upgrade.xml | 106 ++++++++++++++++++ .../src/main/res/layout/fragment_hmi.xml | 14 +++ .../main/res/layout/view_auto_pilot_check.xml | 35 ++++++ .../main/res/layout/view_system_version.xml | 106 ++++++++++++++++++ .../src/main/res/values/color.xml | 9 ++ .../src/main/res/values/strings.xml | 10 ++ .../module/adas/OnAdasListenerAdapter.java | 24 +++- 17 files changed, 460 insertions(+), 3 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ad.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_latest_version.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_pad.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrade_tips_background.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml diff --git a/config.gradle b/config.gradle index 4615e6c779..7b02452c5e 100644 --- a/config.gradle +++ b/config.gradle @@ -114,7 +114,7 @@ ext { obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.19', mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.10', - adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate1', + adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate3', // google googlezxing : "com.google.zxing:core:3.3.3", diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt new file mode 100644 index 0000000000..6f429fd0e4 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt @@ -0,0 +1,46 @@ +package com.mogo.eagle.core.function.hmi.ui.tools + +import android.content.Context +import android.widget.TextView +import androidx.lifecycle.LifecycleObserver +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.module.common.dialog.BaseFloatDialog + +/** + * @author XuXinChao + * @description 工控机确认升级对话框 + * @since: 2022/1/13 + */ +class AdUpgradeDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver { + + companion object { + const val TAG = "AdUpgradeDialog" + } + + private var upgradeConfirm : TextView? = null + private var upgradeCancel : TextView? = null + + init { + setContentView(R.layout.dialog_ad_upgrade) + setCanceledOnTouchOutside(true) + upgradeConfirm=findViewById(R.id.tv_upgrade_confirm) + upgradeCancel=findViewById(R.id.tv_upgrade_cancel) + + upgradeConfirm?.setOnClickListener{ + Logger.i(TAG,"upgradeConfirm click") + } + upgradeCancel?.setOnClickListener { + Logger.i(TAG,"upgradeCancel click") + } + } + + fun showUpgradeDialog(){ + if(isShowing){ + return + } + + show() + } + +} \ No newline at end of file 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 new file mode 100644 index 0000000000..69f5f076af --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -0,0 +1,73 @@ +package com.mogo.eagle.core.function.hmi.ui.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import kotlinx.android.synthetic.main.view_system_version.view.* + +/** + * @author XuXinChao + * @description 工具箱-系统版本（鹰眼版本、工控机版本）视图 + * @since: 2022/1/13 + */ +class SystemVersionView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener { + + companion object { + const val TAG = "SystemVersionView" + } + + private var connectStatus = false + private var adUpgradeDialog : AdUpgradeDialog? = null + + init { + LayoutInflater.from(context).inflate(R.layout.view_system_version, this, true) + initView() + } + + private fun initView(){ + //鹰眼版本视图点击事件 + ivPadVersion.setOnClickListener { + Logger.i(TAG,"pad version view clicked") + } + //工控机版本视图点击事件 + ivAdVersion.setOnClickListener { + Logger.i(TAG,"ad version view clicked") + if(adUpgradeDialog == null){ + adUpgradeDialog = AdUpgradeDialog(context) + } + adUpgradeDialog?.showUpgradeDialog() + } + } + + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerAutoPilotStatusListenerManager.addListener(TAG, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerAutoPilotStatusListenerManager.removeListener(TAG) + } + + override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { + connectStatus = autoPilotStatusInfo.connectStatus + setViewStatus() + } + + private fun setViewStatus(){ + + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ad.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ad.png new file mode 100644 index 0000000000000000000000000000000000000000..05e8e316db2fdc747f1a8149a0901710aa3cbd0d GIT binary patch literal 1713 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
  • $ZL00p#jXbuI<89h!YQRuft=OWm~gFD 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 literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml new file mode 100644 index 0000000000..7c919f37a6 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrade_tips_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrade_tips_background.xml new file mode 100644 index 0000000000..ce6a8b62cf --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrade_tips_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml new file mode 100644 index 0000000000..8cab4286f1 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml new file mode 100644 index 0000000000..5c5a6b1bb0 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml new file mode 100644 index 0000000000..817a11fdde --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index e34535885b..b4e0c7aabf 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -98,6 +98,20 @@ app:layout_constraintStart_toEndOf="@+id/viewPerspectiveSwitch" app:layout_goneMarginStart="50px" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 89090b898b..1458f14fc9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -34,4 +34,13 @@ #FF2966EC #FFA7B6F0 #B3FFFFFF + + + #6D7BAF + #3B4577 + #029DFF + #0056FF + #3B4577 + #3B4577 + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index 7b65371b3c..cd38032747 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -24,4 +24,14 @@ 系统运行 关机 重启 + + + 系统版本 + 当前版本 + 应用升级 + 是否将应用升级至最新版本？ + 注意！升级时需退出自动驾驶，支持在人工驾驶时升级，升级时不可中途断电。 + 确认 + 取消 + diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java index 3930bb76ee..83a7f3f4d7 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java @@ -24,7 +24,8 @@ import com.zhidao.support.adas.high.bean.AutopilotStatus; import com.zhidao.support.adas.high.bean.AutopilotWayArrive; import com.zhidao.support.adas.high.bean.CarLaneInfo; import com.zhidao.support.adas.high.bean.CarStateInfo; -import com.zhidao.support.adas.high.bean.IPCUpgradePatchDownloadProgressInfo; +import com.zhidao.support.adas.high.bean.IPCPowerResultInfo; +import com.zhidao.support.adas.high.bean.IPCUpgradePatchDownloadStatusInfo; import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo; import com.zhidao.support.adas.high.bean.LightStatueInfo; import com.zhidao.support.adas.high.bean.ObstaclesInfo; @@ -197,13 +198,32 @@ public class OnAdasListenerAdapter implements OnAdasListener { } + + /** + * 工控机电源返回 + * @param info 域控制器电源返回结果 + */ + @Override + public void onIPCPowerResultInfo(IPCPowerResultInfo info) { + + } + + /** + * 工控机升级状态 + * @param info 工控机升级状态 + */ @Override public void onUpgradeStateInfo(IPCUpgradeStateInfo info) { } + /** + * 工控机下载状态 + * @param info 工控机升级包下载进度 + */ @Override - public void onUpgradePatchDownload(IPCUpgradePatchDownloadProgressInfo info) { + public void onUpgradePatchDownloadStatus(IPCUpgradePatchDownloadStatusInfo info) { } + }