From 2304b9708fbb1bf2d8415da68f6a5338c94204c6 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Fri, 18 Feb 2022 18:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=8E=A7=E6=9C=BAdocker=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84=E5=92=8CUI?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 完善了docker的重启逻辑，由于本期暂时不上该功能，故暂时把UI入口进行隐藏 --- .../adapter/MoGoAdasListenerImpl.java | 11 ++- .../core/function/hmi/ui/MoGoHmiFragment.kt | 19 ++++ .../hmi/ui/tools/AutoPilotAndCheckView.kt | 1 + .../hmi/ui/tools/DockerRebootDialog.kt | 60 +++++++++++++ .../function/hmi/ui/widget/CheckSystemView.kt | 46 +++++++++- .../src/main/res/layout/dialog_ad_upgrade.xml | 2 +- .../main/res/layout/dialog_docker_reboot.xml | 88 +++++++++++++++++++ .../main/res/layout/view_auto_pilot_check.xml | 18 ++-- .../src/main/res/layout/view_check_system.xml | 15 ++-- .../src/main/res/values/color.xml | 2 +- .../src/main/res/values/strings.xml | 3 + .../data/autopilot/AdUpgradeStateHelper.kt | 9 ++ .../api/hmi/warning/IMoGoWaringProvider.kt | 7 ++ .../function/call/hmi/CallerHmiManager.kt | 11 ++- 14 files changed, 272 insertions(+), 20 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java index 9e5ec04f04..a2b9997f1f 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java @@ -310,9 +310,16 @@ public class MoGoAdasListenerImpl implements OnAdasListener { } } - + /** + * 命令返回结果 + * @param info 结果返回实体 + */ @Override public void onSSHResult(SSHResult info) { - + if(info!=null && "docker restart autocar_default_1".equals(info.cmd)){ + CallerHmiManager.INSTANCE.showDockerRebootResult(info.code, info.msg); + }else{ + Logger.d(TAG,"onSSHResult : result info is null"); + } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 265f440c2a..c26a078c9f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -342,6 +342,25 @@ class MoGoHmiFragment : MvpFragment onBadCaseHide = onHide } + /** + * 工控机重启返回结果 + * @param code + * @param msg + */ + override fun showDockerRebootResult(code: Int, msg: String) { + ThreadUtils.runOnUiThread{ + if(code>=-1){ + //重启成功 + ToastUtils.showShort("重启成功") + }else{ + //重启失败 + msg?.let { + ToastUtils.showShort(it) + } + } + } + } + private fun showBadCasesFloat(dismiss: (() -> Unit)?) { Log.d("QQQ", "showBadCaseToolsFloat") context?.let { it -> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 3679c1788f..8f7d97bdf1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -124,6 +124,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor( fun showAdUpgradeStatus(upgradeMode: Int,downloadStatus : Int,currentProgress : Int,totalProgress : Int ,downloadVersion : String,upgradeStatus : Int){ systemVersionView?.showAdUpgradeStatus(upgradeMode,downloadStatus,currentProgress, totalProgress, downloadVersion, upgradeStatus) + checkSystemView?.setAdUpgradeStatus(downloadStatus, upgradeStatus) } override fun onAttachedToWindow() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt new file mode 100644 index 0000000000..be94fe594c --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt @@ -0,0 +1,60 @@ +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 重启自动驾驶docker确认对话框 + * @since: 2022/2/17 + */ +class DockerRebootDialog(context: Context): BaseFloatDialog(context), LifecycleObserver { + + companion object { + const val TAG = "DockerRebootDialog" + } + + private var rebootConfirm : TextView? = null + private var rebootCancel : TextView? = null + + private var clickListener: ClickListener? = null + + init{ + setContentView(R.layout.dialog_docker_reboot) + setCanceledOnTouchOutside(true) + rebootConfirm=findViewById(R.id.tv_reboot_confirm) + rebootCancel=findViewById(R.id.tv_reboot_cancel) + + rebootConfirm?.setOnClickListener{ + Logger.i(TAG,"rebootConfirm click") + clickListener?.confirm() + dismiss() + } + rebootCancel?.setOnClickListener { + Logger.i(TAG,"rebootCancel click") + clickListener?.cancel() + dismiss() + } + } + + fun setClickListener(clickListener: ClickListener) { + this.clickListener = clickListener + } + + fun showUpgradeDialog(){ + if(isShowing){ + return + } + show() + } + + interface ClickListener{ + fun confirm() + fun cancel() + } + +} \ 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/CheckSystemView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt index e4d2d67e0a..fc1127e263 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt @@ -6,11 +6,16 @@ import android.view.Gravity import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.autopilot.AdUpgradeStateHelper 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.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.notification.WarningFloat +import com.mogo.eagle.core.function.hmi.ui.tools.DockerRebootDialog +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.ToastUtils import kotlinx.android.synthetic.main.view_check_system.view.* class CheckSystemView @JvmOverloads constructor( @@ -23,7 +28,12 @@ class CheckSystemView @JvmOverloads constructor( const val TAG = "CheckSystemView" } - private var connectStatus = false + private var connectStatus = false //是否连接工控机 + private var autopilotStatus:Int ?=null //自动驾驶状态 0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中 + private var dockerRebootDialog: DockerRebootDialog? = null + + private var downloadStatus: Int=-1 //下载状态 + private var upgradeStatus: Int=-1 //升级状态 init { LayoutInflater.from(context).inflate(R.layout.view_check_system, this, true) @@ -31,17 +41,45 @@ class CheckSystemView @JvmOverloads constructor( } private fun initView() { - //todo view状态注意消息回执 viewCheckShutDown.setOnClickListener { //dialog // showSystemOperationWindow() } viewCheckReboot.setOnClickListener { //dialog -// showSystemOperationWindow() + if(dockerRebootDialog == null){ + dockerRebootDialog = DockerRebootDialog(context) + dockerRebootDialog?.setClickListener(object : DockerRebootDialog.ClickListener{ + override fun confirm() { + if(autopilotStatus==2){ + //当前处于自动驾驶状态，不可进行重启，Toast提示 + ToastUtils.showShort("请先退出自动驾驶状态") + }else if(AdUpgradeStateHelper.showCannotReboot(downloadStatus, upgradeStatus)){ + //当工控机处于下载或者升级状态，需要先进行升级 + ToastUtils.showShort("请先完成新自动驾驶系统的下载/升级") + } else{ + //确认重启 + Logger.i(TAG,"reboot confirm") + CallerAutoPilotManager.setIPCReboot() + } + } + + override fun cancel() { + //取消重启 + Logger.i(TAG,"reboot cancel") + } + + }) + } + dockerRebootDialog?.showUpgradeDialog() } } + fun setAdUpgradeStatus(downloadStatus : Int,upgradeStatus : Int){ + this.downloadStatus=downloadStatus + this.upgradeStatus=upgradeStatus + } + private fun showSystemOperationWindow(view: View) { WarningFloat.with(context).setGravity(Gravity.CENTER).setLayout(view) .setImmersionStatusBar(true).show() @@ -59,6 +97,7 @@ class CheckSystemView @JvmOverloads constructor( override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { connectStatus = autoPilotStatusInfo.connectStatus + autopilotStatus = autoPilotStatusInfo.state setViewStatus() } @@ -72,6 +111,7 @@ class CheckSystemView @JvmOverloads constructor( viewCheckShutDown.isClickable = false viewCheckReboot.isClickable = false } + } } \ 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 index 817a11fdde..5dbf010e0e 100644 --- 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 @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="840px" android:layout_height="584px" - android:background="@color/upgrade_dialog_bg_color" + android:background="@color/dialog_bg_color" app:roundLayoutRadius="32px" > diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml new file mode 100644 index 0000000000..2c4ecd7bca --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml index 54641ba41e..6ccb53257a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml @@ -3,18 +3,20 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="960px" - android:layout_height="match_parent" + android:layout_height="2000px" android:background="@color/notice_check_dialog_bg_color"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintRight_toRightOf="parent"> + android:layout_height="match_parent"> + app:layout_constraintTop_toBottomOf="@id/llSpeedPosition" + android:visibility="gone"/> + app:layout_constraintTop_toBottomOf="@id/llSpeedPosition" + android:visibility="gone"/> + app:layout_constraintTop_toBottomOf="@id/tvSystemOperation" + android:visibility="gone"/> + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml index eaf152bbf6..f3e63fd01e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml @@ -14,7 +14,8 @@ android:src="@drawable/check_shut_down" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + android:visibility="gone"/> + app:layout_constraintTop_toBottomOf="@id/viewCheckShutDown" + android:visibility="gone"/> + app:layout_constraintLeft_toLeftOf="@id/viewCheckReboot" + app:layout_constraintRight_toRightOf="@id/viewCheckReboot" + app:layout_constraintTop_toBottomOf="@id/viewCheckReboot" /> + \ 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 1458f14fc9..304e9575c6 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 @@ -41,6 +41,6 @@ #029DFF #0056FF #3B4577 - #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 1f76aa9980..69371132e5 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 @@ -25,6 +25,9 @@ 系统运行 关机 重启 + 重启提示 + 是否重启自动驾驶系统? + 系统版本 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdUpgradeStateHelper.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdUpgradeStateHelper.kt index cc1db61f69..0edea8699b 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdUpgradeStateHelper.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdUpgradeStateHelper.kt @@ -36,6 +36,15 @@ class AdUpgradeStateHelper { return isDownloading(downloadStatus) || isDownloadFinish(downloadStatus,upgradeStatus) || getUpgradeStatus() || isUpgradeFailed(upgradeStatus) } + /** + * 如果工控机处于升级、下载过程中，则不能进行重启 + * @param downloadStatus 下载状态 + * @param upgradeStatus 升级状态 + */ + fun showCannotReboot(downloadStatus: Int,upgradeStatus: Int): Boolean{ + return isDownloading(downloadStatus)|| isDownloadFinish(downloadStatus,upgradeStatus) || getUpgradeStatus() + } + /** * 工控机是否处于“下载中”状态 * @param downloadStatus 下载状态 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt index bf8cad29ac..ce74708a31 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt @@ -187,4 +187,11 @@ interface IMoGoWaringProvider { * [onHide]回调不用关心，可以不注册 */ fun registerBadCaseCallback(onShow:() -> View, onHide: (() -> Unit)?) + + /** + * 工控机重启返回结果 + * @param code + * @param msg + */ + fun showDockerRebootResult(code: Int,msg: String) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 15f74ffd6e..ea0ee0f7fe 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -265,5 +265,14 @@ object CallerHmiManager : CallerBase() { fun registerBadCaseCallback(onShow:() -> View, onHide: (() -> Unit)?) { waringProviderApi?.registerBadCaseCallback(onShow, onHide) } - + + /** + * 工控机重启返回结果 + * @param code + * @param msg + */ + fun showDockerRebootResult(code: Int,msg: String){ + waringProviderApi?.showDockerRebootResult(code, msg) + } + } \ No newline at end of file