From c1a6a97db8dbf4282f2259b9ae49553aa9d14f73 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 15 Oct 2024 14:57:02 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=E5=86=B7=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/widget/ColdStartView.kt | 80 +++++++++++++++++ .../drawable-xhdpi/icon_cold_start_fail.png | Bin 0 -> 939 bytes .../icon_cold_start_process.png | Bin 0 -> 1126 bytes .../icon_cold_start_success.png | Bin 0 -> 1530 bytes .../res/drawable/bg_cold_start_divider.xml | 7 ++ .../src/main/res/layout/view_cold_start.xml | 84 ++++++++++++++++++ .../src/main/res/values/strings.xml | 3 + .../src/main/res/values/dimens.xml | 1 + 8 files changed, 175 insertions(+) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_fail.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_process.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_success.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_cold_start_divider.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt new file mode 100644 index 0000000000..21d71e9d08 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -0,0 +1,80 @@ +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.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.hmi.R +import com.zhjt.mogo.adas.data.AdasConstants +import system_master.SsmInfo +import system_master.SystemStatusInfo + +/** + * 冷启动呈现二期 + * 前置展示冷启动过程和结果 + */ +class ColdStartView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener { + + companion object { + const val TAG = "ColdStartView" + } + + init { + LayoutInflater.from(context).inflate(R.layout.view_cold_start, this, true) + initView() + } + + private fun initView(){ + + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerAutoPilotStatusListenerManager.addListener(TAG, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerAutoPilotStatusListenerManager.removeListener(TAG) + } + + override fun onAutopilotIpcConnectStatusChanged( + status: AdasConstants.IpcConnectionStatus, + reason: String? + ){ + if(status == AdasConstants.IpcConnectionStatus.CONNECTED){ + //域控连接成功 + + }else{ + //域控连接失败 + + } + } + + /** + * 状态查询应答 + * @param status 数据 + * HQ、M1 MAP350开始弃用，其他车型MAP360开始弃用 + */ + override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) { + + } + + + /** + * 定频SSM接口 + * 1hz hq m1 MAP350开始支持，其他车型MAP360开始支持 + * 定频SSM接入后 onStatusQueryResp 状态查询应答接口将弃用 + * @param statusInf 数据 + */ + override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) { + + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_fail.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_fail.png new file mode 100644 index 0000000000000000000000000000000000000000..e469e824d27c5a66c719951c54ba2be0bfda12dc GIT binary patch literal 939 zcmV;c162HpP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91D4+uX1ONa40RR91C;$Ke0D9(TtN;K56-h)vR9FeknLTI}Q4q&xHYbU4 zq_9x9LIf=WM*O%m9wAuS`hj9;FIt&SP+}cBv9Pn0gh*PkkTaa1o+3uD&{l~>)DZMS zE<66`z1{oF-repV&mDN#x3}-j{NC)okC`wf6nR@ZLY{XX-HSwAAfF1vC@MnV$U`AP zp(^?QGEY^$nrAWpaGdt?p>%+DMsASEML}8i{wEi{+(WJ-w)h zBE(XizKhW=4joR7ngPqA+E80j9J@Y{%9*`1w&yXvwJT8_hx$A70@b#!ap~3HPQ6_o zG^23|r$p)q*xb#NU4Zm%`i?WtwYp0o)pm!py<#&V^qa$U?P%xfR$%&a>%?h*n5AT^ z{w4W@fU5oH>_FC^;R;(xL}&MC?r69K(b;WS zXioc?Z_w-zb`g%HtF7_qq2_ICz4>d58qZp$0Fbu5o9LZ(hll~tw`tyNsc2?rG1G;< zU0gRX`#k{7sU-Hs?}C;mmCXx|OfD?Ow}IoFzG9r`GAl&@;;@-n;euyQ!dV5xDc!@S zmR%2mO~1i}dy*5kiwC^#PD~{+0yZo&8hvF{z=l_BLc@#_iUJ~T9frtOQ;T0~*3;Fh zSZ4g?bUK3Gzsf{^KHKv9qQgG4j!uAQT zIO^e(I=ynQ({rJ|NWiec|4v}`1ys;Xr+`CG8qlmJ(OV(Ix~qRf`~z82A06hcnc4sV N002ovPDHLkV1lx|rM&Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91D4+uX1ONa40RR91C;$Ke0D9(TtN;K5&`Cr=R9Fe^m%nQiK@`Vxd%wIp z(g{Hn6vZYWVl7GxS|p;4jbN*dg?3hoffS||ME`*lmTDk{pqNsy@dp?X{6R=i5%EX3 z+uPeaKi_jl_U?9e@6HWr?!n{D&b;})@4lURGn*MpNm{K|7N|Vxpk5}E@zQ`6SXv^2 znLu}>1)3&7kuwr*o4%oJngm-zF-Vw{CP5P_wd@ISD+n5*saPw)TCH}v(P+G@*Xyr6 z&zl-BT4EO2^=0$`dJrAA;ah zg+k$Exc`6K5S#`hsa(}^j^n7d>6mH@ZPWbsjE~pRna)G|Qjq|abs#j4(*{)X@SJ=@xZZmf% zJI@m*g&eqG?9b(L$LZp};XbQWD(j(PYqKwckUPSTz5$AMoObs&f?c$tMhs91E(O;# zl{F8{<#M^a7U9~_rR^Lm-Q;lAeK7J$9|uGU(f^I&Wsy85(+os)!;Y0$f&sbfWK8u* zwNZ7l2JpRD)QCZjRGnBl1sq;5ix$w?B$C!o%sM&5dYc1KpH*+KLhf?Iz6HrwJa-5L zj?yuU`h5N+e0tU>^Y=pPEIvw18x!jh=MnxJw0p#wK_*SoqUm>@KosT0IMker>G)_daTCG07?>pGPiM3+$x2{3k1Y19! z^)`Whr5higwR+9wJ4k>0s}6#M?_X{MPD*f3m0&`wp@z4FVA2{KglTF7wb)HyKJ~yS sjhWkRQzHoQ61qwDHX*y*9cb9+KcT0psKS)k{r~^~07*qoM6N<$f@>P@_y7O^ literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_success.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_success.png new file mode 100644 index 0000000000000000000000000000000000000000..3c6cc6ebd90755b3a2449f230445f19b98d4aaaf GIT binary patch literal 1530 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91D4+uX1ONa40RR91C;$Ke0D9(TtN;K7WJyFpR9FekS$S-fMHGKCyQT4{ zB?vu*Hej?;+O-w5Au1_tXf)J|ROunc5@WoG`j22y8?+%N5~D_=28|(>)Vf9@CKzaI zAr@0D(zRl(2W`P#Y1)!-EX(c;v~EC-po6G`{sBvvkW3EYg`S> z6j1L62DwZ?Dw;|2ex|T(5Cnbz1{o7=iY@M&*6fFeBXPyTQCj^=eFn3$P3Zgq)LR^e zt^i=|AjFq8rhK&DvEi&$T}uEVD7Y zSOV1cx#({tMqid_2CS&Kv%W+Z)&Nq5@NU9-`(>|f%x8A__!Ge1tQEByHtkDGU$f5; zK2FS-tGFGuW!?>6XRm`*iHib@F>oAmWoZl5GsK?U8dx}rt?}FjZ)C25mDi=i)jSRg z=b8W{pG;7`2TrFFtQQk=Ig6cfcrD{Da9o?Dxxu{;_Dvi&b;&^7hldNswIh?MSado# z&bO_LR>JKGbSm?dcLsij_DMRCnU?gT&M%g8I?tJkM4P<{D4Lro?SD4X1>hq#N6Xb7$|^UpfnA3$oy`t#m3q=f5G%kc}RU~}*Ha8A9bH$`0I$nGI!nu8cW;l$A?(C9F}Xzp$4I|$XuxiAOk<)_2H zYI89R6Xv2!d_|qwxU6yQy2cH5N{%V!8Zqs0HajZH$RlmkpuLsga|F@S0;ERILyo963dE2e z7o3;wE2x?@`t$)v9rTccE2qvV6a!kpjkv5OXZ=6^zAgbs0`!oB2U!aB>{5Zhx4`^3 zf-7lpRI~)@_H6%wda#Y&N>HF4$pjOT**166um*~pZa82B^-la%d+DtNPb1BGTa;=A z?Rq97PJ@)b0KMlkdoK{tNXm^thj1+3Ff+UJa0NibE*0LchFM`$;Gyi{xVRshd& zCYT56!^E%UR!m<_xm8`E#Et!70W>PorJC-obT!0$ltvdEx + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml new file mode 100644 index 0000000000..1da924a954 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + \ 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 61244a3c46..a219598048 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 @@ -213,4 +213,7 @@ 红绿灯信号来源 已发起上报 + 域控连接状态图标 + SSM连接状态图标 + diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index aec6045a64..4bf0a083d8 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1112,6 +1112,7 @@ 55dp 57dp 69dp + 70dp 72dp 76dp 80dp