diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 15296500ad..1db9bb90cd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -9,6 +9,7 @@ import android.os.SystemClock import android.util.DisplayMetrics import android.view.* import android.widget.CheckBox +import android.widget.ImageView import android.widget.TextView import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.app.AppConfigInfo @@ -67,7 +68,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList private lateinit var rbFive: CheckBox private lateinit var rbSix: CheckBox - private lateinit var viewAudioButton: View + private lateinit var viewAudioButton: ImageView private lateinit var tvAudioCountDown: TextView private lateinit var tvInitiativeReport: TextView @@ -203,7 +204,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList audioFileName = "Audio_${System.currentTimeMillis()}_BadCase" RecordManager.getInstance().start(audioFileName) //更改录音按钮背景 - viewAudioButton.background = mActivity.getDrawable(R.drawable.bad_case_audio_select) + viewAudioButton.setImageResource(R.drawable.icon_bad_case_audio_select) tvAudioCountDown.visibility = View.VISIBLE //开始倒计时 if(countDownTimer==null){ @@ -218,7 +219,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList //结束录音 RecordManager.getInstance().stop() //更改录音按钮背景 - viewAudioButton.background = mActivity.getDrawable(R.drawable.bad_case_audio_normal) + viewAudioButton.setImageResource(R.drawable.icon_bad_case_audio_normal) } } countDownTimer?.start() 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 6cc160c725..ff05c2fdb1 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 @@ -11,6 +11,7 @@ import android.util.Log import android.view.* import android.widget.CheckBox import android.widget.CompoundButton +import android.widget.ImageView import android.widget.TextView import com.google.android.flexbox.FlexboxLayout import com.mogo.cloud.passport.MoGoAiCloudClientConfig @@ -78,7 +79,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene private lateinit var tvPassiveTime: TextView private lateinit var tvPassiveIdentity: TextView - private lateinit var viewAudioButton: View + private lateinit var viewAudioButton: ImageView private lateinit var tvAudioCountDown: TextView private lateinit var tvPassiveReport: TextView @@ -156,7 +157,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene audioFileName = "Audio_${System.currentTimeMillis()}_BadCase" RecordManager.getInstance().start(audioFileName) //更改录音按钮背景 - viewAudioButton.background = mActivity.getDrawable(R.drawable.bad_case_audio_select) + viewAudioButton.setImageResource(R.drawable.icon_bad_case_audio_select) tvAudioCountDown.visibility = View.VISIBLE //开始倒计时 if(countDownTimer==null){ @@ -171,7 +172,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene //结束录音 RecordManager.getInstance().stop() //更改录音按钮背景 - viewAudioButton.background = mActivity.getDrawable(R.drawable.bad_case_audio_normal) + viewAudioButton.setImageResource(R.drawable.icon_bad_case_audio_normal) } } countDownTimer?.start() @@ -285,10 +286,10 @@ 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.setPadding(SizeUtils.dp2px(12f), - SizeUtils.dp2px(5f), + checkBox.setPadding(SizeUtils.dp2px(10f), SizeUtils.dp2px(10f), - SizeUtils.dp2px(5f)) + SizeUtils.dp2px(10f), + SizeUtils.dp2px(10f)) checkBox.textSize = SizeUtils.sp2px(9f).toFloat() checkBox.text = it.reason checkBox.isChecked = it.isChecked diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_audio_bg.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_audio_bg.png new file mode 100644 index 0000000000..c67751750d Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_audio_bg.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_normal.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_normal.png new file mode 100644 index 0000000000..cd3fee2a61 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_normal.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_select.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_select.png new file mode 100644 index 0000000000..80b99b08c9 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_bad_case_audio_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_cancel_bg.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_cancel_bg.png new file mode 100644 index 0000000000..cf7d73bddc Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_cancel_bg.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_bg.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_bg.xml deleted file mode 100644 index 7435bac1f2..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_normal.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_normal.xml deleted file mode 100644 index db561fa63a..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_normal.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_select.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_select.xml deleted file mode 100644 index b90bb936be..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bad_case_audio_select.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/cancel_button_bg.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/cancel_button_bg.xml deleted file mode 100644 index 612a3e5afe..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/cancel_button_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml index 257adb9947..cb1134f4fe 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml @@ -145,7 +145,7 @@ android:textSize="38px" app:layout_constraintTop_toBottomOf="@id/rbProduct" app:layout_constraintLeft_toLeftOf="@id/rbProduct" - android:layout_marginTop="@dimen/dp_80" + android:layout_marginTop="@dimen/dp_50" /> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml index c41ed98cf1..5c04822c7a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_ai_data_collect.xml @@ -175,7 +175,7 @@ android:textColor="#FFFFFF" android:textSize="30px" android:gravity="center" - android:background="@drawable/cancel_button_bg" + android:background="@drawable/icon_cancel_bg" android:layout_marginBottom="@dimen/dp_40" /> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml index d66f5135db..8afe1d5e5c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml @@ -172,40 +172,30 @@ android:textColor="#FFFFFF" android:textSize="30px" android:gravity="center" - android:background="@drawable/cancel_button_bg" + android:background="@drawable/icon_cancel_bg" android:layout_marginBottom="@dimen/dp_40" /> - - - - - - - -