diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
index 6f6d0e9b16..8fec467ed1 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
@@ -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){
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_audio.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_audio.png
new file mode 100644
index 0000000000..ce064b4dad
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_audio.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case.png
new file mode 100644
index 0000000000..c189267f95
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case_num.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case_num.png
new file mode 100644
index 0000000000..182c64c66c
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case_num.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case_title.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case_title.png
new file mode 100644
index 0000000000..1e432034bd
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_bad_case_title.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_report.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_report.png
new file mode 100644
index 0000000000..ceca324bf4
Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/bg_passive_report.png differ
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_passive_cancel.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_passive_cancel.xml
new file mode 100644
index 0000000000..9c523cef79
--- /dev/null
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_passive_cancel.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/passive_radio_button_style.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/passive_radio_button_style.xml
new file mode 100644
index 0000000000..f05e99720f
--- /dev/null
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/passive_radio_button_style.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml
index 448a6f1303..cd5c3f0124 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_passive_bad_case.xml
@@ -1,41 +1,61 @@
-
+ android:layout_width="@dimen/dp_908"
+ android:layout_height="@dimen/dp_1306"
+ android:background="@drawable/bg_passive_bad_case">
+
+
+
+
+
+
@@ -136,8 +166,8 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
index b7f06a8256..1ea3d4ae20 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml
@@ -68,4 +68,6 @@
不能选则
上报
+ 故障反馈
+
\ No newline at end of file
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 4bf0a083d8..5193688dc8 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -1058,6 +1058,7 @@
1261dp
1284dp
1300dp
+ 1306dp
1373dp
1386dp
1550dp