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 0000000000..05e8e316db Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_ad.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_latest_version.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_latest_version.png new file mode 100644 index 0000000000..315b2ee523 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_latest_version.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_pad.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_pad.png new file mode 100644 index 0000000000..48cb847b54 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_pad.png differ 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) { } + }