From a52a6e5688a54fa9b3311541c8f1c51d44061ec1 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 16 Feb 2023 01:12:41 +0800 Subject: [PATCH] =?UTF-8?q?[2.14.0]=E5=BD=95=E5=8C=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E4=BF=AE=E5=A4=8DBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 6 +- .../res/drawable-xhdpi/icon_bag_no_data.png | Bin 0 -> 17281 bytes .../res/layout/layout_badcase_manager.xml | 327 ++++++++++-------- .../core/function/hmi/ui/MoGoHmiFragment.kt | 57 ++- .../api/hmi/warning/IMoGoWaringProvider.kt | 5 + 5 files changed, 253 insertions(+), 142 deletions(-) create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_no_data.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt index 801708f121..31d0b57875 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt @@ -35,7 +35,7 @@ import java.util.* * @description BadCase录包管理页面 * @since: 2022/12/15 */ -internal class BadCaseManagerView @JvmOverloads constructor( +class BadCaseManagerView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -66,6 +66,8 @@ internal class BadCaseManagerView @JvmOverloads constructor( private fun initView(){ background = ColorDrawable(Color.parseColor("#F0151D41")) + clLayout.setOnClickListener { + } //关闭BadCase管理窗口 ivManagerClose.setOnClickListener { clickListener?.onClose() @@ -272,6 +274,8 @@ internal class BadCaseManagerView @JvmOverloads constructor( } //遍历所有bag else if(bagManager.reqType == 2){ + clBagHaveDataLayout.visibility = View.VISIBLE + clBagNoDataLayout.visibility = View.GONE if(bagManager.bagsInfoRespCount>0){ for(bagInfo in bagManager.bagsInfoRespList){ bagInfo?.let { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_no_data.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_no_data.png new file mode 100644 index 0000000000000000000000000000000000000000..5f4ea0176bbdfed99a9cfa982a3e91b672f0dc9d GIT binary patch literal 17281 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

D zH*0CBvjpL*cYXUXTi(-21$-UsR{}!f;M=rSEGmdAXkB zjgr&!$(s=*qSN3mKD4-Z@Z z{Fx44EAFwdUs*GLgroPU*LqNr(UN0~>U;d5U?<+$=InXyMJfC6sh*?ptV%}YE*7Pn zsmkVmTFZK*NCl{vPA?Io=y&k0I3HCskG*i>Z4UYt-gFKD0oeNQzW@d~|6H4P9_kr* zej=JLzF>hGt9D%#ku}I8PbOU6*5IIJ2Zk82k|PQYHA+m_{C&!p&6T(Szh|x^2bDLT z{}{k7x66fBQRL`!@q3p-I{dnKyWGU5!HPPPA!b2(0sK}4EuSWAYDYBJm!7r;(tZWj$)r~%9p=GCjywY$>IqEYapiDzM%;| zu@R6G{&v!uT&yTfiwhyoUmq+oa?y_U?5Dcw!T-xhHw+IV9L43d4vpQIT!yni$o}$C z!I6ZCm;R4a2Bi>UitQe#`ll1#ej$WZU$OwMC>EiNcqw3KP$IM=_eV;Mgje3vCe=$_ z;Z7v#=Z*|7E&W4TAVW$v-7Au>K9+KUyl;7B2N@M+=q=i;jSLuXr#+b#>7|>tZDF_%8PIwJd@cr8dO)d_sVHmay z8dI*wKptkD?t^-w&*RS<+qWqp%MX`N$R$`a0cF7=`9Gj3#vW4iBgO_y9jggJP%@r` z)?;+M>Z16BMCY~eL;#DH=={G35CjD%x22Q}cWcD_<)tq!OUp;VHO=IkJ#f#W5reAn zSX%eHl3;E45>{CJKLQ2;`TnAL5l>+F4fEXjsm@&j>De~V%*~Bbn_WSlQ2jwgQQ?=N z|81|v&@p*@s57U>0=SUOa&$$-$ZZkJ}N zT}Am=Dg?0IgX<#ZY&xEfNwxE`PY1TY5;ns86!ZBp4dF+8$~L6gm}HeTTQB`| - + android:id="@+id/clLayout" + > - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@id/viewManagerTitleLine" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="@id/viewManagerTitleLine" + android:visibility="gone" + > - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 582699cdbf..daed3fa99b 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 @@ -106,6 +106,7 @@ import com.mogo.eagle.core.utilcode.util.* import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String import com.zhidao.support.adas.high.common.MogoReport.Code.Error.EMAP.* +import com.zhjt.mogo_core_function_devatools.badcase.biz.BadCaseManagerView import com.zhjt.mogo_core_function_devatools.badcase.biz.SpaceWarningDialog import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import com.zhjt.service_biz.BizConfig @@ -142,6 +143,10 @@ class MoGoHmiFragment : MvpFragment(), private var mSOPSettingViewFloat: WarningFloat.Builder? = null private var mSOPSettingView: SOPSettingView? = null + //BadCaseManagerView + private var mBadCaseManagerViewFloat: WarningFloat.Builder ?= null + private var mBadCaseManagerView: BadCaseManagerView?= null + //StatusView private var statusBarView: StatusBarView? = null @@ -564,7 +569,8 @@ class MoGoHmiFragment : MvpFragment(), override fun showBadCaseManagerView() { dismissToolsFloatView() - CallerDevaToolsManager.showBadCaseManagerView(it) +// CallerDevaToolsManager.showBadCaseManagerView(it) + toggleBagManagerView() } }) } @@ -839,6 +845,55 @@ class MoGoHmiFragment : MvpFragment(), } } + override fun toggleBagManagerView() { + activity?.let{ + if (mBadCaseManagerViewFloat != null) { + WarningFloat.dismiss(mBadCaseManagerViewFloat!!.config.floatTag, false) + mBadCaseManagerViewFloat = null + mBadCaseManagerView = null + } else { + if (mBadCaseManagerView == null) { + mBadCaseManagerView = BadCaseManagerView(it) + mBadCaseManagerView?.setOnClickListener(object: BadCaseManagerView.ClickListener{ + override fun onClose() { + toggleBagManagerView() + } + }) + } + mBadCaseManagerViewFloat = WarningFloat.with(it) + .setTag("mBadCaseManagerView") + .setLayout(mBadCaseManagerView!!) + .setSidePattern(LEFT) + .setGravity(Gravity.LEFT, offsetY = 70) + .setImmersionStatusBar(false) + .setWindowHeight(LayoutParams.MATCH_PARENT) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { + interpolator = OvershootInterpolator() + } + + override fun exitAnim( + view: View, + params: LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .show() + } + } + } + + /** * 展示VR下V2X预警 * 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 122866ef06..bc1a7dadbb 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 @@ -89,6 +89,11 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy { */ fun toggleSOPView() + /** + * 开关Bag包任务管理页面 + */ + fun toggleBagManagerView() + /** * 展示VR下V2X预警 *