yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[2.14.0]录包工具任务管理修复Bug

Browse Source
This commit is contained in:
xuxinchao
2023-02-16 01:12:41 +08:00
parent f265c9d037
commit a52a6e5688
5 changed files with 253 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt
View File

@@ -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 {

BIN
core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_bag_no_data.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

327
core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_manager.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:layout_width="960dp"
tools:layout_height="match_parent"
android:layout_width="960dp"
android:layout_height="match_parent"
android:background="#F0151D41"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
android:id="@+id/clLayout"
>
<ImageView
android:id="@+id/ivManagerClose"
@@ -41,141 +41,188 @@
android:layout_marginStart="50dp"
/>
<ProgressBar
android:id="@+id/pbSpacePercent"
app:layout_constraintLeft_toLeftOf="@id/viewManagerTitleLine"
app:layout_constraintTop_toBottomOf="@id/viewManagerTitleLine"
style="?android:attr/progressBarStyleHorizontal"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clBagHaveDataLayout"
android:layout_width="785dp"
android:layout_height="26dp"
android:layout_marginTop="100dp"
android:progressDrawable="@drawable/space_percent_bg"
android:max="100"
android:progress="10"
/>
<View
android:id="@+id/viewUsedSpace"
android:layout_width="23dp"
android:layout_height="23dp"
app:layout_constraintTop_toBottomOf="@id/pbSpacePercent"
app:layout_constraintLeft_toLeftOf="@id/pbSpacePercent"
android:layout_marginTop="20dp"
android:background="@drawable/used_space_bg"
/>
<TextView
android:id="@+id/tvUsedSpaceContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
android:textSize="32dp"
app:layout_constraintTop_toTopOf="@id/viewUsedSpace"
app:layout_constraintBottom_toBottomOf="@id/viewUsedSpace"
app:layout_constraintLeft_toRightOf="@id/viewUsedSpace"
android:layout_marginStart="10dp"
/>
<TextView
android:id="@+id/tvFreeSpaceContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
android:textSize="32dp"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
app:layout_constraintTop_toTopOf="@id/viewUsedSpace"
app:layout_constraintBottom_toBottomOf="@id/viewUsedSpace"
/>
<View
android:id="@+id/viewFreeSpace"
android:layout_width="23dp"
android:layout_height="23dp"
android:background="@drawable/unused_space_bg"
app:layout_constraintTop_toTopOf="@id/viewUsedSpace"
app:layout_constraintBottom_toBottomOf="@id/viewUsedSpace"
app:layout_constraintRight_toLeftOf="@id/tvFreeSpaceContent"
android:layout_marginEnd="10dp"
/>
<TextView
android:id="@+id/tvSelectAll"
android:layout_width="200dp"
android:layout_height="80dp"
app:layout_constraintLeft_toLeftOf="@id/viewManagerTitleLine"
app:layout_constraintTop_toBottomOf="@id/viewUsedSpace"
android:layout_marginTop="50dp"
android:background="@drawable/select_all_button_bg"
android:text="一键全选"
android:textColor="#FFFFFFFF"
android:textSize="36dp"
android:gravity="center"
/>
<TextView
android:id="@+id/tvCancelSelect"
android:layout_width="200dp"
android:layout_height="80dp"
app:layout_constraintTop_toTopOf="@id/tvSelectAll"
app:layout_constraintBottom_toBottomOf="@id/tvSelectAll"
app:layout_constraintLeft_toRightOf="@id/tvSelectAll"
android:layout_marginStart="30dp"
android:background="@drawable/cancel_select_button_bg"
android:text="取消"
android:textColor="#FFFFFFFF"
android:textSize="36dp"
android:gravity="center"
/>
<TextView
android:id="@+id/tvSelectedBagSize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tvSelectAll"
app:layout_constraintBottom_toBottomOf="@id/tvSelectAll"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
android:textColor="#FF00AFFF"
android:textSize="34dp"
/>
<TextView
android:id="@+id/tvUploadCloud"
android:layout_width="330dp"
android:layout_height="120dp"
app:layout_constraintLeft_toLeftOf="@id/pbSpacePercent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="120dp"
android:background="@drawable/upload_cloud_button_bg"
android:text="上云"
android:textColor="#FFFFFFFF"
android:textSize="42dp"
android:gravity="center"
/>
<TextView
android:id="@+id/tvDeleteSelect"
android:layout_width="330dp"
android:layout_height="120dp"
app:layout_constraintTop_toTopOf="@id/tvUploadCloud"
app:layout_constraintBottom_toBottomOf="@id/tvUploadCloud"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
android:background="@drawable/delete_button_bg"
android:text="删除"
android:textColor="#FFFFFFFF"
android:textSize="42dp"
android:gravity="center"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvBagList"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintLeft_toLeftOf="@id/pbSpacePercent"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
app:layout_constraintTop_toBottomOf="@id/tvSelectAll"
app:layout_constraintBottom_toTopOf="@id/tvUploadCloud"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
/>
app:layout_constraintTop_toBottomOf="@id/viewManagerTitleLine"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/viewManagerTitleLine"
android:visibility="gone"
>
</merge>
<ProgressBar
android:id="@+id/pbSpacePercent"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="785dp"
android:layout_height="26dp"
android:layout_marginTop="100dp"
android:progressDrawable="@drawable/space_percent_bg"
android:max="100"
android:progress="10"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
/>
<View
android:id="@+id/viewUsedSpace"
android:layout_width="23dp"
android:layout_height="23dp"
app:layout_constraintTop_toBottomOf="@id/pbSpacePercent"
app:layout_constraintLeft_toLeftOf="@id/pbSpacePercent"
android:layout_marginTop="20dp"
android:background="@drawable/used_space_bg"
/>
<TextView
android:id="@+id/tvUsedSpaceContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
android:textSize="32dp"
app:layout_constraintTop_toTopOf="@id/viewUsedSpace"
app:layout_constraintBottom_toBottomOf="@id/viewUsedSpace"
app:layout_constraintLeft_toRightOf="@id/viewUsedSpace"
android:layout_marginStart="10dp"
/>
<TextView
android:id="@+id/tvFreeSpaceContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
android:textSize="32dp"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
app:layout_constraintTop_toTopOf="@id/viewUsedSpace"
app:layout_constraintBottom_toBottomOf="@id/viewUsedSpace"
/>
<View
android:id="@+id/viewFreeSpace"
android:layout_width="23dp"
android:layout_height="23dp"
android:background="@drawable/unused_space_bg"
app:layout_constraintTop_toTopOf="@id/viewUsedSpace"
app:layout_constraintBottom_toBottomOf="@id/viewUsedSpace"
app:layout_constraintRight_toLeftOf="@id/tvFreeSpaceContent"
android:layout_marginEnd="10dp"
/>
<TextView
android:id="@+id/tvSelectAll"
android:layout_width="200dp"
android:layout_height="80dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/viewUsedSpace"
android:layout_marginTop="50dp"
android:background="@drawable/select_all_button_bg"
android:text="一键全选"
android:textColor="#FFFFFFFF"
android:textSize="36dp"
android:gravity="center"
/>
<TextView
android:id="@+id/tvCancelSelect"
android:layout_width="200dp"
android:layout_height="80dp"
app:layout_constraintTop_toTopOf="@id/tvSelectAll"
app:layout_constraintBottom_toBottomOf="@id/tvSelectAll"
app:layout_constraintLeft_toRightOf="@id/tvSelectAll"
android:layout_marginStart="30dp"
android:background="@drawable/cancel_select_button_bg"
android:text="取消"
android:textColor="#FFFFFFFF"
android:textSize="36dp"
android:gravity="center"
/>
<TextView
android:id="@+id/tvSelectedBagSize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tvSelectAll"
app:layout_constraintBottom_toBottomOf="@id/tvSelectAll"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
android:textColor="#FF00AFFF"
android:textSize="34dp"
/>
<TextView
android:id="@+id/tvUploadCloud"
android:layout_width="330dp"
android:layout_height="120dp"
app:layout_constraintLeft_toLeftOf="@id/pbSpacePercent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="120dp"
android:background="@drawable/upload_cloud_button_bg"
android:text="上云"
android:textColor="#FFFFFFFF"
android:textSize="42dp"
android:gravity="center"
/>
<TextView
android:id="@+id/tvDeleteSelect"
android:layout_width="330dp"
android:layout_height="120dp"
app:layout_constraintTop_toTopOf="@id/tvUploadCloud"
app:layout_constraintBottom_toBottomOf="@id/tvUploadCloud"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
android:background="@drawable/delete_button_bg"
android:text="删除"
android:textColor="#FFFFFFFF"
android:textSize="42dp"
android:gravity="center"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvBagList"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintLeft_toLeftOf="@id/pbSpacePercent"
app:layout_constraintRight_toRightOf="@id/pbSpacePercent"
app:layout_constraintTop_toBottomOf="@id/tvSelectAll"
app:layout_constraintBottom_toTopOf="@id/tvUploadCloud"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clBagNoDataLayout"
android:layout_width="785dp"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/viewManagerTitleLine"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/viewManagerTitleLine"
>
<ImageView
android:id="@+id/ivBagNoData"
android:layout_width="@dimen/dp_317"
android:layout_height="@dimen/dp_290"
android:src="@drawable/icon_bag_no_data"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginTop="@dimen/dp_400"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无数据"
android:textColor="#FFCAD6FF"
android:textSize="@dimen/dp_44"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivBagNoData"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

57
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
View File

@@ -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<MoGoHmiContract.View?, HmiPresenter?>(),
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<MoGoHmiContract.View?, HmiPresenter?>(),
override fun showBadCaseManagerView() {
dismissToolsFloatView()
CallerDevaToolsManager.showBadCaseManagerView(it)
// CallerDevaToolsManager.showBadCaseManagerView(it)
toggleBagManagerView()
}
})
}
@@ -839,6 +845,55 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
}
}
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预警
*