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

Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

Browse Source
This commit is contained in:
donghongyu-pc
2024-10-21 17:06:21 +08:00
parent 8ab3c01fef 2c3db60b57
commit aab924793b
11 changed files with 110 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,8 +187,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
}
tvPassiveNum.text = BadCaseConfig.windowNum.toString()
BadCaseConfig.windowNum++
tvPassiveTime.text = "时间：${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}"
tvPassiveIdentity.text = "身份：${BadCaseConfig.identity}"
tvPassiveTime.text = millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())
tvPassiveIdentity.text = BadCaseConfig.identity
viewAudioBg.setOnClickListener {
audioStatus = !audioStatus
setAudio(audioStatus)
@@ -248,8 +248,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
it.format = PixelFormat.RGBA_8888
it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
it.gravity = Gravity.START or Gravity.TOP
it.width = 859
it.height = 850
it.width = 908
it.height = 1306
it.alpha = 1.0f
}
}
@@ -520,7 +520,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
// 默认固定位置，靠屏幕右边缘的中间
mWindowManager!!.defaultDisplay.getMetrics(metrics)
// mWindowParams!!.x = metrics.widthPixels
mWindowParams!!.x = 0
mWindowParams!!.x = metrics.widthPixels
mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-950
mWindowManager!!.addView(mFloatLayout, mWindowParams)
}
@@ -681,13 +681,13 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
val lp = FlexboxLayout.LayoutParams(
FlexboxLayout.LayoutParams.WRAP_CONTENT,
FlexboxLayout.LayoutParams.WRAP_CONTENT)
checkBox.buttonDrawable = mActivity.resources.getDrawable(R.drawable.badcase_radio_button_style)
checkBox.buttonDrawable = mActivity.resources.getDrawable(R.drawable.passive_radio_button_style)
checkBox.setPadding(
SizeUtils.dp2px(18f),
SizeUtils.dp2px(7f),
SizeUtils.dp2px(18f),
SizeUtils.dp2px(7f))
checkBox.textSize = AutoSizeUtils.dp2px(mActivity,15f).toFloat()
SizeUtils.dp2px(AutoSizeUtils.dp2px(mActivity,12f).toFloat()),
SizeUtils.dp2px(AutoSizeUtils.dp2px(mActivity,7f).toFloat()),
SizeUtils.dp2px(AutoSizeUtils.dp2px(mActivity,12f).toFloat()),
SizeUtils.dp2px(AutoSizeUtils.dp2px(mActivity,7f).toFloat()))
checkBox.textSize = AutoSizeUtils.dp2px(mActivity,20f).toFloat()
checkBox.text = it
checkBox.setOnCheckedChangeListener{ _, isChecked ->
if(isChecked){

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 933 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 756 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

8
core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_passive_cancel.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="#E5333333"
android:endColor="#E5333333"
/>
<corners android:radius="@dimen/dp_10" />
</shape>

9
core/function-impl/mogo-core-function-devatools/src/main/res/drawable/passive_radio_button_style.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="false"
android:drawable="@drawable/icon_record_check_false" />
<item
android:state_checked="true"
android:drawable="@drawable/icon_record_check_true" />
</selector>

128
core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml
View File

@@ -1,41 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.eagle.core.widget.RoundConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_859"
android:layout_height="@dimen/dp_850"
app:roundLayoutRadius="@dimen/dp_36"
android:background="#1B2966">
android:layout_width="@dimen/dp_908"
android:layout_height="@dimen/dp_1306"
android:background="@drawable/bg_passive_bad_case">
<View
android:layout_width="match_parent"
android:id="@+id/viewPassiveTitleBg"
android:layout_width="@dimen/dp_831"
android:layout_height="@dimen/dp_102"
android:background="@drawable/ai_collect_title_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:background="@drawable/bg_passive_bad_case_title"
android:layout_marginTop="@dimen/dp_32"
android:layout_marginStart="@dimen/dp_24"
/>
<TextView
android:id="@+id/tvPassiveTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/viewPassiveTitleBg"
app:layout_constraintLeft_toLeftOf="@id/viewPassiveTitleBg"
android:textColor="@color/white"
android:textSize="@dimen/sp_45"
android:text="@string/passive_title"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_54"
/>
<TextView
android:id="@+id/tvPassiveNum"
android:layout_width="@dimen/dp_108"
android:layout_height="@dimen/dp_102"
android:background="@drawable/icon_num_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:textColor="#FFFFFFFF"
android:textSize="@dimen/sp_42"
android:layout_width="@dimen/dp_46"
android:layout_height="@dimen/dp_46"
app:layout_constraintTop_toTopOf="@id/tvPassiveTitle"
app:layout_constraintBottom_toBottomOf="@id/tvPassiveTitle"
app:layout_constraintLeft_toRightOf="@id/tvPassiveTitle"
android:textColor="@color/white"
android:textSize="@dimen/sp_30"
android:gravity="center"
android:text="1"
android:background="@drawable/bg_passive_bad_case_num"
android:layout_marginStart="@dimen/dp_10"
/>
<TextView
android:id="@+id/tvPassiveTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toRightOf="@id/tvPassiveNum"
app:layout_constraintRight_toRightOf="@id/viewPassiveTitleBg"
app:layout_constraintTop_toTopOf="@id/tvPassiveNum"
app:layout_constraintBottom_toBottomOf="@id/tvPassiveNum"
android:textColor="#FFFFFFFF"
android:textSize="@dimen/sp_34"
android:layout_marginStart="@dimen/dp_50"
android:textColor="#999999"
android:textSize="@dimen/sp_38"
android:layout_marginEnd="@dimen/dp_62"
/>
<TextView
@@ -44,18 +64,28 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tvPassiveNum"
app:layout_constraintBottom_toBottomOf="@id/tvPassiveNum"
app:layout_constraintRight_toRightOf="parent"
android:textColor="#FFFFFFFF"
android:textSize="@dimen/sp_34"
android:layout_marginEnd="@dimen/dp_50"
app:layout_constraintRight_toLeftOf="@id/tvPassiveTime"
android:textColor="#999999"
android:textSize="@dimen/sp_38"
android:layout_marginEnd="@dimen/dp_39"
/>
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_40"
app:layout_constraintTop_toTopOf="@id/tvPassiveIdentity"
app:layout_constraintBottom_toBottomOf="@id/tvPassiveIdentity"
app:layout_constraintLeft_toRightOf="@id/tvPassiveIdentity"
app:layout_constraintRight_toLeftOf="@id/tvPassiveTime"
android:background="#999999"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvPassiveNum"
app:layout_constraintLeft_toLeftOf="@id/viewPassiveTitleBg"
app:layout_constraintRight_toRightOf="@id/viewPassiveTitleBg"
app:layout_constraintTop_toBottomOf="@id/viewPassiveTitleBg"
app:layout_constraintBottom_toTopOf="@id/viewAudioBg"
android:scrollbars="vertical"
android:fadeScrollbars="false"
@@ -78,42 +108,42 @@
<TextView
android:id="@+id/tvPassiveReport"
android:layout_width="@dimen/dp_370"
android:layout_width="@dimen/dp_335"
android:layout_height="@dimen/dp_80"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintLeft_toLeftOf="@id/viewPassiveTitleBg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/tvPassiveCancel"
android:background="@drawable/report_button_bg"
android:background="@drawable/bg_passive_report"
android:text="上报"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_27"
android:textColor="@color/white"
android:textSize="@dimen/dp_36"
android:gravity="center"
android:layout_marginBottom="@dimen/dp_40"
android:layout_marginBottom="@dimen/dp_100"
/>
<TextView
android:id="@+id/tvPassiveCancel"
android:layout_width="@dimen/dp_370"
android:layout_width="@dimen/dp_335"
android:layout_height="@dimen/dp_80"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintRight_toRightOf="@id/viewPassiveTitleBg"
app:layout_constraintLeft_toRightOf="@id/tvPassiveReport"
android:text="取消"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_27"
android:textColor="@color/white"
android:textSize="@dimen/sp_36"
android:gravity="center"
android:background="@drawable/icon_cancel_bg"
android:layout_marginBottom="@dimen/dp_40"
android:background="@drawable/bg_passive_cancel"
android:layout_marginBottom="@dimen/dp_100"
/>
<ImageView
android:id="@+id/viewAudioBg"
android:layout_width="@dimen/dp_768"
android:layout_height="@dimen/dp_122"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_width="@dimen/dp_720"
android:layout_height="@dimen/dp_90"
app:layout_constraintLeft_toLeftOf="@id/viewPassiveTitleBg"
app:layout_constraintRight_toRightOf="@id/viewPassiveTitleBg"
app:layout_constraintBottom_toTopOf="@id/tvPassiveReport"
android:background="@drawable/icon_audio_bg"
android:background="@drawable/bg_passive_audio"
android:layout_marginBottom="@dimen/dp_40"
/>
@@ -136,8 +166,8 @@
<ImageView
android:id="@+id/viewAudioButton"
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_48"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_62"
app:layout_constraintLeft_toLeftOf="@id/viewAudioBg"
app:layout_constraintRight_toRightOf="@id/viewAudioBg"
app:layout_constraintTop_toTopOf="@id/viewAudioBg"
@@ -147,8 +177,8 @@
<ImageView
android:id="@+id/viewAudioStart"
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_48"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_62"
app:layout_constraintTop_toTopOf="@id/viewAudioBg"
app:layout_constraintBottom_toBottomOf="@id/viewAudioBg"
app:layout_constraintRight_toRightOf="@id/viewAudioBg"
@@ -157,4 +187,4 @@
android:visibility="gone"
/>
</com.mogo.eagle.core.widget.RoundConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
View File

@@ -68,4 +68,6 @@
<string name="take_over_record_cannot_check">不能选则</string>
<string name="ai_collect_report_title">上报</string>
<string name="passive_title">故障反馈</string>
</resources>

1
core/mogo-core-res/src/main/res/values/dimens.xml
View File

@@ -1058,6 +1058,7 @@
<dimen name="dp_1261">1261dp</dimen>
<dimen name="dp_1284">1284dp</dimen>
<dimen name="dp_1300">1300dp</dimen>
<dimen name="dp_1306">1306dp</dimen>
<dimen name="dp_1373">1373dp</dimen>
<dimen name="dp_1386">1386dp</dimen>
<dimen name="dp_1528">1550dp</dimen>